Make sure attribute table doesn't use deleted field formatters

qgis · Dec 20, 2016 · afacbb1 · afacbb1
1 parent c6dc31a
commit afacbb1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/python/core/qgsfieldformatterregistry.sip b/python/core/qgsfieldformatterregistry.sip
@@ -28,6 +28,7 @@ class QgsFieldFormatterRegistry : QObject
     void removeFieldFormatter( QgsFieldFormatter* formatter );
     void removeFieldFormatter( const QString& id );
     QgsFieldFormatter* fieldFormatter( const QString& id ) const;
+    QgsFieldFormatter* fallbackFieldFormatter() const;
   signals:
     void fieldFormatterAdded( QgsFieldFormatter* formatter );
     void fieldFormatterRemoved( QgsFieldFormatter* formatter );

diff --git a/src/core/qgsfieldformatterregistry.cpp b/src/core/qgsfieldformatterregistry.cpp
@@ -68,3 +68,8 @@ QgsFieldFormatter* QgsFieldFormatterRegistry::fieldFormatter( const QString& id
 {
   return mFieldFormatters.value( id, mFallbackFieldFormatter );
 }
+
+QgsFieldFormatter* QgsFieldFormatterRegistry::fallbackFieldFormatter() const
+{
+  return mFallbackFieldFormatter;
+}
diff --git a/src/core/qgsfieldformatterregistry.h b/src/core/qgsfieldformatterregistry.h
@@ -69,6 +69,12 @@ class CORE_EXPORT QgsFieldFormatterRegistry : public QObject
      */
     QgsFieldFormatter* fieldFormatter( const QString& id ) const;
 
+    /**
+     * Returns a basic fallback field formatter which can be used
+     * to represent any field in an unspectacular manner.
+     */
+    QgsFieldFormatter* fallbackFieldFormatter() const;
+
   signals:
 
     /**

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -269,10 +269,10 @@ void QgsAttributeTableModel::layerDeleted()
 
 void QgsAttributeTableModel::fieldFormatterRemoved( QgsFieldFormatter* fieldFormatter )
 {
-  for ( QVector<QgsFieldFormatter*>::Iterator it = mFieldFormatters.begin(); it != mFieldFormatters.end(); ++it )
+  for ( int i = 0; i < mFieldFormatters.size(); ++i )
   {
-    if ( it.value() == fieldFormatter )
-      it.setValue( QgsApplication::fieldFormatterRegistry()->defaultFormatter() );
+    if ( mFieldFormatters.at( i ) == fieldFormatter )
+      mFieldFormatters[i] = QgsApplication::fieldFormatterRegistry()->fallbackFieldFormatter();
   }
 }