Apply suggestions from code review

Co-authored-by: Paul Blottiere <blottiere.paul@gmail.com>
qgis · Apr 26, 2021 · 95e7360 · 95e7360
1 parent 1b10f18
commit 95e7360
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/core/settings/qgssettingsentry.cpp b/src/core/settings/qgssettingsentry.cpp
@@ -117,8 +117,8 @@ bool QgsSettingsEntryBase::keyIsValid( const QString &key ) const
   if ( !hasDynamicKey() )
     return completeKeyToCheck == prefixedSettingsKey;
 
-  QRegularExpression regularExpression( prefixedSettingsKey.replace( QRegularExpression( QStringLiteral( "%\\d+" ) ), QStringLiteral( ".*" ) ) );
-  QRegularExpressionMatch regularExpressionMatch = regularExpression.match( completeKeyToCheck );
+  const QRegularExpression regularExpression( prefixedSettingsKey.replace( QRegularExpression( QStringLiteral( "%\\d+" ) ), QStringLiteral( ".*" ) ) );
+  const QRegularExpressionMatch regularExpressionMatch = regularExpression.match( completeKeyToCheck );
   return regularExpressionMatch.hasMatch();
 }
 
@@ -643,4 +643,3 @@ int QgsSettingsEntryDouble::displayHintDecimals() const
 }
 
 
-
diff --git a/src/core/settings/qgssettingsregistry.cpp b/src/core/settings/qgssettingsregistry.cpp
@@ -73,7 +73,7 @@ const QgsSettingsEntryBase *QgsSettingsRegistry::getSettingsEntry( const QString
     for ( const QgsSettingsRegistry *settingsRegistry : std::as_const( mSettingsRegistryChildList ) )
     {
       const QgsSettingsEntryBase *settingsEntry = settingsRegistry->getSettingsEntry( key, true );
-      if ( settingsEntry != nullptr )
+      if ( settingsEntry )
         return settingsEntry;
     }
   }