From 1e2ab2f3ed00ddae4855ccbf9eee92364cc33420 Mon Sep 17 00:00:00 2001 From: Thomas Orgis Date: Mon, 21 Apr 2008 15:43:10 -0700 Subject: [PATCH] some fixes for gcc 3.4 --- src/FbCommands.cc | 2 +- src/FbTk/Accessor.hh | 2 +- src/FbTk/App.cc | 2 +- src/FbTk/BoolMenuItem.hh | 2 +- src/FbTk/BorderTheme.cc | 2 +- src/FbTk/BorderTheme.hh | 2 +- src/FbTk/Button.cc | 2 +- src/FbTk/Container.cc | 2 +- src/FbTk/Container.hh | 2 +- src/FbTk/DefaultValue.hh | 2 +- src/FbTk/EventManager.cc | 2 +- src/FbTk/FbDrawable.cc | 2 +- src/FbTk/FbPixmap.cc | 2 +- src/FbTk/FbString.cc | 4 ++-- src/FbTk/FileUtil.cc | 2 +- src/FbTk/Font.cc | 3 ++- src/FbTk/FontImp.hh | 2 +- src/FbTk/I18n.cc | 2 +- src/FbTk/I18n.hh | 2 +- src/FbTk/Image.cc | 2 +- src/FbTk/ImageControl.cc | 2 +- src/FbTk/IntMenuItem.hh | 2 +- src/FbTk/LogicCommands.cc | 2 +- src/FbTk/MacroCommand.cc | 2 +- src/FbTk/Menu.cc | 2 +- src/FbTk/MenuItem.cc | 2 +- src/FbTk/MenuTheme.cc | 2 +- src/FbTk/ObjectRegistry.hh | 2 +- src/FbTk/Parser.hh | 2 +- src/FbTk/RegExp.cc | 2 +- src/FbTk/RegExp.hh | 2 +- src/FbTk/Resource.cc | 2 +- src/FbTk/Resource.hh | 1 + src/FbTk/STLUtil.hh | 4 ++-- src/FbTk/Shape.cc | 2 +- src/FbTk/Shape.hh | 2 +- src/FbTk/StringUtil.cc | 4 ++-- src/FbTk/Subject.cc | 2 +- src/FbTk/TextBox.cc | 2 +- src/FbTk/TextButton.cc | 2 +- src/FbTk/TextTheme.cc | 2 +- src/FbTk/TextTheme.hh | 2 +- src/FbTk/TextUtils.cc | 2 +- src/FbTk/Texture.cc | 2 +- src/FbTk/Texture.hh | 4 ++-- src/FbTk/TextureRender.cc | 2 +- src/FbTk/TextureRender.hh | 2 +- src/FbTk/Theme.cc | 2 +- src/FbTk/Timer.cc | 2 +- src/FbTk/Transparent.cc | 2 +- src/FbTk/Transparent.hh | 2 +- src/FbTk/XftFontImp.cc | 2 +- src/FbTk/XmbFontImp.cc | 2 +- src/FocusableList.hh | 2 +- src/Window.hh | 2 +- src/Xutil.cc | 2 +- src/Xutil.hh | 2 +- 57 files changed, 62 insertions(+), 60 deletions(-) diff --git a/src/FbCommands.cc b/src/FbCommands.cc index c815145c..059031c8 100644 --- a/src/FbCommands.cc +++ b/src/FbCommands.cc @@ -556,4 +556,4 @@ void DeiconifyCmd::execute() { }; } -}; // end namespace FbCommands +} // end namespace FbCommands diff --git a/src/FbTk/Accessor.hh b/src/FbTk/Accessor.hh index e60298bd..f21602cc 100644 --- a/src/FbTk/Accessor.hh +++ b/src/FbTk/Accessor.hh @@ -81,6 +81,6 @@ private: Getter m_getter; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_ACCESSOR_HH diff --git a/src/FbTk/App.cc b/src/FbTk/App.cc index 4bdc205c..25c338f6 100644 --- a/src/FbTk/App.cc +++ b/src/FbTk/App.cc @@ -81,4 +81,4 @@ void App::end() { m_done = true; //end loop in App::eventLoop } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/BoolMenuItem.hh b/src/FbTk/BoolMenuItem.hh index 47d6db4c..3e68cbd1 100644 --- a/src/FbTk/BoolMenuItem.hh +++ b/src/FbTk/BoolMenuItem.hh @@ -58,6 +58,6 @@ private: Accessor &m_item; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_BOOLMENUITEM_HH diff --git a/src/FbTk/BorderTheme.cc b/src/FbTk/BorderTheme.cc index 12239543..c4ce4dcd 100644 --- a/src/FbTk/BorderTheme.cc +++ b/src/FbTk/BorderTheme.cc @@ -33,4 +33,4 @@ BorderTheme::BorderTheme(Theme &theme, const std::string &name, m_color->setFromString("black", theme.screenNum()); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/BorderTheme.hh b/src/FbTk/BorderTheme.hh index 9b9ca550..79cd5e48 100644 --- a/src/FbTk/BorderTheme.hh +++ b/src/FbTk/BorderTheme.hh @@ -42,6 +42,6 @@ private: ThemeItem m_color; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_BORDERTHEME_HH diff --git a/src/FbTk/Button.cc b/src/FbTk/Button.cc index bcdc90e8..0284fead 100644 --- a/src/FbTk/Button.cc +++ b/src/FbTk/Button.cc @@ -146,4 +146,4 @@ void Button::exposeEvent(XExposeEvent &event) { clearArea(event.x, event.y, event.width, event.height); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Container.cc b/src/FbTk/Container.cc index 0c9b6ac6..81758295 100644 --- a/src/FbTk/Container.cc +++ b/src/FbTk/Container.cc @@ -491,4 +491,4 @@ void Container::setOrientation(Orientation orient) { } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Container.hh b/src/FbTk/Container.hh index d2b826c0..2a97f7f1 100644 --- a/src/FbTk/Container.hh +++ b/src/FbTk/Container.hh @@ -109,6 +109,6 @@ private: bool m_update_lock; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_CONTAINER_HH diff --git a/src/FbTk/DefaultValue.hh b/src/FbTk/DefaultValue.hh index ca20370b..1a59a041 100644 --- a/src/FbTk/DefaultValue.hh +++ b/src/FbTk/DefaultValue.hh @@ -51,6 +51,6 @@ private: bool m_use_default; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_DEFAULTVALUE_HH diff --git a/src/FbTk/EventManager.cc b/src/FbTk/EventManager.cc index 1a88e142..31d0293d 100644 --- a/src/FbTk/EventManager.cc +++ b/src/FbTk/EventManager.cc @@ -221,4 +221,4 @@ void EventManager::dispatch(Window win, XEvent &ev, bool parent) { } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/FbDrawable.cc b/src/FbTk/FbDrawable.cc index 3d7160c6..766dd56a 100644 --- a/src/FbTk/FbDrawable.cc +++ b/src/FbTk/FbDrawable.cc @@ -166,4 +166,4 @@ XImage *FbDrawable::image(int x, int y, unsigned int width, unsigned int height) ZPixmap); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/FbPixmap.cc b/src/FbTk/FbPixmap.cc index 7c1d6741..3670703e 100644 --- a/src/FbTk/FbPixmap.cc +++ b/src/FbTk/FbPixmap.cc @@ -506,4 +506,4 @@ void FbPixmap::create(Drawable src, m_depth = depth; } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/FbString.cc b/src/FbTk/FbString.cc index c8129dbe..0164afd8 100644 --- a/src/FbTk/FbString.cc +++ b/src/FbTk/FbString.cc @@ -239,7 +239,7 @@ bool haveUTF8() { } -}; // end namespace StringUtil +} // end namespace StringUtil StringConvertor::StringConvertor(EncodingTarget target): #ifdef HAVE_ICONV @@ -289,4 +289,4 @@ string StringConvertor::recode(const string &src) { #endif } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/FileUtil.cc b/src/FbTk/FileUtil.cc index d615b8ff..5de560ba 100644 --- a/src/FbTk/FileUtil.cc +++ b/src/FbTk/FileUtil.cc @@ -145,4 +145,4 @@ bool Directory::open(const char *dir) { } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc index b21e7c4d..f0951ff9 100644 --- a/src/FbTk/Font.cc +++ b/src/FbTk/Font.cc @@ -73,12 +73,13 @@ using std::string; using std::map; using std::list; -namespace { #ifdef HAVE_SETLOCALE #include #endif //HAVE_SETLOCALE +namespace { + // use to map || => typedef map StringMap; typedef StringMap::iterator StringMapIt; diff --git a/src/FbTk/FontImp.hh b/src/FbTk/FontImp.hh index d903a4e1..4d7eb168 100644 --- a/src/FbTk/FontImp.hh +++ b/src/FbTk/FontImp.hh @@ -53,6 +53,6 @@ protected: FontImp() { } }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_FONTIMP_HH diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc index 2d8cc4c9..81ff0780 100644 --- a/src/FbTk/I18n.cc +++ b/src/FbTk/I18n.cc @@ -195,4 +195,4 @@ FbString I18n::getMessage(int set_number, int message_number, return default_message; } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/I18n.hh b/src/FbTk/I18n.hh index 819abcc1..0413f743 100644 --- a/src/FbTk/I18n.hh +++ b/src/FbTk/I18n.hh @@ -123,6 +123,6 @@ private: void NLSInit(const char *); -}; // end namespace FbTk +} // end namespace FbTk #endif // I18N_HH diff --git a/src/FbTk/Image.cc b/src/FbTk/Image.cc index 078d32b1..639bafd4 100644 --- a/src/FbTk/Image.cc +++ b/src/FbTk/Image.cc @@ -160,4 +160,4 @@ void Image::removeAllSearchPaths() { s_search_paths.clear(); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/ImageControl.cc b/src/FbTk/ImageControl.cc index 1fa2f65e..d68ddb13 100644 --- a/src/FbTk/ImageControl.cc +++ b/src/FbTk/ImageControl.cc @@ -672,4 +672,4 @@ void ImageControl::createColorTable() { } } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/IntMenuItem.hh b/src/FbTk/IntMenuItem.hh index 010a614a..4aade43f 100644 --- a/src/FbTk/IntMenuItem.hh +++ b/src/FbTk/IntMenuItem.hh @@ -96,6 +96,6 @@ private: Accessor &m_res; ///< resource item to be changed }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_INTMENUITEM_HH diff --git a/src/FbTk/LogicCommands.cc b/src/FbTk/LogicCommands.cc index 15bcbdb0..e1ea5b8d 100644 --- a/src/FbTk/LogicCommands.cc +++ b/src/FbTk/LogicCommands.cc @@ -153,4 +153,4 @@ bool XorCommand::execute() { return ret; } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc index 372cde99..511683b4 100644 --- a/src/FbTk/MacroCommand.cc +++ b/src/FbTk/MacroCommand.cc @@ -97,6 +97,6 @@ void ToggleCommand::execute() { m_state = 0; } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc index ff57bdeb..4b73b414 100644 --- a/src/FbTk/Menu.cc +++ b/src/FbTk/Menu.cc @@ -1300,4 +1300,4 @@ void Menu::hideShownMenu() { shown->hide(); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc index 81765b18..dcd7dd78 100644 --- a/src/FbTk/MenuItem.cc +++ b/src/FbTk/MenuItem.cc @@ -354,4 +354,4 @@ void MenuItem::showSubmenu() { submenu()->show(); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/MenuTheme.cc b/src/FbTk/MenuTheme.cc index 2e3e7945..12aee4d2 100644 --- a/src/FbTk/MenuTheme.cc +++ b/src/FbTk/MenuTheme.cc @@ -177,4 +177,4 @@ void ThemeItem::load(const std::string *name, const std:: // do nothing, we don't have anything extra to load } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/ObjectRegistry.hh b/src/FbTk/ObjectRegistry.hh index e68d6305..4f47b771 100644 --- a/src/FbTk/ObjectRegistry.hh +++ b/src/FbTk/ObjectRegistry.hh @@ -58,6 +58,6 @@ private: CreatorMap m_creators; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // OBJECTREGISTRY_HH diff --git a/src/FbTk/Parser.hh b/src/FbTk/Parser.hh index 8415d4a8..dbb51191 100644 --- a/src/FbTk/Parser.hh +++ b/src/FbTk/Parser.hh @@ -47,6 +47,6 @@ public: }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_PARSER_HH diff --git a/src/FbTk/RegExp.cc b/src/FbTk/RegExp.cc index 3ee95b6d..34679717 100644 --- a/src/FbTk/RegExp.cc +++ b/src/FbTk/RegExp.cc @@ -92,4 +92,4 @@ bool RegExp::error() const { #endif // USE_REGEXP } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/RegExp.hh b/src/FbTk/RegExp.hh index 03866706..47d2cd58 100644 --- a/src/FbTk/RegExp.hh +++ b/src/FbTk/RegExp.hh @@ -61,6 +61,6 @@ private: }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_REGEXP_HH diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc index 1bf7964f..94b31b2d 100644 --- a/src/FbTk/Resource.cc +++ b/src/FbTk/Resource.cc @@ -230,4 +230,4 @@ void ResourceManager::unlock() { } } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Resource.hh b/src/FbTk/Resource.hh index e9c3ac95..bfdcdcaa 100644 --- a/src/FbTk/Resource.hh +++ b/src/FbTk/Resource.hh @@ -145,6 +145,7 @@ protected: private: static bool m_init; + ResourceList m_resourcelist; XrmDatabaseHelper *m_database; diff --git a/src/FbTk/STLUtil.hh b/src/FbTk/STLUtil.hh index ec783d92..d427a171 100644 --- a/src/FbTk/STLUtil.hh +++ b/src/FbTk/STLUtil.hh @@ -49,7 +49,7 @@ void destroyAndClearSecond(A &a) { a.clear(); } -}; // end namespace STLUtil -}; // end namespace FbTk +} // end namespace STLUtil +} // end namespace FbTk #endif // STLUTIL_Hh diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc index 251d4d4e..6cc46f8f 100644 --- a/src/FbTk/Shape.cc +++ b/src/FbTk/Shape.cc @@ -372,4 +372,4 @@ bool Shape::isShaped(const FbWindow &win) { return (shaped != 0 ? true : false); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Shape.hh b/src/FbTk/Shape.hh index 35399595..49c1d3f6 100644 --- a/src/FbTk/Shape.hh +++ b/src/FbTk/Shape.hh @@ -69,6 +69,6 @@ private: int m_shapeplaces; ///< places to shape }; -}; // end namespace FbTk +} // end namespace FbTk #endif // SHAPE_HH diff --git a/src/FbTk/StringUtil.cc b/src/FbTk/StringUtil.cc index 1e8df014..7c8f91cc 100644 --- a/src/FbTk/StringUtil.cc +++ b/src/FbTk/StringUtil.cc @@ -236,6 +236,6 @@ void getFirstWord(const std::string &in, std::string &word, std::string &rest) { } } -}; // end namespace StringUtil +} // end namespace StringUtil -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Subject.cc b/src/FbTk/Subject.cc index f6fb2d59..594eb232 100644 --- a/src/FbTk/Subject.cc +++ b/src/FbTk/Subject.cc @@ -82,4 +82,4 @@ void Subject::removeObserver(Observer *obj) { } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/TextBox.cc b/src/FbTk/TextBox.cc index 1527fa1f..b8cdcdeb 100644 --- a/src/FbTk/TextBox.cc +++ b/src/FbTk/TextBox.cc @@ -464,4 +464,4 @@ void TextBox::adjustPos(){ adjustStartPos(); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/TextButton.cc b/src/FbTk/TextButton.cc index 5a7afa6a..561fe21e 100644 --- a/src/FbTk/TextButton.cc +++ b/src/FbTk/TextButton.cc @@ -187,4 +187,4 @@ void TextButton::exposeEvent(XExposeEvent &event) { clearArea(event.x, event.y, event.width, event.height, false); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/TextTheme.cc b/src/FbTk/TextTheme.cc index dad002e3..68eaa5f7 100644 --- a/src/FbTk/TextTheme.cc +++ b/src/FbTk/TextTheme.cc @@ -45,4 +45,4 @@ void TextTheme::updateTextColor() { m_text_gc.setForeground(*m_text_color); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/TextTheme.hh b/src/FbTk/TextTheme.hh index 02adf92c..3832b9a5 100644 --- a/src/FbTk/TextTheme.hh +++ b/src/FbTk/TextTheme.hh @@ -50,6 +50,6 @@ private: GContext m_text_gc; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_TEXTTHEME_HH diff --git a/src/FbTk/TextUtils.cc b/src/FbTk/TextUtils.cc index 2b47531c..fa2ea0cb 100644 --- a/src/FbTk/TextUtils.cc +++ b/src/FbTk/TextUtils.cc @@ -84,4 +84,4 @@ template <> void ThemeItem::load(const std::string *name, const std::string *altname) { } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Texture.cc b/src/FbTk/Texture.cc index eea7f277..5a12e8d8 100644 --- a/src/FbTk/Texture.cc +++ b/src/FbTk/Texture.cc @@ -147,4 +147,4 @@ void Texture::calcHiLoColors(int screen_num) { m_locolor.setPixel(xcol.pixel); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Texture.hh b/src/FbTk/Texture.hh index a3168798..96953fda 100644 --- a/src/FbTk/Texture.hh +++ b/src/FbTk/Texture.hh @@ -41,14 +41,14 @@ public: FLAT = 0x00002, SUNKEN = 0x00004, RAISED = 0x00008, - DEFAULT_BEVEL = FLAT, + DEFAULT_BEVEL = FLAT }; enum Textures { NONE = 0x00000, SOLID = 0x00010, GRADIENT = 0x00020, - DEFAULT_TEXTURE = SOLID, + DEFAULT_TEXTURE = SOLID }; enum Gradients { diff --git a/src/FbTk/TextureRender.cc b/src/FbTk/TextureRender.cc index a4bb50ce..3ee5acd3 100644 --- a/src/FbTk/TextureRender.cc +++ b/src/FbTk/TextureRender.cc @@ -1840,4 +1840,4 @@ void TextureRender::cdgradient() { } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/TextureRender.hh b/src/FbTk/TextureRender.hh index cfedba56..158625eb 100644 --- a/src/FbTk/TextureRender.hh +++ b/src/FbTk/TextureRender.hh @@ -98,5 +98,5 @@ private: unsigned int *xtable, *ytable; }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_TEXTURERENDER_HH diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc index ce3b3b4e..46c9a56f 100644 --- a/src/FbTk/Theme.cc +++ b/src/FbTk/Theme.cc @@ -263,4 +263,4 @@ void ThemeManager::listItems() { } */ -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Timer.cc b/src/FbTk/Timer.cc index f235476f..a8c1c146 100644 --- a/src/FbTk/Timer.cc +++ b/src/FbTk/Timer.cc @@ -287,4 +287,4 @@ void Timer::removeTimer(Timer *timer) { m_timerlist.remove(timer); } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Transparent.cc b/src/FbTk/Transparent.cc index 60afe3e8..992678ac 100644 --- a/src/FbTk/Transparent.cc +++ b/src/FbTk/Transparent.cc @@ -335,7 +335,7 @@ void Transparent::freeAlpha() { m_alpha = 255; } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/Transparent.hh b/src/FbTk/Transparent.hh index 9aafa664..154c223a 100644 --- a/src/FbTk/Transparent.hh +++ b/src/FbTk/Transparent.hh @@ -69,7 +69,7 @@ private: static void init(); }; -}; // end namespace FbTk +} // end namespace FbTk #endif // FBTK_TRANSPARENT_HH diff --git a/src/FbTk/XftFontImp.cc b/src/FbTk/XftFontImp.cc index 5b933de5..80eb2c4b 100644 --- a/src/FbTk/XftFontImp.cc +++ b/src/FbTk/XftFontImp.cc @@ -249,4 +249,4 @@ bool XftFontImp::validOrientation(FbTk::Orientation orient) { -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index e05609c2..872a24b6 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc @@ -306,5 +306,5 @@ unsigned int XmbFontImp::height() const { return m_setextents->max_ink_extent.height; } -}; // end namespace FbTk +} // end namespace FbTk diff --git a/src/FocusableList.hh b/src/FocusableList.hh index d46fe480..cdf6beca 100644 --- a/src/FocusableList.hh +++ b/src/FocusableList.hh @@ -42,7 +42,7 @@ public: /// list option bits enum { LIST_GROUPS = 0x01, //< list groups instead of clients - STATIC_ORDER = 0x02, ///< use creation order instead of focused order + STATIC_ORDER = 0x02 ///< use creation order instead of focused order }; FocusableList(BScreen &scr): m_pat(0), m_parent(0), m_screen(scr) { } diff --git a/src/Window.hh b/src/Window.hh index 700bd108..de5bfe4c 100644 --- a/src/Window.hh +++ b/src/Window.hh @@ -96,7 +96,7 @@ public: ATTRIB_WORKSPACE = 0x10, ///< workspace ATTRIB_STACK = 0x20, ///< stack ATTRIB_DECORATION = 0x40, ///< decorations - ATTRIB_HIDDEN = 0x80, ///< hidden + ATTRIB_HIDDEN = 0x80 ///< hidden }; /** diff --git a/src/Xutil.cc b/src/Xutil.cc index a1744c45..e179857a 100644 --- a/src/Xutil.cc +++ b/src/Xutil.cc @@ -142,5 +142,5 @@ string getWMClassClass(Window win) { return class_name; } -}; // end namespace Xutil +} // end namespace Xutil diff --git a/src/Xutil.hh b/src/Xutil.hh index 27e6629f..70fa8ed1 100644 --- a/src/Xutil.hh +++ b/src/Xutil.hh @@ -34,6 +34,6 @@ std::string getWMClassName(Window win); std::string getWMClassClass(Window win); -}; // end namespace Xutil +} // end namespace Xutil #endif // XUTIL_HH