summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qmenu_p.h
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-07-06 14:12:36 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-07-06 14:49:33 (GMT)
commitd000c29f9039dab6cd46bb3a12df828d5f9354a7 (patch)
tree3fffb322e6d5a92ae9f3c30ec51d6ece4d1404d0 /src/gui/widgets/qmenu_p.h
parentba25bdcb9122d45ccdd06f281a5f49999eaff089 (diff)
downloadQt-d000c29f9039dab6cd46bb3a12df828d5f9354a7.zip
Qt-d000c29f9039dab6cd46bb3a12df828d5f9354a7.tar.gz
Qt-d000c29f9039dab6cd46bb3a12df828d5f9354a7.tar.bz2
QMenu: scrolling in menus was broken
Diffstat (limited to 'src/gui/widgets/qmenu_p.h')
-rw-r--r--src/gui/widgets/qmenu_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index 50a9f2f..461d435 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -189,10 +189,10 @@ public:
enum ScrollDirection { ScrollNone=0, ScrollUp=0x01, ScrollDown=0x02 };
uint scrollFlags : 2, scrollDirection : 2;
int scrollOffset;
- QBasicTimer *scrollTimer;
+ QBasicTimer scrollTimer;
- QMenuScroller() : scrollFlags(ScrollNone), scrollDirection(ScrollNone), scrollOffset(0), scrollTimer(0) { }
- ~QMenuScroller() { delete scrollTimer; }
+ QMenuScroller() : scrollFlags(ScrollNone), scrollDirection(ScrollNone), scrollOffset(0) { }
+ ~QMenuScroller() { }
} *scroll;
void scrollMenu(QMenuScroller::ScrollLocation location, bool active=false);
void scrollMenu(QMenuScroller::ScrollDirection direction, bool page=false, bool active=false);