Skip to content

Commit

Permalink
fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jun 2, 2014
1 parent 23ed9fd commit f041072
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion python/analysis/vector/qgsgeometryanalyzer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
4 changes: 2 additions & 2 deletions src/analysis/raster/qgsrastercalcparser.yy
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions src/analysis/vector/qgsgeometryanalyzer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down Expand Up @@ -1009,7 +1009,7 @@ bool QgsGeometryAnalyzer::eventLayer( QgsVectorLayer* lineLayer, QgsVectorLayer*
}
if ( nOutputFeatures < 1 )
{
unlocatedFeatureIds.push_back( fet.id() );
unlocatedFeatureIds.insert( fet.id() );
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/vector/qgsgeometryanalyzer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsfieldmodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down

0 comments on commit f041072

Please sign in to comment.