aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-02-16 16:32:43 (GMT)
committerfluxgen <fluxgen>2003-02-16 16:32:43 (GMT)
commit9db6e018950bd831d08d9fda605e1fe89b148699 (patch)
tree32ddf9fdb047a1878852362d02aa9774adafe7e5
parent453e220df91fabd80a2f8e5992ad1a3a73f4efbe (diff)
downloadfluxbox-9db6e018950bd831d08d9fda605e1fe89b148699.zip
fluxbox-9db6e018950bd831d08d9fda605e1fe89b148699.tar.bz2
changed screen pointer to reference
-rw-r--r--src/Workspace.hh9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Workspace.hh b/src/Workspace.hh
index 2eb32f0..fe10eec 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -47,7 +47,8 @@ public:
47 typedef std::vector<FluxboxWindow *> Windows; 47 typedef std::vector<FluxboxWindow *> Windows;
48 typedef std::vector<Window> Stack; 48 typedef std::vector<Window> Stack;
49 49
50 explicit Workspace(BScreen *screen, FbTk::MultLayers &layermanager, unsigned int workspaceid = 0); 50 Workspace(BScreen &screen, FbTk::MultLayers &layermanager,
51 unsigned int workspaceid = 0);
51 ~Workspace(); 52 ~Workspace();
52 53
53 void setLastFocusedWindow(FluxboxWindow *w); 54 void setLastFocusedWindow(FluxboxWindow *w);
@@ -64,10 +65,10 @@ public:
64 void shutdown(); 65 void shutdown();
65 int addWindow(FluxboxWindow *win, bool place = false); 66 int addWindow(FluxboxWindow *win, bool place = false);
66 int removeWindow(FluxboxWindow *win); 67 int removeWindow(FluxboxWindow *win);
67 BScreen *getScreen() { return screen; } 68 BScreen &getScreen() { return screen; }
68 FluxboxWindow *getLastFocusedWindow() { return lastfocus; } 69 FluxboxWindow *getLastFocusedWindow() { return lastfocus; }
69 70
70 const BScreen *getScreen() const { return screen; } 71 const BScreen &getScreen() const { return screen; }
71 const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; } 72 const FluxboxWindow *getLastFocusedWindow() const { return lastfocus; }
72 FbTk::Menu &menu() { return m_clientmenu; } 73 FbTk::Menu &menu() { return m_clientmenu; }
73 inline const FbTk::Menu &menu() const { return m_clientmenu; } 74 inline const FbTk::Menu &menu() const { return m_clientmenu; }
@@ -96,7 +97,7 @@ protected:
96 97
97private: 98private:
98 99
99 BScreen *screen; 100 BScreen &screen;
100 FluxboxWindow *lastfocus; 101 FluxboxWindow *lastfocus;
101 FbTk::Menu m_clientmenu; 102 FbTk::Menu m_clientmenu;
102 103