From 90ff80f89b990fcdf98d8c28b4d85a4420a8e213 Mon Sep 17 00:00:00 2001 From: fluxgen Date: Tue, 16 Dec 2003 23:36:06 +0000 Subject: cleaning --- src/FbCommands.hh | 4 ++-- src/FbWinFrame.hh | 6 +++--- src/Keys.hh | 10 ++++------ src/Shape.hh | 6 +++--- src/Toolbar.hh | 4 ++-- src/Window.hh | 3 +-- src/fluxbox.cc | 7 +++---- 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/FbCommands.hh b/src/FbCommands.hh index d77bbf7..fc97791 100644 --- a/src/FbCommands.hh +++ b/src/FbCommands.hh @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbCommands.hh,v 1.13 2003/12/03 22:13:21 fluxgen Exp $ +// $Id: FbCommands.hh,v 1.14 2003/12/16 23:35:00 fluxgen Exp $ // \file contains basic commands to restart, reconfigure, execute command and exit fluxbox @@ -98,6 +98,6 @@ public: void execute(); }; -}; // end namespace FbCommands +} // end namespace FbCommands #endif // FBCOMMANDS_HH diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index f1db3fe..f1a7d3f 100644 --- a/src/FbWinFrame.hh +++ b/src/FbWinFrame.hh @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: FbWinFrame.hh,v 1.25 2003/12/09 08:48:08 rathnor Exp $ +// $Id: FbWinFrame.hh,v 1.26 2003/12/16 23:34:36 fluxgen Exp $ #ifndef FBWINFRAME_HH #define FBWINFRAME_HH @@ -46,7 +46,7 @@ class ImageControl; class Command; class Button; class Texture; -}; +} /// holds a window frame with a client window /// (see: image) @@ -295,7 +295,7 @@ private: class ThemeListener: public FbTk::Observer { public: ThemeListener(FbWinFrame &frame):m_frame(frame) { } - void update(FbTk::Subject *subj) { + void update(FbTk::Subject *) { m_frame.reconfigure(); } private: diff --git a/src/Keys.hh b/src/Keys.hh index cc51218..b04cdc8 100644 --- a/src/Keys.hh +++ b/src/Keys.hh @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Keys.hh,v 1.29 2003/10/05 07:19:36 rathnor Exp $ +// $Id: Keys.hh,v 1.30 2003/12/16 23:32:29 fluxgen Exp $ #ifndef KEYS_HH #define KEYS_HH @@ -28,11 +28,9 @@ #include #include -#include "NotCopyable.hh" -#include "RefCount.hh" -namespace FbTk { -class Command; -}; +#include "FbTk/NotCopyable.hh" +#include "FbTk/RefCount.hh" +#include "FbTk/Command.hh" class Keys:private FbTk::NotCopyable { public: diff --git a/src/Shape.hh b/src/Shape.hh index 1232117..0bc037f 100644 --- a/src/Shape.hh +++ b/src/Shape.hh @@ -19,7 +19,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Shape.hh,v 1.2 2003/08/24 15:02:15 fluxgen Exp $ +// $Id: Shape.hh,v 1.3 2003/12/16 23:32:02 fluxgen Exp $ #ifndef SHAPE_HH #define SHAPE_HH @@ -28,7 +28,7 @@ namespace FbTk { class FbWindow; -}; +} /// creates round corners on windows class Shape { @@ -38,7 +38,7 @@ public: BOTTOMRIGHT = 0x01, TOPRIGHT = 0x02, BOTTOMLEFT = 0x04, - TOPLEFT = 0x08, + TOPLEFT = 0x08 }; Shape(FbTk::FbWindow &win, int shapeplaces); diff --git a/src/Toolbar.hh b/src/Toolbar.hh index a2cacd9..57d4bd6 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Toolbar.hh,v 1.50 2003/12/08 17:29:44 fluxgen Exp $ +// $Id: Toolbar.hh,v 1.51 2003/12/16 23:33:21 fluxgen Exp $ #ifndef TOOLBAR_HH #define TOOLBAR_HH @@ -50,7 +50,7 @@ class ToolbarItem; namespace FbTk { class ImageControl; -}; +} /// The toolbar. /// Handles iconbar, workspace name view and clock view diff --git a/src/Window.hh b/src/Window.hh index 6418347..d8a1ec5 100644 --- a/src/Window.hh +++ b/src/Window.hh @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Window.hh,v 1.101 2003/12/07 17:47:42 fluxgen Exp $ +// $Id: Window.hh,v 1.102 2003/12/16 23:28:36 fluxgen Exp $ #ifndef WINDOW_HH #define WINDOW_HH @@ -387,7 +387,6 @@ private: void updateMWMHintsFromClient(WinClient &client); void updateBlackboxHintsFromClient(const WinClient &client); void saveBlackboxAttribs(); - void setNetWMAttributes(); void associateClientWindow(bool use_attrs = false, int x = 0, int y = 0, unsigned int width = 1, unsigned int height = 1); void restoreGravity(); diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 5290cf1..26bf782 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -22,7 +22,7 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: fluxbox.cc,v 1.206 2003/12/09 12:28:24 rathnor Exp $ +// $Id: fluxbox.cc,v 1.207 2003/12/16 23:36:06 fluxgen Exp $ #include "fluxbox.hh" @@ -368,7 +368,7 @@ void copyFile(const std::string &from, const std::string &to) { } } -}; +} // end anonymous static int handleXErrors(Display *d, XErrorEvent *e) { #ifdef DEBUG @@ -1983,7 +1983,7 @@ void Fluxbox::setFocusedWindow(WinClient *client) { #endif // DEBUG BScreen *old_screen = 0, *screen = 0; WinClient *old_client = 0; - Workspace *old_wkspc = 0, *wkspc = 0; + Workspace *old_wkspc = 0; if (m_focused_window != 0) { // check if m_focused_window is valid @@ -2024,7 +2024,6 @@ void Fluxbox::setFocusedWindow(WinClient *client) { m_focused_window = 0; // the window pointer wasn't valid, mark no window focused } else { screen = *winscreen; - wkspc = screen->getWorkspace(win->workspaceNumber()); m_focused_window = client; // update focused window win->setCurrentClient(*client, false); // don't setinputfocus win->setFocusFlag(true); // set focus flag -- cgit v0.11.2