Changeset 561 for trunk/tools/designer/src/components/propertyeditor/propertyeditor.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/designer/src/components/propertyeditor/propertyeditor.cpp (modified) (6 diffs)

trunk/tools/designer/src/components/propertyeditor/propertyeditor.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 Qt Designer 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$
 **
@@ -138 +138 @@
     property->setAttribute(m_strings.m_validationModeAttribute, params.first);
     // assuming comment cannot appear or disappear for the same property in different object instance
-    if (!hasComment) {
-        QList<QtProperty *> commentProperties = property->subProperties();
-        if (commentProperties.count() > 0)
-            delete commentProperties.at(0);
-        if (commentProperties.count() > 1)
-            delete commentProperties.at(1);
-    }
+    if (!hasComment)
+        qDeleteAll(property->subProperties());
 }
 
@@ -206 +201 @@
     colors.push_back(QColor(255, 191, 239));
     m_colors.reserve(colors.count());
+
     for (int i = 0; i < colors.count(); i++) {
         QColor c = colors.at(i);
-        m_colors.push_back(qMakePair(c, c.darker(150)));
+        m_colors.push_back(qMakePair(c, c.darker()));
     }
     QColor dynamicColor(191, 207, 255);
     QColor layoutColor(255, 191, 191);
-    m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker(150));
-    m_layoutColor = qMakePair(layoutColor, layoutColor.darker(150));
+    m_dynamicColor = qMakePair(dynamicColor, dynamicColor.darker());
+    m_layoutColor = qMakePair(layoutColor, layoutColor.darker());
 
     updateForegroundBrightness();
@@ -267 +263 @@
     configureMenu->addAction(m_sortingAction);
     configureMenu->addAction(m_coloringAction);
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= 0x0400
     configureMenu->addSeparator();
     configureMenu->addAction(m_treeAction);