From: Dana Jansens Date: Sun, 12 May 2002 20:56:40 +0000 (+0000) Subject: move some typedefs into class scope X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=4969c1b08453a4048c94f207f0c02287bdbc1d0c;p=chaz%2Fopenbox move some typedefs into class scope --- diff --git a/src/Screen.h b/src/Screen.h index c59a2e95..15f83a22 100644 --- a/src/Screen.h +++ b/src/Screen.h @@ -55,10 +55,6 @@ #include #include -typedef std::list menuList; -typedef std::list netList; -typedef std::vector wkspList; -typedef std::vector wkspNameList; // forward declaration class BScreen; @@ -116,8 +112,11 @@ private: Iconmenu *iconmenu; Rootmenu *rootmenu; + typedef std::list menuList; menuList rootmenuList; + typedef std::list netList; netList netizenList; + typedef std::list 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 wkspNameList; wkspNameList workspaceNames; + typedef std::vector wkspList; wkspList workspacesList; struct resource { diff --git a/src/Workspace.h b/src/Workspace.h index 9b7aba10..1f2483af 100644 --- a/src/Workspace.h +++ b/src/Workspace.h @@ -35,16 +35,15 @@ class OpenboxWindow; class Size; class Rect; -typedef std::vector winVect; -typedef std::list winList; - class Workspace { private: BScreen &screen; OpenboxWindow *lastfocus; Clientmenu *clientmenu; + typedef std::vector winVect; winVect _windows; + typedef std::list winList; winList _zorder; char *name;