nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move some typedefs into class scope

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Screen.h
View file

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

5
src/Workspace.h
View file

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