From e8105e4783f3932885695353eefa1a60937929a1 Mon Sep 17 00:00:00 2001
From: Xizhi Zhu <xizhi.zhu@gmail.com>
Date: Mon, 23 Jan 2012 19:37:27 +0100
Subject: Remove Symbian and Maemo 5 code from QtWidgets.

Change-Id: I715c0ec70cbad05a6ba9737e49be9da7cbd65bf9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/widgets/widgets/qmenu_p.h | 50 -------------------------------------------
 1 file changed, 50 deletions(-)

(limited to 'src/widgets/widgets/qmenu_p.h')

diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h
index c8db4e3e8b..af236c1c8f 100644
--- a/src/widgets/widgets/qmenu_p.h
+++ b/src/widgets/widgets/qmenu_p.h
@@ -61,22 +61,10 @@
 #include "QtCore/qbasictimer.h"
 #include "private/qwidget_p.h"
 
-
-#ifdef Q_WS_S60
-class CEikMenuPane;
-#define QT_SYMBIAN_FIRST_MENU_ITEM 32000
-#define QT_SYMBIAN_LAST_MENU_ITEM 41999 // 10000 items ought to be enough for anybody...
-#endif
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MENU
 
-#ifdef Q_WS_S60
-void qt_symbian_next_menu_from_action(QWidget* actionContainer);
-void qt_symbian_show_toplevel(CEikMenuPane* menuPane);
-void qt_symbian_show_submenu(CEikMenuPane* menuPane, int id);
-#endif // Q_WS_S60
-
 class QTornOffMenu;
 class QEventLoop;
 
@@ -88,15 +76,6 @@ struct QWceMenuAction {
     QWceMenuAction() : menuHandle(0), command(0) {}
 };
 #endif
-#ifdef Q_WS_S60
-struct QSymbianMenuAction {
-    uint command;
-    int parent;
-    CEikMenuPane* menuPane;
-    QPointer<QAction> action;
-    QSymbianMenuAction() : command(0) {}
-};
-#endif
 
 class QMenuPrivate : public QWidgetPrivate
 {
@@ -114,9 +93,6 @@ public:
 
 #if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
                       ,wce_menu(0)
-#endif
-#ifdef Q_WS_S60
-                      ,symbian_menu(0)
 #endif
     { }
     ~QMenuPrivate()
@@ -126,10 +102,6 @@ public:
 #if defined(Q_WS_WINCE) && !defined(QT_NO_MENUBAR)
         delete wce_menu;
 #endif
-#ifdef Q_WS_S60
-        delete symbian_menu;
-#endif
-
     }
     void init();
 
@@ -280,28 +252,6 @@ public:
     } *wce_menu;
     HMENU wceMenu();
     QAction* wceCommands(uint command);
-#endif
-#if defined(Q_WS_S60)
-    struct QSymbianMenuPrivate {
-        QList<QSymbianMenuAction*> actionItems;
-        QSymbianMenuPrivate();
-        ~QSymbianMenuPrivate();
-        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(bool reCreate = false);
-        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;
-        }
-    } *symbian_menu;
 #endif
     QPointer<QWidget> noReplayFor;
 };
-- 
cgit v1.2.3