M src/Screen.h → src/Screen.h

@@ -55,10 +55,6 @@ #include "Util.h"
 
 #include <list>
 #include <vector>
-typedef std::list<Rootmenu *> menuList;
-typedef std::list<Netizen *> netList;
-typedef std::vector<Workspace *> wkspList;
-typedef std::vector<std::string> wkspNameList;
 
 // forward declaration
 class BScreen;
@@ -116,8 +112,11 @@ Configmenu *configmenu;
   Iconmenu *iconmenu;
   Rootmenu *rootmenu;
 
+  typedef std::list<Rootmenu *> menuList;
   menuList rootmenuList;
+  typedef std::list<Netizen *> netList;
   netList netizenList;
+  typedef std::list<OpenboxWindow *> winList;
   winList iconList;     // winList is declared in Workspace.h
 
 #ifdef    SLIT
@@ -131,7 +130,9 @@ 
   unsigned int geom_w, geom_h;
   unsigned long event_mask;
 
+  typedef std::vector<std::string> wkspNameList;
   wkspNameList workspaceNames;
+  typedef std::vector<Workspace *> wkspList;
   wkspList workspacesList;
 
   struct resource {

M src/Workspace.h → src/Workspace.h

@@ -35,16 +35,15 @@ class OpenboxWindow;
 class Size;
 class Rect;
 
-typedef std::vector<OpenboxWindow *> winVect;
-typedef std::list<OpenboxWindow *> winList;
-
 class Workspace {
 private:
   BScreen &screen;
   OpenboxWindow *lastfocus;
   Clientmenu *clientmenu;
 
+  typedef std::vector<OpenboxWindow *> winVect;
   winVect _windows;
+  typedef std::list<OpenboxWindow *> winList;
   winList _zorder;
 
   char *name;