Skip to content

Commit 5739478

Browse files
committed
QgsSettings: homogenize "qgis" keys
1 parent 1822caa commit 5739478

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/app/qgisapp.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9321,7 +9321,7 @@ void QgisApp::apiDocumentation()
93219321
else
93229322
{
93239323
QgsSettings settings;
9324-
QString QgisApiUrl = settings.value( QStringLiteral( "Qgis/QgisApiUrl" ),
9324+
QString QgisApiUrl = settings.value( QStringLiteral( "qgis/QgisApiUrl" ),
93259325
QStringLiteral( "https://qgis.org/api/" ) ).toString();
93269326
openURL( QgisApiUrl, false );
93279327
}
@@ -9330,23 +9330,23 @@ void QgisApp::apiDocumentation()
93309330
void QgisApp::reportaBug()
93319331
{
93329332
QgsSettings settings;
9333-
QString reportaBugUrl = settings.value( QStringLiteral( "Qgis/reportaBugUrl" ),
9333+
QString reportaBugUrl = settings.value( QStringLiteral( "qgis/reportaBugUrl" ),
93349334
tr( "https://qgis.org/en/site/getinvolved/development/bugreporting.html" ) ).toString();
93359335
openURL( reportaBugUrl, false );
93369336
}
93379337

93389338
void QgisApp::supportProviders()
93399339
{
93409340
QgsSettings settings;
9341-
QString supportProvidersUrl = settings.value( QStringLiteral( "Qgis/supportProvidersUrl" ),
9341+
QString supportProvidersUrl = settings.value( QStringLiteral( "qgis/supportProvidersUrl" ),
93429342
tr( "https://qgis.org/en/site/forusers/commercial_support.html" ) ).toString();
93439343
openURL( supportProvidersUrl, false );
93449344
}
93459345

93469346
void QgisApp::helpQgisHomePage()
93479347
{
93489348
QgsSettings settings;
9349-
QString helpQgisHomePageUrl = settings.value( QStringLiteral( "Qgis/helpQgisHomePageUrl" ),
9349+
QString helpQgisHomePageUrl = settings.value( QStringLiteral( "qgis/helpQgisHomePageUrl" ),
93509350
QStringLiteral( "https://qgis.org" ) ).toString();
93519351
openURL( helpQgisHomePageUrl, false );
93529352
}

src/providers/wms/qgswmsconnection.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,20 +124,20 @@ QgsDataSourceUri QgsWMSConnection::uri()
124124
QStringList QgsWMSConnection::connectionList()
125125
{
126126
QgsSettings settings;
127-
settings.beginGroup( QStringLiteral( "Qgis/connections-wms" ) );
127+
settings.beginGroup( QStringLiteral( "qgis/connections-wms" ) );
128128
return settings.childGroups();
129129
}
130130

131131
QString QgsWMSConnection::selectedConnection()
132132
{
133133
QgsSettings settings;
134-
return settings.value( QStringLiteral( "Qgis/connections-wms/selected" ) ).toString();
134+
return settings.value( QStringLiteral( "qgis/connections-wms/selected" ) ).toString();
135135
}
136136

137137
void QgsWMSConnection::setSelectedConnection( const QString &name )
138138
{
139139
QgsSettings settings;
140-
settings.setValue( QStringLiteral( "Qgis/connections-wms/selected" ), name );
140+
settings.setValue( QStringLiteral( "qgis/connections-wms/selected" ), name );
141141
}
142142

143143
void QgsWMSConnection::deleteConnection( const QString &name )

src/providers/wms/qgswmssourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,7 @@ void QgsWMSSourceSelect::addDefaultServers()
11021102
exampleServers[QStringLiteral( "GeoServer Demo - World" )] = QStringLiteral( "http://tiles.boundlessgeo.com/" );
11031103

11041104
QgsSettings settings;
1105-
settings.beginGroup( QStringLiteral( "Qgis/connections-wms" ) );
1105+
settings.beginGroup( QStringLiteral( "qgis/connections-wms" ) );
11061106
QMap<QString, QString>::const_iterator i = exampleServers.constBegin();
11071107
for ( ; i != exampleServers.constEnd(); ++i )
11081108
{
@@ -1234,7 +1234,7 @@ void QgsWMSSourceSelect::on_btnAddWMS_clicked()
12341234
}
12351235

12361236
// add selected WMS to config and mark as current
1237-
settings.setValue( QStringLiteral( "Qgis/connections-wms/%1/url" ).arg( wmsTitle ), wmsUrl );
1237+
settings.setValue( QStringLiteral( "qgis/connections-wms/%1/url" ).arg( wmsTitle ), wmsUrl );
12381238
QgsWMSConnection::setSelectedConnection( wmsTitle );
12391239
populateConnectionList();
12401240

src/providers/wms/qgsxyzconnection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ QString QgsXyzConnection::encodedUri() const
3333
QStringList QgsXyzConnectionUtils::connectionList()
3434
{
3535
QgsSettings settings;
36-
settings.beginGroup( QStringLiteral( "Qgis/connections-xyz" ) );
36+
settings.beginGroup( QStringLiteral( "qgis/connections-xyz" ) );
3737
return settings.childGroups();
3838
}
3939

0 commit comments

Comments
 (0)