nelements is not passed anymore, its simply a return value

[chaz/openbox] / src / screen.hh

diff --git a/src/screen.hh b/src/screen.hh
index 65eacaee3c290e24cf141c8a51e59069be8dece9..d59cf313d2b402919fd7352e319ecbeb2678afad 100644 (file)
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -54,10 +54,8 @@ public:
                                           ButtonPressMask |
                                           ButtonReleaseMask;
 
-  //! Holds a list of Clients
-  typedef std::list<Client*> ClientList;
   //! All managed clients on the screen (in order of being mapped)
-  ClientList clients;
+  std::list<Client*> clients;
   
 private:
   //! Was %Openbox able to manage the screen?
@@ -88,7 +86,7 @@ private:
   Window _supportwindow;
 
   //! A list of all managed clients on the screen, in their stacking order
-  ClientList _stacking;
+  std::list<Client*> _stacking;
 
   //! The desktop currently being displayed
   unsigned int _desktop;
@@ -148,12 +146,10 @@ private:
   void changeNumDesktops(unsigned int num);
 
 public:
-#ifndef SWIG
   //! Constructs a new Screen object
   Screen(int screen);
   //! Destroys the Screen object
   virtual ~Screen();
-#endif
 
   inline int number() const { return _number; }