Generic code cleanup

m-kuhn · m-kuhn · commit 1b5e577fd3d3 · 2016-12-20T01:20:08.000+01:00
diff --git a/python/core/qgsfieldformatterregistry.sip b/python/core/qgsfieldformatterregistry.sip
@@ -20,17 +20,15 @@ class QgsFieldFormatterRegistry : QObject
 %End
   public:
 
-    QgsFieldFormatterRegistry();
+    QgsFieldFormatterRegistry( QObject* parent /TransferThis/ );
     ~QgsFieldFormatterRegistry();
 
-    void addFieldFormatter( QgsFieldFormatter* kit /Transfer/ );
-
-    void removeFieldFormatter( QgsFieldFormatter* kit );
-
-    QgsFieldFormatter* fieldKit( const QString& id ) const;
+    void addFieldFormatter( QgsFieldFormatter* formatter /Transfer/ );
 
+    void removeFieldFormatter( QgsFieldFormatter* formatter );
+    void removeFieldFormatter( const QString& id );
+    QgsFieldFormatter* fieldFormatter( const QString& id ) const;
   signals:
-    void fieldKitAdded( QgsFieldFormatter* kit );
-
-    void fieldKitRemoved( QgsFieldFormatter* kit );
+    void fieldFormatterAdded( QgsFieldFormatter* formatter );
+    void fieldFormatterRemoved( QgsFieldFormatter* formatter );
 };
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -6399,7 +6399,7 @@ QVariant QgisAppFieldValueConverter::convert( int idx, const QVariant& value )
     return value;
   }
   const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, mLayer->fields().field( idx ).name() );
-  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
+  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
   return fieldKit->representValue( mLayer, idx, setup.config(), QVariant(), value );
 }
 
diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -142,7 +142,7 @@ const QVariantMap QgsAttributeTypeDialog::editorWidgetConfig()
   return QVariantMap();
 }
 
-void QgsAttributeTypeDialog::setWidgetType( const QString& type )
+void QgsAttributeTypeDialog::setEditorWidgetType( const QString& type )
 {
   for ( int i = 0; i < selectionListWidget->count(); i++ )
   {
@@ -181,7 +181,7 @@ void QgsAttributeTypeDialog::setWidgetType( const QString& type )
   defaultExpressionChanged();
 }
 
-void QgsAttributeTypeDialog::setWidgetConfig( const QVariantMap& config )
+void QgsAttributeTypeDialog::setEditorWidgetConfig( const QVariantMap& config )
 {
   mWidgetConfig = config;
 }
@@ -311,7 +311,7 @@ void QgsAttributeTypeDialog::on_selectionListWidget_currentRowChanged( int index
 {
   const QString editType = selectionListWidget->item( index )->data( Qt::UserRole ).toString();
 
-  setWidgetType( editType );
+  setEditorWidgetType( editType );
 }
 
 void QgsAttributeTypeDialog::defaultExpressionChanged()
@@ -350,7 +350,7 @@ void QgsAttributeTypeDialog::defaultExpressionChanged()
     return;
   }
 
-  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( editorWidgetType() );
+  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( editorWidgetType() );
 
   QString previewText = fieldKit->representValue( mLayer, mFieldIdx, editorWidgetConfig(), QVariant(), val );
 
diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h
@@ -43,11 +43,11 @@ class APP_EXPORT QgsAttributeTypeDialog: public QDialog, private Ui::QgsAttribut
 
     const QString editorWidgetText();
 
-    void setWidgetType( const QString& type );
+    void setEditorWidgetType( const QString& type );
 
     const QVariantMap editorWidgetConfig();
 
-    void setWidgetConfig( const QVariantMap& config );
+    void setEditorWidgetConfig( const QVariantMap& config );
 
     /**
      * Setter for checkbox to label on top
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
@@ -577,8 +577,8 @@ void QgsFieldsProperties::attributeTypeDialog()
   attributeTypeDialog.setConstraintExpressionEnforced( cfg.mConstraintStrength.value( QgsFieldConstraints::ConstraintExpression, QgsFieldConstraints::ConstraintStrengthHard ) == QgsFieldConstraints::ConstraintStrengthHard );
   attributeTypeDialog.setDefaultValueExpression( mLayer->defaultValueExpression( index ) );
 
-  attributeTypeDialog.setWidgetConfig( cfg.mEditorWidgetConfig );
-  attributeTypeDialog.setWidgetType( cfg.mEditorWidgetType );
+  attributeTypeDialog.setEditorWidgetConfig( cfg.mEditorWidgetConfig );
+  attributeTypeDialog.setEditorWidgetType( cfg.mEditorWidgetType );
 
   if ( !attributeTypeDialog.exec() )
     return;
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -734,7 +734,7 @@ QString QgsIdentifyResultsDialog::representValue( QgsVectorLayer* vlayer, const
   QMap<QString, QVariant>& layerCaches = mWidgetCaches[vlayer->id()];
 
   QgsEditorWidgetFactory* factory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
-  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
+  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
 
   int idx = vlayer->fields().lookupField( fieldName );
 
diff --git a/src/core/fieldformatter/qgsdatetimefieldformatter.cpp b/src/core/fieldformatter/qgsdatetimefieldformatter.cpp
@@ -20,11 +20,6 @@
 #include "qgsfield.h"
 #include "qgsvectorlayer.h"
 
-QgsDateTimeFieldFormatter::QgsDateTimeFieldFormatter()
-{
-
-}
-
 QString QgsDateTimeFieldFormatter::id() const
 {
   return QStringLiteral( "DateTime" );
diff --git a/src/core/fieldformatter/qgsdatetimefieldformatter.h b/src/core/fieldformatter/qgsdatetimefieldformatter.h
@@ -25,9 +25,7 @@
 class CORE_EXPORT QgsDateTimeFieldFormatter : public QgsFieldFormatter
 {
   public:
-    QgsDateTimeFieldFormatter();
-
-    QString id() const override;
+    virtual QString id() const override;
 
     virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
 
diff --git a/src/core/fieldformatter/qgsfallbackfieldformatter.cpp b/src/core/fieldformatter/qgsfallbackfieldformatter.cpp
@@ -15,11 +15,6 @@
  ***************************************************************************/
 #include "qgsfallbackfieldformatter.h"
 
-QgsFallbackFieldFormatter::QgsFallbackFieldFormatter()
-{
-
-}
-
 QString QgsFallbackFieldFormatter::id() const
 {
   return QString();
diff --git a/src/core/fieldformatter/qgsfallbackfieldformatter.h b/src/core/fieldformatter/qgsfallbackfieldformatter.h
@@ -21,9 +21,7 @@
 class CORE_EXPORT QgsFallbackFieldFormatter : public QgsFieldFormatter
 {
   public:
-    QgsFallbackFieldFormatter();
-
-    QString id() const override;
+    virtual QString id() const override;
 };
 
 #endif // QGSFALLBACKFIELDKIT_H
diff --git a/src/core/fieldformatter/qgskeyvaluefieldformatter.cpp b/src/core/fieldformatter/qgskeyvaluefieldformatter.cpp
@@ -17,11 +17,6 @@
 
 #include <QSettings>
 
-QgsKeyValueFieldFormatter::QgsKeyValueFieldFormatter()
-{
-
-}
-
 QString QgsKeyValueFieldFormatter::id() const
 {
   return QStringLiteral( "KeyValue" );
diff --git a/src/core/fieldformatter/qgskeyvaluefieldformatter.h b/src/core/fieldformatter/qgskeyvaluefieldformatter.h
@@ -21,10 +21,8 @@
 class CORE_EXPORT QgsKeyValueFieldFormatter : public QgsFieldFormatter
 {
   public:
-    QgsKeyValueFieldFormatter();
-
-    QString id() const override;
-    QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
+    virtual QString id() const override;
+    virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
 };
 
 #endif // QGSKEYVALUEFIELDKIT_H
diff --git a/src/core/fieldformatter/qgslistfieldformatter.cpp b/src/core/fieldformatter/qgslistfieldformatter.cpp
@@ -17,11 +17,6 @@
 
 #include <QSettings>
 
-QgsListFieldFormatter::QgsListFieldFormatter()
-{
-
-}
-
 QString QgsListFieldFormatter::id() const
 {
   return QStringLiteral( "List" );
diff --git a/src/core/fieldformatter/qgslistfieldformatter.h b/src/core/fieldformatter/qgslistfieldformatter.h
@@ -21,11 +21,9 @@
 class CORE_EXPORT QgsListFieldFormatter : public QgsFieldFormatter
 {
   public:
-    QgsListFieldFormatter();
+    virtual QString id() const override;
 
-    QString id() const override;
-
-    QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
+    virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
 };
 
 #endif // QGSLISTFIELDKIT_H
diff --git a/src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp b/src/core/fieldformatter/qgsrelationreferencefieldformatter.cpp
@@ -22,11 +22,6 @@
 #include "qgsrelationmanager.h"
 #include "qgsvectorlayer.h"
 
-QgsRelationReferenceFieldFormatter::QgsRelationReferenceFieldFormatter()
-{
-
-}
-
 QString QgsRelationReferenceFieldFormatter::id() const
 {
   return QStringLiteral( "RelationReference" );
diff --git a/src/core/fieldformatter/qgsrelationreferencefieldformatter.h b/src/core/fieldformatter/qgsrelationreferencefieldformatter.h
@@ -21,9 +21,7 @@
 class CORE_EXPORT QgsRelationReferenceFieldFormatter : public QgsFieldFormatter
 {
   public:
-    QgsRelationReferenceFieldFormatter();
-
-    QString id() const override;
+    virtual QString id() const override;
 
     virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
 
diff --git a/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp b/src/core/fieldformatter/qgsvaluemapfieldformatter.cpp
@@ -17,11 +17,6 @@
 
 #include "qgsvectorlayer.h"
 
-QgsValueMapFieldFormatter::QgsValueMapFieldFormatter()
-{
-
-}
-
 QString QgsValueMapFieldFormatter::id() const
 {
   return QStringLiteral( "ValueMap" );
diff --git a/src/core/fieldformatter/qgsvaluemapfieldformatter.h b/src/core/fieldformatter/qgsvaluemapfieldformatter.h
@@ -23,13 +23,11 @@
 class CORE_EXPORT QgsValueMapFieldFormatter : public QgsFieldFormatter
 {
   public:
-    QgsValueMapFieldFormatter();
+    virtual QString id() const override;
 
-    QString id() const override;
+    virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
 
-    QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
-
-    QVariant sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
+    virtual QVariant sortValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;
 };
 
 #endif // QGSVALUEMAPFIELDKIT_H
diff --git a/src/core/qgsfieldformatterregistry.cpp b/src/core/qgsfieldformatterregistry.cpp
@@ -44,22 +44,27 @@ QgsFieldFormatterRegistry::~QgsFieldFormatterRegistry()
   delete mFallbackFieldFormatter;
 }
 
-void QgsFieldFormatterRegistry::addFieldFormatter( QgsFieldFormatter* kit )
+void QgsFieldFormatterRegistry::addFieldFormatter( QgsFieldFormatter* formatter )
 {
-  mFieldFormatters.insert( kit->id(), kit );
-  emit fieldKitAdded( kit );
+  mFieldFormatters.insert( formatter->id(), formatter );
+  emit fieldFormatterAdded( formatter );
 }
 
-void QgsFieldFormatterRegistry::removeFieldFormatter( QgsFieldFormatter* kit )
+void QgsFieldFormatterRegistry::removeFieldFormatter( QgsFieldFormatter* formatter )
 {
-  if ( mFieldFormatters.remove( kit->id() ) )
+  removeFieldFormatter( formatter->id() );
+}
+
+void QgsFieldFormatterRegistry::removeFieldFormatter( const QString& id )
+{
+  if ( QgsFieldFormatter* formatter = mFieldFormatters.take( id ) )
   {
-    emit fieldKitRemoved( kit );
-    delete kit;
+    emit fieldFormatterRemoved( formatter );
+    delete formatter;
   }
 }
 
-QgsFieldFormatter* QgsFieldFormatterRegistry::fieldKit( const QString& id ) const
+QgsFieldFormatter* QgsFieldFormatterRegistry::fieldFormatter( const QString& id ) const
 {
   return mFieldFormatters.value( id, mFallbackFieldFormatter );
 }
diff --git a/src/core/qgsfieldformatterregistry.h b/src/core/qgsfieldformatterregistry.h
@@ -41,7 +41,7 @@ class CORE_EXPORT QgsFieldFormatterRegistry : public QObject
      *
      * Use the one provided by `QgsApplication::fieldKitRegistry()` instead.
      */
-    QgsFieldFormatterRegistry( QObject* parent = nullptr );
+    explicit QgsFieldFormatterRegistry( QObject* parent = nullptr );
     ~QgsFieldFormatterRegistry();
 
     /**
@@ -50,31 +50,36 @@ class CORE_EXPORT QgsFieldFormatterRegistry : public QObject
      *
      * Ownership is transferred to the registry.
      */
-    void addFieldFormatter( QgsFieldFormatter* kit );
+    void addFieldFormatter( QgsFieldFormatter* formatter );
 
     /**
      * Remove a field formatter from the registry.
      * The field formatter will be deleted.
      */
-    void removeFieldFormatter( QgsFieldFormatter* kit );
+    void removeFieldFormatter( QgsFieldFormatter* formatter );
+
+    /**
+     * Remove the field formatter with the specified id.
+     */
+    void removeFieldFormatter( const QString& id );
 
     /**
      * Get a field formatter by its id. If there is no such id registered,
      * a default QgsFallbackFieldFormatter with a null id will be returned instead.
      */
-    QgsFieldFormatter* fieldKit( const QString& id ) const;
+    QgsFieldFormatter* fieldFormatter( const QString& id ) const;
 
   signals:
 
     /**
      * Will be emitted after a new field formatter has been added.
      */
-    void fieldKitAdded( QgsFieldFormatter* kit );
+    void fieldFormatterAdded( QgsFieldFormatter* formatter );
 
     /**
      * Will be emitted just before a field formatter is removed and deleted.
      */
-    void fieldKitRemoved( QgsFieldFormatter* kit );
+    void fieldFormatterRemoved( QgsFieldFormatter* formatter );
 
   private:
     QHash<QString, QgsFieldFormatter*> mFieldFormatters;
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -343,7 +343,7 @@ void QgsAttributeTableModel::loadAttributes()
   {
     const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( layer(), fields[idx].name() );
     QgsEditorWidgetFactory* widgetFactory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
-    QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
+    QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
 
     if ( widgetFactory )
     {
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -3383,7 +3383,7 @@ QDomElement QgsWmsServer::createFeatureGML(
 QString QgsWmsServer::replaceValueMapAndRelation( QgsVectorLayer* vl, int idx, const QString& attributeVal )
 {
   const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( vl, vl->fields().field( idx ).name() );
-  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
+  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );
   QString value( fieldKit->representValue( vl, idx, setup.config(), QVariant(), attributeVal ) );
 
   if ( setup.config().value( QStringLiteral( "AllowMulti" ) ).toBool() && value.startsWith( QLatin1String( "{" ) ) && value.endsWith( QLatin1String( "}" ) ) )

Original file line number	Diff line number	Diff line change
`@@ -6399,7 +6399,7 @@ QVariant QgisAppFieldValueConverter::convert( int idx, const QVariant& value )`
`6399`	`6399`	`return value;`
`6400`	`6400`	`}`
`6401`	`6401`	`const QgsEditorWidgetSetup setup = QgsEditorWidgetRegistry::instance()->findBest( mLayer, mLayer->fields().field( idx ).name() );`
`6402`		`- QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );`
	`6402`	`+ QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( setup.type() );`
`6403`	`6403`	`return fieldKit->representValue( mLayer, idx, setup.config(), QVariant(), value );`
`6404`	`6404`	`}`
`6405`	`6405`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ const QVariantMap QgsAttributeTypeDialog::editorWidgetConfig()`
`142`	`142`	`return QVariantMap();`
`143`	`143`	`}`
`144`	`144`
`145`		`-void QgsAttributeTypeDialog::setWidgetType( const QString& type )`
	`145`	`+void QgsAttributeTypeDialog::setEditorWidgetType( const QString& type )`
`146`	`146`	`{`
`147`	`147`	`for ( int i = 0; i < selectionListWidget->count(); i++ )`
`148`	`148`	`{`
`@@ -181,7 +181,7 @@ void QgsAttributeTypeDialog::setWidgetType( const QString& type )`
`181`	`181`	`defaultExpressionChanged();`
`182`	`182`	`}`
`183`	`183`
`184`		`-void QgsAttributeTypeDialog::setWidgetConfig( const QVariantMap& config )`
	`184`	`+void QgsAttributeTypeDialog::setEditorWidgetConfig( const QVariantMap& config )`
`185`	`185`	`{`
`186`	`186`	`mWidgetConfig = config;`
`187`	`187`	`}`
`@@ -311,7 +311,7 @@ void QgsAttributeTypeDialog::on_selectionListWidget_currentRowChanged( int index`
`311`	`311`	`{`
`312`	`312`	`const QString editType = selectionListWidget->item( index )->data( Qt::UserRole ).toString();`
`313`	`313`
`314`		`- setWidgetType( editType );`
	`314`	`+ setEditorWidgetType( editType );`
`315`	`315`	`}`
`316`	`316`
`317`	`317`	`void QgsAttributeTypeDialog::defaultExpressionChanged()`
`@@ -350,7 +350,7 @@ void QgsAttributeTypeDialog::defaultExpressionChanged()`
`350`	`350`	`return;`
`351`	`351`	`}`
`352`	`352`
`353`		`- QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( editorWidgetType() );`
	`353`	`+ QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldFormatter( editorWidgetType() );`
`354`	`354`
`355`	`355`	`QString previewText = fieldKit->representValue( mLayer, mFieldIdx, editorWidgetConfig(), QVariant(), val );`
`356`	`356`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,7 @@`
`25`	`25`	`class CORE_EXPORT QgsDateTimeFieldFormatter : public QgsFieldFormatter`
`26`	`26`	`{`
`27`	`27`	`public:`
`28`		`- QgsDateTimeFieldFormatter();`
`29`		`-`
`30`		`- QString id() const override;`
	`28`	`+ virtual QString id() const override;`
`31`	`29`
`32`	`30`	`virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const override;`
`33`	`31`