[afs] Remove 'cached' checkbox from source select dialog

nyalldawson · nyalldawson · commit 76c31dbc5e40 · 2018-11-10T16:16:40.000+10:00
This checkbox was never hooked up to anything (caching is ALWAYS enabled for the provider). (cherry picked from commit 1066161)
diff --git a/src/providers/arcgisrest/qgsafssourceselect.cpp b/src/providers/arcgisrest/qgsafssourceselect.cpp
@@ -110,14 +110,11 @@ bool QgsAfsSourceSelect::connectToService( const QgsOwsConnection &connection )
         QStandardItem *nameItem = new QStandardItem( name );
         QStandardItem *abstractItem = new QStandardItem( description );
         abstractItem->setToolTip( description );
-        QStandardItem *cachedItem = new QStandardItem();
         QStandardItem *filterItem = new QStandardItem();
-        cachedItem->setCheckable( true );
-        cachedItem->setCheckState( Qt::Checked );
 
         mAvailableCRS[name] = QList<QString>()  << authid;
 
-        layerItems.insert( layerId, QList<QStandardItem *>() << idItem << nameItem << abstractItem << cachedItem << filterItem );
+        layerItems.insert( layerId, QList<QStandardItem *>() << idItem << nameItem << abstractItem << filterItem );
       }
     }, serviceInfoMap, baseItemUrl );
 
@@ -158,7 +155,7 @@ void QgsAfsSourceSelect::buildQuery( const QgsOwsConnection &connection, const Q
   {
     return;
   }
-  QModelIndex filterIndex = index.sibling( index.row(), 4 );
+  QModelIndex filterIndex = index.sibling( index.row(), 3 );
   const QString url = index.sibling( index.row(), 0 ).data( UrlRole ).toString();
 
   // Query available fields
diff --git a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp
@@ -78,8 +78,7 @@ QgsArcGisServiceSourceSelect::QgsArcGisServiceSourceSelect( const QString &servi
   mModel->setHorizontalHeaderItem( 2, new QStandardItem( QStringLiteral( "Abstract" ) ) );
   if ( serviceType == FeatureService )
   {
-    mModel->setHorizontalHeaderItem( 3, new QStandardItem( QStringLiteral( "Cache Feature" ) ) );
-    mModel->setHorizontalHeaderItem( 4, new QStandardItem( QStringLiteral( "Filter" ) ) );
+    mModel->setHorizontalHeaderItem( 3, new QStandardItem( QStringLiteral( "Filter" ) ) );
     gbImageEncoding->hide();
   }
   else
@@ -346,14 +345,13 @@ void QgsArcGisServiceSourceSelect::addButtonClicked()
     QString layerTitle = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->text();  //layer title/id
     QString layerName = mModel->itemFromIndex( mModel->index( row, 1, idx.parent() ) )->text(); //layer name
     const QString layerUri = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->data( UrlRole ).toString();
-    bool cacheFeatures = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->checkState() == Qt::Checked : false;
-    QString filter = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 4, idx.parent() ) )->text() : QString(); //optional filter specified by user
+    QString filter = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->text() : QString(); //optional filter specified by user
     if ( cbxUseTitleLayerName->isChecked() && !layerTitle.isEmpty() )
     {
       layerName = layerTitle;
     }
     QgsRectangle layerExtent;
-    if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() || !cacheFeatures ) )
+    if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() ) )
     {
       layerExtent = extent;
     }

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,7 @@ QgsArcGisServiceSourceSelect::QgsArcGisServiceSourceSelect( const QString &servi`
`78`	`78`	`mModel->setHorizontalHeaderItem( 2, new QStandardItem( QStringLiteral( "Abstract" ) ) );`
`79`	`79`	`if ( serviceType == FeatureService )`
`80`	`80`	`{`
`81`		`- mModel->setHorizontalHeaderItem( 3, new QStandardItem( QStringLiteral( "Cache Feature" ) ) );`
`82`		`- mModel->setHorizontalHeaderItem( 4, new QStandardItem( QStringLiteral( "Filter" ) ) );`
	`81`	`+ mModel->setHorizontalHeaderItem( 3, new QStandardItem( QStringLiteral( "Filter" ) ) );`
`83`	`82`	`gbImageEncoding->hide();`
`84`	`83`	`}`
`85`	`84`	`else`
`@@ -346,14 +345,13 @@ void QgsArcGisServiceSourceSelect::addButtonClicked()`
`346`	`345`	`QString layerTitle = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->text(); //layer title/id`
`347`	`346`	`QString layerName = mModel->itemFromIndex( mModel->index( row, 1, idx.parent() ) )->text(); //layer name`
`348`	`347`	`const QString layerUri = mModel->itemFromIndex( mModel->index( row, 0, idx.parent() ) )->data( UrlRole ).toString();`
`349`		`- bool cacheFeatures = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->checkState() == Qt::Checked : false;`
`350`		`- QString filter = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 4, idx.parent() ) )->text() : QString(); //optional filter specified by user`
	`348`	`+ QString filter = mServiceType == FeatureService ? mModel->itemFromIndex( mModel->index( row, 3, idx.parent() ) )->text() : QString(); //optional filter specified by user`
`351`	`349`	`if ( cbxUseTitleLayerName->isChecked() && !layerTitle.isEmpty() )`
`352`	`350`	`{`
`353`	`351`	`layerName = layerTitle;`
`354`	`352`	`}`
`355`	`353`	`QgsRectangle layerExtent;`
`356`		`- if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() \|\| !cacheFeatures ) )`
	`354`	`+ if ( mServiceType == FeatureService && ( cbxFeatureCurrentViewExtent->isChecked() ) )`
`357`	`355`	`{`
`358`	`356`	`layerExtent = extent;`
`359`	`357`	`}`