Auxiliary storage can be used on non spatial layer

pblottiere · pblottiere · commit b6752df628bb · 2017-10-09T05:13:59.000+01:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1545,9 +1545,7 @@ void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
     mAuxiliaryLayerActionClear->setEnabled( false );
     mAuxiliaryLayerActionDelete->setEnabled( false );
     mAuxiliaryLayerActionExport->setEnabled( false );
-
-    if ( mLayer->isSpatial() )
-      mAuxiliaryLayerActionNew->setEnabled( true );
+    mAuxiliaryLayerActionNew->setEnabled( true );
 
     mAuxiliaryStorageFieldsTree->clear();
     mAuxiliaryStorageKeyLineEdit->setText( QString() );
@@ -1565,7 +1563,7 @@ void QgsVectorLayerProperties::onAuxiliaryLayerNew()
 {
   QgsAuxiliaryLayer *alayer = mLayer->auxiliaryLayer();
 
-  if ( alayer || !mLayer->isSpatial() )
+  if ( alayer )
     return;
 
   QgsNewAuxiliaryLayerDialog dlg( mLayer, this );
diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp
@@ -480,7 +480,7 @@ QgsAuxiliaryLayer *QgsAuxiliaryStorage::createAuxiliaryLayer( const QgsField &fi
 {
   QgsAuxiliaryLayer *alayer = nullptr;
 
-  if ( mValid && layer && layer->isSpatial() )
+  if ( mValid && layer )
   {
     const QString table( layer->id() );
     sqlite3 *handler = openDB( currentFileName() );
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2252,7 +2252,7 @@ QList<QgsMapLayer *> QgsProject::addMapLayers(
         continue;
 
       QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( mlayer );
-      if ( vl && vl->isSpatial() )
+      if ( vl )
       {
         vl->loadAuxiliaryLayer( *mAuxiliaryStorage.get() );
       }
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -4273,7 +4273,7 @@ bool QgsVectorLayer::loadAuxiliaryLayer( const QgsAuxiliaryStorage &storage )
 {
   bool rc = false;
 
-  if ( isSpatial() && storage.isValid() && !mAuxiliaryLayerKey.isEmpty() )
+  if ( storage.isValid() && !mAuxiliaryLayerKey.isEmpty() )
   {
     QgsAuxiliaryLayer *alayer = nullptr;
 

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ QgsAuxiliaryLayer *QgsAuxiliaryStorage::createAuxiliaryLayer( const QgsField &fi`
`480`	`480`	`{`
`481`	`481`	`QgsAuxiliaryLayer *alayer = nullptr;`
`482`	`482`
`483`		`- if ( mValid && layer && layer->isSpatial() )`
	`483`	`+ if ( mValid && layer )`
`484`	`484`	`{`
`485`	`485`	`const QString table( layer->id() );`
`486`	`486`	`sqlite3 *handler = openDB( currentFileName() );`
Original file line number	Diff line number	Diff line change
`@@ -2252,7 +2252,7 @@ QList<QgsMapLayer *> QgsProject::addMapLayers(`
`2252`	`2252`	`continue;`
`2253`	`2253`
`2254`	`2254`	`QgsVectorLayer vl = qobject_cast<QgsVectorLayer >( mlayer );`
`2255`		`- if ( vl && vl->isSpatial() )`
	`2255`	`+ if ( vl )`
`2256`	`2256`	`{`
`2257`	`2257`	`vl->loadAuxiliaryLayer( *mAuxiliaryStorage.get() );`
`2258`	`2258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4273,7 +4273,7 @@ bool QgsVectorLayer::loadAuxiliaryLayer( const QgsAuxiliaryStorage &storage )`
`4273`	`4273`	`{`
`4274`	`4274`	`bool rc = false;`
`4275`	`4275`
`4276`		`- if ( isSpatial() && storage.isValid() && !mAuxiliaryLayerKey.isEmpty() )`
	`4276`	`+ if ( storage.isValid() && !mAuxiliaryLayerKey.isEmpty() )`
`4277`	`4277`	`{`
`4278`	`4278`	`QgsAuxiliaryLayer *alayer = nullptr;`
`4279`	`4279`