diff options
author | Xizhi Zhu <xizhi.zhu@gmail.com> | 2012-01-23 19:37:27 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-31 07:05:00 +0100 |
commit | e8105e4783f3932885695353eefa1a60937929a1 (patch) | |
tree | 7b2217f4c92a7fb330212d3fd960cb377d77c3db /src/widgets/widgets/qmenubar_p.h | |
parent | 0436281771d5d47f0c80d0694f938bb8f737da4c (diff) |
Remove Symbian and Maemo 5 code from QtWidgets.
Change-Id: I715c0ec70cbad05a6ba9737e49be9da7cbd65bf9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qmenubar_p.h')
-rw-r--r-- | src/widgets/widgets/qmenubar_p.h | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h index a73ec1ddde..a15a1e432e 100644 --- a/src/widgets/widgets/qmenubar_p.h +++ b/src/widgets/widgets/qmenubar_p.h @@ -61,13 +61,6 @@ #include "qguifunctions_wince.h" #endif -#ifndef QT_NO_MENUBAR -#ifdef Q_WS_S60 -class CCoeControl; -class CEikMenuBar; -#endif -#endif - QT_BEGIN_NAMESPACE #ifndef QT_NO_MENUBAR @@ -83,10 +76,6 @@ public: #ifdef Q_WS_WINCE , wce_menubar(0), wceClassicMenu(false) #endif -#ifdef Q_WS_S60 - , symbian_menubar(0) -#endif - { } ~QMenuBarPrivate() { @@ -94,9 +83,6 @@ public: #ifdef Q_WS_WINCE delete wce_menubar; #endif -#ifdef Q_WS_S60 - delete symbian_menubar; -#endif } void init(); @@ -203,35 +189,6 @@ public: void wceRefresh(); bool wceEmitSignals(QList<QWceMenuAction*> actions, uint command); #endif -#ifdef Q_WS_S60 - void symbianCreateMenuBar(QWidget *); - void symbianDestroyMenuBar(); - void reparentMenuBar(QWidget *oldParent, QWidget *newParent); - struct QSymbianMenuBarPrivate { - QList<QSymbianMenuAction*> actionItems; - QMenuBarPrivate *d; - QSymbianMenuBarPrivate(QMenuBarPrivate *menubar); - ~QSymbianMenuBarPrivate(); - void addAction(QAction *, QSymbianMenuAction* =0); - void addAction(QSymbianMenuAction *, QSymbianMenuAction* =0); - void syncAction(QSymbianMenuAction *); - inline void syncAction(QAction *a) { syncAction(findAction(a)); } - void removeAction(QSymbianMenuAction *); - void rebuild(); - inline void removeAction(QAction *a) { removeAction(findAction(a)); } - inline QSymbianMenuAction *findAction(QAction *a) { - for(int i = 0; i < actionItems.size(); i++) { - QSymbianMenuAction *act = actionItems[i]; - if(a == act->action) - return act; - } - return 0; - } - void insertNativeMenuItems(const QList<QAction*> &actions); - - } *symbian_menubar; - static int symbianCommands(int command); -#endif #ifdef QT_SOFTKEYS_ENABLED QAction *menuBarAction; #endif |