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

trunk/tools/designer/src/components/propertyeditor/paletteeditor.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$
 **
 ****************************************************************************/
-
-/*
-TRANSLATOR qdesigner_internal::PaletteEditor
-*/
-/*
-TRANSLATOR qdesigner_internal::PaletteModel
-*/
 
 #include "paletteeditor.h"
@@ -85 +78 @@
     ui.paletteView->setItemDelegate(delegate);
     ui.paletteView->setEditTriggers(QAbstractItemView::AllEditTriggers);
-    connect(m_paletteModel, SIGNAL(paletteChanged(const QPalette &)),
-                this, SLOT(paletteChanged(const QPalette &)));
+    connect(m_paletteModel, SIGNAL(paletteChanged()),
+                this, SLOT(paletteChanged()));
     ui.paletteView->setSelectionBehavior(QAbstractItemView::SelectRows);
 #ifndef QT_NO_DRAGANDDROP
@@ -435 +428 @@
     layout->setMargin(0);
     layout->addWidget(m_button);
-    connect(m_button, SIGNAL(colorChanged(const QColor &)), this, SLOT(brushChanged()));
+    connect(m_button, SIGNAL(colorChanged()), this, SLOT(brushChanged()));
     setFocusProxy(m_button);
 }
@@ -525 +518 @@
     if (index.column() == 0) {
         RoleEditor *editor = new RoleEditor(parent);
-        connect(editor, SIGNAL(changed(QWidget *)), this, SIGNAL(commitData(QWidget *)));
+        connect(editor, SIGNAL(changed(QWidget*)));
         //editor->setFocusPolicy(Qt::NoFocus);
         //editor->installEventFilter(const_cast<ColorDelegate *>(this));
@@ -531 +524 @@
     } else {
         BrushEditor *editor = new BrushEditor(m_core, parent);
-        connect(editor, SIGNAL(changed(QWidget *)), this, SIGNAL(commitData(QWidget *)));
+        connect(editor, SIGNAL(changed(QWidget*)));
         editor->setFocusPolicy(Qt::NoFocus);
         editor->installEventFilter(const_cast<ColorDelegate *>(this));