Remove deprecated QgsAttributeEditor

qgis · Sep 15, 2016 · 2a9e520 · 2a9e520
1 parent fe65063
commit 2a9e520
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 231 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -178,6 +178,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
 
 <ul>
 <li>QgsAttributeAction was removed, and replaced by QgsActionManager.</li>
+<li>QgsAttributeEditor was removed. Use QgsEditorWidgetRegistry::create() instead.</li>
 <li>QgsColorbutton was removed. QgsColorButtonV2 has now been renamed to QgsColorButton. Hence, QgsColorButtonV2 does not exist anymore.</li>
 <li>QgsColorDialog was removed, and QgsColorDialogV2 was renamed to QgsColorDialog. Hence, QgsColorButtonV2 does not exist anymore.
 All the functionality from the old QgsColorDialog has been moved to the new class.</li>

diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -28,7 +28,6 @@
 %Include qgsadvanceddigitizingdockwidget.sip
 %Include qgsannotationitem.sip
 %Include qgsattributedialog.sip
-%Include qgsattributeeditor.sip
 %Include qgsattributeeditorcontext.sip
 %Include qgsattributeform.sip
 %Include qgsattributeformeditorwidget.sip

diff --git a/python/gui/qgsattributeeditor.sip b/python/gui/qgsattributeeditor.sip
diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp
@@ -19,13 +19,13 @@
 #include "qgsmergeattributesdialog.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
+#include "qgseditorwidgetwrapper.h"
 #include "qgsfeatureiterator.h"
 #include "qgsfield.h"
 #include "qgsmapcanvas.h"
 #include "qgsrubberband.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
-#include "qgsattributeeditor.h"
 #include "qgsstatisticalsummary.h"
 #include "qgseditorwidgetregistry.h"
 
@@ -142,6 +142,8 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
   QStringList verticalHeaderLabels; //the id column is in the
   verticalHeaderLabels << tr( "Id" );
 
+  QgsAttributeEditorContext context;
+
   for ( int i = 0; i < mFeatureList.size(); ++i )
   {
     verticalHeaderLabels << FID_TO_STRING( mFeatureList[i].id() );
@@ -155,8 +157,12 @@ void QgsMergeAttributesDialog::createTableWidgetContents()
       QTableWidgetItem* attributeValItem = new QTableWidgetItem( attrs.at( idx ).toString() );
       attributeValItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
       mTableWidget->setItem( i + 1, j, attributeValItem );
-      QWidget* attributeWidget = QgsAttributeEditor::createAttributeEditor( mTableWidget, nullptr, mVectorLayer, idx, attrs.at( idx ) );
-      mTableWidget->setCellWidget( i + 1, j, attributeWidget );
+      QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( mVectorLayer, idx, nullptr, mTableWidget, context );
+      if ( eww )
+      {
+        eww->setValue( attrs.at( idx ) );
+      }
+      mTableWidget->setCellWidget( i + 1, j, eww->widget() );
     }
   }
 
@@ -329,16 +335,14 @@ QVariant QgsMergeAttributesDialog::featureAttribute( QgsFeatureId featureId, int
   for ( i = 0; i < mFeatureList.size() && mFeatureList.at( i ).id() != featureId; i++ )
     ;
 
-  QVariant value;
-  if ( i < mFeatureList.size() &&
-       QgsAttributeEditor::retrieveValue( mTableWidget->cellWidget( i + 1, col ), mVectorLayer, fieldIdx, value ) )
+  if ( i < mFeatureList.size() )
   {
-    return value;
-  }
-  else
-  {
-    return QVariant( mVectorLayer->fields().at( fieldIdx ).type() );
+    QgsEditorWidgetWrapper* wrapper = QgsEditorWidgetWrapper::fromWidget( mTableWidget->cellWidget( i + 1, col ) );
+    if ( wrapper )
+      return wrapper->value();
   }
+
+  return QVariant( mVectorLayer->fields().at( fieldIdx ).type() );
 }
 
 

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -166,7 +166,6 @@ SET(QGIS_GUI_SRCS
   qgsadvanceddigitizingdockwidget.cpp
   qgsannotationitem.cpp
   qgsattributedialog.cpp
-  qgsattributeeditor.cpp
   qgsattributeform.cpp
   qgsattributeformeditorwidget.cpp
   qgsattributeforminterface.cpp
@@ -332,7 +331,6 @@ SET(QGIS_GUI_MOC_HDRS
   qgsactionmenu.h
   qgsadvanceddigitizingdockwidget.h
   qgsattributedialog.h
-  qgsattributeeditor.h
   qgsattributeform.h
   qgsattributeformeditorwidget.h
   qgsattributetypeloaddialog.h

diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
diff --git a/src/gui/qgsattributeeditor.h b/src/gui/qgsattributeeditor.h
diff --git a/src/gui/qgsformannotationitem.cpp b/src/gui/qgsformannotationitem.cpp
@@ -16,7 +16,9 @@
  ***************************************************************************/
 
 #include "qgsformannotationitem.h"
-#include "qgsattributeeditor.h"
+#include "qgsattributeeditorcontext.h"
+#include "qgseditorwidgetregistry.h"
+#include "qgseditorwidgetwrapper.h"
 #include "qgsfeature.h"
 #include "qgsfeatureiterator.h"
 #include "qgslogger.h"
@@ -89,6 +91,7 @@ QWidget* QgsFormAnnotationItem::createDesignerWidget( const QString& filePath )
   file.close();
 
   //get feature and set attribute information
+  QgsAttributeEditorContext context;
   if ( mVectorLayer && mHasAssociatedFeature )
   {
     QgsFeature f;
@@ -103,7 +106,11 @@ QWidget* QgsFormAnnotationItem::createDesignerWidget( const QString& filePath )
           QWidget* attWidget = widget->findChild<QWidget*>( fields.at( i ).name() );
           if ( attWidget )
           {
-            QgsAttributeEditor::createAttributeEditor( widget, attWidget, mVectorLayer, i, attrs.at( i ) );
+            QgsEditorWidgetWrapper* eww = QgsEditorWidgetRegistry::instance()->create( mVectorLayer, i, attWidget, widget, context );
+            if ( eww )
+            {
+              eww->setValue( attrs.at( i ) );
+            }
           }
         }
       }