Changeset 561 for trunk/tools/shared/qttoolbardialog/qttoolbardialog.cpp

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)
• tools/shared/qttoolbardialog/qttoolbardialog.cpp (modified) (12 diffs)

trunk/tools/shared/qttoolbardialog/qttoolbardialog.cpp

@@ -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 tools applications 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$
 **
@@ -120 +120 @@
 
 private:
-    QtFullToolBarManagerPrivate *d_ptr;
+    Qd_ptr;
     Q_DECLARE_PRIVATE(QtFullToolBarManager)
     Q_DISABLE_COPY(QtFullToolBarManager)
@@ -444 +444 @@
 
 QtFullToolBarManager::QtFullToolBarManager(QObject *parent)
-    : QObject(parent)
-{
-    d_ptr = new QtFullToolBarManagerPrivate;
+    : QObject(parent), d_ptr(new QtFullToolBarManagerPrivate)
+{
     d_ptr->q_ptr = this;
 }
@@ -452 +451 @@
 QtFullToolBarManager::~QtFullToolBarManager()
 {
-    delete d_ptr;
 }
 
@@ -638 +636 @@
     QToolBar *toolBar = new QToolBar(toolBarName, mainWindow());
     int i = 1;
-    const QString prefix = QLatin1String("_Custom_Toolbar_");
-    QString name = QString(QLatin1String("%1%2")).arg(prefix).arg(i);
+    const QString prefix = QLatin1String("_Custom_Toolbar_");
+    QString name = .arg(i);
     while (d_ptr->toolBarByName(name))
-        name = QString(QLatin1String("%1%2")).arg(prefix).arg(++i);
+        name = .arg(++i);
     toolBar->setObjectName(name);
     mainWindow()->addToolBar(toolBar);
@@ -832 +830 @@
 */
 QtToolBarManager::QtToolBarManager(QObject *parent)
-    : QObject(parent)
-{
-    d_ptr = new QtToolBarManagerPrivate;
+    : QObject(parent), d_ptr(new QtToolBarManagerPrivate)
+{
     d_ptr->q_ptr = this;
 
@@ -845 +842 @@
 QtToolBarManager::~QtToolBarManager()
 {
-    delete d_ptr;
 }
 
@@ -1782 +1778 @@
 */
 QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WindowFlags flags)
-    : QDialog(parent, flags)
-{
-    d_ptr = new QtToolBarDialogPrivate;
+    : QDialog(parent, flags), d_ptr(new QtToolBarDialogPrivate)
+{
     d_ptr->q_ptr = this;
     d_ptr->ui.setupUi(this);
@@ -1813 +1808 @@
     connect(d_ptr->ui.buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), this, SLOT(cancelClicked()));
 
-    connect(d_ptr->ui.actionTree, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
-                    this, SLOT(currentActionChanged(QTreeWidgetItem *)));
-    connect(d_ptr->ui.toolBarList, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
-                    this, SLOT(currentToolBarChanged(QListWidgetItem *)));
+    connect(d_ptr->ui.actionTree, SIGNAL(currentItemChanged(QTreeWidgetItem*)),
+                    this, SLOT(currentActionChanged(QTreeWidgetItem*)));
+    connect(d_ptr->ui.toolBarList, SIGNAL(currentItemChanged(QListWidgetItem*)),
+                    this, SLOT(currentToolBarChanged(QListWidgetItem*)));
     connect(d_ptr->ui.currentToolBarList,
-                    SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)),
-                    this, SLOT(currentToolBarActionChanged(QListWidgetItem *)));
-
-    connect(d_ptr->ui.actionTree, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
+                    SIGNAL(currentItemChanged(QListWidgetItem*)),
+                    this, SLOT(currentToolBarActionChanged(QListWidgetItem*)));
+
+    connect(d_ptr->ui.actionTree, SIGNAL(itemDoubleClicked(QTreeWidgetItemint)),
                     this, SLOT(rightClicked()));
-    connect(d_ptr->ui.currentToolBarList, SIGNAL(itemDoubleClicked(QListWidgetItem *)),
+    connect(d_ptr->ui.currentToolBarList, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
                     this, SLOT(leftClicked()));
-    connect(d_ptr->ui.toolBarList, SIGNAL(itemChanged(QListWidgetItem *)),
-                    this, SLOT(toolBarRenamed(QListWidgetItem *)));
+    connect(d_ptr->ui.toolBarList, SIGNAL(itemChanged(QListWidgetItem*)),
+                    this, SLOT(toolBarRenamed(QListWidgetItem*)));
 }
 
@@ -1835 +1830 @@
 {
     d_ptr->clearOld();
-    delete d_ptr;
 }