const of QgsProperty and some styling

signedav · signedav · commit 7c0d3b582911 · 2020-05-14T09:48:41.000+02:00
diff --git a/python/core/auto_generated/qgsproject.sip.in b/python/core/auto_generated/qgsproject.sip.in
@@ -430,7 +430,7 @@ implying a hierarchy of keys and corresponding values
     int readNumEntry( const QString &scope, const QString &key, int def = 0, bool *ok = 0 ) const;
     double readDoubleEntry( const QString &scope, const QString &key, double def = 0, bool *ok = 0 ) const;
     bool readBoolEntry( const QString &scope, const QString &key, bool def = false, bool *ok = 0 ) const;
-    QgsProperty readPropertyEntry( const QString &scope, const QString &key, QgsProperty def = QgsProperty(), bool *ok = 0 ) const;
+    QgsProperty readPropertyEntry( const QString &scope, const QString &key, const QgsProperty &def = QgsProperty(), bool *ok = 0 ) const;
 
 
     bool removeEntry( const QString &scope, const QString &key );
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2488,20 +2488,20 @@ bool QgsProject::readBoolEntry( const QString &scope, const QString &key, bool d
   return def;
 }
 
-QgsProperty QgsProject::readPropertyEntry( const QString &scope, const QString &key, QgsProperty def, bool *ok ) const
+QgsProperty QgsProject::readPropertyEntry( const QString &scope, const QString &key, const QgsProperty &def, bool *ok ) const
 {
   QgsProjectProperty *property = findKey_( scope, key, mProperties );
 
   if ( property )
   {
-    QgsProperty qgsproperty;
+    QgsProperty propertyValue;
     QVariant value = property->value();
-    bool loaded = qgsproperty.loadVariant( value );
+    bool loaded = propertyValue.loadVariant( value );
     if ( ok )
       *ok = loaded;
 
     if ( loaded )
-      return qgsproperty;
+      return propertyValue;
   }
 
   return def;
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
@@ -445,7 +445,7 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
     int readNumEntry( const QString &scope, const QString &key, int def = 0, bool *ok = nullptr ) const;
     double readDoubleEntry( const QString &scope, const QString &key, double def = 0, bool *ok = nullptr ) const;
     bool readBoolEntry( const QString &scope, const QString &key, bool def = false, bool *ok = nullptr ) const;
-    QgsProperty readPropertyEntry( const QString &scope, const QString &key, QgsProperty def = QgsProperty(), bool *ok = nullptr ) const;
+    QgsProperty readPropertyEntry( const QString &scope, const QString &key, const QgsProperty &def = QgsProperty(), bool *ok = nullptr ) const;
 
 
     //! Remove the given key
diff --git a/src/core/qgsprojectproperty.cpp b/src/core/qgsprojectproperty.cpp
@@ -88,7 +88,6 @@ bool QgsProjectPropertyValue::readXml( const QDomNode &keyNode )
       return false;
 
     case QVariant::Map:
-      //it's a property
       mValue = QgsXmlUtils::readVariant( subkeyElement.firstChild().toElement() ).toMap();
       break;
 

Original file line number	Diff line number	Diff line change
`@@ -2488,20 +2488,20 @@ bool QgsProject::readBoolEntry( const QString &scope, const QString &key, bool d`
`2488`	`2488`	`return def;`
`2489`	`2489`	`}`
`2490`	`2490`
`2491`		`-QgsProperty QgsProject::readPropertyEntry( const QString &scope, const QString &key, QgsProperty def, bool *ok ) const`
	`2491`	`+QgsProperty QgsProject::readPropertyEntry( const QString &scope, const QString &key, const QgsProperty &def, bool *ok ) const`
`2492`	`2492`	`{`
`2493`	`2493`	`QgsProjectProperty *property = findKey_( scope, key, mProperties );`
`2494`	`2494`
`2495`	`2495`	`if ( property )`
`2496`	`2496`	`{`
`2497`		`- QgsProperty qgsproperty;`
	`2497`	`+ QgsProperty propertyValue;`
`2498`	`2498`	`QVariant value = property->value();`
`2499`		`- bool loaded = qgsproperty.loadVariant( value );`
	`2499`	`+ bool loaded = propertyValue.loadVariant( value );`
`2500`	`2500`	`if ( ok )`
`2501`	`2501`	`*ok = loaded;`
`2502`	`2502`
`2503`	`2503`	`if ( loaded )`
`2504`		`- return qgsproperty;`
	`2504`	`+ return propertyValue;`
`2505`	`2505`	`}`
`2506`	`2506`
`2507`	`2507`	`return def;`