Move the QgsProject singleton problem one step up

elpaso · elpaso · commit 2d45ba8d68dd · 2019-06-11T09:22:31.000+02:00
diff --git a/python/core/auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip.in b/python/core/auto_generated/fieldformatter/qgsvaluerelationfieldformatter.sip.in
@@ -121,9 +121,9 @@ Check whether the ``feature`` has all values required by the ``expression``
 .. versionadded:: 3.2
 %End
 
-    static QgsVectorLayer *resolveLayer( const QVariantMap &config );
+    static QgsVectorLayer *resolveLayer( const QVariantMap &config, const QgsProject *project );
 %Docstring
-Returns the (possibly NULL) layer from the widget's ``config``
+Returns the (possibly NULL) layer from the widget's ``config`` and ``project``
 
 .. versionadded:: 3.8
 %End
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp b/src/core/fieldformatter/qgsvaluerelationfieldformatter.cpp
@@ -118,7 +118,7 @@ QgsValueRelationFieldFormatter::ValueRelationCache QgsValueRelationFieldFormatte
 {
   ValueRelationCache cache;
 
-  const QgsVectorLayer *layer = resolveLayer( config );
+  const QgsVectorLayer *layer = resolveLayer( config, QgsProject::instance() );
 
   if ( !layer )
     return cache;
@@ -274,12 +274,12 @@ bool QgsValueRelationFieldFormatter::expressionIsUsable( const QString &expressi
   return true;
 }
 
-QgsVectorLayer *QgsValueRelationFieldFormatter::resolveLayer( const QVariantMap &config )
+QgsVectorLayer *QgsValueRelationFieldFormatter::resolveLayer( const QVariantMap &config, const QgsProject *project )
 {
   QgsVectorLayerRef ref { config.value( QStringLiteral( "Layer" ) ).toString(),
                           config.value( QStringLiteral( "LayerName" ) ).toString(),
                           config.value( QStringLiteral( "LayerSource" ) ).toString(),
                           config.value( QStringLiteral( "LayerProviderName" ) ).toString() };
-  return ref.resolveByIdOrNameOnly( QgsProject::instance() );
+  return ref.resolveByIdOrNameOnly( project );
 }
 
diff --git a/src/core/fieldformatter/qgsvaluerelationfieldformatter.h b/src/core/fieldformatter/qgsvaluerelationfieldformatter.h
@@ -120,10 +120,10 @@ class CORE_EXPORT QgsValueRelationFieldFormatter : public QgsFieldFormatter
     static bool expressionIsUsable( const QString &expression, const QgsFeature &feature );
 
     /**
-     * Returns the (possibly NULL) layer from the widget's \a config
+     * Returns the (possibly NULL) layer from the widget's \a config and \a project
      * \since QGIS 3.8
      */
-    static QgsVectorLayer *resolveLayer( const QVariantMap &config );
+    static QgsVectorLayer *resolveLayer( const QVariantMap &config, const QgsProject *project );
 
 
 
diff --git a/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp
@@ -75,7 +75,7 @@ QVariantMap QgsValueRelationConfigDlg::config()
 
 void QgsValueRelationConfigDlg::setConfig( const QVariantMap &config )
 {
-  QgsVectorLayer *lyr = QgsValueRelationFieldFormatter::resolveLayer( config );
+  QgsVectorLayer *lyr = QgsValueRelationFieldFormatter::resolveLayer( config, QgsProject::instance() );
   mLayerName->setLayer( lyr );
   mKeyColumn->setField( config.value( QStringLiteral( "Key" ) ).toString() );
   mValueColumn->setField( config.value( QStringLiteral( "Value" ) ).toString() );
diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp
@@ -302,7 +302,7 @@ int QgsValueRelationWidgetWrapper::columnCount() const
 
 QVariant::Type QgsValueRelationWidgetWrapper::fkType() const
 {
-  const QgsVectorLayer *layer = QgsValueRelationFieldFormatter::resolveLayer( config() );
+  const QgsVectorLayer *layer = QgsValueRelationFieldFormatter::resolveLayer( config(), QgsProject::instance() );
   if ( layer )
   {
     QgsFields fields = layer->fields();

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ QgsValueRelationFieldFormatter::ValueRelationCache QgsValueRelationFieldFormatte`
`118`	`118`	`{`
`119`	`119`	`ValueRelationCache cache;`
`120`	`120`
`121`		`- const QgsVectorLayer *layer = resolveLayer( config );`
	`121`	`+ const QgsVectorLayer *layer = resolveLayer( config, QgsProject::instance() );`
`122`	`122`
`123`	`123`	`if ( !layer )`
`124`	`124`	`return cache;`
`@@ -274,12 +274,12 @@ bool QgsValueRelationFieldFormatter::expressionIsUsable( const QString &expressi`
`274`	`274`	`return true;`
`275`	`275`	`}`
`276`	`276`
`277`		`-QgsVectorLayer *QgsValueRelationFieldFormatter::resolveLayer( const QVariantMap &config )`
	`277`	`+QgsVectorLayer QgsValueRelationFieldFormatter::resolveLayer( const QVariantMap &config, const QgsProject project )`
`278`	`278`	`{`
`279`	`279`	`QgsVectorLayerRef ref { config.value( QStringLiteral( "Layer" ) ).toString(),`
`280`	`280`	`config.value( QStringLiteral( "LayerName" ) ).toString(),`
`281`	`281`	`config.value( QStringLiteral( "LayerSource" ) ).toString(),`
`282`	`282`	`config.value( QStringLiteral( "LayerProviderName" ) ).toString() };`
`283`		`- return ref.resolveByIdOrNameOnly( QgsProject::instance() );`
	`283`	`+ return ref.resolveByIdOrNameOnly( project );`
`284`	`284`	`}`
`285`	`285`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ QVariantMap QgsValueRelationConfigDlg::config()`
`75`	`75`
`76`	`76`	`void QgsValueRelationConfigDlg::setConfig( const QVariantMap &config )`
`77`	`77`	`{`
`78`		`- QgsVectorLayer *lyr = QgsValueRelationFieldFormatter::resolveLayer( config );`
	`78`	`+ QgsVectorLayer *lyr = QgsValueRelationFieldFormatter::resolveLayer( config, QgsProject::instance() );`
`79`	`79`	`mLayerName->setLayer( lyr );`
`80`	`80`	`mKeyColumn->setField( config.value( QStringLiteral( "Key" ) ).toString() );`
`81`	`81`	`mValueColumn->setField( config.value( QStringLiteral( "Value" ) ).toString() );`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ int QgsValueRelationWidgetWrapper::columnCount() const`
`302`	`302`
`303`	`303`	`QVariant::Type QgsValueRelationWidgetWrapper::fkType() const`
`304`	`304`	`{`
`305`		`- const QgsVectorLayer *layer = QgsValueRelationFieldFormatter::resolveLayer( config() );`
	`305`	`+ const QgsVectorLayer *layer = QgsValueRelationFieldFormatter::resolveLayer( config(), QgsProject::instance() );`
`306`	`306`	`if ( layer )`
`307`	`307`	`{`
`308`	`308`	`QgsFields fields = layer->fields();`