Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/gui/widgets/qmenu_symbian.cpp

    r769 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
     
    4949#include <private/qmenu_p.h>
    5050#include <private/qmenubar_p.h>
    51 #include <qt_s60_p.h>
     51#include <private/qt_s60_p.h>
    5252#include <QtCore/qlibrary.h>
    5353
     
    169169            if (action->action->menu()->actions().size() > 0) {
    170170                for (int c2= 0; c2 < action->action->menu()->actions().size(); ++c2) {
    171                     QSymbianMenuAction *symbianAction2 = new QSymbianMenuAction;
     171                    QScopedPointer<QSymbianMenuAction> symbianAction2(new QSymbianMenuAction);
    172172                    symbianAction2->action = action->action->menu()->actions().at(c2);
    173173                    QMenu * menu = symbianAction2->action->menu();
    174174                    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));
    176176                }
    177177            }
     
    433433{
    434434    for (int i = 0; i <actions.size(); ++i) {
    435         QSymbianMenuAction *symbianActionTopLevel = new QSymbianMenuAction;
     435        QScopedPointer<QSymbianMenuAction> symbianActionTopLevel(new QSymbianMenuAction);
    436436        symbianActionTopLevel->action = actions.at(i);
    437437        symbianActionTopLevel->parent = 0;
    438438        symbianActionTopLevel->command = qt_symbian_menu_static_cmd_id++;
    439         qt_symbian_insert_action(symbianActionTopLevel, &symbianMenus);
     439        qt_symbian_insert_action(symbianActionTopLevel.data(), &symbianMenus);
    440440    }
    441441}
Note: See TracChangeset for help on using the changeset viewer.