Skip to content

Commit 1ca73f4

Browse files
nirvnnirvn
authoredMar 13, 2017
harmonize all providers to use lowercase qgis as settings key (#4252)
(fixes ArcGisRest browser / connection dialog)
·
ltr-3_40final-3_0_0
1 parent 5c02c8a commit 1ca73f4

25 files changed

+65
-65
lines changed
 

‎src/core/qgsowsconnection.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ QgsOwsConnection::QgsOwsConnection( const QString &service, const QString &connN
4242

4343
QgsSettings settings;
4444

45-
QString key = "/Qgis/connections-" + mService.toLower() + '/' + mConnName;
46-
QString credentialsKey = "/Qgis/" + mService + '/' + mConnName;
45+
QString key = "qgis//connections-" + mService.toLower() + '/' + mConnName;
46+
QString credentialsKey = "qgis//" + mService + '/' + mConnName;
4747

4848
QStringList connStringParts;
4949

@@ -99,25 +99,25 @@ QgsDataSourceUri QgsOwsConnection::uri() const
9999
QStringList QgsOwsConnection::connectionList( const QString &service )
100100
{
101101
QgsSettings settings;
102-
settings.beginGroup( "/Qgis/connections-" + service.toLower() );
102+
settings.beginGroup( "qgis//connections-" + service.toLower() );
103103
return settings.childGroups();
104104
}
105105

106106
QString QgsOwsConnection::selectedConnection( const QString &service )
107107
{
108108
QgsSettings settings;
109-
return settings.value( "/Qgis/connections-" + service.toLower() + "/selected" ).toString();
109+
return settings.value( "qgis//connections-" + service.toLower() + "/selected" ).toString();
110110
}
111111

112112
void QgsOwsConnection::setSelectedConnection( const QString &service, const QString &name )
113113
{
114114
QgsSettings settings;
115-
settings.setValue( "/Qgis/connections-" + service.toLower() + "/selected", name );
115+
settings.setValue( "qgis//connections-" + service.toLower() + "/selected", name );
116116
}
117117

118118
void QgsOwsConnection::deleteConnection( const QString &service, const QString &name )
119119
{
120120
QgsSettings settings;
121-
settings.remove( "/Qgis/connections-" + service.toLower() + '/' + name );
122-
settings.remove( "/Qgis/" + service + '/' + name );
121+
settings.remove( "qgis//connections-" + service.toLower() + '/' + name );
122+
settings.remove( "qgis//" + service + '/' + name );
123123
}

‎src/gui/qgsnewhttpconnection.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ QgsNewHttpConnection::QgsNewHttpConnection(
6969
QgsSettings settings;
7070

7171
QString key = mBaseKey + connName;
72-
QString credentialsKey = "/Qgis/" + mCredentialsBaseKey + '/' + connName;
72+
QString credentialsKey = "qgis//" + mCredentialsBaseKey + '/' + connName;
7373
txtName->setText( connName );
7474
txtUrl->setText( settings.value( key + "/url" ).toString() );
7575

@@ -124,23 +124,23 @@ QgsNewHttpConnection::QgsNewHttpConnection(
124124
}
125125
}
126126

127-
if ( mBaseKey != QLatin1String( "/Qgis/connections-wms/" ) )
127+
if ( mBaseKey != QLatin1String( "qgis//connections-wms/" ) )
128128
{
129-
if ( mBaseKey != QLatin1String( "/Qgis/connections-wcs/" ) &&
130-
mBaseKey != QLatin1String( "/Qgis/connections-wfs/" ) )
129+
if ( mBaseKey != QLatin1String( "qgis//connections-wcs/" ) &&
130+
mBaseKey != QLatin1String( "qgis//connections-wfs/" ) )
131131
{
132132
cbxIgnoreAxisOrientation->setVisible( false );
133133
cbxInvertAxisOrientation->setVisible( false );
134134
mGroupBox->layout()->removeWidget( cbxIgnoreAxisOrientation );
135135
mGroupBox->layout()->removeWidget( cbxInvertAxisOrientation );
136136
}
137137

138-
if ( mBaseKey == QLatin1String( "/Qgis/connections-wfs/" ) )
138+
if ( mBaseKey == QLatin1String( "qgis//connections-wfs/" ) )
139139
{
140140
cbxIgnoreAxisOrientation->setText( tr( "Ignore axis orientation (WFS 1.1/WFS 2.0)" ) );
141141
}
142142

143-
if ( mBaseKey == QLatin1String( "/Qgis/connections-wcs/" ) )
143+
if ( mBaseKey == QLatin1String( "qgis//connections-wcs/" ) )
144144
{
145145
cbxIgnoreGetMapURI->setText( tr( "Ignore GetCoverage URI reported in capabilities" ) );
146146
cbxIgnoreAxisOrientation->setText( tr( "Ignore axis orientation" ) );
@@ -167,7 +167,7 @@ QgsNewHttpConnection::QgsNewHttpConnection(
167167
mGroupBox->layout()->removeWidget( lblReferer );
168168
}
169169

170-
if ( mBaseKey != QLatin1String( "/Qgis/connections-wfs/" ) )
170+
if ( mBaseKey != QLatin1String( "qgis//connections-wfs/" ) )
171171
{
172172
cmbVersion->setVisible( false );
173173
mGroupBox->layout()->removeWidget( cmbVersion );
@@ -201,7 +201,7 @@ void QgsNewHttpConnection::accept()
201201
{
202202
QgsSettings settings;
203203
QString key = mBaseKey + txtName->text();
204-
QString credentialsKey = "/Qgis/" + mCredentialsBaseKey + '/' + txtName->text();
204+
QString credentialsKey = "qgis//" + mCredentialsBaseKey + '/' + txtName->text();
205205

206206
// warn if entry was renamed to an existing connection
207207
if ( ( mOriginalConnName.isNull() || mOriginalConnName.compare( txtName->text(), Qt::CaseInsensitive ) != 0 ) &&
@@ -227,7 +227,7 @@ void QgsNewHttpConnection::accept()
227227
if ( !mOriginalConnName.isNull() && mOriginalConnName != key )
228228
{
229229
settings.remove( mBaseKey + mOriginalConnName );
230-
settings.remove( "/Qgis/" + mCredentialsBaseKey + '/' + mOriginalConnName );
230+
settings.remove( "qgis//" + mCredentialsBaseKey + '/' + mOriginalConnName );
231231
settings.sync();
232232
}
233233

@@ -255,15 +255,15 @@ void QgsNewHttpConnection::accept()
255255

256256
settings.setValue( key + "/url", url.toString() );
257257

258-
if ( mBaseKey == QLatin1String( "/Qgis/connections-wms/" ) ||
259-
mBaseKey == QLatin1String( "/Qgis/connections-wcs/" ) ||
260-
mBaseKey == QLatin1String( "/Qgis/connections-wfs/" ) )
258+
if ( mBaseKey == QLatin1String( "qgis//connections-wms/" ) ||
259+
mBaseKey == QLatin1String( "qgis//connections-wcs/" ) ||
260+
mBaseKey == QLatin1String( "qgis//connections-wfs/" ) )
261261
{
262262
settings.setValue( key + "/ignoreAxisOrientation", cbxIgnoreAxisOrientation->isChecked() );
263263
settings.setValue( key + "/invertAxisOrientation", cbxInvertAxisOrientation->isChecked() );
264264
}
265265

266-
if ( mBaseKey == QLatin1String( "/Qgis/connections-wms/" ) || mBaseKey == QLatin1String( "/Qgis/connections-wcs/" ) )
266+
if ( mBaseKey == QLatin1String( "qgis//connections-wms/" ) || mBaseKey == QLatin1String( "qgis//connections-wcs/" ) )
267267
{
268268
settings.setValue( key + "/ignoreGetMapURI", cbxIgnoreGetMapURI->isChecked() );
269269
settings.setValue( key + "/smoothPixmapTransform", cbxSmoothPixmapTransform->isChecked() );
@@ -290,11 +290,11 @@ void QgsNewHttpConnection::accept()
290290

291291
settings.setValue( key + "/dpiMode", dpiMode );
292292
}
293-
if ( mBaseKey == QLatin1String( "/Qgis/connections-wms/" ) )
293+
if ( mBaseKey == QLatin1String( "qgis//connections-wms/" ) )
294294
{
295295
settings.setValue( key + "/ignoreGetFeatureInfoURI", cbxIgnoreGetFeatureInfoURI->isChecked() );
296296
}
297-
if ( mBaseKey == QLatin1String( "/Qgis/connections-wfs/" ) )
297+
if ( mBaseKey == QLatin1String( "qgis//connections-wfs/" ) )
298298
{
299299
QString version = QStringLiteral( "auto" );
300300
switch ( cmbVersion->currentIndex() )

‎src/gui/qgsnewhttpconnection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class GUI_EXPORT QgsNewHttpConnection : public QDialog, private Ui::QgsNewHttpCo
3333

3434
public:
3535
//! Constructor
36-
QgsNewHttpConnection( QWidget *parent = nullptr, const QString &baseKey = "/Qgis/connections-wms/", const QString &connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
36+
QgsNewHttpConnection( QWidget *parent = nullptr, const QString &baseKey = "qgis/connections-wms/", const QString &connName = QString::null, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
3737

3838
public slots:
3939
// Saves the connection to ~/.qt/qgisrc

‎src/gui/qgssourceselectdialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ QString QgsSourceSelectDialog::getPreferredCrs( const QSet<QString> &crsSet ) co
220220
void QgsSourceSelectDialog::addEntryToServerList()
221221
{
222222

223-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-%1/" ).arg( mServiceName.toLower() ) );
223+
QgsNewHttpConnection nc( 0, QStringLiteral( "qgis/connections-%1/" ).arg( mServiceName.toLower() ) );
224224
nc.setWindowTitle( tr( "Create a new %1 connection" ).arg( mServiceName ) );
225225

226226
if ( nc.exec() )
@@ -232,7 +232,7 @@ void QgsSourceSelectDialog::addEntryToServerList()
232232

233233
void QgsSourceSelectDialog::modifyEntryOfServerList()
234234
{
235-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-%1/" ).arg( mServiceName.toLower() ), cmbConnections->currentText() );
235+
QgsNewHttpConnection nc( 0, QStringLiteral( "qgis/connections-%1/" ).arg( mServiceName.toLower() ), cmbConnections->currentText() );
236236
nc.setWindowTitle( tr( "Modify %1 connection" ).arg( mServiceName ) );
237237

238238
if ( nc.exec() )

‎src/providers/arcgisrest/qgsafsdataitems.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void QgsAfsRootItem::connectionsChanged()
6767

6868
void QgsAfsRootItem::newConnection()
6969
{
70-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgisfeatureserver/" ) );
70+
QgsNewHttpConnection nc( 0, QStringLiteral( "qgis/connections-arcgisfeatureserver/" ) );
7171
nc.setWindowTitle( tr( "Create a new ArcGisFeatureServer connection" ) );
7272

7373
if ( nc.exec() )
@@ -130,7 +130,7 @@ QList<QAction *> QgsAfsConnectionItem::actions()
130130

131131
void QgsAfsConnectionItem::editConnection()
132132
{
133-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgisfeatureserver/" ), mName );
133+
QgsNewHttpConnection nc( 0, QStringLiteral( "qgis/connections-arcgisfeatureserver/" ), mName );
134134
nc.setWindowTitle( tr( "Modify ArcGisFeatureServer connection" ) );
135135

136136
if ( nc.exec() )

‎src/providers/arcgisrest/qgsamsdataitems.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void QgsAmsRootItem::connectionsChanged()
6464

6565
void QgsAmsRootItem::newConnection()
6666
{
67-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgismapserver/" ) );
67+
QgsNewHttpConnection nc( 0, QStringLiteral( "qgis/connections-arcgismapserver/" ) );
6868
nc.setWindowTitle( tr( "Create a new ArcGisMapServer connection" ) );
6969

7070
if ( nc.exec() )
@@ -145,7 +145,7 @@ QList<QAction *> QgsAmsConnectionItem::actions()
145145

146146
void QgsAmsConnectionItem::editConnection()
147147
{
148-
QgsNewHttpConnection nc( 0, QStringLiteral( "/Qgis/connections-arcgismapserver/" ), mName );
148+
QgsNewHttpConnection nc( 0, QStringLiteral( "qgis/connections-arcgismapserver/" ), mName );
149149
nc.setWindowTitle( tr( "Modify ArcGisMapServer connection" ) );
150150

151151
if ( nc.exec() )

‎src/providers/db2/qgsdb2featureiterator.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )
185185
mCompileStatus = NoCompilation;
186186
if ( request.filterType() == QgsFeatureRequest::FilterExpression )
187187
{
188-
QgsDebugMsg( QString( "compileExpressions: %1" ).arg( QgsSettings().value( "/qgis/compileExpressions", true ).toString() ) );
189-
if ( QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() )
188+
QgsDebugMsg( QString( "compileExpressions: %1" ).arg( QgsSettings().value( "qgis/compileExpressions", true ).toString() ) );
189+
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
190190
{
191191
QgsDb2ExpressionCompiler compiler = QgsDb2ExpressionCompiler( mSource );
192192
QgsDebugMsg( "expression dump: " + request.filterExpression()->dump() );
@@ -218,8 +218,8 @@ void QgsDb2FeatureIterator::BuildStatement( const QgsFeatureRequest &request )
218218

219219
QStringList orderByParts;
220220
mOrderByCompiled = true;
221-
QgsDebugMsg( QString( "compileExpressions: %1" ).arg( QgsSettings().value( "/qgis/compileExpressions", true ).toString() ) );
222-
if ( QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() && limitAtProvider )
221+
QgsDebugMsg( QString( "compileExpressions: %1" ).arg( QgsSettings().value( "qgis/compileExpressions", true ).toString() ) );
222+
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() && limitAtProvider )
223223
{
224224
Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, request.orderBy() )
225225
{

‎src/providers/mssql/qgsmssqlfeatureiterator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest &request )
178178
mCompileStatus = NoCompilation;
179179
if ( request.filterType() == QgsFeatureRequest::FilterExpression )
180180
{
181-
if ( QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() )
181+
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
182182
{
183183
QgsMssqlExpressionCompiler compiler = QgsMssqlExpressionCompiler( mSource );
184184
QgsSqlExpressionCompiler::Result result = compiler.compile( request.filterExpression() );
@@ -209,7 +209,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest &request )
209209
QStringList orderByParts;
210210
mOrderByCompiled = true;
211211

212-
if ( QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() )
212+
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
213213
{
214214
Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, request.orderBy() )
215215
{

‎src/providers/ogr/qgsogrfeatureiterator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource *source, bool
115115
}
116116

117117
if ( request.filterType() == QgsFeatureRequest::FilterExpression
118-
&& QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() )
118+
&& QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
119119
{
120120
QgsSqlExpressionCompiler *compiler = nullptr;
121121
if ( source->mDriverName == QLatin1String( "SQLite" ) || source->mDriverName == QLatin1String( "GPKG" ) )

‎src/providers/ogr/qgsogrprovider.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3391,7 +3391,7 @@ void QgsOgrProvider::open( OpenMode mode )
33913391
if ( QFileInfo( mFilePath ).suffix().compare( QLatin1String( "gpkg" ), Qt::CaseInsensitive ) == 0 &&
33923392
IsLocalFile( mFilePath ) &&
33933393
!CPLGetConfigOption( "OGR_SQLITE_JOURNAL", NULL ) &&
3394-
QgsSettings().value( QStringLiteral( "/qgis/walForSqlite3" ), true ).toBool() )
3394+
QgsSettings().value( QStringLiteral( "qgis/walForSqlite3" ), true ).toBool() )
33953395
{
33963396
// For GeoPackage, we force opening of the file in WAL (Write Ahead Log)
33973397
// mode so as to avoid readers blocking writer(s), and vice-versa.

‎src/providers/oracle/qgsoraclefeatureiterator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ QgsOracleFeatureIterator::QgsOracleFeatureIterator( QgsOracleFeatureSource *sour
169169
bool useFallback = false;
170170
if ( request.filterType() == QgsFeatureRequest::FilterExpression )
171171
{
172-
if ( QgsSettings().value( "/qgis/compileExpressions", true ).toBool() )
172+
if ( QgsSettings().value( "qgis/compileExpressions", true ).toBool() )
173173
{
174174
QgsOracleExpressionCompiler compiler( mSource );
175175
QgsSqlExpressionCompiler::Result result = compiler.compile( mRequest.filterExpression() );

‎src/providers/oracle/qgsoraclesourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags f
227227
connect( mTablesTreeView->selectionModel(), SIGNAL( selectionChanged( const QItemSelection &, const QItemSelection & ) ), this, SLOT( treeWidgetSelectionChanged( const QItemSelection &, const QItemSelection & ) ) );
228228

229229
QgsSettings settings;
230-
mTablesTreeView->setSelectionMode( settings.value( "/qgis/addOracleDC", false ).toBool() ?
230+
mTablesTreeView->setSelectionMode( settings.value( "qgis/addOracleDC", false ).toBool() ?
231231
QAbstractItemView::ExtendedSelection :
232232
QAbstractItemView::MultiSelection );
233233

@@ -358,7 +358,7 @@ void QgsOracleSourceSelect::on_mTablesTreeView_clicked( const QModelIndex &index
358358
void QgsOracleSourceSelect::on_mTablesTreeView_doubleClicked( const QModelIndex &index )
359359
{
360360
QgsSettings settings;
361-
if ( settings.value( "/qgis/addOracleDC", false ).toBool() )
361+
if ( settings.value( "qgis/addOracleDC", false ).toBool() )
362362
{
363363
addTables();
364364
}

‎src/providers/ows/qgsowsdataitems.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ QList<QAction *> QgsOWSConnectionItem::actions()
146146
void QgsOWSConnectionItem::editConnection()
147147
{
148148
#if 0
149-
QgsNewHttpConnection nc( 0, "/Qgis/connections-ows/", mName );
149+
QgsNewHttpConnection nc( 0, "qgis/connections-ows/", mName );
150150

151151
if ( nc.exec() )
152152
{
@@ -235,7 +235,7 @@ void QgsOWSRootItem::connectionsChanged()
235235
void QgsOWSRootItem::newConnection()
236236
{
237237
#if 0
238-
QgsNewHttpConnection nc( 0, "/Qgis/connections-ows/" );
238+
QgsNewHttpConnection nc( 0, "qgis/connections-ows/" );
239239

240240
if ( nc.exec() )
241241
{

‎src/providers/postgres/qgspostgresfeatureiterator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource
9696
}
9797
mFilterRequiresGeometry = request.filterExpression()->needsGeometry();
9898

99-
if ( QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() )
99+
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
100100
{
101101
//IMPORTANT - this MUST be the last clause added!
102102
QgsPostgresExpressionCompiler compiler = QgsPostgresExpressionCompiler( source );
@@ -132,7 +132,7 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresFeatureSource
132132
// SELECT my_int_col::text FROM some_table ORDER BY some_table.my_int_col
133133
// but that's non-trivial
134134
#if 0
135-
if ( QgsSettings().value( "/qgis/compileExpressions", true ).toBool() )
135+
if ( QgsSettings().value( "qgis/compileExpressions", true ).toBool() )
136136
{
137137
Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, request.orderBy() )
138138
{

‎src/providers/spatialite/qgsspatialitefeatureiterator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeature
9898
mFetchGeometry = true;
9999
}
100100

101-
if ( QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() )
101+
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
102102
{
103103
QgsSQLiteExpressionCompiler compiler = QgsSQLiteExpressionCompiler( source->mFields );
104104

@@ -137,7 +137,7 @@ QgsSpatiaLiteFeatureIterator::QgsSpatiaLiteFeatureIterator( QgsSpatiaLiteFeature
137137

138138
mOrderByCompiled = true;
139139

140-
if ( QgsSettings().value( QStringLiteral( "/qgis/compileExpressions" ), true ).toBool() )
140+
if ( QgsSettings().value( QStringLiteral( "qgis/compileExpressions" ), true ).toBool() )
141141
{
142142
Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, request.orderBy() )
143143
{

‎src/providers/wcs/qgswcsdataitems.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ QList<QAction *> QgsWCSConnectionItem::actions()
9898

9999
void QgsWCSConnectionItem::editConnection()
100100
{
101-
QgsNewHttpConnection nc( nullptr, QStringLiteral( "/Qgis/connections-wcs/" ), mName );
101+
QgsNewHttpConnection nc( nullptr, QStringLiteral( "qgis/connections-wcs/" ), mName );
102102

103103
if ( nc.exec() )
104104
{
@@ -265,7 +265,7 @@ void QgsWCSRootItem::connectionsChanged()
265265

266266
void QgsWCSRootItem::newConnection()
267267
{
268-
QgsNewHttpConnection nc( nullptr, QStringLiteral( "/Qgis/connections-wcs/" ) );
268+
QgsNewHttpConnection nc( nullptr, QStringLiteral( "qgis/connections-wcs/" ) );
269269

270270
if ( nc.exec() )
271271
{

‎src/providers/wfs/qgswfscapabilities.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ QString QgsWfsCapabilities::NormalizeSRSName( QString crsName )
482482
int QgsWfsCapabilities::defaultExpirationInSec()
483483
{
484484
QgsSettings s;
485-
return s.value( QStringLiteral( "/qgis/defaultCapabilitiesExpiry" ), "24" ).toInt() * 60 * 60;
485+
return s.value( QStringLiteral( "qgis/defaultCapabilitiesExpiry" ), "24" ).toInt() * 60 * 60;
486486
}
487487

488488
void QgsWfsCapabilities::parseSupportedOperations( const QDomElement &operationsElem,

‎src/providers/wfs/qgswfsconstants.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const QString QgsWFSConstants::URI_PARAM_HIDEDOWNLOADPROGRESSDIALOG( QStringLite
4040

4141
const QString QgsWFSConstants::VERSION_AUTO( QStringLiteral( "auto" ) );
4242

43-
const QString QgsWFSConstants::CONNECTIONS_WFS( QStringLiteral( "/Qgis/connections-wfs/" ) );
43+
const QString QgsWFSConstants::CONNECTIONS_WFS( QStringLiteral( "qgis/connections-wfs/" ) );
4444
const QString QgsWFSConstants::SETTINGS_VERSION( QStringLiteral( "version" ) );
4545
const QString QgsWFSConstants::SETTINGS_MAXNUMFEATURES( QStringLiteral( "maxnumfeatures" ) );
4646

‎src/providers/wfs/qgswfsfeatureiterator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ void QgsWFSFeatureDownloader::run( bool serializeFeatures, int maxFeatures )
402402
bool interrupted = false;
403403
bool truncatedResponse = false;
404404
QgsSettings s;
405-
const int maxRetry = s.value( QStringLiteral( "/qgis/defaultTileMaxRetry" ), "3" ).toInt();
405+
const int maxRetry = s.value( QStringLiteral( "qgis/defaultTileMaxRetry" ), "3" ).toInt();
406406
int retryIter = 0;
407407
int lastValidTotalDownloadedFeatureCount = 0;
408408
int pagingIter = 1;

‎src/providers/wms/qgswmscapabilities.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2075,7 +2075,7 @@ void QgsWmsCapabilitiesDownload::capabilitiesReplyFinished()
20752075
if ( cmd.expirationDate().isNull() )
20762076
{
20772077
QgsSettings s;
2078-
cmd.setExpirationDate( QDateTime::currentDateTime().addSecs( s.value( QStringLiteral( "/qgis/defaultCapabilitiesExpiry" ), "24" ).toInt() * 60 * 60 ) );
2078+
cmd.setExpirationDate( QDateTime::currentDateTime().addSecs( s.value( QStringLiteral( "qgis/defaultCapabilitiesExpiry" ), "24" ).toInt() * 60 * 60 ) );
20792079
}
20802080

20812081
nam->cache()->updateMetaData( cmd );

0 commit comments

Comments
 (0)
Please sign in to comment.