move some typedefs into class scope

This commit is contained in:
Dana Jansens 2002-05-12 20:56:40 +00:00
parent 30b899fc02
commit 4969c1b084
2 changed files with 7 additions and 7 deletions

View file

@ -55,10 +55,6 @@
#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 @@ private:
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 @@ private:
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 {

View file

@ -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;