sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-30 00:04:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix in listwidgetfactory and set method of ogrprovider to const not changing class values

Browse Source
This commit is contained in:
signedav 2019-01-02 08:19:52 +01:00
parent a62867db5b
commit 386c16fd1a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/editorwidgets/qgslistwidgetfactory.cpp
View File

@ -44,5 +44,5 @@ QgsEditorConfigWidget *QgsListWidgetFactory::configWidget( QgsVectorLayer *vl, i
unsigned int QgsListWidgetFactory::fieldScore( const QgsVectorLayer *vl, int fieldIdx ) const unsigned int QgsListWidgetFactory::fieldScore( const QgsVectorLayer *vl, int fieldIdx ) const
{ {
const QgsField field = vl->fields().field( fieldIdx ); 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;
} }

2
src/providers/ogr/qgsogrprovider.cpp
View File

@ -1408,7 +1408,7 @@ OGRGeometryH QgsOgrProvider::ConvertGeometryIfNecessary( OGRGeometryH hGeom )
return OGR_G_ForceTo( hGeom, layerGeomType, nullptr ); 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 ) switch ( type )
{ {

2
src/providers/ogr/qgsogrprovider.h
View File

@ -285,7 +285,7 @@ class QgsOgrProvider : public QgsVectorDataProvider
mutable QStringList mSubLayerList; mutable QStringList mSubLayerList;
//! converts \a value from json QVariant to QString regarding to \a type //! 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 ); bool addFeaturePrivate( QgsFeature &f, QgsFeatureSink::Flags flags );
//! Deletes one feature //! Deletes one feature