Add a default editor widget factory

m-kuhn · m-kuhn · commit 2b950319ec67 · 2018-05-17T10:20:14.000+02:00
for safety when working without initialized widget registry in standalone apps and tests
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -40,6 +40,11 @@
 #include "qgsvaluemapwidgetfactory.h"
 #include "qgsvaluerelationwidgetfactory.h"
 
+QgsEditorWidgetRegistry::QgsEditorWidgetRegistry()
+{
+  mFallbackWidgetFactory.reset( new QgsTextEditWidgetFactory( tr( "Text Edit" ) ) );
+}
+
 void QgsEditorWidgetRegistry::initEditors( QgsMapCanvas *mapCanvas, QgsMessageBar *messageBar )
 {
   registerWidget( QStringLiteral( "TextEdit" ), new QgsTextEditWidgetFactory( tr( "Text Edit" ) ) );
@@ -163,7 +168,7 @@ QMap<QString, QgsEditorWidgetFactory *> QgsEditorWidgetRegistry::factories()
 
 QgsEditorWidgetFactory *QgsEditorWidgetRegistry::factory( const QString &widgetId )
 {
-  return mWidgetFactories.value( widgetId );
+  return mWidgetFactories.value( widgetId, mFallbackWidgetFactory.get() );
 }
 
 bool QgsEditorWidgetRegistry::registerWidget( const QString &widgetId, QgsEditorWidgetFactory *widgetFactory )
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h
@@ -52,7 +52,7 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
      * Constructor for QgsEditorWidgetRegistry. QgsEditorWidgetRegistry is not usually directly created, but rather accessed through
      * QgsGui::editorWidgetRegistry().
      */
-    QgsEditorWidgetRegistry() = default;
+    QgsEditorWidgetRegistry();
 
     /**
      * Registers all the default widgets.
@@ -188,6 +188,7 @@ class GUI_EXPORT QgsEditorWidgetRegistry : public QObject
     QMap<QString, QgsEditorWidgetFactory *> mWidgetFactories;
     QMap<const char *, QPair<int, QString> > mFactoriesByType;
     QgsEditorWidgetAutoConf mAutoConf;
+    std::unique_ptr<QgsEditorWidgetFactory> mFallbackWidgetFactory = nullptr;
 };
 
 #endif // QGSEDITORWIDGETREGISTRY_H

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,11 @@`
`40`	`40`	`#include "qgsvaluemapwidgetfactory.h"`
`41`	`41`	`#include "qgsvaluerelationwidgetfactory.h"`
`42`	`42`
	`43`	`+QgsEditorWidgetRegistry::QgsEditorWidgetRegistry()`
	`44`	`+{`
	`45`	`+ mFallbackWidgetFactory.reset( new QgsTextEditWidgetFactory( tr( "Text Edit" ) ) );`
	`46`	`+}`
	`47`	`+`
`43`	`48`	`void QgsEditorWidgetRegistry::initEditors( QgsMapCanvas mapCanvas, QgsMessageBar messageBar )`
`44`	`49`	`{`
`45`	`50`	`registerWidget( QStringLiteral( "TextEdit" ), new QgsTextEditWidgetFactory( tr( "Text Edit" ) ) );`
`@@ -163,7 +168,7 @@ QMap<QString, QgsEditorWidgetFactory *> QgsEditorWidgetRegistry::factories()`
`163`	`168`
`164`	`169`	`QgsEditorWidgetFactory *QgsEditorWidgetRegistry::factory( const QString &widgetId )`
`165`	`170`	`{`
`166`		`- return mWidgetFactories.value( widgetId );`
	`171`	`+ return mWidgetFactories.value( widgetId, mFallbackWidgetFactory.get() );`
`167`	`172`	`}`
`168`	`173`
`169`	`174`	`bool QgsEditorWidgetRegistry::registerWidget( const QString &widgetId, QgsEditorWidgetFactory *widgetFactory )`