From 61dec2e6356179183feaa44dcaa889facb70569d Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Thu, 5 Jun 2014 13:57:24 +0200
Subject: [PATCH] Move away from QDesktopWidget

0 screen is always primary
Use QGuiApplication::screens to count screens
---
 .../statusnotifieritem/statusnotifieritemsource.cpp    |  1 -
 shell/scripting/desktopscriptengine.cpp                | 10 ----------
 shell/scripting/desktopscriptengine.h                  |  1 -
 shell/scripting/scriptengine.cpp                       |  3 +--
 startkde/kcminit/main.cpp                              |  2 +-
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
index 2157def2d..89b337b37 100644
--- a/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
+++ b/dataengines/statusnotifieritem/statusnotifieritemsource.cpp
@@ -24,7 +24,6 @@
 #include "statusnotifieritemservice.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
 #include <QIcon>
 #include <QDebug>
 #include <KIcon>
diff --git a/shell/scripting/desktopscriptengine.cpp b/shell/scripting/desktopscriptengine.cpp
index 337ad9e8b..37d138744 100644
--- a/shell/scripting/desktopscriptengine.cpp
+++ b/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"
diff --git a/shell/scripting/desktopscriptengine.h b/shell/scripting/desktopscriptengine.h
index de8fe783b..dd097d228 100644
--- a/shell/scripting/desktopscriptengine.h
+++ b/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;
diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
index c2227cd98..7be3cf88f 100644
--- a/shell/scripting/scriptengine.cpp
+++ b/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)
diff --git a/startkde/kcminit/main.cpp b/startkde/kcminit/main.cpp
index e5918c6b4..1246e2578 100644
--- a/startkde/kcminit/main.cpp
+++ b/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