Fix some const-issues

m-kuhn · m-kuhn · commit 41c7a95b0173 · 2016-09-20T12:09:27.000+02:00
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -191,7 +191,7 @@ class QgsVectorLayer : QgsMapLayer
     void setDisplayField( const QString& fldName = "" );
 
     /** Returns the primary display field name used in the identify results dialog */
-    const QString displayField() const;
+    QString displayField() const;
 
     /** Set the preview expression, used to create a human readable preview string.
      *  Used e.g. in the attribute table feature list. Uses { @link QgsExpression }.
@@ -207,7 +207,7 @@ class QgsVectorLayer : QgsMapLayer
      *
      *  @return The expression which will be used to preview features for this layer
      */
-    const QString displayExpression();
+    QString displayExpression() const;
 
     /** Returns the data provider */
     QgsVectorDataProvider* dataProvider();
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2878,7 +2878,7 @@ void QgsVectorLayer::setCoordinateSystem()
 }
 
 
-const QString QgsVectorLayer::displayField() const
+QString QgsVectorLayer::displayField() const
 {
   return mDisplayField;
 }
@@ -2888,7 +2888,7 @@ void QgsVectorLayer::setDisplayExpression( const QString &displayExpression )
   mDisplayExpression = displayExpression;
 }
 
-const QString QgsVectorLayer::displayExpression()
+QString QgsVectorLayer::displayExpression() const
 {
   return mDisplayExpression;
 }
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -556,7 +556,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     void setDisplayField( const QString& fldName = "" );
 
     /** Returns the primary display field name used in the identify results dialog */
-    const QString displayField() const;
+    QString displayField() const;
 
     /** Set the preview expression, used to create a human readable preview string.
      *  Used e.g. in the attribute table feature list. Uses { @link QgsExpression }.
@@ -572,7 +572,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      *
      *  @return The expression which will be used to preview features for this layer
      */
-    const QString displayExpression();
+    QString displayExpression() const;
 
     /** Returns the data provider */
     QgsVectorDataProvider* dataProvider();

Original file line number	Diff line number	Diff line change
`@@ -2878,7 +2878,7 @@ void QgsVectorLayer::setCoordinateSystem()`
`2878`	`2878`	`}`
`2879`	`2879`
`2880`	`2880`
`2881`		`-const QString QgsVectorLayer::displayField() const`
	`2881`	`+QString QgsVectorLayer::displayField() const`
`2882`	`2882`	`{`
`2883`	`2883`	`return mDisplayField;`
`2884`	`2884`	`}`
`@@ -2888,7 +2888,7 @@ void QgsVectorLayer::setDisplayExpression( const QString &displayExpression )`
`2888`	`2888`	`mDisplayExpression = displayExpression;`
`2889`	`2889`	`}`
`2890`	`2890`
`2891`		`-const QString QgsVectorLayer::displayExpression()`
	`2891`	`+QString QgsVectorLayer::displayExpression() const`
`2892`	`2892`	`{`
`2893`	`2893`	`return mDisplayExpression;`
`2894`	`2894`	`}`