Changeset 846 for trunk/src/gui/widgets/qmenu_symbian.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/src/gui/widgets/qmenu_symbian.cpp
r769 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 49 49 #include <private/qmenu_p.h> 50 50 #include <private/qmenubar_p.h> 51 #include < qt_s60_p.h>51 #include <private/qt_s60_p.h> 52 52 #include <QtCore/qlibrary.h> 53 53 … … 169 169 if (action->action->menu()->actions().size() > 0) { 170 170 for (int c2= 0; c2 < action->action->menu()->actions().size(); ++c2) { 171 QS ymbianMenuAction *symbianAction2 = new QSymbianMenuAction;171 QScopedPointer<QSymbianMenuAction> symbianAction2(new QSymbianMenuAction); 172 172 symbianAction2->action = action->action->menu()->actions().at(c2); 173 173 QMenu * menu = symbianAction2->action->menu(); 174 174 symbianAction2->command = qt_symbian_menu_static_cmd_id++; 175 qt_symbian_insert_action(symbianAction2 , &(menuItem->children));175 qt_symbian_insert_action(symbianAction2.data(), &(menuItem->children)); 176 176 } 177 177 } … … 433 433 { 434 434 for (int i = 0; i <actions.size(); ++i) { 435 QS ymbianMenuAction *symbianActionTopLevel = new QSymbianMenuAction;435 QScopedPointer<QSymbianMenuAction> symbianActionTopLevel(new QSymbianMenuAction); 436 436 symbianActionTopLevel->action = actions.at(i); 437 437 symbianActionTopLevel->parent = 0; 438 438 symbianActionTopLevel->command = qt_symbian_menu_static_cmd_id++; 439 qt_symbian_insert_action(symbianActionTopLevel , &symbianMenus);439 qt_symbian_insert_action(symbianActionTopLevel.data(), &symbianMenus); 440 440 } 441 441 }
Note:
See TracChangeset
for help on using the changeset viewer.