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

trunk/tools/shared/qtgradienteditor/qtgradientstopswidget.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$
 **
@@ -361 +361 @@
 
 QtGradientStopsWidget::QtGradientStopsWidget(QWidget *parent)
-    : QAbstractScrollArea(parent)
-{
-    d_ptr = new QtGradientStopsWidgetPrivate;
+    : QAbstractScrollArea(parent), d_ptr(new QtGradientStopsWidgetPrivate)
+{
     d_ptr->q_ptr = this;
     d_ptr->m_backgroundCheckered = true;
@@ -392 +391 @@
 QtGradientStopsWidget::~QtGradientStopsWidget()
 {
-    delete d_ptr;
 }
 
@@ -424 +422 @@
 
     if (d_ptr->m_model) {
-        disconnect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
-                    this, SLOT(slotStopAdded(QtGradientStop *)));
-        disconnect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
-                    this, SLOT(slotStopRemoved(QtGradientStop *)));
-        disconnect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
-                    this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
-        disconnect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
-                    this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
-        disconnect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
-                    this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
-        disconnect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
-                    this, SLOT(slotStopSelected(QtGradientStop *, bool)));
-        disconnect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
-                    this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
+        disconnect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
+                    this, SLOT(slotStopAdded(QtGradientStop*)));
+        disconnect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
+                    this, SLOT(slotStopRemoved(QtGradientStop*)));
+        disconnect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
+                    this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
+        disconnect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
+                    this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
+        disconnect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
+                    this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
+        disconnect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
+                    this, SLOT(slotStopSelected(QtGradientStop*,bool)));
+        disconnect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
+                    this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
 
         d_ptr->m_stops.clear();
@@ -445 +443 @@
 
     if (d_ptr->m_model) {
-        connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop *)),
-                    this, SLOT(slotStopAdded(QtGradientStop *)));
-        connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop *)),
-                    this, SLOT(slotStopRemoved(QtGradientStop *)));
-        connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop *, qreal)),
-                    this, SLOT(slotStopMoved(QtGradientStop *, qreal)));
-        connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop *, QtGradientStop *)),
-                    this, SLOT(slotStopsSwapped(QtGradientStop *, QtGradientStop *)));
-        connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop *, const QColor &)),
-                    this, SLOT(slotStopChanged(QtGradientStop *, const QColor &)));
-        connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop *, bool)),
-                    this, SLOT(slotStopSelected(QtGradientStop *, bool)));
-        connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop *)),
-                    this, SLOT(slotCurrentStopChanged(QtGradientStop *)));
+        connect(d_ptr->m_model, SIGNAL(stopAdded(QtGradientStop*)),
+                    this, SLOT(slotStopAdded(QtGradientStop*)));
+        connect(d_ptr->m_model, SIGNAL(stopRemoved(QtGradientStop*)),
+                    this, SLOT(slotStopRemoved(QtGradientStop*)));
+        connect(d_ptr->m_model, SIGNAL(stopMoved(QtGradientStop*,qreal)),
+                    this, SLOT(slotStopMoved(QtGradientStop*,qreal)));
+        connect(d_ptr->m_model, SIGNAL(stopsSwapped(QtGradientStop*,QtGradientStop*)),
+                    this, SLOT(slotStopsSwapped(QtGradientStop*,QtGradientStop*)));
+        connect(d_ptr->m_model, SIGNAL(stopChanged(QtGradientStop*,QColor)),
+                    this, SLOT(slotStopChanged(QtGradientStop*,QColor)));
+        connect(d_ptr->m_model, SIGNAL(stopSelected(QtGradientStop*,bool)),
+                    this, SLOT(slotStopSelected(QtGradientStop*,bool)));
+        connect(d_ptr->m_model, SIGNAL(currentStopChanged(QtGradientStop*)),
+                    this, SLOT(slotCurrentStopChanged(QtGradientStop*)));
 
         QList<QtGradientStop *> stops = d_ptr->m_model->stops().values();