Remove QWorkspace.

QWorkspace had been called Q3Workspace before Qt4.0 finally released.
In a sense, it is a Qt3 support Widget. And QWorkspace has been
deprecated and replaced by QMdiArea at Qt4.3.

Change-Id: Iea1bf831c9960c23c2b21d51fdc7c13b303642ea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

4 files changed, 0 insertions, 65 deletions

diff --git a/src/plugins/accessible/widgets/main.cpp b/src/plugins/accessible/widgets/main.cpp
index ca8bf816b6..10a9aa8f47 100644
--- a/src/plugins/accessible/widgets/main.cpp
+++ b/src/plugins/accessible/widgets/main.cpp
@@ -116,7 +116,6 @@ QStringList AccessibleFactory::keys() const
     list << QLatin1String("QHeaderView");
     list << QLatin1String("QTabBar");
     list << QLatin1String("QToolBar");
-    list << QLatin1String("QWorkspaceChild");
     list << QLatin1String("QSizeGrip");
     list << QLatin1String("QAbstractItemView");
     list << QLatin1String("QWidget");
@@ -133,7 +132,6 @@ QStringList AccessibleFactory::keys() const
     list << QLatin1String("QToolBox");
     list << QLatin1String("QMdiArea");
     list << QLatin1String("QMdiSubWindow");
-    list << QLatin1String("QWorkspace");
     list << QLatin1String("QDialogButtonBox");
 #ifndef QT_NO_DIAL
     list << QLatin1String("QDial");
@@ -274,8 +272,6 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec
     } else if (classname == QLatin1String("QTabBar")) {
         iface = new QAccessibleTabBar(widget);
 #endif
-    } else if (classname == QLatin1String("QWorkspaceChild")) {
-        iface = new QAccessibleWidget(widget, QAccessible::Window);
     } else if (classname == QLatin1String("QSizeGrip")) {
         iface = new QAccessibleWidget(widget, QAccessible::Grip);
 #ifndef QT_NO_SPLITTER
@@ -306,10 +302,6 @@ QAccessibleInterface *AccessibleFactory::create(const QString &classname, QObjec
     } else if (classname == QLatin1String("QMdiSubWindow")) {
         iface = new QAccessibleMdiSubWindow(widget);
 #endif
-#ifndef QT_NO_WORKSPACE
-    } else if (classname == QLatin1String("QWorkspace")) {
-        iface = new QAccessibleWorkspace(widget);
-#endif
     } else if (classname == QLatin1String("QDialogButtonBox")) {
         iface = new QAccessibleDialogButtonBox(widget);
 #ifndef QT_NO_DIAL
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
index 140848a559..222d838642 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.cpp
@@ -54,7 +54,6 @@
 #include <QToolBox>
 #include <QMdiArea>
 #include <QMdiSubWindow>
-#include <QWorkspace>
 #include <QDialogButtonBox>
 #include <limits.h>
 #include <QRubberBand>
@@ -740,44 +739,6 @@ QMdiSubWindow *QAccessibleMdiSubWindow::mdiSubWindow() const
 }
 #endif // QT_NO_MDIAREA
 
-// ======================= QAccessibleWorkspace ======================
-#ifndef QT_NO_WORKSPACE
-QAccessibleWorkspace::QAccessibleWorkspace(QWidget *widget)
-    : QAccessibleWidget(widget, QAccessible::LayeredPane)
-{
-    Q_ASSERT(qobject_cast<QWorkspace *>(widget));
-}
-
-int QAccessibleWorkspace::childCount() const
-{
-    return workspace()->windowList().count();
-}
-
-QAccessibleInterface *QAccessibleWorkspace::child(int index) const
-{
-    QWidgetList subWindows = workspace()->windowList();
-    if (index < 0 || subWindows.isEmpty() || index >= subWindows.count())
-        return 0;
-    QObject *targetObject = subWindows.at(index);
-    return QAccessible::queryAccessibleInterface(targetObject);
-}
-
-int QAccessibleWorkspace::indexOfChild(const QAccessibleInterface *child) const
-{
-    if (!child || !child->object() || workspace()->windowList().isEmpty())
-        return -1;
-    if (QWidget *window = qobject_cast<QWidget *>(child->object())) {
-        return workspace()->windowList().indexOf(window);
-    }
-    return -1;
-}
-
-QWorkspace *QAccessibleWorkspace::workspace() const
-{
-    return static_cast<QWorkspace *>(object());
-}
-#endif
-
 #ifndef QT_NO_DIALOGBUTTONBOX
 // ======================= QAccessibleDialogButtonBox ======================
 QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget)
diff --git a/src/plugins/accessible/widgets/qaccessiblewidgets.h b/src/plugins/accessible/widgets/qaccessiblewidgets.h
index 147ea91a41..f161c52561 100644
--- a/src/plugins/accessible/widgets/qaccessiblewidgets.h
+++ b/src/plugins/accessible/widgets/qaccessiblewidgets.h
@@ -56,7 +56,6 @@ class QStackedWidget;
 class QToolBox;
 class QMdiArea;
 class QMdiSubWindow;
-class QWorkspace;
 class QRubberBand;
 class QTextBrowser;
 class QCalendarWidget;
@@ -176,21 +175,6 @@ protected:
 };
 #endif // QT_NO_MDIAREA
 
-#ifndef QT_NO_WORKSPACE
-class QAccessibleWorkspace : public QAccessibleWidget
-{
-public:
-    explicit QAccessibleWorkspace(QWidget *widget);
-
-    int childCount() const;
-    QAccessibleInterface *child(int index) const;
-    int indexOfChild(const QAccessibleInterface *child) const;
-
-protected:
-    QWorkspace *workspace() const;
-};
-#endif
-
 class QAccessibleDialogButtonBox : public QAccessibleWidget
 {
 public:
diff --git a/src/plugins/accessible/widgets/widgets.json b/src/plugins/accessible/widgets/widgets.json
index fdeb6f2b52..21c0157144 100644
--- a/src/plugins/accessible/widgets/widgets.json
+++ b/src/plugins/accessible/widgets/widgets.json
@@ -26,7 +26,6 @@
     "QHeaderView",
     "QTabBar",
     "QToolBar",
-    "QWorkspaceChild",
     "QSizeGrip",
     "QAbstractItemView",
     "QWidget",
@@ -39,7 +38,6 @@
     "QToolBox",
     "QMdiArea",
     "QMdiSubWindow",
-    "QWorkspace",
     "QDialogButtonBox",
     "QDial",
     "QRubberBand",