Changeset 561 for trunk/src/gui/widgets/qmenu_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qmenu_p.h (modified) (19 diffs)

trunk/src/gui/widgets/qmenu_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -62 +62 @@
 #include "private/qwidget_p.h"
 
+
+
+
+
+
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MENU
+
+
+
+
+
 
 class QTornOffMenu;
@@ -113 +123 @@
 #endif
 
-#ifdef Q_OS_WINCE
+#ifdef Q_S_WINCE
 struct QWceMenuAction {
     uint command;    
@@ -121 +131 @@
 };
 #endif
+
+
+
+
+
+
+
+
+
 
 class QMenuPrivate : public QWidgetPrivate
@@ -127 +146 @@
 public:
     QMenuPrivate() : itemsDirty(0), maxIconWidth(0), tabWidth(0), ncols(0),
-                      collapsibleSeparators(true), hasHadMouse(0), aboutToHide(0), motions(0),
-                      currentAction(0), scroll(0), eventLoop(0), tearoff(0), tornoff(0), tearoffHighlighted(0),
-                      hasCheckableItems(0), sloppyAction(0)
+                      collapsibleSeparators(true), activationRecursionGuard(false), hasHadMouse(0), aboutToHide(0), motions(0),
+                      currentAction(0),
+#ifdef QT_KEYPAD_NAVIGATION
+                      selectAction(0),
+                      cancelAction(0),
+#endif
+                      scroll(0), eventLoop(0), tearoff(0), tornoff(0), tearoffHighlighted(0),
+                      hasCheckableItems(0), sloppyAction(0), doChildEffects(false)
 #ifdef Q_WS_MAC
                       ,mac_menu(0)
 #endif
-#if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR)
+#if defined(Q_S_WINCE) && !defined(QT_NO_MENUBAR)
                       ,wce_menu(0)
+
+
+
 #endif
 #ifdef QT3_SUPPORT
@@ -146 +173 @@
         delete mac_menu;
 #endif
-#if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR)
+#if defined(Q_S_WINCE) && !defined(QT_NO_MENUBAR)
         delete wce_menu;
 #endif
+
+
+
+
     }
     void init();
+
+
+
 
     //item calculations
@@ -156 +190 @@
     mutable uint maxIconWidth, tabWidth;
     QRect actionRect(QAction *) const;
-    mutable QMap<QAction*, QRect> actionRects;
-    mutable QList<QAction*> actionList;
+
+    mutable Q;
     mutable QHash<QAction *, QWidget *> widgetItems;
-    void calcActionRects(QMap<QAction*, QRect> &actionRects, QList<QAction*> &actionList) const;
-    void updateActions();
-    QRect popupGeometry(int screen=-1) const;
-    QList<QAction *> filterActions(const QList<QAction *> &actions) const;
-    uint ncols : 4; //4 bits is probably plenty
+    void updateActionRects() const;
+    QRect popupGeometry(const QWidget *widget) const;
+    QRect popupGeometry(int screen = -1) const;
+    mutable uint ncols : 4; //4 bits is probably plenty
     uint collapsibleSeparators : 1;
 
-    uint activationRecursionGuard : 1;
+    ;
 
     //selection
@@ -175 +208 @@
     int motions;
     QAction *currentAction;
+
+
+
+
     static QBasicTimer menuDelayTimer;
     enum SelectionReason {
@@ -180 +217 @@
         SelectedFromElsewhere
     };
+
     QAction *actionAt(QPoint p) const;
     void setFirstActionActive();
@@ -192 +230 @@
         uint scrollFlags : 2, scrollDirection : 2;
         int scrollOffset;
-        QBasicTimer *scrollTimer;
-
-        QMenuScroller() : scrollFlags(ScrollNone), scrollDirection(ScrollNone), scrollOffset(0), scrollTimer(0) { }
-        ~QMenuScroller() { delete scrollTimer; }
+        QBasicTimer scrollTimer;
+
+        QMenuScroller() : scrollFlags(ScrollNone), scrollDirection(ScrollNone), scrollOffset(0) { }
+        ~QMenuScroller() { }
     } *scroll;
     void scrollMenu(QMenuScroller::ScrollLocation location, bool active=false);
@@ -209 +247 @@
     QBasicTimer searchBufferTimer;
 
-    //passing of mouse events up the parent heirarchy
+    //passing of mouse events up the parent hrarchy
     QPointer<QMenu> activeMenu;
     bool mouseEventTaken(QMouseEvent *);
@@ -221 +259 @@
     QMenuCaused causedPopup;
     void hideUpToMenuBar();
-    void hideMenu(QMenu *menu);
+    void hideMenu(QMenu *menu);
 
     //index mappings
@@ -235 +273 @@
     //sloppy selection
     static QBasicTimer sloppyDelayTimer;
-    QAction *sloppyAction;
+    QAction *sloppyAction;
     QRegion sloppyRegion;
 
@@ -255 +293 @@
 
     bool hasMouseMoved(const QPoint &globalPos);
+
+
+
 
     //menu fading/scrolling effects
@@ -285 +326 @@
     OSMenuRef macMenu(OSMenuRef merge);
     void setMacMenuEnabled(bool enable = true);
+
     static QHash<OSMenuRef, OSMenuRef> mergeMenuHash;
     static QHash<OSMenuRef, QMenuMergeList*> mergeMenuItemsHash;
@@ -294 +336 @@
 #endif
 
-#if defined(Q_OS_WINCE) && !defined(QT_NO_MENUBAR)
+#if defined(Q_S_WINCE) && !defined(QT_NO_MENUBAR)
     struct QWceMenuPrivate {
         QList<QWceMenuAction*> actionItems;
@@ -319 +361 @@
     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;
 };