aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Slit.hh13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Slit.hh b/src/Slit.hh
index f39642f..5bb6aa9 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25/// $Id: Slit.hh,v 1.19 2003/02/18 15:11:08 rathnor Exp $ 25/// $Id: Slit.hh,v 1.20 2003/02/20 16:38:17 fluxgen Exp $
26 26
27#ifndef SLIT_HH 27#ifndef SLIT_HH
28#define SLIT_HH 28#define SLIT_HH
@@ -39,6 +39,7 @@
39#include <list> 39#include <list>
40#include <string> 40#include <string>
41#include <memory> 41#include <memory>
42
42class BScreen; 43class BScreen;
43class SlitClient; 44class SlitClient;
44 45
@@ -88,8 +89,8 @@ public:
88 /// cycle slit clients down one step 89 /// cycle slit clients down one step
89 void cycleClientsDown(); 90 void cycleClientsDown();
90 91
91 BScreen *screen() { return m_screen; } 92 BScreen &screen() { return m_screen; }
92 const BScreen *screen() const { return m_screen; } 93 const BScreen &screen() const { return m_screen; }
93 /** 94 /**
94 @name eventhandlers 95 @name eventhandlers
95 */ 96 */
@@ -118,14 +119,14 @@ private:
118 Direction m_direction; 119 Direction m_direction;
119 Placement m_placement; 120 Placement m_placement;
120 121
121 BScreen *m_screen; 122 BScreen &m_screen;
122 FbTk::Timer timer; 123 FbTk::Timer timer;
123 124
124 typedef std::list<SlitClient *> SlitClients; 125 typedef std::list<SlitClient *> SlitClients;
125 126
126 SlitClients clientList; 127 SlitClients clientList;
127 FbTk::Menu slitmenu, placement_menu, clientlist_menu; 128 FbTk::Menu slitmenu, placement_menu, clientlist_menu;
128 LayerMenu<Slit> *slit_layermenu; 129 std::auto_ptr<LayerMenu<Slit> > slit_layermenu;
129 std::string clientListPath; 130 std::string clientListPath;
130 std::string m_filename; 131 std::string m_filename;
131 132
@@ -139,7 +140,7 @@ private:
139 // for KDE 140 // for KDE
140 Atom kwm1_dockwindow, kwm2_dockwindow; 141 Atom kwm1_dockwindow, kwm2_dockwindow;
141 142
142 FbTk::XLayerItem *m_layeritem; 143 std::auto_ptr<FbTk::XLayerItem> m_layeritem;
143}; 144};
144 145
145 146