get rid of desktop and lastScreen accessors

remove Containment::desktop() lastDesktop(), lastScreen()

src/plasma/containment.cpp

@@ -506,21 +506,6 @@ int Containment::screen() const
     return d->screen;
 }
 
-int Containment::lastScreen() const
-{
-    return d->lastScreen;
-}
-
-int Containment::desktop() const
-{
-    return d->desktop;
-}
-
-int Containment::lastDesktop() const
-{
-    return d->lastDesktop;
-}
-
 KPluginInfo::List Containment::listContainments(const QString &category,
                                                 const QString &parentApp)
 {

src/plasma/containment.h

@@ -227,25 +227,6 @@ class PLASMA_EXPORT Containment : public Applet
          */
         int screen() const;
 
-        /**
-         * @return the last screen number this containment had
-         *         only returns -1 if it's never ever been on a screen
-         * @since 4.5
-         */
-        int lastScreen() const;
-
-        /**
-         * @return the viewport (e.g. virtual desktop) this Containment is associated with.
-         */
-        int desktop() const;
-
-        /**
-         * @return the viewport (e.g. virtual desktop) this Containment was associated with
-         * last time it had a screen
-         * @since 4.5
-         */
-        int lastDesktop() const;
-
         /**
          * @reimp
          * @sa Applet::save(KConfigGroup &)

src/plasma/corona.cpp

@@ -219,7 +219,6 @@ Containment *Corona::containmentForScreen(int screen, int desktop) const
 {
     foreach (Containment *containment, d->containments) {
         if (containment->screen() == screen &&
-            (desktop < 0 || containment->desktop() == desktop) &&
             (containment->containmentType() == Containment::DesktopContainment ||
              containment->containmentType() == Containment::CustomContainment)) {
             return containment;

src/plasma/private/containment_p.cpp

@@ -232,7 +232,7 @@ void ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventIn
                          << "and is" << currently->activity()
                          << (QObject*)currently << "i'm" << (QObject*)q;
 #endif
-                currently->setScreen(-1, currently->desktop());
+                currently->setScreen(-1, -1);
                 swapScreensWith = currently;
             }
         }