Fix live color updating slot parameter by using SLOT macro

dakcarto · dakcarto · commit 70ef5a78b0ed · 2013-03-22T10:23:29.000-06:00
diff --git a/python/gui/qgscolordialog.sip b/python/gui/qgscolordialog.sip
@@ -16,7 +16,7 @@ class QgsColorDialog : QObject
     /** Return a color selection from a QColorDialog, with live updating of interim selections.
      * @param initialColor The initial color of the selection dialog.
      * @param updateObject The receiver object of the live updating.
-     * @param updateSlot The receiver object's slot for live updating (e.g. "setColor( const QColor& )" ).
+     * @param updateSlot The receiver object's slot for live updating (e.g. SLOT( setValidColor( const QColor& ) ) ).
      * @param parent Parent widget. Usually 0 is best for native system color dialogs.
      * @param title The title of the QColorDialog.
      * @param options ColorDialogOptions passed to QColorDialog.
diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp
@@ -73,7 +73,7 @@ void QgsColorButton::onButtonClicked()
   if ( mAcceptLiveUpdates && settings.value( "/qgis/live_color_dialogs", false ).toBool() )
   {
     newColor = QgsColorDialog::getLiveColor(
-                 color(), this, "setValidColor( const QColor& )",
+                 color(), this, SLOT( setValidColor( const QColor& ) ),
                  this->parentWidget(), mColorDialogTitle, mColorDialogOptions );
   }
   else
diff --git a/src/gui/qgscolordialog.cpp b/src/gui/qgscolordialog.cpp
@@ -16,7 +16,6 @@
 
 #include "qgscolordialog.h"
 
-#include <QMetaObject>
 
 QgsColorDialog::QgsColorDialog()
 {
@@ -35,12 +34,9 @@ QColor QgsColorDialog::getLiveColor( const QColor& initialColor, QObject* update
   QColorDialog* liveDialog = new QColorDialog( initialColor, parent );
   liveDialog->setWindowTitle( title.isEmpty() ? tr( "Select Color" ) : title );
   liveDialog->setOptions( options );
-#ifdef Q_WS_MAC
-  // always use native color dialog on Mac
-  liveDialog->setOption( QColorDialog::DontUseNativeDialog, false );
-#endif
+
   connect( liveDialog, SIGNAL( currentColorChanged( const QColor& ) ),
-           updateObject, QString( "1%1" ).arg( QString( QMetaObject::normalizedSignature( updateSlot ) ) ).toAscii() );
+           updateObject, updateSlot );
 
   if ( liveDialog->exec() )
   {
diff --git a/src/gui/qgscolordialog.h b/src/gui/qgscolordialog.h
@@ -38,7 +38,7 @@ class GUI_EXPORT QgsColorDialog : public QObject
     /** Return a color selection from a QColorDialog, with live updating of interim selections.
      * @param initialColor The initial color of the selection dialog.
      * @param updateObject The receiver object of the live updating.
-     * @param updateSlot The receiver object's slot for live updating (e.g. "setColor( const QColor& )" ).
+     * @param updateSlot The receiver object's slot for live updating (e.g. SLOT( setValidColor( const QColor& ) ) ).
      * @param parent Parent widget. Usually 0 is best for native system color dialogs.
      * @param title The title of the QColorDialog.
      * @param options ColorDialogOptions passed to QColorDialog.
diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
@@ -264,7 +264,9 @@ void QgsVectorGradientColorRampV2Dialog::stopDoubleClicked( QTreeWidgetItem* ite
     if ( settings.value( "/qgis/live_color_dialogs", false ).toBool() )
     {
       mCurrentItem = item;
-      color = QgsColorDialog::getLiveColor( item->data( 0, StopColorRole ).value<QColor>(), this, "setItemStopColor( const QColor& )", this );
+      color = QgsColorDialog::getLiveColor(
+                item->data( 0, StopColorRole ).value<QColor>(),
+                this, SLOT( setItemStopColor( const QColor& ) ), this );
       mCurrentItem = 0;
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ void QgsColorButton::onButtonClicked()`
`73`	`73`	`if ( mAcceptLiveUpdates && settings.value( "/qgis/live_color_dialogs", false ).toBool() )`
`74`	`74`	`{`
`75`	`75`	`newColor = QgsColorDialog::getLiveColor(`
`76`		`- color(), this, "setValidColor( const QColor& )",`
	`76`	`+ color(), this, SLOT( setValidColor( const QColor& ) ),`
`77`	`77`	`this->parentWidget(), mColorDialogTitle, mColorDialogOptions );`
`78`	`78`	`}`
`79`	`79`	`else`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,9 @@ void QgsVectorGradientColorRampV2Dialog::stopDoubleClicked( QTreeWidgetItem* ite`
`264`	`264`	`if ( settings.value( "/qgis/live_color_dialogs", false ).toBool() )`
`265`	`265`	`{`
`266`	`266`	`mCurrentItem = item;`
`267`		`- color = QgsColorDialog::getLiveColor( item->data( 0, StopColorRole ).value<QColor>(), this, "setItemStopColor( const QColor& )", this );`
	`267`	`+ color = QgsColorDialog::getLiveColor(`
	`268`	`+ item->data( 0, StopColorRole ).value<QColor>(),`
	`269`	`+ this, SLOT( setItemStopColor( const QColor& ) ), this );`
`268`	`270`	`mCurrentItem = 0;`
`269`	`271`	`}`
`270`	`272`	`else`