Fix for compilers that do not cope with template argument

qgis · Sep 18, 2012 · 396c431 · 396c431
1 parent a2d0ee8
commit 396c431
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
@@ -290,7 +290,7 @@ void QgsCptCityColorRampV2Dialog::updateTreeView( QgsCptCityDataItem *item, bool
     lblSchemePath->setText( "" );
     // lblCollectionName->setText( item->path() );
     lblCollectionInfo->setText( item->info() );
-    updateCopyingInfo( );
+    clearCopyingInfo( );
     updateListWidget( item );
   }
   else
@@ -434,6 +434,11 @@ void QgsCptCityColorRampV2Dialog::updatePreview( bool clear )
   updateCopyingInfo( mRamp->copyingInfo() );
 }
 
+void QgsCptCityColorRampV2Dialog::clearCopyingInfo()
+{
+  updateCopyingInfo( QMap< QString, QString >() );
+}
+
 void QgsCptCityColorRampV2Dialog::updateCopyingInfo( const QMap< QString, QString >& copyingMap )
 {
   QString authorStr = copyingMap.value( "authors" );
@@ -544,7 +549,7 @@ bool QgsCptCityColorRampV2Dialog::updateRamp()
   mListRamps.clear();
   cboVariantName->clear();
   updatePreview( true );
-  updateCopyingInfo( );
+  clearCopyingInfo( );
 
   QgsDebugMsg( "schemeName= " + mRamp->schemeName() );
   if ( mRamp->schemeName() == "" )

diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
@@ -56,7 +56,8 @@ class GUI_EXPORT QgsCptCityColorRampV2Dialog : public QDialog, private Ui::QgsCp
   protected:
 
     void updatePreview( bool clear = false );
-    void updateCopyingInfo( const QMap< QString, QString >& copyingMap = QMap< QString, QString >() );
+    void clearCopyingInfo();
+    void updateCopyingInfo( const QMap< QString, QString >& copyingMap );
     void updateTreeView( QgsCptCityDataItem *item, bool resetRamp = true );
     void updateListWidget( QgsCptCityDataItem *item );
     bool eventFilter( QObject *obj, QEvent *event );