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

fix some warnings

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-06-02 20:56:08 +02:00
parent 23ed9fd97d
commit f041072e66
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/analysis/vector/qgsgeometryanalyzer.sip
View File

@ -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 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 @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, const QString& outputFormat, int locationField1, int locationField2 = -1, int offsetField = -1, double offsetScale = 1.0,
bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 ); bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 );

4
src/analysis/raster/qgsrastercalcparser.yy
View File

@ -114,13 +114,13 @@ void joinTmpNodes(QgsRasterCalcNode* parent, QgsRasterCalcNode* left, QgsRasterC
if (left) if (left)
{ {
res = gTmpNodes.removeAll(left); res = gTmpNodes.removeAll(left) != 0;
Q_ASSERT(res); Q_ASSERT(res);
} }
if (right) if (right)
{ {
res = gTmpNodes.removeAll(right); res = gTmpNodes.removeAll(right) != 0;
Q_ASSERT(res); Q_ASSERT(res);
} }

4
src/analysis/vector/qgsgeometryanalyzer.cpp
View File

@ -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, const QString& outputFormat, int locationField1, int locationField2, int offsetField, double offsetScale,
bool forceSingleGeometry, QgsVectorDataProvider* memoryProvider, QProgressDialog* p ) bool forceSingleGeometry, QgsVectorDataProvider* memoryProvider, QProgressDialog* p )
{ {
@ -1009,7 +1009,7 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
} }
if ( nOutputFeatures < 1 ) if ( nOutputFeatures < 1 )
{ {
unlocatedFeatureIds.push_back( fet.id() ); unlocatedFeatureIds.insert( fet.id() );
} }
} }

2
src/analysis/vector/qgsgeometryanalyzer.h
View File

@ -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 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 @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, const QString& outputFormat, int locationField1, int locationField2 = -1, int offsetField = -1, double offsetScale = 1.0,
bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 ); bool forceSingleGeometry = false, QgsVectorDataProvider* memoryProvider = 0, QProgressDialog* p = 0 );

2
src/gui/qgsfieldmodel.cpp
View File

@ -162,7 +162,7 @@ QVariant QgsFieldModel::data( const QModelIndex &index, int role ) const
if ( !mLayer ) if ( !mLayer )
return QVariant(); return QVariant();
int exprIdx = index.internalId() - mFields.count(); qint64 exprIdx = index.internalId() - mFields.count();
switch ( role ) switch ( role )
{ {