Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
remove explicit default empty string
  • Loading branch information
alexbruy committed Apr 23, 2020
1 parent 5137d4a commit a94d195
Showing 1 changed file with 50 additions and 50 deletions.
100 changes: 50 additions & 50 deletions src/gui/qgsmanageconnectionsdialog.cpp
Expand Up @@ -449,22 +449,22 @@ QDomDocument QgsManageConnectionsDialog::saveOWSConnections( const QStringList &
path = "/qgis/connections-" + service.toLower() + '/';
QDomElement el = doc.createElement( service.toLower() );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url" ).toString() );

if ( service == QLatin1String( "WMS" ) )
{
el.setAttribute( QStringLiteral( "ignoreGetMapURI" ), settings.value( path + connections[i] + "/ignoreGetMapURI", false ).toBool() ? "true" : "false" );
el.setAttribute( QStringLiteral( "ignoreGetFeatureInfoURI" ), settings.value( path + connections[i] + "/ignoreGetFeatureInfoURI", false ).toBool() ? "true" : "false" );
el.setAttribute( QStringLiteral( "ignoreAxisOrientation" ), settings.value( path + connections[i] + "/ignoreAxisOrientation", false ).toBool() ? "true" : "false" );
el.setAttribute( QStringLiteral( "invertAxisOrientation" ), settings.value( path + connections[i] + "/invertAxisOrientation", false ).toBool() ? "true" : "false" );
el.setAttribute( QStringLiteral( "referer" ), settings.value( path + connections[ i ] + "/referer", "" ).toString() );
el.setAttribute( QStringLiteral( "referer" ), settings.value( path + connections[ i ] + "/referer" ).toString() );
el.setAttribute( QStringLiteral( "smoothPixmapTransform" ), settings.value( path + connections[i] + "/smoothPixmapTransform", false ).toBool() ? "true" : "false" );
el.setAttribute( QStringLiteral( "dpiMode" ), settings.value( path + connections[i] + "/dpiMode", "7" ).toInt() );
}

path = "/qgis/" + service.toUpper() + '/';
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password" ).toString() );
root.appendChild( el );
}

Expand All @@ -485,18 +485,18 @@ QDomDocument QgsManageConnectionsDialog::saveWfsConnections( const QStringList &
path = QStringLiteral( "/qgis/connections-wfs/" );
QDomElement el = doc.createElement( QStringLiteral( "wfs" ) );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url" ).toString() );

el.setAttribute( QStringLiteral( "version" ), settings.value( path + connections[ i ] + "/version", "" ).toString() );
el.setAttribute( QStringLiteral( "maxnumfeatures" ), settings.value( path + connections[ i ] + "/maxnumfeatures", "" ).toString() );
el.setAttribute( QStringLiteral( "pagesize" ), settings.value( path + connections[ i ] + "/pagesize", "" ).toString() );
el.setAttribute( QStringLiteral( "version" ), settings.value( path + connections[ i ] + "/version" ).toString() );
el.setAttribute( QStringLiteral( "maxnumfeatures" ), settings.value( path + connections[ i ] + "/maxnumfeatures" ).toString() );
el.setAttribute( QStringLiteral( "pagesize" ), settings.value( path + connections[ i ] + "/pagesize" ).toString() );
el.setAttribute( QStringLiteral( "pagingenabled" ), settings.value( path + connections[ i ] + "/pagingenabled", false ).toString() );
el.setAttribute( QStringLiteral( "ignoreAxisOrientation" ), settings.value( path + connections[ i ] + "/ignoreAxisOrientation", false ).toString() );
el.setAttribute( QStringLiteral( "invertAxisOrientation" ), settings.value( path + connections[ i ] + "/invertAxisOrientation", false ).toString() );

path = QStringLiteral( "/qgis/WFS/" );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password" ).toString() );
root.appendChild( el );
}

Expand All @@ -517,25 +517,25 @@ QDomDocument QgsManageConnectionsDialog::savePgConnections( const QStringList &c
path = "/PostgreSQL/connections/" + connections[ i ];
QDomElement el = doc.createElement( QStringLiteral( "postgis" ) );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host", "" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port", "" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database", "" ).toString() );
el.setAttribute( QStringLiteral( "service" ), settings.value( path + "/service", "" ).toString() );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database" ).toString() );
el.setAttribute( QStringLiteral( "service" ), settings.value( path + "/service" ).toString() );
el.setAttribute( QStringLiteral( "sslmode" ), settings.value( path + "/sslmode", "1" ).toString() );
el.setAttribute( QStringLiteral( "estimatedMetadata" ), settings.value( path + "/estimatedMetadata", "0" ).toString() );

el.setAttribute( QStringLiteral( "saveUsername" ), settings.value( path + "/saveUsername", "false" ).toString() );

if ( settings.value( path + "/saveUsername", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username" ).toString() );
}

el.setAttribute( QStringLiteral( "savePassword" ), settings.value( path + "/savePassword", "false" ).toString() );

if ( settings.value( path + "/savePassword", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password" ).toString() );
}

root.appendChild( el );
Expand All @@ -558,25 +558,25 @@ QDomDocument QgsManageConnectionsDialog::saveMssqlConnections( const QStringList
path = "/MSSQL/connections/" + connections[ i ];
QDomElement el = doc.createElement( QStringLiteral( "mssql" ) );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host", "" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port", "" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database", "" ).toString() );
el.setAttribute( QStringLiteral( "service" ), settings.value( path + "/service", "" ).toString() );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database" ).toString() );
el.setAttribute( QStringLiteral( "service" ), settings.value( path + "/service" ).toString() );
el.setAttribute( QStringLiteral( "sslmode" ), settings.value( path + "/sslmode", "1" ).toString() );
el.setAttribute( QStringLiteral( "estimatedMetadata" ), settings.value( path + "/estimatedMetadata", "0" ).toString() );

el.setAttribute( QStringLiteral( "saveUsername" ), settings.value( path + "/saveUsername", "false" ).toString() );

if ( settings.value( path + "/saveUsername", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username" ).toString() );
}

el.setAttribute( QStringLiteral( "savePassword" ), settings.value( path + "/savePassword", "false" ).toString() );

if ( settings.value( path + "/savePassword", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password" ).toString() );
}

root.appendChild( el );
Expand All @@ -599,12 +599,12 @@ QDomDocument QgsManageConnectionsDialog::saveOracleConnections( const QStringLis
path = "/Oracle/connections/" + connections[ i ];
QDomElement el = doc.createElement( QStringLiteral( "oracle" ) );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host", "" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port", "" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database", "" ).toString() );
el.setAttribute( QStringLiteral( "dboptions" ), settings.value( path + "/dboptions", "" ).toString() );
el.setAttribute( QStringLiteral( "dbworkspace" ), settings.value( path + "/dbworkspace", "" ).toString() );
el.setAttribute( QStringLiteral( "schema" ), settings.value( path + "/schema", QString() ).toString() );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database" ).toString() );
el.setAttribute( QStringLiteral( "dboptions" ), settings.value( path + "/dboptions" ).toString() );
el.setAttribute( QStringLiteral( "dbworkspace" ), settings.value( path + "/dbworkspace" ).toString() );
el.setAttribute( QStringLiteral( "schema" ), settings.value( path + "/schema" ).toString() );
el.setAttribute( QStringLiteral( "estimatedMetadata" ), settings.value( path + "/estimatedMetadata", "0" ).toString() );
el.setAttribute( QStringLiteral( "userTablesOnly" ), settings.value( path + "/userTablesOnly", "0" ).toString() );
el.setAttribute( QStringLiteral( "geometryColumnsOnly" ), settings.value( path + "/geometryColumnsOnly", "0" ).toString() );
Expand All @@ -614,14 +614,14 @@ QDomDocument QgsManageConnectionsDialog::saveOracleConnections( const QStringLis

if ( settings.value( path + "/saveUsername", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username" ).toString() );
}

el.setAttribute( QStringLiteral( "savePassword" ), settings.value( path + "/savePassword", "false" ).toString() );

if ( settings.value( path + "/savePassword", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password" ).toString() );
}

root.appendChild( el );
Expand All @@ -644,25 +644,25 @@ QDomDocument QgsManageConnectionsDialog::saveDb2Connections( const QStringList &
path = "/DB2/connections/" + connections[ i ];
QDomElement el = doc.createElement( QStringLiteral( "db2" ) );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host", "" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port", "" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database", "" ).toString() );
el.setAttribute( QStringLiteral( "service" ), settings.value( path + "/service", "" ).toString() );
el.setAttribute( QStringLiteral( "host" ), settings.value( path + "/host" ).toString() );
el.setAttribute( QStringLiteral( "port" ), settings.value( path + "/port" ).toString() );
el.setAttribute( QStringLiteral( "database" ), settings.value( path + "/database" ).toString() );
el.setAttribute( QStringLiteral( "service" ), settings.value( path + "/service" ).toString() );
el.setAttribute( QStringLiteral( "sslmode" ), settings.value( path + "/sslmode", "1" ).toString() );
el.setAttribute( QStringLiteral( "estimatedMetadata" ), settings.value( path + "/estimatedMetadata", "0" ).toString() );

el.setAttribute( QStringLiteral( "saveUsername" ), settings.value( path + "/saveUsername", "false" ).toString() );

if ( settings.value( path + "/saveUsername", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username" ).toString() );
}

el.setAttribute( QStringLiteral( "savePassword" ), settings.value( path + "/savePassword", "false" ).toString() );

if ( settings.value( path + "/savePassword", "false" ).toString() == QLatin1String( "true" ) )
{
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password" ).toString() );
}

root.appendChild( el );
Expand All @@ -685,11 +685,11 @@ QDomDocument QgsManageConnectionsDialog::saveGeonodeConnections( const QStringLi
path = QStringLiteral( "/qgis/connections-geonode/" );
QDomElement el = doc.createElement( QStringLiteral( "geonode" ) );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url" ).toString() );

path = QStringLiteral( "/qgis/GeoNode/" );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password" ).toString() );
root.appendChild( el );
}

Expand All @@ -711,13 +711,13 @@ QDomDocument QgsManageConnectionsDialog::saveXyzTilesConnections( const QStringL
QDomElement el = doc.createElement( QStringLiteral( "xyztiles" ) );

el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + "/url", "" ).toString() );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + "/url" ).toString() );
el.setAttribute( QStringLiteral( "zmin" ), settings.value( path + "/zmin", -1 ).toInt() );
el.setAttribute( QStringLiteral( "zmax" ), settings.value( path + "/zmax", -1 ).toInt() );
el.setAttribute( QStringLiteral( "authcfg" ), settings.value( path + "/authcfg", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "referer" ), settings.value( path + "/referer", "" ).toString() );
el.setAttribute( QStringLiteral( "authcfg" ), settings.value( path + "/authcfg" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + "/username" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + "/password" ).toString() );
el.setAttribute( QStringLiteral( "referer" ), settings.value( path + "/referer" ).toString() );

root.appendChild( el );
}
Expand All @@ -739,13 +739,13 @@ QDomDocument QgsManageConnectionsDialog::saveArcgisConnections( const QStringLis
path = "/qgis/connections-" + service.toLower() + '/';
QDomElement el = doc.createElement( service.toLower() );
el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url", "" ).toString() );
el.setAttribute( QStringLiteral( "referer" ), settings.value( path + connections[ i ] + "/referer", "" ).toString() );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + connections[ i ] + "/url" ).toString() );
el.setAttribute( QStringLiteral( "referer" ), settings.value( path + connections[ i ] + "/referer" ).toString() );

path = "/qgis/" + service.toUpper() + '/';
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username", "" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password", "" ).toString() );
el.setAttribute( QStringLiteral( "authcfg" ), settings.value( path + connections[ i ] + "/authcfg", "" ).toString() );
el.setAttribute( QStringLiteral( "username" ), settings.value( path + connections[ i ] + "/username" ).toString() );
el.setAttribute( QStringLiteral( "password" ), settings.value( path + connections[ i ] + "/password" ).toString() );
el.setAttribute( QStringLiteral( "authcfg" ), settings.value( path + connections[ i ] + "/authcfg" ).toString() );
root.appendChild( el );
}

Expand All @@ -767,7 +767,7 @@ QDomDocument QgsManageConnectionsDialog::saveVectorTileConnections( const QStrin
QDomElement el = doc.createElement( QStringLiteral( "vectortile" ) );

el.setAttribute( QStringLiteral( "name" ), connections[ i ] );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + "/url", "" ).toString() );
el.setAttribute( QStringLiteral( "url" ), settings.value( path + "/url" ).toString() );
el.setAttribute( QStringLiteral( "zmin" ), settings.value( path + "/zmin", -1 ).toInt() );
el.setAttribute( QStringLiteral( "zmax" ), settings.value( path + "/zmax", -1 ).toInt() );

Expand Down

0 comments on commit a94d195

Please sign in to comment.