Remove Windows and X11 from src/widgets/platforms.

This is dead code, unused with QPA in place, so remove it to avoid confusion
caused through grepping for class names existing in both old and new places.

Mac code is left in place for now, as some of it is still in use.

Change-Id: Ia82cd5bbabe71285ca997f79d8fd9c0504e32c28
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

7 files changed, 1 insertions, 319 deletions

diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc
index 4d63e2f466..06a52af893 100644
--- a/src/widgets/kernel/qdesktopwidget.qdoc
+++ b/src/widgets/kernel/qdesktopwidget.qdoc
@@ -93,7 +93,7 @@
     In the illustration above, Application One's primary screen is
     screen 0, and App Two's primary screen is screen 1.
 
-    \sa QApplication, QApplication::desktop(), QX11Info::appRootWindow()
+    \sa QApplication, QApplication::desktop()
 */
 
 /*!
diff --git a/src/widgets/kernel/qguieventdispatcher_glib.cpp b/src/widgets/kernel/qguieventdispatcher_glib.cpp
deleted file mode 100644
index 6f9bb8f80d..0000000000
--- a/src/widgets/kernel/qguieventdispatcher_glib.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qguieventdispatcher_glib_p.h"
-
-#include "qapplication.h"
-#include "qx11info_x11.h"
-
-#include "qt_x11_p.h"
-
-#include <glib.h>
-
-QT_BEGIN_NAMESPACE
-
-struct GX11EventSource
-{
-    GSource source;
-    GPollFD pollfd;
-    QEventLoop::ProcessEventsFlags flags;
-    QGuiEventDispatcherGlib *q;
-    QGuiEventDispatcherGlibPrivate *d;
-};
-
-class QGuiEventDispatcherGlibPrivate : public QEventDispatcherGlibPrivate
-{
-    Q_DECLARE_PUBLIC(QGuiEventDispatcherGlib)
-
-public:
-    QGuiEventDispatcherGlibPrivate();
-    GX11EventSource *x11EventSource;
-    QList<XEvent> queuedUserInputEvents;
-};
-
-static gboolean x11EventSourcePrepare(GSource *s, gint *timeout)
-{
-    if (timeout)
-        *timeout = -1;
-    GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
-    return (XEventsQueued(X11->display, QueuedAfterFlush)
-            || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
-                && !source->d->queuedUserInputEvents.isEmpty()));
-}
-
-static gboolean x11EventSourceCheck(GSource *s)
-{
-    GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
-    return (XEventsQueued(X11->display, QueuedAfterFlush)
-            || (!(source->flags & QEventLoop::ExcludeUserInputEvents)
-                && !source->d->queuedUserInputEvents.isEmpty()));
-}
-
-static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointer user_data)
-{
-    GX11EventSource *source = reinterpret_cast<GX11EventSource *>(s);
-
-    ulong marker = XNextRequest(X11->display);
-    do {
-        XEvent event;
-        if (!(source->flags & QEventLoop::ExcludeUserInputEvents)
-            && !source->d->queuedUserInputEvents.isEmpty()) {
-            // process a pending user input event
-            event = source->d->queuedUserInputEvents.takeFirst();
-        } else if (XEventsQueued(X11->display, QueuedAlready)) {
-            // process events from the X server
-            XNextEvent(X11->display, &event);
-
-            if (source->flags & QEventLoop::ExcludeUserInputEvents) {
-                // queue user input events
-                switch (event.type) {
-                case ButtonPress:
-                case ButtonRelease:
-                case MotionNotify:
-                case XKeyPress:
-                case XKeyRelease:
-                case EnterNotify:
-                case LeaveNotify:
-                    source->d->queuedUserInputEvents.append(event);
-                    continue;
-
-                case ClientMessage:
-                    // only keep the wm_take_focus and
-                    // _qt_scrolldone protocols, queue all other
-                    // client messages
-                    if (event.xclient.format == 32) {
-                        if (event.xclient.message_type == ATOM(WM_PROTOCOLS) &&
-                            (Atom) event.xclient.data.l[0] == ATOM(WM_TAKE_FOCUS)) {
-                            break;
-                        } else if (event.xclient.message_type == ATOM(_QT_SCROLL_DONE)) {
-                            break;
-                        }
-                    }
-                    source->d->queuedUserInputEvents.append(event);
-                    continue;
-
-                default:
-                    break;
-                }
-            }
-        } else {
-            // no event to process
-            break;
-        }
-
-        // send through event filter
-        if (source->q->filterEvent(&event))
-            continue;
-
-        if (qApp->x11ProcessEvent(&event) == 1)
-            return true;
-
-        if (event.xany.serial >= marker)
-            goto out;
-    } while (XEventsQueued(X11->display, QueuedAfterFlush));
-
- out:
-
-    source->d->runTimersOnceWithNormalPriority();
-
-    if (callback)
-        callback(user_data);
-    return true;
-}
-
-static GSourceFuncs x11EventSourceFuncs = {
-    x11EventSourcePrepare,
-    x11EventSourceCheck,
-    x11EventSourceDispatch,
-    NULL,
-    NULL,
-    NULL
-};
-
-QGuiEventDispatcherGlibPrivate::QGuiEventDispatcherGlibPrivate()
-{
-    x11EventSource = reinterpret_cast<GX11EventSource *>(g_source_new(&x11EventSourceFuncs,
-                                                                      sizeof(GX11EventSource)));
-    g_source_set_can_recurse(&x11EventSource->source, true);
-
-    memset(&x11EventSource->pollfd, 0, sizeof(GPollFD));
-    x11EventSource->flags = QEventLoop::AllEvents;
-    x11EventSource->q = 0;
-    x11EventSource->d = 0;
-
-    g_source_attach(&x11EventSource->source, mainContext);
-}
-
-QGuiEventDispatcherGlib::QGuiEventDispatcherGlib(QObject *parent)
-    : QEventDispatcherGlib(*new QGuiEventDispatcherGlibPrivate, parent)
-{
-}
-
-QGuiEventDispatcherGlib::~QGuiEventDispatcherGlib()
-{
-    Q_D(QGuiEventDispatcherGlib);
-
-    g_source_remove_poll(&d->x11EventSource->source, &d->x11EventSource->pollfd);
-    g_source_destroy(&d->x11EventSource->source);
-    d->x11EventSource = 0;
-}
-
-bool QGuiEventDispatcherGlib::processEvents(QEventLoop::ProcessEventsFlags flags)
-{
-    Q_D(QGuiEventDispatcherGlib);
-    QEventLoop::ProcessEventsFlags saved_flags = d->x11EventSource->flags;
-    d->x11EventSource->flags = flags;
-    bool returnValue = QEventDispatcherGlib::processEvents(flags);
-    d->x11EventSource->flags = saved_flags;
-    return returnValue;
-}
-
-void QGuiEventDispatcherGlib::startingUp()
-{
-    Q_D(QGuiEventDispatcherGlib);
-    d->x11EventSource->pollfd.fd = XConnectionNumber(X11->display);
-    d->x11EventSource->pollfd.events = G_IO_IN | G_IO_HUP | G_IO_ERR;
-    d->x11EventSource->q = this;
-    d->x11EventSource->d = d;
-    g_source_add_poll(&d->x11EventSource->source, &d->x11EventSource->pollfd);
-}
-
-void QGuiEventDispatcherGlib::flush()
-{
-    XFlush(X11->display);
-}
-
-QT_END_NAMESPACE
diff --git a/src/widgets/kernel/qguieventdispatcher_glib_p.h b/src/widgets/kernel/qguieventdispatcher_glib_p.h
deleted file mode 100644
index ff210b5ca4..0000000000
--- a/src/widgets/kernel/qguieventdispatcher_glib_p.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QGUIEVENTDISPATCHER_GLIB_P_H
-#define QGUIEVENTDISPATCHER_GLIB_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of the QLibrary class.  This header file may change from
-// version to version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/private/qeventdispatcher_glib_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QGuiEventDispatcherGlibPrivate;
-
-class QGuiEventDispatcherGlib : public QEventDispatcherGlib
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QGuiEventDispatcherGlib)
-
-public:
-    explicit QGuiEventDispatcherGlib(QObject *parent = 0);
-    ~QGuiEventDispatcherGlib();
-
-    bool processEvents(QEventLoop::ProcessEventsFlags flags);
-
-    void startingUp();
-    void flush();
-};
-
-QT_END_NAMESPACE
-
-#endif // QGUIEVENTDISPATCHER_GLIB_P_H
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 11b4f0cd84..7a53dc3415 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -65,10 +65,6 @@
 #define SPI_GETDROPSHADOW                   0x1024
 #endif
 #endif
-#if defined(Q_WS_X11)
-#include "qx11info_x11.h"
-#include <qwidget.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index ec3523d9b3..c419856838 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -11953,13 +11953,6 @@ void QWidget::clearMask()
     setMask(QRegion());
 }
 
-/*! \fn const QX11Info &QWidget::x11Info() const
-    Returns information about the configuration of the X display used to display
-    the widget.
-
-    \warning This function is only available on X11.
-*/
-
 /*! \fn Qt::HANDLE QWidget::x11PictureHandle() const
     Returns the X11 Picture handle of the widget for XRender
     support. Use of this function is not portable. This function will
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index d3d7c12a44..f97b343463 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -101,9 +101,6 @@ class QGraphicsEffect;
 class QRasterWindowSurface;
 class QUnifiedToolbarSurface;
 class QPixmap;
-#if defined(Q_WS_X11)
-class QX11Info;
-#endif
 
 class QWidgetData
 {
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 84c1c0b58b..c890dfe70c 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -677,7 +677,6 @@ public:
 
     // *************************** Platform specific ************************************
 #if defined(Q_WS_X11) // <----------------------------------------------------------- X11
-    QX11Info xinfo;
     Qt::HANDLE picture;
     static QWidget *mouseGrabber;
     static QWidget *keyboardGrabber;