fix some warnings

jef-n · jef-n · commit f041072e6636 · 2014-06-02T21:52:01.000+02:00
diff --git 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<int>& unlocatedFeatureIds /Out/, const QString& outputLayer,
+    bool eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QSet<qint64> &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
@@ -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
@@ -907,7 +907,7 @@ void QgsGeometryAnalyzer::bufferFeature( QgsFeature& f, int nProcessedFeatures,
   }
 }
 
-bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList<int>& 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
@@ -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<int>& 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
@@ -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 )
   {

Original file line number	Diff line number	Diff line change
`@@ -114,13 +114,13 @@ void joinTmpNodes(QgsRasterCalcNode* parent, QgsRasterCalcNode* left, QgsRasterC`
`114`	`114`
`115`	`115`	`if (left)`
`116`	`116`	`{`
`117`		`- res = gTmpNodes.removeAll(left);`
	`117`	`+ res = gTmpNodes.removeAll(left) != 0;`
`118`	`118`	`Q_ASSERT(res);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if (right)`
`122`	`122`	`{`
`123`		`- res = gTmpNodes.removeAll(right);`
	`123`	`+ res = gTmpNodes.removeAll(right) != 0;`
`124`	`124`	`Q_ASSERT(res);`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -907,7 +907,7 @@ void QgsGeometryAnalyzer::bufferFeature( QgsFeature& f, int nProcessedFeatures,`
`907`	`907`	`}`
`908`	`908`	`}`
`909`	`909`
`910`		`-bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QList<int>& unlocatedFeatureIds, const QString& outputLayer,`
	`910`	`+bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer* eventLayer, int lineField, int eventField, QgsFeatureIds &unlocatedFeatureIds, const QString& outputLayer,`
`911`	`911`	`const QString& outputFormat, int locationField1, int locationField2, int offsetField, double offsetScale,`
`912`	`912`	`bool forceSingleGeometry, QgsVectorDataProvider* memoryProvider, QProgressDialog* p )`
`913`	`913`	`{`
`@@ -1009,7 +1009,7 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*`
`1009`	`1009`	`}`
`1010`	`1010`	`if ( nOutputFeatures < 1 )`
`1011`	`1011`	`{`
`1012`		`- unlocatedFeatureIds.push_back( fet.id() );`
	`1012`	`+ unlocatedFeatureIds.insert( fet.id() );`
`1013`	`1013`	`}`
`1014`	`1014`	`}`
`1015`	`1015`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const`
`162`	`162`	`if ( !mLayer )`
`163`	`163`	`return QVariant();`
`164`	`164`
`165`		`- int exprIdx = index.internalId() - mFields.count();`
	`165`	`+ qint64 exprIdx = index.internalId() - mFields.count();`
`166`	`166`
`167`	`167`	`switch ( role )`
`168`	`168`	`{`