Suppress QWindowSystemInterface inclusion warnings.

Since QWindowSystemInterface is now part of QPA API. The correct inclusion is: #include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface_p.h> Bulk of the work was done by: find . -type f | xargs sed -i -e 's,#include <\(QtGui/\)\?QWindowSystemInterface>,#include <qpa/qwindowsysteminterface.h>,g' Change-Id: If75fc32611e72ef1cf58505794def375b1acf74a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-03 09:16:36 +05:30 · 2012-07-03 09:16:36 +05:30 · 122741c671
commit 122741c671
parent 0f3528a7f6
46 changed files with 49 additions and 49 deletions
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@ -74,8 +74,8 @@
 #include <qpa/qplatforminputcontext.h>
 #include <qpa/qplatforminputcontext_p.h>

-#include <QWindowSystemInterface>
-#include "private/qwindowsysteminterface_qpa_p.h"
+#include <qpa/qwindowsysteminterface.h>
+#include <qpa/qwindowsysteminterface_p.h>
 #include "private/qwindow_p.h"
 #include "private/qcursor_p.h"

--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@ -41,7 +41,7 @@

 #include "qplatformwindow.h"

-#include <QtGui/qwindowsysteminterface_qpa.h>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtGui/qwindow.h>
 #include <QtGui/qscreen.h>

--- a/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp
+++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher.cpp
@ -44,7 +44,7 @@
 #include "qunixeventdispatcher_qpa_p.h"
 #include "private/qguiapplication_p.h"

-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtCore/QElapsedTimer>
 #include <QtCore/QAtomicInt>
 #include <QtCore/QSemaphore>
--- a/src/platformsupport/fb_base/fb_base.cpp
+++ b/src/platformsupport/fb_base/fb_base.cpp
@ -44,7 +44,7 @@
 #include <qdebug.h>
 #include <qbitmap.h>
 #include <qpa/qplatformcursor.h>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 QPlatformSoftwareCursor::QPlatformSoftwareCursor(QPlatformScreen *scr)
        : QPlatformCursor(scr), currentRect(QRect()), prevRect(QRect())
--- a/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
+++ b/src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
@ -45,7 +45,7 @@

 #include <QSocketNotifier>
 #include <QStringList>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QCoreApplication>
 #include <private/qcore_unix_p.h>

--- a/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousehandler.cpp
@ -46,7 +46,7 @@
 #include <QPoint>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <qplatformdefs.h>
 #include <private/qcore_unix_p.h> // overrides QT_OPEN
--- a/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
+++ b/src/platformsupport/input/evdevmouse/qevdevmousemanager.cpp
@ -44,7 +44,7 @@
 #include <QStringList>
 #include <QGuiApplication>
 #include <QScreen>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 //#define QT_QPA_MOUSEMANAGER_DEBUG

--- a/src/platformsupport/input/evdevtablet/qevdevtablet.cpp
+++ b/src/platformsupport/input/evdevtablet/qevdevtablet.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include "qevdevtablet_p.h"
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QStringList>
 #include <QSocketNotifier>
 #include <QGuiApplication>
--- a/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
+++ b/src/platformsupport/input/evdevtouch/qevdevtouch_p.h
@ -46,7 +46,7 @@
 #include <QString>
 #include <QList>
 #include <QThread>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 QT_BEGIN_HEADER

--- a/src/plugins/generic/meego/qmeegointegration.cpp
+++ b/src/plugins/generic/meego/qmeegointegration.cpp
@ -45,7 +45,7 @@
 #include <QDBusConnection>
 #include <QDBusArgument>
 #include <qguiapplication.h>
-#include <qwindowsysteminterface_qpa.h>
+#include <qpa/qwindowsysteminterface.h>

 QMeeGoIntegration::QMeeGoIntegration()
    : screenTopEdge(QStringLiteral("com.nokia.SensorService"), QStringLiteral("Screen.TopEdge"))
--- a/src/plugins/generic/tslib/qtslib.cpp
+++ b/src/plugins/generic/tslib/qtslib.cpp
@ -46,7 +46,7 @@
 #include <QSocketNotifier>
 #include <QStringList>
 #include <QPoint>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <Qt>

--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
@ -83,7 +83,7 @@
 #include <qguiapplication.h>
 #include <private/qguiapplication_p.h>
 #include "qt_mac_p.h"
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 QT_USE_NAMESPACE

--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@ -47,7 +47,7 @@
 #include "qnsview.h"
 #include <QtCore/private/qcore_mac_p.h>
 #include <qwindow.h>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformscreen.h>

 #include <Cocoa/Cocoa.h>
--- a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h
+++ b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h
@ -57,7 +57,7 @@

 #import <Cocoa/Cocoa.h>

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <qhash.h>
 #include <QtCore>

--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@ -50,7 +50,7 @@
 #include "qmultitouch_mac_p.h"
 #include "qcocoadrag.h"

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QTextFormat>
 #include <QtCore/QDebug>

--- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm
+++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
@ -42,7 +42,7 @@
 #include "qnswindowdelegate.h"

 #include <QDebug>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

@implementation QNSWindowDelegate

--- a/src/plugins/platforms/directfb/qdirectfbinput.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbinput.cpp
@ -44,7 +44,7 @@

 #include <QThread>
 #include <QDebug>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QMouseEvent>
 #include <QEvent>

--- a/src/plugins/platforms/directfb/qdirectfbwindow.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbwindow.cpp
@ -44,7 +44,7 @@
 #include "qdirectfbinput.h"
 #include "qdirectfbscreen.h"

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <directfb.h>

--- a/src/plugins/platforms/eglfs/qeglfscursor.cpp
+++ b/src/plugins/platforms/eglfs/qeglfscursor.cpp
@ -40,7 +40,7 @@
 ****************************************************************************/

 #include "qeglfscursor.h"
-#include <QtGui/qwindowsysteminterface_qpa.h>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QOpenGLContext>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonArray>
--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
@ -41,7 +41,7 @@

 #include "qeglfswindow.h"
 #include "qeglfshooks.h"
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <QtPlatformSupport/private/qeglconvenience_p.h>

--- a/src/plugins/platforms/kms/qkmswindow.cpp
+++ b/src/plugins/platforms/kms/qkmswindow.cpp
@ -42,7 +42,7 @@
 #include "qkmswindow.h"
 #include "qkmsscreen.h"

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 QT_BEGIN_NAMESPACE

 QKmsWindow::QKmsWindow(QWindow *window)
--- a/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp
+++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.cpp
@ -41,7 +41,7 @@

 #include "qminimaleglwindow.h"

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/openwfd/qopenwfdwindow.cpp
+++ b/src/plugins/platforms/openwfd/qopenwfdwindow.cpp
@ -42,7 +42,7 @@
 #include "qopenwfdwindow.h"

 #include "qopenwfdscreen.h"
-#include "QtGui/QWindowSystemInterface"
+#include <qpa/qwindowsysteminterface.h>

 QOpenWFDWindow::QOpenWFDWindow(QWindow *window)
    : QPlatformWindow(window)
--- a/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp
+++ b/src/plugins/platforms/qnx/qqnxeventdispatcher_blackberry.cpp
@ -41,7 +41,7 @@

 #include "qqnxeventdispatcher_blackberry.h"

-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <private/qguiapplication_p.h>

 QT_BEGIN_NAMESPACE
--- a/src/plugins/platforms/qnx/qqnxintegration.cpp
+++ b/src/plugins/platforms/qnx/qqnxintegration.cpp
@ -81,7 +81,7 @@
 #endif

 #include <qpa/qplatformwindow.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #if !defined(QT_NO_OPENGL)
 #include "qqnxglbackingstore.h"
--- a/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp
+++ b/src/plugins/platforms/qnx/qqnxnavigatoreventhandler.cpp
@ -43,7 +43,7 @@

 #include <QDebug>
 #include <QGuiApplication>
-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #ifdef QQNXNAVIGATOREVENTHANDLER_DEBUG
 #define qNavigatorEventHandlerDebug qDebug
--- a/src/plugins/platforms/qnx/qqnxscreen.cpp
+++ b/src/plugins/platforms/qnx/qqnxscreen.cpp
@ -44,7 +44,7 @@

 #include <QtCore/QThread>
 #include <QtCore/QDebug>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <errno.h>

--- a/src/plugins/platforms/qnx/qqnxscreeneventhandler.h
+++ b/src/plugins/platforms/qnx/qqnxscreeneventhandler.h
@ -42,7 +42,7 @@
 #ifndef QQNXSCREENEVENTHANDLER_H
 #define QQNXSCREENEVENTHANDLER_H

-#include <QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <screen/screen.h>

--- a/src/plugins/platforms/qnx/qqnxwindow.cpp
+++ b/src/plugins/platforms/qnx/qqnxwindow.cpp
@ -47,7 +47,7 @@
 #include "qqnxscreen.h"

 #include <QtGui/QWindow>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <QtCore/QDebug>

--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
@ -54,7 +54,7 @@
 #include "qwindowstheme.h"

 #include <QtGui/QWindow>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <QtGui/QGuiApplication>

--- a/src/plugins/platforms/windows/qwindowsdrag.cpp
+++ b/src/plugins/platforms/windows/qwindowsdrag.cpp
@ -55,7 +55,7 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 #include <QtGui/QGuiApplication>
-#include <QtGui/private/qwindowsysteminterface_qpa_p.h>
+#include <qpa/qwindowsysteminterface_p.h>
 #include <QtGui/private/qguiapplication_p.h>

 #include <QtCore/QDebug>
--- a/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp
+++ b/src/plugins/platforms/windows/qwindowsguieventdispatcher.cpp
@ -42,7 +42,7 @@
 #include "qwindowsguieventdispatcher.h"
 #include "qwindowscontext.h"

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <QtCore/QStack>
 #include <QtCore/QDebug>
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@ -68,7 +68,7 @@
 #endif

 #include <qpa/qplatformnativeinterface.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QBackingStore>
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/private/qguiapplication_p.h>
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@ -45,7 +45,7 @@
 #include "qwindowsguieventdispatcher.h"

 #include <QtGui/QWindow>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QKeyEvent>

 QT_BEGIN_NAMESPACE
--- a/src/plugins/platforms/windows/qwindowsmousehandler.cpp
+++ b/src/plugins/platforms/windows/qwindowsmousehandler.cpp
@ -45,7 +45,7 @@
 #include "qwindowswindow.h"
 #include "qwindowsintegration.h"

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QGuiApplication>
 #include <QtGui/QScreen>

--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
@ -50,7 +50,7 @@

 #include <QtGui/QPixmap>
 #include <QtGui/QGuiApplication>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtGui/QScreen>

 #include <QtCore/QDebug>
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
@ -57,7 +57,7 @@
 #include <QtCore/QSysInfo>
 #include <QtGui/QPalette>
 #include <QtGui/QGuiApplication>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@ -55,7 +55,7 @@
 #include <QtGui/QWindow>
 #include <QtGui/QRegion>
 #include <private/qwindow_p.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <QtCore/QDebug>

--- a/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_maemo.cpp
@ -44,7 +44,7 @@
 #ifdef XCB_USE_XINPUT2_MAEMO

 #include "qxcbwindow.h"
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/XI2proto.h>
 #include <X11/Xatom.h>
--- a/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
@ -41,7 +41,7 @@

 #include "qxcbconnection.h"
 #include "qxcbwindow.h"
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #ifdef XCB_USE_XINPUT2

--- a/src/plugins/platforms/xcb/qxcbdrag.cpp
+++ b/src/plugins/platforms/xcb/qxcbdrag.cpp
@ -54,7 +54,7 @@
 #include <qrect.h>
 #include <qpainter.h>

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <QtPlatformSupport/private/qshapedpixmapdndwindow_p.h>
 #include <QtPlatformSupport/private/qsimpledrag_p.h>
--- a/src/plugins/platforms/xcb/qxcbkeyboard.cpp
+++ b/src/plugins/platforms/xcb/qxcbkeyboard.cpp
@ -44,7 +44,7 @@
 #include "qxcbscreen.h"
 #include <xcb/xcb_keysyms.h>
 #include <X11/keysym.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>
 #include <QtCore/QTextCodec>
 #include <QtCore/QMetaMethod>
 #include <private/qguiapplication_p.h>
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@ -50,7 +50,7 @@

 #include <xcb/randr.h>

-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@ -91,7 +91,7 @@
 #include <private/qwindow_p.h>

 #include <qpa/qplatformbackingstore.h>
-#include <QtGui/QWindowSystemInterface>
+#include <qpa/qwindowsysteminterface.h>

 #include <stdio.h>

--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@ -70,8 +70,8 @@
 #include "private/qcoreapplication_p.h"
 #include "QtCore/qpoint.h"
 #include <QTime>
-#include <QWindowSystemInterface>
-#include "private/qwindowsysteminterface_qpa_p.h"
+#include <qpa/qwindowsysteminterface.h>
+#include <qpa/qwindowsysteminterface_p.h>
 #include <qpa/qplatformintegration.h>
 #include "private/qguiapplication_p.h"

--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@ -58,8 +58,8 @@
 #include <qpa/qplatformtheme.h>

 #include <qdebug.h>
-#include <QWindowSystemInterface>
-#include "private/qwindowsysteminterface_qpa_p.h"
+#include <qpa/qwindowsysteminterface.h>
+#include <qpa/qwindowsysteminterface_p.h>
 #include <qpa/qplatformintegration.h>

 #include "qdesktopwidget_qpa_p.h"