From f041072e66367398d604fdc1e47d690517af59b1 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 2 Jun 2014 20:56:08 +0200 Subject: [PATCH] fix some warnings --- python/analysis/vector/qgsgeometryanalyzer.sip | 2 +- src/analysis/raster/qgsrastercalcparser.yy | 4 ++-- src/analysis/vector/qgsgeometryanalyzer.cpp | 4 ++-- src/analysis/vector/qgsgeometryanalyzer.h | 2 +- src/gui/qgsfieldmodel.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/analysis/vector/qgsgeometryanalyzer.sip b/python/analysis/vector/qgsgeometryanalyzer.sip index c4306e315d9..aa567bfb7bd 100644 --- a/python/analysis/vector/qgsgeometryanalyzer.sip +++ b/python/analysis/vector/qgsgeometryanalyzer.sip @@ -90,7 +90,7 @@ class QgsGeometryAnalyzer @param memoryProvider memory provider to write output to (can be 0 if output is written to a file) @param p progress dialog or 0 if no progress dialog should be shown */ - bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList& unlocatedFeatureIds /Out/, const QString& outputLayer, + bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QSet &unlocatedFeatureIds /Out/, const QString& outputLayer, const QString& outputFormat, int locationField1, int locationField2 = -1, int offsetField = -1, double offsetScale = 1.0, bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 ); diff --git a/src/analysis/raster/qgsrastercalcparser.yy b/src/analysis/raster/qgsrastercalcparser.yy index 3634983c6bf..81779cfa879 100644 --- a/src/analysis/raster/qgsrastercalcparser.yy +++ b/src/analysis/raster/qgsrastercalcparser.yy @@ -114,13 +114,13 @@ void joinTmpNodes(QgsRasterCalcNode* parent, QgsRasterCalcNode* left, QgsRasterC if (left) { - res = gTmpNodes.removeAll(left); + res = gTmpNodes.removeAll(left) != 0; Q_ASSERT(res); } if (right) { - res = gTmpNodes.removeAll(right); + res = gTmpNodes.removeAll(right) != 0; Q_ASSERT(res); } diff --git a/src/analysis/vector/qgsgeometryanalyzer.cpp b/src/analysis/vector/qgsgeometryanalyzer.cpp index 0c7184d2572..9395e9a93ce 100644 --- a/src/analysis/vector/qgsgeometryanalyzer.cpp +++ b/src/analysis/vector/qgsgeometryanalyzer.cpp @@ -907,7 +907,7 @@ void QgsGeometryAnalyzer::bufferFeature( QgsFeature& f, int nProcessedFeatures, } } -bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList& unlocatedFeatureIds, const QString& outputLayer, +bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QgsFeatureIds &unlocatedFeatureIds, const QString& outputLayer, const QString& outputFormat, int locationField1, int locationField2, int offsetField, double offsetScale, bool forceSingleGeometry, QgsVectorDataProvider* memoryProvider, QProgressDialog* p ) { @@ -1009,7 +1009,7 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* } if ( nOutputFeatures < 1 ) { - unlocatedFeatureIds.push_back( fet.id() ); + unlocatedFeatureIds.insert( fet.id() ); } } diff --git a/src/analysis/vector/qgsgeometryanalyzer.h b/src/analysis/vector/qgsgeometryanalyzer.h index 75ad05af53d..4762b973200 100644 --- a/src/analysis/vector/qgsgeometryanalyzer.h +++ b/src/analysis/vector/qgsgeometryanalyzer.h @@ -117,7 +117,7 @@ class ANALYSIS_EXPORT QgsGeometryAnalyzer @param memoryProvider memory provider to write output to (can be 0 if output is written to a file) @param p progress dialog or 0 if no progress dialog should be shown */ - bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList& unlocatedFeatureIds, const QString& outputLayer, + bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QgsFeatureIds &unlocatedFeatureIds, const QString& outputLayer, const QString& outputFormat, int locationField1, int locationField2 = -1, int offsetField = -1, double offsetScale = 1.0, bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 ); diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp index 1b8da8eef89..af5fc37a202 100644 --- a/src/gui/qgsfieldmodel.cpp +++ b/src/gui/qgsfieldmodel.cpp @@ -162,7 +162,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const if ( !mLayer ) return QVariant(); - int exprIdx = index.internalId() - mFields.count(); + qint64 exprIdx = index.internalId() - mFields.count(); switch ( role ) {