From 386c16fd1a965f7099fbc0c9524d245012fc3899 Mon Sep 17 00:00:00 2001 From: signedav Date: Wed, 2 Jan 2019 08:19:52 +0100 Subject: [PATCH] fix in listwidgetfactory and set method of ogrprovider to const not changing class values --- src/gui/editorwidgets/qgslistwidgetfactory.cpp | 2 +- src/providers/ogr/qgsogrprovider.cpp | 2 +- src/providers/ogr/qgsogrprovider.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gui/editorwidgets/qgslistwidgetfactory.cpp b/src/gui/editorwidgets/qgslistwidgetfactory.cpp index c7a4c68e197..5bb04a0a7d7 100644 --- 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 index a8c39f8b661..4867d154867 100644 --- 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 index 0a4c22f634b..1bd64798467 100644 --- 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