summaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Color.cc4
-rw-r--r--src/FbTk/FbPixmap.cc2
-rw-r--r--src/FbTk/FbWindow.cc6
-rw-r--r--src/FbTk/FileUtil.hh2
-rw-r--r--src/FbTk/Font.cc4
-rw-r--r--src/FbTk/Image.cc2
-rw-r--r--src/FbTk/Image.hh2
-rw-r--r--src/FbTk/ImageControl.cc2
-rw-r--r--src/FbTk/ImageImlib2.cc2
-rw-r--r--src/FbTk/KeyUtil.cc2
-rw-r--r--src/FbTk/LogicCommands.cc2
-rw-r--r--src/FbTk/MacroCommand.cc2
-rw-r--r--src/FbTk/MultLayers.hh2
-rw-r--r--src/FbTk/Observer.cc2
-rw-r--r--src/FbTk/Parser.cc2
-rw-r--r--src/FbTk/Shape.cc2
-rw-r--r--src/FbTk/SignalHandler.cc13
-rw-r--r--src/FbTk/Transparent.cc2
-rw-r--r--src/FbTk/XFontImp.cc2
-rw-r--r--src/FbTk/XmbFontImp.cc3
20 files changed, 31 insertions, 29 deletions
diff --git a/src/FbTk/Color.cc b/src/FbTk/Color.cc
index 2cd4278..b2d61ec 100644
--- a/src/FbTk/Color.cc
+++ b/src/FbTk/Color.cc
@@ -37,7 +37,7 @@ inline unsigned char maxValue(unsigned short colval) {
37 return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF); 37 return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF);
38} 38}
39 39
40}; 40}
41 41
42namespace FbTk { 42namespace FbTk {
43 43
@@ -184,4 +184,4 @@ void Color::setRGB(unsigned short red, unsigned short green, unsigned short blue
184 m_blue = blue; 184 m_blue = blue;
185} 185}
186 186
187}; 187}
diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc
index 3670703..b0c9d70 100644
--- a/src/FbTk/FbPixmap.cc
+++ b/src/FbTk/FbPixmap.cc
@@ -66,7 +66,7 @@ void checkAtoms() {
66 } 66 }
67} 67}
68 68
69}; // end of anonymous namespace 69} // end of anonymous namespace
70 70
71FbPixmap::FbPixmap():m_pm(0), 71FbPixmap::FbPixmap():m_pm(0),
72 m_width(0), m_height(0), 72 m_width(0), m_height(0),
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc
index 2ef24fa..fb0ad1d 100644
--- a/src/FbTk/FbWindow.cc
+++ b/src/FbTk/FbWindow.cc
@@ -87,7 +87,7 @@ FbWindow::FbWindow(int screen_num,
87 create(RootWindow(display(), screen_num), 87 create(RootWindow(display(), screen_num),
88 x, y, width, height, eventmask, 88 x, y, width, height, eventmask,
89 override_redirect, save_unders, depth, class_type); 89 override_redirect, save_unders, depth, class_type);
90}; 90}
91 91
92FbWindow::FbWindow(const FbWindow &parent, 92FbWindow::FbWindow(const FbWindow &parent,
93 int x, int y, unsigned int width, unsigned int height, 93 int x, int y, unsigned int width, unsigned int height,
@@ -105,7 +105,7 @@ FbWindow::FbWindow(const FbWindow &parent,
105 override_redirect, save_unders, depth, class_type); 105 override_redirect, save_unders, depth, class_type);
106 106
107 107
108}; 108}
109 109
110FbWindow::FbWindow(Window client): 110FbWindow::FbWindow(Window client):
111 FbDrawable(), 111 FbDrawable(),
@@ -686,4 +686,4 @@ bool operator == (Window win, const FbWindow &fbwin) {
686 return win == fbwin.window(); 686 return win == fbwin.window();
687} 687}
688 688
689}; 689}
diff --git a/src/FbTk/FileUtil.hh b/src/FbTk/FileUtil.hh
index fea1c1f..d031a6e 100644
--- a/src/FbTk/FileUtil.hh
+++ b/src/FbTk/FileUtil.hh
@@ -58,7 +58,7 @@ namespace FileUtil {
58 /// copies file 'from' to 'to' 58 /// copies file 'from' to 'to'
59 bool copyFile(const char* from, const char* to); 59 bool copyFile(const char* from, const char* to);
60 60
61}; // end of File namespace 61} // end of File namespace
62 62
63/// Wrapper class for DIR * routines 63/// Wrapper class for DIR * routines
64class Directory : private FbTk::NotCopyable { 64class Directory : private FbTk::NotCopyable {
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index f0951ff..cbd8250 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -100,7 +100,7 @@ void resetEffects(FbTk::Font& font) {
100 font.setShadowOffX(2); 100 font.setShadowOffX(2);
101} 101}
102 102
103}; // end nameless namespace 103} // end nameless namespace
104 104
105 105
106 106
@@ -301,5 +301,5 @@ void Font::drawText(const FbDrawable &w, int screen, GC gc,
301 301
302} 302}
303 303
304}; 304}
305 305
diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc
index 0c7b5fc..070672e 100644
--- a/src/FbTk/Image.cc
+++ b/src/FbTk/Image.cc
@@ -59,7 +59,7 @@ FbTk::ImageXPM xpm_loader;
59#endif 59#endif
60 60
61 61
62}; // end of anonymous namespace 62} // end of anonymous namespace
63 63
64namespace FbTk { 64namespace FbTk {
65 65
diff --git a/src/FbTk/Image.hh b/src/FbTk/Image.hh
index 3c731ad..f828d10 100644
--- a/src/FbTk/Image.hh
+++ b/src/FbTk/Image.hh
@@ -50,7 +50,7 @@ namespace Image {
50 void removeAllSearchPaths(); 50 void removeAllSearchPaths();
51 /// locates an image in the search path 51 /// locates an image in the search path
52 std::string locateFile(const std::string &filename); 52 std::string locateFile(const std::string &filename);
53}; 53}
54 54
55/// common interface for all image classes 55/// common interface for all image classes
56class ImageBase { 56class ImageBase {
diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc
index 067bcde..39fb4a7 100644
--- a/src/FbTk/ImageControl.cc
+++ b/src/FbTk/ImageControl.cc
@@ -94,7 +94,7 @@ inline unsigned long bsqrt(unsigned long x) {
94 } 94 }
95} 95}
96 96
97}; // end anonymous namespace 97} // end anonymous namespace
98 98
99struct ImageControl::Cache { 99struct ImageControl::Cache {
100 Pixmap pixmap; 100 Pixmap pixmap;
diff --git a/src/FbTk/ImageImlib2.cc b/src/FbTk/ImageImlib2.cc
index 9983604..5bac7a4 100644
--- a/src/FbTk/ImageImlib2.cc
+++ b/src/FbTk/ImageImlib2.cc
@@ -35,7 +35,7 @@ typedef ScreenImlibContextContainer::iterator ScreenImlibContext;
35 35
36ScreenImlibContextContainer contexts; 36ScreenImlibContextContainer contexts;
37 37
38}; // anon namespace 38} // anon namespace
39 39
40 40
41namespace FbTk { 41namespace FbTk {
diff --git a/src/FbTk/KeyUtil.cc b/src/FbTk/KeyUtil.cc
index 0bfa38e..0578b9c 100644
--- a/src/FbTk/KeyUtil.cc
+++ b/src/FbTk/KeyUtil.cc
@@ -55,7 +55,7 @@ const struct t_modlist modlist[] = {
55 {0, 0} 55 {0, 0}
56}; 56};
57 57
58}; 58}
59 59
60namespace FbTk { 60namespace FbTk {
61 61
diff --git a/src/FbTk/LogicCommands.cc b/src/FbTk/LogicCommands.cc
index e1ea5b8..b3abe31 100644
--- a/src/FbTk/LogicCommands.cc
+++ b/src/FbTk/LogicCommands.cc
@@ -77,7 +77,7 @@ REGISTER_COMMAND_PARSER(and, parseLogicCommand, bool);
77REGISTER_COMMAND_PARSER(or, parseLogicCommand, bool); 77REGISTER_COMMAND_PARSER(or, parseLogicCommand, bool);
78REGISTER_COMMAND_PARSER(xor, parseLogicCommand, bool); 78REGISTER_COMMAND_PARSER(xor, parseLogicCommand, bool);
79 79
80}; // end anonymous namespace 80} // end anonymous namespace
81 81
82Command<void> *IfCommand::parse(const std::string &command, const std::string &args, 82Command<void> *IfCommand::parse(const std::string &command, const std::string &args,
83 bool trusted) { 83 bool trusted) {
diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index 555e5f5..0b7a6b8 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -66,7 +66,7 @@ Command<void> *parseMacroCmd(const std::string &command, const std::string &args
66REGISTER_COMMAND_PARSER(macrocmd, parseMacroCmd, void); 66REGISTER_COMMAND_PARSER(macrocmd, parseMacroCmd, void);
67REGISTER_COMMAND_PARSER(togglecmd, parseMacroCmd, void); 67REGISTER_COMMAND_PARSER(togglecmd, parseMacroCmd, void);
68 68
69}; // end anonymous namespace 69} // end anonymous namespace
70 70
71void MacroCommand::add(RefCount<Command<void> > &com) { 71void MacroCommand::add(RefCount<Command<void> > &com) {
72 m_commandlist.push_back(com); 72 m_commandlist.push_back(com);
diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh
index 2e3915d..2a979be 100644
--- a/src/FbTk/MultLayers.hh
+++ b/src/FbTk/MultLayers.hh
@@ -67,5 +67,5 @@ private:
67 int m_lock; 67 int m_lock;
68}; 68};
69 69
70}; 70}
71#endif // FBTK_MULTLAYERS_HH 71#endif // FBTK_MULTLAYERS_HH
diff --git a/src/FbTk/Observer.cc b/src/FbTk/Observer.cc
index 85af7fd..dcd115f 100644
--- a/src/FbTk/Observer.cc
+++ b/src/FbTk/Observer.cc
@@ -28,4 +28,4 @@ Observer::~Observer() {
28 Subject::removeObserver(this); // make sure no subject has this observer attached 28 Subject::removeObserver(this); // make sure no subject has this observer attached
29} 29}
30 30
31}; 31}
diff --git a/src/FbTk/Parser.cc b/src/FbTk/Parser.cc
index 9e08a53..0555a1a 100644
--- a/src/FbTk/Parser.cc
+++ b/src/FbTk/Parser.cc
@@ -23,4 +23,4 @@
23 23
24namespace FbTk { 24namespace FbTk {
25 const Parser::Item Parser::s_empty_item("", ""); 25 const Parser::Item Parser::s_empty_item("", "");
26}; 26}
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index 6bb63aa..e7e2563 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -103,7 +103,7 @@ struct CornerPixmaps {
103// unfortunately, we need a separate pixmap per screen 103// unfortunately, we need a separate pixmap per screen
104std::vector<CornerPixmaps> s_corners; 104std::vector<CornerPixmaps> s_corners;
105 105
106}; // end of anonymous namespace 106} // end of anonymous namespace
107 107
108Shape::Shape(FbWindow &win, int shapeplaces): 108Shape::Shape(FbWindow &win, int shapeplaces):
109 m_win(&win), 109 m_win(&win),
diff --git a/src/FbTk/SignalHandler.cc b/src/FbTk/SignalHandler.cc
index ea0f86f..a0a4c4c 100644
--- a/src/FbTk/SignalHandler.cc
+++ b/src/FbTk/SignalHandler.cc
@@ -36,7 +36,7 @@ SignalHandler &SignalHandler::instance() {
36 return singleton; 36 return singleton;
37} 37}
38 38
39bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh, 39bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
40 SignalEventHandler **oldhandler_ret) { 40 SignalEventHandler **oldhandler_ret) {
41 // must be less than NSIG 41 // must be less than NSIG
42 if (signum >= NSIG) 42 if (signum >= NSIG)
@@ -45,18 +45,18 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
45 // get old signal handler for this signum 45 // get old signal handler for this signum
46 if (oldhandler_ret != 0) 46 if (oldhandler_ret != 0)
47 *oldhandler_ret = s_signal_handler[signum]; 47 *oldhandler_ret = s_signal_handler[signum];
48 48
49 struct sigaction sa; 49 struct sigaction sa;
50 // set callback 50 // set callback
51 sa.sa_handler = SignalHandler::handleSignal; 51 sa.sa_handler = SignalHandler::handleSignal;
52 sigemptyset (&sa.sa_mask); 52 sigemptyset (&sa.sa_mask);
53 sa.sa_flags = 0; 53 sa.sa_flags = 0;
54 54
55 if (sigaction(signum, &sa, 0) == -1) 55 if (sigaction(signum, &sa, 0) == -1)
56 return false; 56 return false;
57 57
58 s_signal_handler[signum] = eh; 58 s_signal_handler[signum] = eh;
59 59
60 return true; 60 return true;
61} 61}
62 62
@@ -69,4 +69,5 @@ void SignalHandler::handleSignal(int signum) {
69 } 69 }
70} 70}
71 71
72}; 72}
73
diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc
index 992678a..bf8a110 100644
--- a/src/FbTk/Transparent.cc
+++ b/src/FbTk/Transparent.cc
@@ -103,7 +103,7 @@ Picture createAlphaPic(Window drawable, unsigned char alpha) {
103 return alpha_pic; 103 return alpha_pic;
104} 104}
105#endif // HAVE_XRENDER 105#endif // HAVE_XRENDER
106}; 106}
107 107
108namespace FbTk { 108namespace FbTk {
109 109
diff --git a/src/FbTk/XFontImp.cc b/src/FbTk/XFontImp.cc
index a94aa75..257a2a0 100644
--- a/src/FbTk/XFontImp.cc
+++ b/src/FbTk/XFontImp.cc
@@ -410,4 +410,4 @@ bool XFontImp::validOrientation(FbTk::Orientation orient) {
410 return m_rotfonts[orient] != 0; 410 return m_rotfonts[orient] != 0;
411} 411}
412 412
413}; 413}
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc
index 872a24b..3ce913d 100644
--- a/src/FbTk/XmbFontImp.cc
+++ b/src/FbTk/XmbFontImp.cc
@@ -158,7 +158,8 @@ XFontSet createFontSet(const char *fontname, bool& utf8mode) {
158 return fs; 158 return fs;
159} 159}
160 160
161}; 161}
162
162namespace FbTk { 163namespace FbTk {
163 164
164XmbFontImp::XmbFontImp(const char *filename, bool utf8) : m_fontset(0), m_setextents(0), m_utf8mode(utf8) { 165XmbFontImp::XmbFontImp(const char *filename, bool utf8) : m_fontset(0), m_setextents(0), m_utf8mode(utf8) {