Move away from QDesktopWidget

0 screen is always primary
Use QGuiApplication::screens to count screens

dataengines/statusnotifieritem/statusnotifieritemsource.cpp

@@ -24,7 +24,6 @@
 #include "statusnotifieritemservice.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QIcon>
 #include <QDebug>
 #include <KIcon>

shell/scripting/desktopscriptengine.cpp

@@ -21,7 +21,6 @@
 
 #include <QApplication>
 #include <QCursor>
-#include <QDesktopWidget>
 
 #include "containment.h"
 #include "appinterface.h"
@@ -48,15 +47,6 @@ QScriptValue DesktopScriptEngine::wrap(Containment *c)
     return ScriptEngine::wrap(c);
 }
 
-int DesktopScriptEngine::defaultPanelScreen() const
-{
-    if (m_startup) {
-        return ScriptEngine::defaultPanelScreen();
-    } else {
-        return qApp->desktop()->screenNumber(QCursor::pos());
-    }
-}
-
 }
 
 #include "desktopscriptengine.moc"

shell/scripting/desktopscriptengine.h

@@ -35,7 +35,6 @@ public:
     DesktopScriptEngine(ShellCorona *corona, bool isStartup = true, QObject *parent = 0);
     QScriptValue wrap(Plasma::Containment *c);
     QScriptValue wrap(Containment *c);
-    int defaultPanelScreen() const;
 
 private:
     bool m_startup;

shell/scripting/scriptengine.cpp

@@ -20,7 +20,6 @@
 #include "scriptengine.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>
@@ -282,7 +281,7 @@ QScriptValue ScriptEngine::wrap(Containment *c)
 
 int ScriptEngine::defaultPanelScreen() const
 {
-    return qApp ? qApp->desktop()->primaryScreen() : 0;
+    return 0;
 }
 
 ScriptEngine *ScriptEngine::envFor(QScriptEngine *engine)

startkde/kcminit/main.cpp

@@ -183,7 +183,7 @@ KCMInit::KCMInit( KCmdLineArgs* args )
   KConfigGroup config(&_config, "X11");
 #ifdef Q_WS_X11
   bool multihead = !config.readEntry( "disableMultihead", false) &&
-                    (QDesktopWidget().screenCount() > 1);
+                    (QGuiApplication::screens().count() > 1);
 #else
   bool multihead = false;
 #endif