Changeset 561 for trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.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/qtpropertybrowser/qtpropertybrowser.cpp (modified) (15 diffs)

trunk/tools/shared/qtpropertybrowser/qtpropertybrowser.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** 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 have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -49 +49 @@
 #endif
 
-#if QT_VERSION >= 0x040400
 QT_BEGIN_NAMESPACE
-#endif
 
 class QtPropertyPrivate
@@ -145 +143 @@
 */
 QtProperty::QtProperty(QtAbstractPropertyManager *manager)
-{
-    d_ptr = new QtPropertyPrivate(manager);
+    : d_ptr(new QtPropertyPrivate(manager))
+{
     d_ptr->q_ptr = this;
 }
@@ -180 +178 @@
         property->d_ptr->m_subItems.removeAll(this);
     }
-    delete d_ptr;
 }
 
@@ -641 +638 @@
 */
 QtAbstractPropertyManager::QtAbstractPropertyManager(QObject *parent)
-    : QObject(parent)
-{
-    d_ptr = new QtAbstractPropertyManagerPrivate;
+    : QObject(parent), d_ptr(new QtAbstractPropertyManagerPrivate)
+{
     d_ptr->q_ptr = this;
 
@@ -655 +651 @@
 {
     clear();
-    delete d_ptr;
 }
 
@@ -1170 +1165 @@
 
 QtBrowserItem::QtBrowserItem(QtAbstractPropertyBrowser *browser, QtProperty *property, QtBrowserItem *parent)
-{
-    d_ptr = new QtBrowserItemPrivate(browser, property, parent);
+    : d_ptr(new QtBrowserItemPrivate(browser, property, parent))
+{
     d_ptr->q_ptr = this;
 }
@@ -1177 +1172 @@
 QtBrowserItem::~QtBrowserItem()
 {
-    delete d_ptr;
 }
 
@@ -1250 +1244 @@
         q_ptr->connect(manager, SIGNAL(propertyRemoved(QtProperty *,
                             QtProperty *)),
-                q_ptr, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
-        q_ptr->connect(manager, SIGNAL(propertyDestroyed(QtProperty *)),
-                q_ptr, SLOT(slotPropertyDestroyed(QtProperty *)));
-        q_ptr->connect(manager, SIGNAL(propertyChanged(QtProperty *)),
-                q_ptr, SLOT(slotPropertyDataChanged(QtProperty *)));
+                q_ptr, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
+        q_ptr->connect(manager, SIGNAL(propertyDestroyed(QtProperty*)),
+                q_ptr, SLOT(slotPropertyDestroyed(QtProperty*)));
+        q_ptr->connect(manager, SIGNAL(propertyChanged(QtProperty*)),
+                q_ptr, SLOT(slotPropertyDataChanged(QtProperty*)));
     }
     m_managerToProperties[manager].append(property);
@@ -1290 +1284 @@
         q_ptr->disconnect(manager, SIGNAL(propertyRemoved(QtProperty *,
                             QtProperty *)),
-                q_ptr, SLOT(slotPropertyRemoved(QtProperty *, QtProperty *)));
-        q_ptr->disconnect(manager, SIGNAL(propertyDestroyed(QtProperty *)),
-                q_ptr, SLOT(slotPropertyDestroyed(QtProperty *)));
-        q_ptr->disconnect(manager, SIGNAL(propertyChanged(QtProperty *)),
-                q_ptr, SLOT(slotPropertyDataChanged(QtProperty *)));
+                q_ptr, SLOT(slotPropertyRemoved(QtProperty*,QtProperty*)));
+        q_ptr->disconnect(manager, SIGNAL(propertyDestroyed(QtProperty*)),
+                q_ptr, SLOT(slotPropertyDestroyed(QtProperty*)));
+        q_ptr->disconnect(manager, SIGNAL(propertyChanged(QtProperty*)),
+                q_ptr, SLOT(slotPropertyDataChanged(QtProperty*)));
 
         m_managerToProperties.remove(manager);
@@ -1649 +1643 @@
 */
 QtAbstractPropertyBrowser::QtAbstractPropertyBrowser(QWidget *parent)
-    : QWidget(parent)
-{
-    d_ptr = new QtAbstractPropertyBrowserPrivate;
+    : QWidget(parent), d_ptr(new QtAbstractPropertyBrowserPrivate)
+{
     d_ptr->q_ptr = this;
 
@@ -1674 +1667 @@
     while (itItem.hasNext())
         d_ptr->clearIndex(itItem.next());
-    delete d_ptr;
 }
 
@@ -1959 +1951 @@
 }
 
-#if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
-#endif
 
 #include "moc_qtpropertybrowser.cpp"