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) {
    return colval == 65535 ? 0xFF : static_cast<unsigned char>(colval/0xFF);
 }
 
-};
+}
 
 namespace FbTk {
 
@@ -184,4 +184,4 @@ void Color::setRGB(unsigned short red, unsigned short green, unsigned short blue
     m_blue = blue;
 }
 
-};
+}
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() {
     }
 }
 
-}; // end of anonymous namespace
+} // end of anonymous namespace
 
 FbPixmap::FbPixmap():m_pm(0),
                      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,
     create(RootWindow(display(), screen_num),
            x, y, width, height, eventmask,
            override_redirect, save_unders, depth, class_type);
-};
+}
 
 FbWindow::FbWindow(const FbWindow &parent,
                    int x, int y, unsigned int width, unsigned int height,
@@ -105,7 +105,7 @@ FbWindow::FbWindow(const FbWindow &parent,
            override_redirect, save_unders, depth, class_type);
 
 
-};
+}
 
 FbWindow::FbWindow(Window client):
     FbDrawable(),
@@ -686,4 +686,4 @@ bool operator == (Window win, const FbWindow &fbwin) {
     return win == fbwin.window();
 }
 
-};
+}
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 {
     /// copies file 'from' to 'to'
     bool copyFile(const char* from, const char* to);
 
-}; // end of File namespace
+} // end of File namespace
 
 ///  Wrapper class for DIR * routines
 class 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) {
     font.setShadowOffX(2);
 }
 
-}; // end nameless namespace
+} // end nameless namespace
 
 
 
@@ -301,5 +301,5 @@ void Font::drawText(const FbDrawable &w, int screen, GC gc,
 
 }
 
-};
+}
 
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;
 #endif
 
 
-}; // end of anonymous namespace
+} // end of anonymous namespace
 
 namespace FbTk {
 
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 {
     void removeAllSearchPaths();
     /// locates an image in the search path
     std::string locateFile(const std::string &filename);
-};
+}
 
 /// common interface for all image classes
 class 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) {
     }
 }
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 struct ImageControl::Cache {
     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;
 
 ScreenImlibContextContainer contexts;
 
-}; // anon namespace
+} // anon namespace
 
 
 namespace 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[] = {
     {0, 0}
 };
 
-};
+}
 
 namespace FbTk {
 
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);
 REGISTER_COMMAND_PARSER(or, parseLogicCommand, bool);
 REGISTER_COMMAND_PARSER(xor, parseLogicCommand, bool);
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 Command<void> *IfCommand::parse(const std::string &command, const std::string &args,
                           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
 REGISTER_COMMAND_PARSER(macrocmd, parseMacroCmd, void);
 REGISTER_COMMAND_PARSER(togglecmd, parseMacroCmd, void);
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 void MacroCommand::add(RefCount<Command<void> > &com) {
     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:
     int m_lock;
 };
 
-};
+}
 #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() {
     Subject::removeObserver(this); // make sure no subject has this observer attached
 }
 
-};
+}
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 @@
 
 namespace FbTk {
     const Parser::Item Parser::s_empty_item("", "");
-};
+}
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 {
 // unfortunately, we need a separate pixmap per screen
 std::vector<CornerPixmaps> s_corners;
 
-}; // end of anonymous namespace
+} // end of anonymous namespace
 
 Shape::Shape(FbWindow &win, int shapeplaces):
     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() {
     return singleton;
 }
 
-bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh, 
+bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
                                     SignalEventHandler **oldhandler_ret) {
     // must be less than NSIG
     if (signum >= NSIG)
@@ -45,18 +45,18 @@ bool SignalHandler::registerHandler(int signum, SignalEventHandler *eh,
     // get old signal handler for this signum
     if (oldhandler_ret != 0)
         *oldhandler_ret = s_signal_handler[signum];
-        
+
     struct sigaction sa;
     // set callback
     sa.sa_handler = SignalHandler::handleSignal;
     sigemptyset (&sa.sa_mask);
     sa.sa_flags = 0;
-        
+
     if (sigaction(signum, &sa, 0) == -1)
         return false;
-        
+
     s_signal_handler[signum] = eh;
-        
+
     return true;
 }
 
@@ -69,4 +69,5 @@ void SignalHandler::handleSignal(int signum) {
     }
 }
 
-}; 
+}
+
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) {
     return alpha_pic;
 }
 #endif //  HAVE_XRENDER
-};
+}
 
 namespace FbTk {
 
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) {
     return m_rotfonts[orient] != 0;
 }
 
-};
+}
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) {
     return fs;
 }
 
-};
+}
+
 namespace FbTk {
 
 XmbFontImp::XmbFontImp(const char *filename, bool utf8) : m_fontset(0), m_setextents(0), m_utf8mode(utf8) {