using QStringLiteral for QVariantMap indexes

qgis · Apr 28, 2020 · 43ab762 · 43ab762
1 parent 1ab5814
commit 43ab762
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -11082,7 +11082,7 @@ void QgisApp::projectTemporalRangeChanged()
           QString time = range.begin().toString( Qt::ISODateWithMs ) + "/" +
                          range.end().toString( Qt::ISODateWithMs );
 
-          uri["time"] = time;
+          uri[ QStringLiteral( "time" ) ] = time;
 
           currentLayer->setDataSource( metadata->encodeUri( uri ), currentLayer->name(), currentLayer->providerType(), QgsDataProvider::ProviderOptions() );
         }

diff --git a/src/gui/raster/qgsrasterlayerproperties.cpp b/src/gui/raster/qgsrasterlayerproperties.cpp
@@ -1247,7 +1247,7 @@ void QgsRasterLayerProperties::updateSourceStaticTime()
   QgsProviderMetadata *metadata = QgsProviderRegistry::instance()->providerMetadata(
                                     mRasterLayer->providerType() );
   QVariantMap uri = metadata->decodeUri( mRasterLayer->dataProvider()->dataSourceUri() );
-  uri["allowTemporalUpdates"] = mWmstGroup->isChecked() ? QStringLiteral( "true" ) :  QStringLiteral( "false" );
+  uri[ QStringLiteral( "allowTemporalUpdates" ) ] = mWmstGroup->isChecked() ;
 
   if ( mWmstGroup->isEnabled() &&
        mRasterLayer->dataProvider() &&
@@ -1257,8 +1257,8 @@ void QgsRasterLayerProperties::updateSourceStaticTime()
     {
       QString time = mStartStaticDateTimeEdit->dateTime().toString( Qt::ISODateWithMs ) + '/' +
                      mEndStaticDateTimeEdit->dateTime().toString( Qt::ISODateWithMs );
-      uri["time"] = time;
-      uri["temporalSource"] = QLatin1String( "provider" );
+      uri[ QStringLiteral( "time" ) ] = time;
+      uri[ QStringLiteral( "temporalSource" ) ] = QLatin1String( "provider" );
     }
 
     if ( mProjectTemporalRange->isChecked() )
@@ -1272,24 +1272,24 @@ void QgsRasterLayerProperties::updateSourceStaticTime()
         QString time = range.begin().toString( Qt::ISODateWithMs ) + "/" +
                        range.end().toString( Qt::ISODateWithMs );
 
-        uri["time"] = time;
-        uri["temporalSource"] = QLatin1String( "project" );
+        uri[ QStringLiteral( "time" ) ] = time;
+        uri[ QStringLiteral( "temporalSource" ) ] = QLatin1String( "project" );
       }
     }
 
     if ( mReferenceTime->isChecked() )
     {
       QString reference_time = mReferenceDateTimeEdit->dateTime().toString( Qt::ISODateWithMs );
-      uri["reference_time"] = reference_time;
+      uri[ QStringLiteral( "reference_time" ) ] = reference_time;
     }
     else
     {
       if ( uri.contains( QStringLiteral( "reference_time" ) ) )
         uri.remove( QStringLiteral( "reference_time" ) );
     }
-    const QLatin1String enableTime = mDisableTime->isChecked() ? QLatin1String( "no" ) : QLatin1String( "yes" );
+    bool enableTime = !mDisableTime->isChecked();
 
-    uri["enableTime"] = enableTime;
+    uri[ QStringLiteral( "enableTime" ) ] = enableTime;
     mRasterLayer->temporalProperties()->setIntervalHandlingMethod( static_cast< QgsRasterDataProviderTemporalCapabilities::IntervalHandlingMethod >(
           mFetchModeComboBox->currentData().toInt() ) );
   }
@@ -1364,17 +1364,17 @@ void QgsRasterLayerProperties::setSourceStaticTimeState()
     mFetchModeComboBox->setCurrentIndex( mFetchModeComboBox->findData( mRasterLayer->temporalProperties()->intervalHandlingMethod() ) );
 
     const QString temporalSource = uri.value( QStringLiteral( "temporalSource" ) ).toString();
-    const QString enableTime = uri.value( QStringLiteral( "enableTime" ) ).toString();
+    bool enableTime = uri.value( QStringLiteral( "enableTime" ), true ).toBool();
 
     if ( temporalSource == QLatin1String( "provider" ) )
       mStaticTemporalRange->setChecked( !time.isEmpty() );
     else if ( temporalSource == QLatin1String( "project" ) )
       mProjectTemporalRange->setChecked( !time.isEmpty() );
 
-    mDisableTime->setChecked( enableTime == QLatin1String( "no" ) );
+    mDisableTime->setChecked( !enableTime );
 
     mWmstGroup->setChecked( uri.contains( QStringLiteral( "allowTemporalUpdates" ) ) &&
-                            uri.value( QStringLiteral( "allowTemporalUpdates" ) ).toString() == QStringLiteral( "true" ) );
+                            uri.value( QStringLiteral( "allowTemporalUpdates" ), true ).toBool() );
   }
 }
 

diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -301,9 +301,7 @@ QString QgsWMSItemBase::createUri()
   // WMS-T defaults settings
   if ( mDataSourceUri.param( QLatin1String( "type" ) ) == QLatin1String( "wmst" ) )
   {
-    mDataSourceUri.setParam( QLatin1String( "allowTemporalUpdates" ), QLatin1String( "false" ) );
     mDataSourceUri.setParam( QLatin1String( "temporalSource" ), QLatin1String( "provider" ) );
-    mDataSourceUri.setParam( QLatin1String( "enableTime" ), QLatin1String( "yes" ) );
   }
 
   QString format;

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -1092,7 +1092,7 @@ void QgsWmsProvider::addWmstParameters( QUrlQuery &query )
   QVariantMap uri = metadata->decodeUri( dataSourceUri() );
 
   // Skip fetching if updates are not allowed
-  if ( uri.value( QStringLiteral( "allowTemporalUpdates" ), QStringLiteral( "true" ) ).toString() != QStringLiteral( "true" ) )
+  if ( !uri.value( QStringLiteral( "allowTemporalUpdates" ), true ).toBool() )
     return;
 
   if ( range.isInfinite() )
@@ -1110,8 +1110,7 @@ void QgsWmsProvider::addWmstParameters( QUrlQuery &query )
     }
   }
 
-  if ( uri.contains( QStringLiteral( "enableTime" ) ) &&
-       uri.value( QStringLiteral( "enableTime" ) ) == QLatin1String( "no" ) )
+  if ( !uri.value( QStringLiteral( "enableTime" ), true ).toBool() )
   {
     format = "yyyy-MM-dd";
     dateOnly = true;