1 files changed, 11 insertions, 9 deletions

diff --git a/src/Slit.hh b/src/Slit.hh
index cce1d97..2c29af6 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -19,8 +19,8 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
   
-#ifndef   _SLIT_HH_
-#define   _SLIT_HH_
+#ifndef   SLIT_HH
+#define   SLIT_HH
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -30,8 +30,8 @@ class Slit;
 class Slitmenu;
 
 #include "Basemenu.hh"
-#include "LinkedList.hh"
 
+#include <list>
 
 class Slitmenu : public Basemenu {
 private: 
@@ -100,7 +100,9 @@ private:
   BScreen *screen;
   BTimer *timer;
 
-  LinkedList<SlitClient> *clientList;
+  typedef std::list<SlitClient *> SlitClients;
+
+  SlitClients clientList;
   Slitmenu *slitmenu;
 
   struct frame {
@@ -137,8 +139,8 @@ public:
   inline const unsigned int &getHeight(void) const { return frame.height; }
 
   void addClient(Window);
-  void removeClient(SlitClient *, Bool = True);
-  void removeClient(Window, Bool = True);
+  void removeClient(SlitClient *, bool = true);
+  void removeClient(Window, bool = true);
   void reconfigure(void);
   void reposition(void);
   void shutdown(void);
@@ -150,9 +152,9 @@ public:
 
   virtual void timeout(void);
 
-  enum { Vertical = 1, Horizontal };
-  enum { TopLeft = 1, CenterLeft, BottomLeft, TopCenter, BottomCenter,
-         TopRight, CenterRight, BottomRight };
+  enum { VERTICAL = 1, HORIZONTAL };
+  enum { TOPLEFT = 1, CENTERLEFT, BOTTOMLEFT, TOPCENTER, BOTTOMCENTER,
+         TOPRIGHT, CENTERRIGHT, BOTTOMRIGHT };
 };