fix in listwidgetfactory and set method of ogrprovider to const not c…

…hanging class values
qgis · Jan 2, 2019 · 386c16f · 386c16f
1 parent a62867d
commit 386c16f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/gui/editorwidgets/qgslistwidgetfactory.cpp b/src/gui/editorwidgets/qgslistwidgetfactory.cpp
@@ -44,5 +44,5 @@ QgsEditorConfigWidget *QgsListWidgetFactory::configWidget( QgsVectorLayer *vl, i
 unsigned int QgsListWidgetFactory::fieldScore( const QgsVectorLayer *vl, int fieldIdx ) const
 {
   const QgsField field = vl->fields().field( fieldIdx );
-  return ( field.type() == QVariant::List || field.type() == QVariant::StringList || QVariant::Map ) && field.subType() != QVariant::Invalid ? 20 : 0;
+  return ( field.type() == QVariant::List || field.type() == QVariant::StringList || field.type() == QVariant::Map ) && field.subType() != QVariant::Invalid ? 20 : 0;
 }
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1408,7 +1408,7 @@ OGRGeometryH QgsOgrProvider::ConvertGeometryIfNecessary( OGRGeometryH hGeom )
   return OGR_G_ForceTo( hGeom, layerGeomType, nullptr );
 }
 
-QString QgsOgrProvider::jsonStringValue( const QVariant &value, const QVariant::Type &type )
+QString QgsOgrProvider::jsonStringValue( const QVariant &value, const QVariant::Type &type ) const
 {
   switch ( type )
   {

diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -285,7 +285,7 @@ class QgsOgrProvider : public QgsVectorDataProvider
     mutable QStringList mSubLayerList;
 
     //! converts \a value from json QVariant to QString regarding to \a type
-    QString jsonStringValue( const QVariant &value, const QVariant::Type &type );
+    QString jsonStringValue( const QVariant &value, const QVariant::Type &type ) const;
 
     bool addFeaturePrivate( QgsFeature &f, QgsFeatureSink::Flags flags );
     //! Deletes one feature