Replaced usage of QSoftKeyStack with QActions having SoftKeyRole

1 files changed, 0 insertions, 62 deletions

diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index a12c32b..90c5db9 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -66,11 +66,6 @@ extern OSWindowRef qt_mac_window_for(const QWidget *); // qwidget_mac.cpp
 QT_END_NAMESPACE
 #endif
 
-#ifndef QT_NO_SOFTKEYSTACK
-#include <qsoftkeystack.h>
-#endif
-#include <qsoftkeyaction.h>
-
 QT_BEGIN_NAMESPACE
 
 class QMainWindowPrivate : public QWidgetPrivate
@@ -85,9 +80,6 @@ public:
 #if !defined(QT_NO_DOCKWIDGET) && !defined(QT_NO_CURSOR)
             , hasOldCursor(false) , cursorAdjusted(false)
 #endif
-#ifndef QT_NO_SOFTKEYSTACK
-            , softKeyStack(0)
-#endif
     { }
     QMainWindowLayout *layout;
     QSize iconSize;
@@ -107,10 +99,6 @@ public:
     uint hasOldCursor : 1;
     uint cursorAdjusted : 1;
 #endif
-
-#ifndef QT_NO_SOFTKEYSTACK
-   QSoftKeyStack *softKeyStack;
-#endif
 };
 
 void QMainWindowPrivate::init()
@@ -122,9 +110,6 @@ void QMainWindowPrivate::init()
     explicitIconSize = false;
 
     q->setAttribute(Qt::WA_Hover);
-//#if defined(Q_OS_SYMBIAN) && !defined(QT_NO_SOFTKEYSTACK)
-//    softKeyStack = new QSoftKeyStack(q);
-//#endif
 }
 
 /*
@@ -534,53 +519,6 @@ void QMainWindow::setMenuWidget(QWidget *menuBar)
 }
 #endif // QT_NO_MENUBAR
 
-#ifndef QT_NO_SOFTKEYSTACK
-/*!
-    Returns the softkey stack for the main window. This function creates
-    and returns an empty soft key stack if the stack does not exist.
-
-    \sa softKeyStack()
-*/
-QSoftKeyStack *QMainWindow::softKeyStack() const
-{
-    if (!d_func()->softKeyStack) {
-        QMainWindow *self = const_cast<QMainWindow *>(this);
-        QSoftKeyStack* softKeyStack = new QSoftKeyStack(self);
-        self->setSoftKeyStack(softKeyStack);
-    }
-    return d_func()->softKeyStack;
-}
-
-/*!
-    Sets the softkey stack for the main window to \a softKeyStack.
-
-    Note: QMainWindow takes ownership of the \a softKeyStack pointer and
-    deletes it at the appropriate time.
-
-    \sa softKeyStack()
-*/
-void QMainWindow::setSoftKeyStack(QSoftKeyStack *softKeyStack)
-{
-    Q_D(QMainWindow);
-    if (d->softKeyStack && d->softKeyStack != softKeyStack) {
-        QSoftKeyStack *oldSoftKeyStack = d->softKeyStack;
-        delete oldSoftKeyStack;
-    }
-    d->softKeyStack = softKeyStack;
-}
-
-/*!
-    Returns true if QMainWindow has a softkeystack and false otherwise
-
-    \sa softKeyStack()
-*/
-bool QMainWindow::hasSoftKeyStack() const
-{
-    Q_D(const QMainWindow);
-    return d->softKeyStack != 0;
-}
-#endif // QT_NO_SOFTKEYSTACK
-
 #ifndef QT_NO_STATUSBAR
 /*!
     Returns the status bar for the main window. This function creates