From 884db973bb7d11252581e7bc10ce172892986b67 Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Wed, 30 Sep 2009 21:02:24 +0200 Subject: cosmetic fixes: removed redundant ';' + some whitespaces --- nls/fluxbox-nls.hh | 2 +- src/ButtonTool.hh | 2 +- src/ClientMenu.cc | 2 +- src/CurrentWindowCmd.cc | 4 +-- src/Ewmh.cc | 3 +- src/FbCommands.cc | 2 +- src/FbTk/Color.cc | 4 +-- src/FbTk/FbPixmap.cc | 2 +- src/FbTk/FbWindow.cc | 6 ++-- src/FbTk/FileUtil.hh | 2 +- src/FbTk/Font.cc | 4 +-- src/FbTk/Image.cc | 2 +- src/FbTk/Image.hh | 2 +- src/FbTk/ImageControl.cc | 2 +- src/FbTk/ImageImlib2.cc | 2 +- src/FbTk/KeyUtil.cc | 2 +- src/FbTk/LogicCommands.cc | 2 +- src/FbTk/MacroCommand.cc | 2 +- src/FbTk/MultLayers.hh | 2 +- src/FbTk/Observer.cc | 2 +- src/FbTk/Parser.cc | 2 +- src/FbTk/Shape.cc | 2 +- src/FbTk/SignalHandler.cc | 13 +++++---- src/FbTk/Transparent.cc | 2 +- src/FbTk/XFontImp.cc | 2 +- src/FbTk/XmbFontImp.cc | 3 +- src/FocusControl.cc | 64 ++++++++++++++++++++++-------------------- src/IconbarTool.cc | 2 +- src/MenuCreator.cc | 2 +- src/Remember.cc | 6 ++-- src/Remember.hh | 2 +- src/Slit.cc | 2 +- src/ToolFactory.cc | 2 +- src/ToolFactory.hh | 2 +- src/Toolbar.cc | 2 +- src/Window.cc | 2 +- src/WorkspaceCmd.cc | 4 +-- util/fbsetroot.hh | 2 +- util/fluxbox-update_configs.cc | 2 +- 39 files changed, 87 insertions(+), 82 deletions(-) diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh index a304995..7e461ca 100644 --- a/nls/fluxbox-nls.hh +++ b/nls/fluxbox-nls.hh @@ -253,6 +253,6 @@ enum { }; // end enum -}; // end namespace FBNLS +} // end namespace FBNLS #endif // FLUXBOX_NLS_HH diff --git a/src/ButtonTool.hh b/src/ButtonTool.hh index 4339722..484fea6 100644 --- a/src/ButtonTool.hh +++ b/src/ButtonTool.hh @@ -31,7 +31,7 @@ class ButtonTheme; namespace FbTk { class Button; class ImageControl; -}; +} class ButtonTool: public GenericTool { public: diff --git a/src/ClientMenu.cc b/src/ClientMenu.cc index 0da3773..71f322c 100644 --- a/src/ClientMenu.cc +++ b/src/ClientMenu.cc @@ -77,7 +77,7 @@ private: Focusable &m_client; }; -}; // end anonymous namespace +} // end anonymous namespace ClientMenu::ClientMenu(BScreen &screen, Focusables &clients, bool listen_for_iconlist_changes): diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc index 6cb5c08..2575a39 100644 --- a/src/CurrentWindowCmd.cc +++ b/src/CurrentWindowCmd.cc @@ -109,7 +109,7 @@ REGISTER_COMMAND_PARSER(movetabright, createCurrentWindowCmd, void); REGISTER_COMMAND_PARSER(detachclient, createCurrentWindowCmd, void); REGISTER_COMMAND_PARSER(windowmenu, createCurrentWindowCmd, void); -}; // end anonymous namespace +} // end anonymous namespace void WindowHelperCmd::execute() { if (WindowCmd::window() || FocusControl::focusedFbWindow()) @@ -201,7 +201,7 @@ FbTk::Command *parseFocusCmd(const string &command, const string &args, REGISTER_COMMAND_PARSER(activate, parseFocusCmd, void); REGISTER_COMMAND_PARSER(focus, parseFocusCmd, void); -}; // end anonymous namespace +} // end anonymous namespace void SetHeadCmd::real_execute() { int num = m_head; diff --git a/src/Ewmh.cc b/src/Ewmh.cc index b64a95d..82653a5 100644 --- a/src/Ewmh.cc +++ b/src/Ewmh.cc @@ -288,7 +288,7 @@ void extractNetWmIcon(Atom net_wm_icon, WinClient& winclient) { winclient.setIcon(icon); } -}; // end anonymous namespace +} // end anonymous namespace class Ewmh::EwmhAtoms { public: @@ -1535,3 +1535,4 @@ void Ewmh::updateFrameExtents(FluxboxWindow &win) { (unsigned char *)extents, 4); } } + diff --git a/src/FbCommands.cc b/src/FbCommands.cc index 3c69386..26a431a 100644 --- a/src/FbCommands.cc +++ b/src/FbCommands.cc @@ -466,7 +466,7 @@ void SetResourceValueDialogCmd::execute() { FbTk::FbWindow *win = new CommandDialog(*screen, "Type resource name and the value", "SetResourceValue "); win->show(); -}; +} REGISTER_UNTRUSTED_COMMAND_WITH_ARGS(bindkey, FbCommands::BindKeyCmd, void); 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(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 *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 *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 > &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 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) { diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 701373b..bf79d3e 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc @@ -62,20 +62,20 @@ bool doSkipWindow(const Focusable &win, const ClientPattern *pat) { return false; // else don't skip } -}; // end anonymous namespace - +} // end anonymous namespace + FocusControl::FocusControl(BScreen &screen): m_screen(screen), - m_focus_model(screen.resourceManager(), - CLICKFOCUS, - screen.name()+".focusModel", + m_focus_model(screen.resourceManager(), + CLICKFOCUS, + screen.name()+".focusModel", screen.altName()+".FocusModel"), - m_tab_focus_model(screen.resourceManager(), - CLICKTABFOCUS, - screen.name()+".tabFocusModel", + m_tab_focus_model(screen.resourceManager(), + CLICKTABFOCUS, + screen.name()+".tabFocusModel", screen.altName()+".TabFocusModel"), - m_focus_new(screen.resourceManager(), true, - screen.name()+".focusNewWindows", + m_focus_new(screen.resourceManager(), true, + screen.name()+".focusNewWindows", screen.altName()+".FocusNewWindows"), m_focused_list(screen), m_creation_order_list(screen), m_focused_win_list(screen), m_creation_order_win_list(screen), @@ -85,7 +85,7 @@ FocusControl::FocusControl(BScreen &screen): m_ignore_mouse_x(-1), m_ignore_mouse_y(-1) { m_cycling_window = m_focused_list.clientList().end(); - + } void FocusControl::cycleFocus(const FocusableList &window_list, @@ -252,7 +252,7 @@ Focusable *FocusControl::lastFocusedWindow(int workspace) { if (workspace < 0 || workspace >= (int) m_screen.numberOfWorkspaces()) return m_focused_list.clientList().front(); - Focusables::iterator it = m_focused_list.clientList().begin(); + Focusables::iterator it = m_focused_list.clientList().begin(); Focusables::iterator it_end = m_focused_list.clientList().end(); for (; it != it_end; ++it) { if ((*it)->fbwindow() && (*it)->acceptsFocus() && @@ -307,11 +307,11 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { // we scan through the list looking for the window that is "closest" // in the given direction - + FluxboxWindow *foundwin = 0; int weight = 999999, exposure = 0; // extreme values int borderW = win.frame().window().borderWidth(), - top = win.y() + borderW, + top = win.y() + borderW, bottom = win.y() + win.height() + borderW, left = win.x() + borderW, right = win.x() + win.width() + borderW; @@ -319,17 +319,17 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { Workspace::Windows &wins = m_screen.currentWorkspace()->windowList(); Workspace::Windows::iterator it = wins.begin(); for (; it != wins.end(); ++it) { - if ((*it) == &win - || (*it)->isIconic() - || (*it)->isFocusHidden() - || !(*it)->acceptsFocus()) + if ((*it) == &win + || (*it)->isIconic() + || (*it)->isFocusHidden() + || !(*it)->acceptsFocus()) continue; // skip self - + // we check things against an edge, and within the bounds (draw a picture) int edge=0, upper=0, lower=0, oedge=0, oupper=0, olower=0; - int otop = (*it)->y() + borderW, - // 2 * border = border on each side + int otop = (*it)->y() + borderW, + // 2 * border = border on each side obottom = (*it)->y() + (*it)->height() + borderW, oleft = (*it)->x() + borderW, // 2 * border = border on each side @@ -371,7 +371,7 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { break; } - if (oedge < edge) + if (oedge < edge) continue; // not in the right direction if (olower <= upper || oupper >= lower) { @@ -396,7 +396,7 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) { } // else not improvement } - if (foundwin) + if (foundwin) foundwin->focus(); } @@ -516,7 +516,7 @@ void FocusControl::revertFocus(BScreen &screen) { * assumption: client has focus */ void FocusControl::unfocusWindow(WinClient &client, - bool full_revert, + bool full_revert, bool unfocus_frame) { // go up the transient tree looking for a focusable window @@ -547,8 +547,8 @@ void FocusControl::setFocusedWindow(WinClient *client) { return; BScreen *screen = client ? &client->screen() : 0; - BScreen *old_screen = - FocusControl::focusedWindow() ? + BScreen *old_screen = + FocusControl::focusedWindow() ? &FocusControl::focusedWindow()->screen() : 0; #ifdef DEBUG @@ -567,10 +567,10 @@ void FocusControl::setFocusedWindow(WinClient *client) { if (client && client->fbwindow() && !client->fbwindow()->isIconic()) { // screen should be ok - s_focused_fbwindow = client->fbwindow(); + s_focused_fbwindow = client->fbwindow(); s_focused_window = client; // update focused window s_expecting_focus = 0; - s_focused_fbwindow->setCurrentClient(*client, + s_focused_fbwindow->setCurrentClient(*client, false); // don't set inputfocus s_focused_fbwindow->setFocusFlag(true); // set focus flag @@ -604,9 +604,9 @@ std::string FbTk::Resource::getString() const { template<> void FbTk::Resource:: setFromString(char const *strval) { - if (strcasecmp(strval, "MouseFocus") == 0) + if (strcasecmp(strval, "MouseFocus") == 0) m_value = FocusControl::MOUSEFOCUS; - else if (strcasecmp(strval, "ClickToFocus") == 0) + else if (strcasecmp(strval, "ClickToFocus") == 0) m_value = FocusControl::CLICKFOCUS; else setDefaultValue(); @@ -630,9 +630,11 @@ setFromString(char const *strval) { if (strcasecmp(strval, "SloppyTabFocus") == 0 ) m_value = FocusControl::MOUSETABFOCUS; - else if (strcasecmp(strval, "ClickToTabFocus") == 0) + else if (strcasecmp(strval, "ClickToTabFocus") == 0) m_value = FocusControl::CLICKTABFOCUS; else setDefaultValue(); } + } // end namespace FbTk + diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index c84372f..90d4728 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc @@ -241,7 +241,7 @@ private: Focusable &m_win; }; -}; // end anonymous namespace +} // end anonymous namespace IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, FbTk::ThemeProxy &focused_theme, diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc index 7a2e9b4..63691af 100644 --- a/src/MenuCreator.cc +++ b/src/MenuCreator.cc @@ -364,7 +364,7 @@ bool getStart(FbMenuParser &parser, string &label, FbTk::StringConvertor &labelc return true; } -}; // end of anonymous namespace +} // end of anonymous namespace FbMenu *MenuCreator::createMenu(const string &label, int screen_number) { BScreen *screen = Fluxbox::instance()->findScreen(screen_number); diff --git a/src/Remember.cc b/src/Remember.cc index 6a611bf..2eb39d4 100644 --- a/src/Remember.cc +++ b/src/Remember.cc @@ -337,7 +337,7 @@ FbTk::Menu *createRememberMenu(BScreen &screen) { menu->updateMenu(); return menu; -}; +} // offset is the offset in the string that we start looking from // return true if all ok, false on error @@ -395,7 +395,7 @@ bool handleStartupItem(const string &line, int offset) { tmp_exec_cmd->execute(); delete tmp_exec_cmd; return true; -}; +} @@ -609,7 +609,7 @@ Application* findMatchingPatterns(ClientPattern *pat, Remember::Patterns *patlis return 0; } -}; // end anonymous namespace +} // end anonymous namespace /*------------------------------------------------------------------*\ \*------------------------------------------------------------------*/ diff --git a/src/Remember.hh b/src/Remember.hh index fb58a5e..0adbfa9 100644 --- a/src/Remember.hh +++ b/src/Remember.hh @@ -41,7 +41,7 @@ class Application; namespace FbTk { class AutoReloadHelper; -}; +} /** * Class Remember is an atomhandler to avoid interfering with diff --git a/src/Slit.cc b/src/Slit.cc index 10fec24..bcc2051 100644 --- a/src/Slit.cc +++ b/src/Slit.cc @@ -215,7 +215,7 @@ private: Slit::Placement m_place; }; -}; // End anonymous namespace +} // End anonymous namespace unsigned int Slit::s_eventmask = SubstructureRedirectMask | ButtonPressMask | EnterWindowMask | LeaveWindowMask | ExposureMask; diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc index be83616..84184eb 100644 --- a/src/ToolFactory.cc +++ b/src/ToolFactory.cc @@ -66,7 +66,7 @@ private: Toolbar &m_tbar; }; -}; +} ToolFactory::ToolFactory(BScreen &screen):m_screen(screen), m_clock_theme(screen.screenNumber(), "toolbar.clock", "Toolbar.Clock"), diff --git a/src/ToolFactory.hh b/src/ToolFactory.hh index 3d99785..7550f48 100644 --- a/src/ToolFactory.hh +++ b/src/ToolFactory.hh @@ -35,7 +35,7 @@ class Toolbar; namespace FbTk { class FbWindow; -}; +} /// creates toolbaritems class ToolFactory:private FbTk::NotCopyable { diff --git a/src/Toolbar.cc b/src/Toolbar.cc index dbe5e5c..e64d74e 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -177,7 +177,7 @@ private: Toolbar::Placement m_place; }; -}; // end anonymous +} // end anonymous // toolbar frame Toolbar::Frame::Frame(FbTk::EventHandler &evh, int screen_num): diff --git a/src/Window.cc b/src/Window.cc index 3ec91ec..dc4015a 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -259,7 +259,7 @@ private: int m_mode; }; -}; +} int FluxboxWindow::s_num_grabs = 0; diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc index dbcc5dd..d72ef13 100644 --- a/src/WorkspaceCmd.cc +++ b/src/WorkspaceCmd.cc @@ -189,7 +189,7 @@ REGISTER_COMMAND_PARSER(prevwindow, parseWindowList, void); REGISTER_COMMAND_PARSER(prevgroup, parseWindowList, void); REGISTER_COMMAND_PARSER(arrangewindows, parseWindowList, void); -}; // end anonymous namespace +} // end anonymous namespace void AttachCmd::execute() { BScreen *screen = Fluxbox::instance()->keyScreen(); @@ -318,7 +318,7 @@ REGISTER_COMMAND_PARSER(rightworkspace, parseIntCmd, void); REGISTER_COMMAND_PARSER(leftworkspace, parseIntCmd, void); REGISTER_COMMAND_PARSER(workspace, parseIntCmd, void); -}; // end anonymous namespace +} // end anonymous namespace void NextWorkspaceCmd::execute() { BScreen *screen = Fluxbox::instance()->mouseScreen(); diff --git a/util/fbsetroot.hh b/util/fbsetroot.hh index 5a4400f..3cc931b 100644 --- a/util/fbsetroot.hh +++ b/util/fbsetroot.hh @@ -27,7 +27,7 @@ namespace FbTk { class ImageControl; -}; +} class fbsetroot : public FbTk::App { public: diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc index 77b3ff7..40962da 100644 --- a/util/fluxbox-update_configs.cc +++ b/util/fluxbox-update_configs.cc @@ -463,7 +463,7 @@ set modified_files; // we may want to put a size limit on this cache, so it doesn't grow too big map file_cache; -}; +} // returns the contents of the file given, either from the cache or by reading // the file from disk -- cgit v0.11.2