Rename QgsFieldKit to QgsFieldFormatter

qgis · Dec 20, 2016 · 22c492e · 22c492e
1 parent f294201
commit 22c492e
Show file tree

Hide file tree

Showing 56 changed files with 341 additions and 341 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -980,10 +980,10 @@ QgsEditorWidgetFactory         {#qgis_api_break_3_0_QgsEditorWidgetFactory}
   from and to a QVariantMap automatically.
 - `writeConfig` has been removed. The configuration is read and written
   from and to a QVariantMap automatically.
-- `representValue` has been removed. Use QgsFieldKit::representValue() instead
-- `sortValue` has been removed. Use QgsFieldKit::representValue() instead
-- `alignmentFlag` has been removed. Use QgsFieldKit::representValue() instead
-- `createCache` has been removed. Use QgsFieldKit::representValue() instead
+- `representValue` has been removed. Use QgsFieldFormatter::representValue() instead
+- `sortValue` has been removed. Use QgsFieldFormatter::representValue() instead
+- `alignmentFlag` has been removed. Use QgsFieldFormatter::representValue() instead
+- `createCache` has been removed. Use QgsFieldFormatter::representValue() instead
 
 
 QgsGraduatedRenderer        {#qgis_api_break_3_0_QgsGraduatedRenderer}

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -101,7 +101,7 @@ INCLUDE_DIRECTORIES(
   ../src/core/composer
   ../src/core/diagram
   ../src/core/effects
-  ../src/core/fieldkit
+  ../src/core/fieldformatter
   ../src/core/dxf
   ../src/core/geometry
   ../src/core/gps

diff --git a/python/core/core.sip b/python/core/core.sip
@@ -60,8 +60,8 @@
 %Include qgsfield.sip
 %Include qgsfieldconstraints.sip
 %Include qgsfields.sip
-%Include qgsfieldkitregistry.sip
-%Include qgsfieldkit.sip
+%Include qgsfieldformatterregistry.sip
+%Include qgsfieldformatter.sip
 %Include qgsgeometrysimplifier.sip
 %Include qgsgeometryvalidator.sip
 %Include qgsgml.sip
@@ -243,13 +243,13 @@
 %Include gps/qgsnmeaconnection.sip
 %Include gps/qgsqtlocationconnection.sip
 
-%Include fieldkit/qgsdatetimefieldkit.sip
-%Include fieldkit/qgsfallbackfieldkit.sip
-%Include fieldkit/qgskeyvaluefieldkit.sip
-%Include fieldkit/qgslistfieldkit.sip
-%Include fieldkit/qgsrelationreferencefieldkit.sip
-%Include fieldkit/qgsvaluemapfieldkit.sip
-%Include fieldkit/qgsvaluerelationfieldkit.sip
+%Include fieldformatter/qgsdatetimefieldformatter.sip
+%Include fieldformatter/qgsfallbackfieldformatter.sip
+%Include fieldformatter/qgskeyvaluefieldformatter.sip
+%Include fieldformatter/qgslistfieldformatter.sip
+%Include fieldformatter/qgsrelationreferencefieldformatter.sip
+%Include fieldformatter/qgsvaluemapfieldformatter.sip
+%Include fieldformatter/qgsvaluerelationfieldformatter.sip
 
 %Include layertree/qgslayertree.sip
 %Include layertree/qgslayertreegroup.sip

diff --git a/python/core/fieldkit/qgsdatetimefieldkit.sip → ...ldformatter/qgsdatetimefieldformatter.sip b/python/core/fieldkit/qgsdatetimefieldkit.sip → ...ldformatter/qgsdatetimefieldformatter.sip
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgsdatetimefieldkit.sip - QgsDateTimeFieldKit
+  qgsdatetimefieldformatter.sip - QgsDateTimeFieldFormatter
 
  ---------------------
  begin                : 2.12.2016
@@ -13,13 +13,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsDateTimeFieldKit : QgsFieldKit
+class QgsDateTimeFieldFormatter : QgsFieldFormatter
 {
 %TypeHeaderCode
-#include "qgsdatetimefieldkit.h"
+#include "qgsdatetimefieldformatter.h"
 %End
   public:
-    QgsDateTimeFieldKit();
+    QgsDateTimeFieldFormatter();
 
     QString id() const;
 

diff --git a/python/core/fieldformatter/qgsfallbackfieldformatter.sip b/python/core/fieldformatter/qgsfallbackfieldformatter.sip
@@ -0,0 +1,9 @@
+class QgsFallbackFieldFormatter : QgsFieldFormatter
+{
+%TypeHeaderCode
+#include "qgsfallbackfieldformatter.h"
+%End
+  public:
+    QgsFallbackFieldFormatter();
+    QString id() const;
+};
diff --git a/python/core/fieldkit/qgskeyvaluefieldkit.sip → ...ldformatter/qgskeyvaluefieldformatter.sip b/python/core/fieldkit/qgskeyvaluefieldkit.sip → ...ldformatter/qgskeyvaluefieldformatter.sip
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgskeyvaluefieldkit.sip - QgsKeyValueFieldKit
+  qgskeyvaluefieldformatter.sip - QgsKeyValueFieldFormatter
 
  ---------------------
  begin                : 3.12.2016
@@ -13,13 +13,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsKeyValueFieldKit : QgsFieldKit
+class QgsKeyValueFieldFormatter : QgsFieldFormatter
 {
 %TypeHeaderCode
-#include "qgskeyvaluefieldkit.h"
+#include "qgskeyvaluefieldformatter.h"
 %End
   public:
-    QgsKeyValueFieldKit();
+    QgsKeyValueFieldFormatter();
     QString id() const;
     QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;
 };
diff --git a/python/core/fieldkit/qgslistfieldkit.sip → .../fieldformatter/qgslistfieldformatter.sip b/python/core/fieldkit/qgslistfieldkit.sip → .../fieldformatter/qgslistfieldformatter.sip
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgslistfieldkit.sip - QgsListFieldKit
+  qgslistfieldformatter.sip - QgsListFieldFormatter
 
  ---------------------
  begin                : 3.12.2016
@@ -13,14 +13,14 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsListFieldKit : QgsFieldKit
+class QgsListFieldFormatter : QgsFieldFormatter
 {
 %TypeHeaderCode
-#include "qgslistfieldkit.h"
+#include "qgslistfieldformatter.h"
 %End
 
   public:
-    QgsListFieldKit();
+    QgsListFieldFormatter();
 
     QString id() const;
 

diff --git a/...fieldkit/qgsrelationreferencefieldkit.sip → ...er/qgsrelationreferencefieldformatter.sip b/...fieldkit/qgsrelationreferencefieldkit.sip → ...er/qgsrelationreferencefieldformatter.sip
@@ -1,10 +1,10 @@
-class QgsRelationReferenceFieldKit : QgsFieldKit
+class QgsRelationReferenceFieldFormatter : QgsFieldFormatter
 {
 %TypeHeaderCode
-#include "qgsrelationreferencefieldkit.h"
+#include "qgsrelationreferencefieldformatter.h"
 %End
   public:
-    QgsRelationReferenceFieldKit();
+    QgsRelationReferenceFieldFormatter();
 
     QString id() const;
     virtual QString representValue( QgsVectorLayer* layer, int fieldIndex, const QVariantMap& config, const QVariant& cache, const QVariant& value ) const;

diff --git a/python/core/fieldkit/qgsvaluemapfieldkit.sip → ...ldformatter/qgsvaluemapfieldformatter.sip b/python/core/fieldkit/qgsvaluemapfieldkit.sip → ...ldformatter/qgsvaluemapfieldformatter.sip
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgsvaluemapfieldkit.sip - QgsValueMapFieldKit
+  qgsvaluemapfieldformatter.sip - QgsValueMapFieldFormatter
 
  ---------------------
  begin                : 3.12.2016
@@ -13,13 +13,13 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsValueMapFieldKit : QgsFieldKit
+class QgsValueMapFieldFormatter : QgsFieldFormatter
 {
 %TypeHeaderCode
-#include "qgsvaluemapfieldkit.h"
+#include "qgsvaluemapfieldformatter.h"
 %End
   public:
-    QgsValueMapFieldKit();
+    QgsValueMapFieldFormatter();
 
     QString id() const;
 

diff --git a/...ore/fieldkit/qgsvaluerelationfieldkit.sip → ...matter/qgsvaluerelationfieldformatter.sip b/...ore/fieldkit/qgsvaluerelationfieldkit.sip → ...matter/qgsvaluerelationfieldformatter.sip
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgsvaluerelationfieldkit.sip - QgsValueRelationFieldKit
+  qgsvaluerelationfieldformatter.sip - QgsValueRelationFieldFormatter
 
  ---------------------
  begin                : 3.12.2016
@@ -13,10 +13,10 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsValueRelationFieldKit : QgsFieldKit
+class QgsValueRelationFieldFormatter : QgsFieldFormatter
 {
 %TypeHeaderCode
-#include "qgsvaluerelationfieldkit.h"
+#include "qgsvaluerelationfieldformatter.h"
 %End
 
   public:
@@ -30,9 +30,9 @@ class QgsValueRelationFieldKit : QgsFieldKit
       QString value;
     };
 
-    typedef QVector < QgsValueRelationFieldKit::ValueRelationItem > ValueRelationCache;
+    typedef QVector < QgsValueRelationFieldFormatter::ValueRelationItem > ValueRelationCache;
 
-    QgsValueRelationFieldKit();
+    QgsValueRelationFieldFormatter();
 
     QString id() const;
     QString representValue( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config, const QVariant &cache, const QVariant &value ) const;
@@ -41,5 +41,5 @@ class QgsValueRelationFieldKit : QgsFieldKit
 
     QVariant createCache( QgsVectorLayer *layer, int fieldIndex, const QVariantMap &config ) const;
 
-    static QgsValueRelationFieldKit::ValueRelationCache createCache( const QVariantMap& config );
+    static QgsValueRelationFieldFormatter::ValueRelationCache createCache( const QVariantMap& config );
 };
diff --git a/python/core/fieldkit/qgsfallbackfieldkit.sip b/python/core/fieldkit/qgsfallbackfieldkit.sip
diff --git a/python/core/qgsapplication.sip b/python/core/qgsapplication.sip
@@ -399,11 +399,11 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
     static QgsRuntimeProfiler* profiler();
 
     /**
-     * Provides access to the field kit registry.
+     * Provides access to the field formatter registry.
      *
      * @note Added in QGIS 3.0
      */
-    static QgsFieldKitRegistry* fieldKitRegistry();
+    static QgsFieldFormatterRegistry* fieldKitRegistry();
   public slots:
 
     /** Causes the application instance to emit the settingsChanged() signal. This should

diff --git a/python/core/qgsfieldkit.sip → python/core/qgsfieldformatter.sip b/python/core/qgsfieldkit.sip → python/core/qgsfieldformatter.sip
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgsfieldkit.sip - QgsFieldKit
+  qgsfieldformatter.sip - QgsFieldFormatter
 
  ---------------------
  begin                : 2.12.2016
@@ -13,15 +13,15 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsFieldKit
+class QgsFieldFormatter
 {
 %TypeHeaderCode
-#include "qgsfieldkit.h"
+#include "qgsfieldformatter.h"
 %End
   public:
-    QgsFieldKit();
+    QgsFieldFormatter();
 
-    virtual ~QgsFieldKit();
+    virtual ~QgsFieldFormatter();
 
     virtual QString id() const = 0;
 

diff --git a/python/core/qgsfieldkitregistry.sip → python/core/qgsfieldformatterregistry.sip b/python/core/qgsfieldkitregistry.sip → python/core/qgsfieldformatterregistry.sip
@@ -1,5 +1,5 @@
 /***************************************************************************
-  qgsfieldkitregistry.sip - QgsFieldKitRegistry
+  qgsfieldformatterregistry.sip - QgsFieldFormatterRegistry
 
  ---------------------
  begin                : 2.12.2016
@@ -13,24 +13,24 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-class QgsFieldKitRegistry : QObject
+class QgsFieldFormatterRegistry : QObject
 {
 %TypeHeaderCode
-#include "qgsfieldkitregistry.h"
+#include "qgsfieldformatterregistry.h"
 %End
   public:
 
-    QgsFieldKitRegistry();
-    ~QgsFieldKitRegistry();
+    QgsFieldFormatterRegistry();
+    ~QgsFieldFormatterRegistry();
 
-    void addFieldKit( QgsFieldKit* kit /Transfer/ );
+    void addFieldFormatter( QgsFieldFormatter* kit /Transfer/ );
 
-    void removeFieldKit( QgsFieldKit* kit );
+    void removeFieldFormatter( QgsFieldFormatter* kit );
 
-    QgsFieldKit* fieldKit( const QString& id ) const;
+    QgsFieldFormatter* fieldKit( const QString& id ) const;
 
   signals:
-    void fieldKitAdded( QgsFieldKit* kit );
+    void fieldKitAdded( QgsFieldFormatter* kit );
 
-    void fieldKitRemoved( QgsFieldKit* kit );
+    void fieldKitRemoved( QgsFieldFormatter* kit );
 };
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -149,8 +149,8 @@
 #include "qgsfeature.h"
 #include "qgsformannotationitem.h"
 #include "qgsfieldcalculator.h"
-#include "qgsfieldkit.h"
-#include "qgsfieldkitregistry.h"
+#include "qgsfieldformatter.h"
+#include "qgsfieldformatterregistry.h"
 #include "qgshtmlannotationitem.h"
 #include "qgsgenericprojectionselector.h"
 #include "qgsgpsinformationwidget.h"
@@ -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() );
-  QgsFieldKit* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
+  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
   return fieldKit->representValue( mLayer, idx, setup.config(), QVariant(), value );
 }
 

diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -23,8 +23,8 @@
 #include "qgisapp.h"
 #include "qgsproject.h"
 #include "qgslogger.h"
-#include "qgsfieldkitregistry.h"
-#include "qgsfieldkit.h"
+#include "qgsfieldformatterregistry.h"
+#include "qgsfieldformatter.h"
 #include "qgseditorwidgetfactory.h"
 #include "qgseditorwidgetregistry.h"
 
@@ -350,7 +350,7 @@ void QgsAttributeTypeDialog::defaultExpressionChanged()
     return;
   }
 
-  QgsFieldKit* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( editorWidgetType() );
+  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( editorWidgetType() );
 
   QString previewText = fieldKit->representValue( mLayer, mFieldIdx, editorWidgetConfig(), QVariant(), val );
 

diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -43,8 +43,8 @@
 #include "qgsstringutils.h"
 #include "qgstreewidgetitem.h"
 #include "qgsfiledownloader.h"
-#include "qgsfieldkitregistry.h"
-#include "qgsfieldkit.h"
+#include "qgsfieldformatterregistry.h"
+#include "qgsfieldformatter.h"
 
 #include <QCloseEvent>
 #include <QLabel>
@@ -734,7 +734,7 @@ QString QgsIdentifyResultsDialog::representValue( QgsVectorLayer* vlayer, const
   QMap<QString, QVariant>& layerCaches = mWidgetCaches[vlayer->id()];
 
   QgsEditorWidgetFactory* factory = QgsEditorWidgetRegistry::instance()->factory( setup.type() );
-  QgsFieldKit* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
+  QgsFieldFormatter* fieldKit = QgsApplication::fieldKitRegistry()->fieldKit( setup.type() );
 
   int idx = vlayer->fields().lookupField( fieldName );