aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormarkt <markt>2007-07-22 19:50:09 (GMT)
committermarkt <markt>2007-07-22 19:50:09 (GMT)
commitdb002b568670977364db48a89ca116804de01925 (patch)
tree7526c8642f3d3a6482e7824f2e4e7e6dfeff7625 /src
parentd91bf8ffdb0be02f95a4c93fc57e7f213311b9d3 (diff)
downloadfluxbox-db002b568670977364db48a89ca116804de01925.zip
fluxbox-db002b568670977364db48a89ca116804de01925.tar.bz2
more cleanup
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/ImageImlib2.cc4
-rw-r--r--src/FbTk/KeyUtil.cc2
-rw-r--r--src/MenuCreator.cc2
-rw-r--r--src/Screen.cc2
-rw-r--r--src/Slit.cc2
-rw-r--r--src/fluxbox.cc2
-rw-r--r--src/fluxbox.hh2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/FbTk/ImageImlib2.cc b/src/FbTk/ImageImlib2.cc
index 2d3ff6c..b4ef415 100644
--- a/src/FbTk/ImageImlib2.cc
+++ b/src/FbTk/ImageImlib2.cc
@@ -52,7 +52,7 @@ ImageImlib2::ImageImlib2() {
52 52
53 // TODO: this are the potential candidates, 53 // TODO: this are the potential candidates,
54 // choose only sane ones. open for discussion 54 // choose only sane ones. open for discussion
55 static char* format_list[] = { 55 static const char* format_list[] = {
56 "PNG", // pngloader 56 "PNG", // pngloader
57 "JPEG", "JPG", "JFI", "JFIF", // jpegloader 57 "JPEG", "JPG", "JFI", "JFIF", // jpegloader
58// "TIFF", "TIF", // tiffloader 58// "TIFF", "TIF", // tiffloader
@@ -67,7 +67,7 @@ ImageImlib2::ImageImlib2() {
67 NULL 67 NULL
68 }; 68 };
69 69
70 char** format = NULL; 70 const char** format = NULL;
71 for(format = format_list; *format != NULL; format++) { 71 for(format = format_list; *format != NULL; format++) {
72 Image::registerType(*format, *this); 72 Image::registerType(*format, *this);
73 } 73 }
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index 1830dca..a6ca632 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -34,7 +34,7 @@
34namespace { 34namespace {
35 35
36struct t_modlist{ 36struct t_modlist{
37 char *str; 37 const char *str;
38 unsigned int mask; 38 unsigned int mask;
39 bool operator == (const char *modstr) const { 39 bool operator == (const char *modstr) const {
40 return (strcasecmp(str, modstr) == 0 && mask !=0); 40 return (strcasecmp(str, modstr) == 0 && mask !=0);
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc
index 16acfb8..b425d41 100644
--- a/src/MenuCreator.cc
+++ b/src/MenuCreator.cc
@@ -523,7 +523,7 @@ FbTk::Menu *MenuCreator::createMenuType(const string &type, int screen_num) {
523 menu->disableTitle(); // not titlebar 523 menu->disableTitle(); // not titlebar
524 if (screen->windowMenuFilename().empty() || 524 if (screen->windowMenuFilename().empty() ||
525 ! createWindowMenuFromFile(screen->windowMenuFilename(), *menu, true)) { 525 ! createWindowMenuFromFile(screen->windowMenuFilename(), *menu, true)) {
526 char *default_menu[] = { 526 const char *default_menu[] = {
527 "shade", 527 "shade",
528 "stick", 528 "stick",
529 "maximize", 529 "maximize",
diff --git a/src/Screen.cc b/src/Screen.cc
index e89db09..d843a53 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1296,6 +1296,8 @@ void BScreen::changeWorkspaceID(unsigned int id) {
1296 1296
1297 FbTk::App::instance()->sync(false); 1297 FbTk::App::instance()->sync(false);
1298 1298
1299 m_currentworkspace_sig.notify();
1300
1299} 1301}
1300 1302
1301 1303
diff --git a/src/Slit.cc b/src/Slit.cc
index c0ff1ac..b18dddc 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -59,7 +59,6 @@
59#include "SlitTheme.hh" 59#include "SlitTheme.hh"
60#include "SlitClient.hh" 60#include "SlitClient.hh"
61#include "Xutil.hh" 61#include "Xutil.hh"
62#include "FbAtoms.hh"
63#include "FbTk/App.hh" 62#include "FbTk/App.hh"
64#include "FbTk/MenuSeparator.hh" 63#include "FbTk/MenuSeparator.hh"
65#include "FbTk/StringUtil.hh" 64#include "FbTk/StringUtil.hh"
@@ -497,7 +496,6 @@ void Slit::addClient(Window w) {
497 496
498 Atom *proto = 0; 497 Atom *proto = 0;
499 int num_return = 0; 498 int num_return = 0;
500 FbAtoms *fbatoms = FbAtoms::instance();
501 499
502 if (XGetWMProtocols(disp, w, &proto, &num_return)) { 500 if (XGetWMProtocols(disp, w, &proto, &num_return)) {
503 501
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 803f911..248c897 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1404,7 +1404,7 @@ string Fluxbox::getRcFilename() {
1404} 1404}
1405 1405
1406/// Provides default filename of data file 1406/// Provides default filename of data file
1407void Fluxbox::getDefaultDataFilename(char *name, string &filename) { 1407void Fluxbox::getDefaultDataFilename(const char *name, string &filename) const {
1408 filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name); 1408 filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name);
1409} 1409}
1410 1410
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 2cd8ef3..625a906 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -196,7 +196,7 @@ public:
196 bool menuTimestampsChanged() const; 196 bool menuTimestampsChanged() const;
197 bool haveShape() const { return m_have_shape; } 197 bool haveShape() const { return m_have_shape; }
198 int shapeEventbase() const { return m_shape_eventbase; } 198 int shapeEventbase() const { return m_shape_eventbase; }
199 void getDefaultDataFilename(char *name, std::string &); 199 void getDefaultDataFilename(const char *name, std::string &) const;
200 // screen mouse was in at last key event 200 // screen mouse was in at last key event
201 BScreen *mouseScreen() { return m_mousescreen; } 201 BScreen *mouseScreen() { return m_mousescreen; }
202 // screen of window that last key event (i.e. focused window) went to 202 // screen of window that last key event (i.e. focused window) went to