Remove Workspace pointer from Placement

placement.cpp

@@ -43,8 +43,6 @@ KWIN_SINGLETON_FACTORY(Placement)
 
 Placement::Placement(QObject*)
 {
-    m_WorkspacePtr = Workspace::self();
-
     reinitCascading(0);
 }
 
@@ -207,7 +205,7 @@ void Placement::placeSmart(Client* c, const QRect& area, Policy /*next*/)
             cxl = x; cxr = x + cw;
             cyt = y; cyb = y + ch;
             ToplevelList::ConstIterator l;
-            for (l = m_WorkspacePtr->stackingOrder().constBegin(); l != m_WorkspacePtr->stackingOrder().constEnd() ; ++l) {
+            for (l = workspace()->stackingOrder().constBegin(); l != workspace()->stackingOrder().constEnd() ; ++l) {
                 Client *client = qobject_cast<Client*>(*l);
                 if (isIrrelevant(client, c, desktop)) {
                     continue;
@@ -256,7 +254,7 @@ void Placement::placeSmart(Client* c, const QRect& area, Policy /*next*/)
 
             // compare to the position of each client on the same desk
             ToplevelList::ConstIterator l;
-            for (l = m_WorkspacePtr->stackingOrder().constBegin(); l != m_WorkspacePtr->stackingOrder().constEnd() ; ++l) {
+            for (l = workspace()->stackingOrder().constBegin(); l != workspace()->stackingOrder().constEnd() ; ++l) {
                 Client *client = qobject_cast<Client*>(*l);
                 if (isIrrelevant(client, c, desktop)) {
                     continue;
@@ -287,7 +285,7 @@ void Placement::placeSmart(Client* c, const QRect& area, Policy /*next*/)
 
             //test the position of each window on the desk
             ToplevelList::ConstIterator l;
-            for (l = m_WorkspacePtr->stackingOrder().constBegin(); l != m_WorkspacePtr->stackingOrder().constEnd() ; ++l) {
+            for (l = workspace()->stackingOrder().constBegin(); l != workspace()->stackingOrder().constEnd() ; ++l) {
                 Client *client = qobject_cast<Client*>(*l);
                 if (isIrrelevant(client, c, desktop)) {
                     continue;
@@ -350,7 +348,7 @@ void Placement::placeCascaded(Client* c, QRect& area, Policy nextPlacement)
     int xp, yp;
 
     //CT how do I get from the 'Client' class the size that NW squarish "handle"
-    const QPoint delta = m_WorkspacePtr->cascadeOffset(c);
+    const QPoint delta = workspace()->cascadeOffset(c);
 
     const int dn = c->desktop() == 0 || c->isOnAllDesktops() ? (VirtualDesktopManager::self()->current() - 1) : (c->desktop() - 1);
 
@@ -531,7 +529,7 @@ void Placement::placeMaximizing(Client* c, QRect& area, Policy nextPlacement)
     if (nextPlacement == Unknown)
         nextPlacement = Smart;
     if (c->isMaximizable() && c->maxSize().width() >= area.width() && c->maxSize().height() >= area.height()) {
-        if (m_WorkspacePtr->clientArea(MaximizeArea, c) == area)
+        if (workspace()->clientArea(MaximizeArea, c) == area)
             c->maximize(Client::MaximizeFull);
         else { // if the geometry doesn't match default maximize area (xinerama case?),
             // it's probably better to use the given area
@@ -580,7 +578,7 @@ void Placement::unclutterDesktop()
 QRect Placement::checkArea(const Client* c, const QRect& area)
 {
     if (area.isNull())
-        return m_WorkspacePtr->clientArea(PlacementArea, c->geometry().center(), c->desktop());
+        return workspace()->clientArea(PlacementArea, c->geometry().center(), c->desktop());
     return area;
 }
 

placement.h

@@ -34,7 +34,6 @@ class QObject;
 namespace KWin
 {
 
-class Workspace;
 class Client;
 
 class Placement
@@ -102,7 +101,6 @@ private:
 
     QList<DesktopCascadingInfo> cci;
 
-    Workspace* m_WorkspacePtr;
     KWIN_SINGLETON(Placement)
 };