Skip to content

Commit

Permalink
QgsSettings: homogenize "qgis" keys
Browse files Browse the repository at this point in the history
  • Loading branch information
elpaso committed Mar 8, 2017
1 parent 1822caa commit 5739478
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/app/qgisapp.cpp
Expand Up @@ -9321,7 +9321,7 @@ void QgisApp::apiDocumentation()
else
{
QgsSettings settings;
QString QgisApiUrl = settings.value( QStringLiteral( "Qgis/QgisApiUrl" ),
QString QgisApiUrl = settings.value( QStringLiteral( "qgis/QgisApiUrl" ),
QStringLiteral( "https://qgis.org/api/" ) ).toString();
openURL( QgisApiUrl, false );
}
Expand All @@ -9330,23 +9330,23 @@ void QgisApp::apiDocumentation()
void QgisApp::reportaBug()
{
QgsSettings settings;
QString reportaBugUrl = settings.value( QStringLiteral( "Qgis/reportaBugUrl" ),
QString reportaBugUrl = settings.value( QStringLiteral( "qgis/reportaBugUrl" ),
tr( "https://qgis.org/en/site/getinvolved/development/bugreporting.html" ) ).toString();
openURL( reportaBugUrl, false );
}

void QgisApp::supportProviders()
{
QgsSettings settings;
QString supportProvidersUrl = settings.value( QStringLiteral( "Qgis/supportProvidersUrl" ),
QString supportProvidersUrl = settings.value( QStringLiteral( "qgis/supportProvidersUrl" ),
tr( "https://qgis.org/en/site/forusers/commercial_support.html" ) ).toString();
openURL( supportProvidersUrl, false );
}

void QgisApp::helpQgisHomePage()
{
QgsSettings settings;
QString helpQgisHomePageUrl = settings.value( QStringLiteral( "Qgis/helpQgisHomePageUrl" ),
QString helpQgisHomePageUrl = settings.value( QStringLiteral( "qgis/helpQgisHomePageUrl" ),
QStringLiteral( "https://qgis.org" ) ).toString();
openURL( helpQgisHomePageUrl, false );
}
Expand Down
6 changes: 3 additions & 3 deletions src/providers/wms/qgswmsconnection.cpp
Expand Up @@ -124,20 +124,20 @@ QgsDataSourceUri QgsWMSConnection::uri()
QStringList QgsWMSConnection::connectionList()
{
QgsSettings settings;
settings.beginGroup( QStringLiteral( "Qgis/connections-wms" ) );
settings.beginGroup( QStringLiteral( "qgis/connections-wms" ) );
return settings.childGroups();
}

QString QgsWMSConnection::selectedConnection()
{
QgsSettings settings;
return settings.value( QStringLiteral( "Qgis/connections-wms/selected" ) ).toString();
return settings.value( QStringLiteral( "qgis/connections-wms/selected" ) ).toString();
}

void QgsWMSConnection::setSelectedConnection( const QString &name )
{
QgsSettings settings;
settings.setValue( QStringLiteral( "Qgis/connections-wms/selected" ), name );
settings.setValue( QStringLiteral( "qgis/connections-wms/selected" ), name );
}

void QgsWMSConnection::deleteConnection( const QString &name )
Expand Down
4 changes: 2 additions & 2 deletions src/providers/wms/qgswmssourceselect.cpp
Expand Up @@ -1102,7 +1102,7 @@ void QgsWMSSourceSelect::addDefaultServers()
exampleServers[QStringLiteral( "GeoServer Demo - World" )] = QStringLiteral( "http://tiles.boundlessgeo.com/" );

QgsSettings settings;
settings.beginGroup( QStringLiteral( "Qgis/connections-wms" ) );
settings.beginGroup( QStringLiteral( "qgis/connections-wms" ) );
QMap<QString, QString>::const_iterator i = exampleServers.constBegin();
for ( ; i != exampleServers.constEnd(); ++i )
{
Expand Down Expand Up @@ -1234,7 +1234,7 @@ void QgsWMSSourceSelect::on_btnAddWMS_clicked()
}

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

Expand Down
2 changes: 1 addition & 1 deletion src/providers/wms/qgsxyzconnection.cpp
Expand Up @@ -33,7 +33,7 @@ QString QgsXyzConnection::encodedUri() const
QStringList QgsXyzConnectionUtils::connectionList()
{
QgsSettings settings;
settings.beginGroup( QStringLiteral( "Qgis/connections-xyz" ) );
settings.beginGroup( QStringLiteral( "qgis/connections-xyz" ) );
return settings.childGroups();
}

Expand Down

0 comments on commit 5739478

Please sign in to comment.