using a Screen reference instead of pointer in Workspace

[chaz/openbox] / src / Screen.cc

diff --git a/src/Screen.cc b/src/Screen.cc
index 78a9a3993d30d60be9db88c7213800059182bd84..74c299d408534c03a4d5082b2e6fc2e82cf509c7 100644 (file)
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -394,12 +394,12 @@ BScreen::BScreen(Openbox &ob, int scrn) : ScreenInfo(ob, scrn), openbox(ob) {
   Workspace *wkspc = (Workspace *) 0;
   if (resource.workspaces != 0) {
     for (int i = 0; i < resource.workspaces; ++i) {
-      wkspc = new Workspace(this, workspacesList->count());
+      wkspc = new Workspace(*this, workspacesList->count());
       workspacesList->insert(wkspc);
       workspacemenu->insert(wkspc->getName(), wkspc->getMenu());
     }
   } else {
-    wkspc = new Workspace(this, workspacesList->count());
+    wkspc = new Workspace(*this, workspacesList->count());
     workspacesList->insert(wkspc);
     workspacemenu->insert(wkspc->getName(), wkspc->getMenu());
   }
@@ -462,7 +462,7 @@ BScreen::BScreen(Openbox &ob, int scrn) : ScreenInfo(ob, scrn), openbox(ob) {
       if (attrib.override_redirect) continue;
 
       if (attrib.map_state != IsUnmapped) {
-        new OpenboxWindow(&openbox, children[i], this);
+        new OpenboxWindow(openbox, children[i], this);
 
         OpenboxWindow *win = openbox.searchWindow(children[i]);
         if (win) {
@@ -1338,7 +1338,7 @@ OpenboxWindow *BScreen::getIcon(int index) {
 
 
 int BScreen::addWorkspace(void) {
-  Workspace *wkspc = new Workspace(this, workspacesList->count());
+  Workspace *wkspc = new Workspace(*this, workspacesList->count());
   workspacesList->insert(wkspc);
 
   workspacemenu->insert(wkspc->getName(), wkspc->getMenu(),