Skip to content

Commit f47d820

Browse files
jef-njef-n
committedFeb 5, 2013
fix warning
·
ltr-3_40archive/master_2
1 parent 89bdb10 commit f47d820

File tree

4 files changed

+74
-74
lines changed

4 files changed

+74
-74
lines changed
 

‎src/app/qgsidentifyresultsdialog.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,8 @@ QTreeWidgetItem *QgsIdentifyResultsDialog::layerItem( QObject *layer )
178178
}
179179

180180
void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer,
181-
const QgsFeature &f,
182-
const QMap<QString, QString> &derivedAttributes )
181+
const QgsFeature &f,
182+
const QMap<QString, QString> &derivedAttributes )
183183
{
184184
QTreeWidgetItem *layItem = layerItem( vlayer );
185185

@@ -291,9 +291,9 @@ void QgsIdentifyResultsDialog::addFeature( QgsVectorLayer *vlayer,
291291
}
292292

293293
void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
294-
QString label,
295-
const QMap<QString, QString> &attributes,
296-
const QMap<QString, QString> &derivedAttributes )
294+
QString label,
295+
const QMap<QString, QString> &attributes,
296+
const QMap<QString, QString> &derivedAttributes )
297297
{
298298
QTreeWidgetItem *layItem = layerItem( layer );
299299

‎src/app/qgsmaptoolidentifyaction.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,26 @@ void QgsMapToolIdentifyAction::canvasPressEvent( QMouseEvent *e )
7777

7878
void QgsMapToolIdentifyAction::canvasReleaseEvent( QMouseEvent *e )
7979
{
80-
if ( !mCanvas || mCanvas->isDrawing() )
81-
{
82-
return;
83-
}
80+
if ( !mCanvas || mCanvas->isDrawing() )
81+
{
82+
return;
83+
}
8484

85-
resultsDialog()->clear();
85+
resultsDialog()->clear();
8686

87-
connect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );
88-
connect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );
89-
bool res = QgsMapToolIdentify::identify(e->x(), e->y() );
90-
disconnect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );
91-
disconnect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );
87+
connect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );
88+
connect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );
89+
bool res = QgsMapToolIdentify::identify( e->x(), e->y() );
90+
disconnect( this, SIGNAL( identifyProgress( int, int ) ), QgisApp::instance(), SLOT( showProgress( int, int ) ) );
91+
disconnect( this, SIGNAL( identifyMessage( QString ) ), QgisApp::instance(), SLOT( showStatusMessage( QString ) ) );
9292

9393

94-
QList<VectorResult>::const_iterator vresult;
95-
for ( vresult = results().mVectorResults.begin(); vresult != results().mVectorResults.end(); ++vresult)
96-
resultsDialog()->addFeature( vresult->mLayer, vresult->mFeature, vresult->mDerivedAttributes);
97-
QList<RasterResult>::const_iterator rresult;
98-
for ( rresult = results().mRasterResults.begin(); rresult != results().mRasterResults.end(); ++rresult)
99-
resultsDialog()->addFeature( rresult->mLayer, rresult->mLabel, rresult->mAttributes, rresult->mDerivedAttributes);
94+
QList<VectorResult>::const_iterator vresult;
95+
for ( vresult = results().mVectorResults.begin(); vresult != results().mVectorResults.end(); ++vresult )
96+
resultsDialog()->addFeature( vresult->mLayer, vresult->mFeature, vresult->mDerivedAttributes );
97+
QList<RasterResult>::const_iterator rresult;
98+
for ( rresult = results().mRasterResults.begin(); rresult != results().mRasterResults.end(); ++rresult )
99+
resultsDialog()->addFeature( rresult->mLayer, rresult->mLabel, rresult->mAttributes, rresult->mDerivedAttributes );
100100

101101
if ( res )
102102
{
@@ -132,8 +132,8 @@ void QgsMapToolIdentifyAction::deactivate()
132132

133133
QGis::UnitType QgsMapToolIdentifyAction::displayUnits()
134134
{
135-
// Get the units for display
136-
QSettings settings;
137-
return QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
135+
// Get the units for display
136+
QSettings settings;
137+
return QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
138138
}
139139

‎src/gui/qgsmaptoolidentify.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,20 @@ void QgsMapToolIdentify::canvasPressEvent( QMouseEvent *e )
6464

6565
void QgsMapToolIdentify::canvasReleaseEvent( QMouseEvent *e )
6666
{
67-
Q_UNUSED( e );
67+
Q_UNUSED( e );
6868
}
6969

70-
bool QgsMapToolIdentify::identify(int x, int y, QList<QgsMapLayer *> layerList, IdentifyMode mode)
70+
bool QgsMapToolIdentify::identify( int x, int y, QList<QgsMapLayer *> layerList, IdentifyMode mode )
7171
{
72-
return identify(x, y, mode, layerList, AllLayers);
72+
return identify( x, y, mode, layerList, AllLayers );
7373
}
7474

75-
bool QgsMapToolIdentify::identify(int x, int y, IdentifyMode mode, LayerType layerType)
75+
bool QgsMapToolIdentify::identify( int x, int y, IdentifyMode mode, LayerType layerType )
7676
{
77-
return identify(x, y, mode, QList<QgsMapLayer*>(), layerType);
77+
return identify( x, y, mode, QList<QgsMapLayer*>(), layerType );
7878
}
7979

80-
bool QgsMapToolIdentify::identify(int x, int y, IdentifyMode mode, QList<QgsMapLayer*> layerList, LayerType layerType )
80+
bool QgsMapToolIdentify::identify( int x, int y, IdentifyMode mode, QList<QgsMapLayer*> layerList, LayerType layerType )
8181
{
8282
bool res = false;
8383

@@ -89,13 +89,13 @@ bool QgsMapToolIdentify::identify(int x, int y, IdentifyMode mode, QList<QgsMapL
8989
mResultData.mVectorResults.clear();
9090
mResultData.mRasterResults.clear();
9191

92-
if (mode == DefaultQgsSetting)
92+
if ( mode == DefaultQgsSetting )
9393
{
9494
QSettings settings;
9595
mode = static_cast<IdentifyMode>( settings.value( "/Map/identifyMode", 0 ).toInt() );
9696
}
9797

98-
if ( mode == ActiveLayer && ~layerList.isEmpty())
98+
if ( mode == ActiveLayer && !layerList.isEmpty() )
9999
{
100100
QgsMapLayer *layer = mCanvas->currentLayer();
101101

@@ -116,20 +116,20 @@ bool QgsMapToolIdentify::identify(int x, int y, IdentifyMode mode, QList<QgsMapL
116116
QStringList noIdentifyLayerIdList = QgsProject::instance()->readListEntry( "Identify", "/disabledLayers" );
117117

118118
int layerCount;
119-
if (layerList.isEmpty())
120-
layerCount = mCanvas->layerCount();
119+
if ( layerList.isEmpty() )
120+
layerCount = mCanvas->layerCount();
121121
else
122-
layerCount = layerList.count();
122+
layerCount = layerList.count();
123123

124124

125125
for ( int i = 0; i < layerCount; i++ )
126126
{
127127

128128
QgsMapLayer *layer ;
129-
if (layerList.isEmpty())
130-
layer = mCanvas->layer( i );
129+
if ( layerList.isEmpty() )
130+
layer = mCanvas->layer( i );
131131
else
132-
layer = layerList.value( i );
132+
layer = layerList.value( i );
133133

134134
emit identifyProgress( i, mCanvas->layerCount() );
135135
emit identifyMessage( tr( "Identifying on %1..." ).arg( layer->name() ) );
@@ -166,11 +166,11 @@ void QgsMapToolIdentify::deactivate()
166166

167167
bool QgsMapToolIdentify::identifyLayer( QgsMapLayer *layer, int x, int y, LayerType layerType )
168168
{
169-
if ( layer->type() == QgsMapLayer::RasterLayer && (layerType==AllLayers || layerType==RasterLayer))
169+
if ( layer->type() == QgsMapLayer::RasterLayer && ( layerType == AllLayers || layerType == RasterLayer ) )
170170
{
171171
return identifyRasterLayer( qobject_cast<QgsRasterLayer *>( layer ), x, y );
172172
}
173-
else if ( layer->type() == QgsMapLayer::VectorLayer && (layerType==AllLayers || layerType==VectorLayer))
173+
else if ( layer->type() == QgsMapLayer::VectorLayer && ( layerType == AllLayers || layerType == VectorLayer ) )
174174
{
175175
return identifyVectorLayer( qobject_cast<QgsVectorLayer *>( layer ), x, y );
176176
}
@@ -322,7 +322,7 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
322322

323323
derivedAttributes.insert( tr( "feature id" ), fid < 0 ? tr( "new feature" ) : FID_TO_STRING( fid ) );
324324

325-
mResultData.mVectorResults.append( VectorResult(layer, *f_it, derivedAttributes));
325+
mResultData.mVectorResults.append( VectorResult( layer, *f_it, derivedAttributes ) );
326326
}
327327

328328
if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent )
@@ -404,7 +404,7 @@ bool QgsMapToolIdentify::identifyRasterLayer( QgsRasterLayer *layer, int x, int
404404
if ( attributes.size() > 0 )
405405
{
406406
derivedAttributes.insert( tr( "(clicked coordinate)" ), idPoint.toString() );
407-
mResultData.mRasterResults.append( RasterResult(layer, type, attributes, derivedAttributes));
407+
mResultData.mRasterResults.append( RasterResult( layer, type, attributes, derivedAttributes ) );
408408
}
409409

410410
return res;
@@ -424,10 +424,10 @@ void QgsMapToolIdentify::convertMeasurement( QgsDistanceArea &calc, double &meas
424424

425425
QGis::UnitType QgsMapToolIdentify::displayUnits()
426426
{
427-
return mCanvas->mapUnits();
427+
return mCanvas->mapUnits();
428428
}
429429

430430
QgsMapToolIdentify::IdentifyResults &QgsMapToolIdentify::results()
431431
{
432-
return mResultData;
432+
return mResultData;
433433
}

‎src/gui/qgsmaptoolidentify.h

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,49 +46,49 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
4646

4747
enum IdentifyMode
4848
{
49-
DefaultQgsSetting=-1,
50-
ActiveLayer,
51-
TopDownStopAtFirst,
52-
TopDownAll
49+
DefaultQgsSetting = -1,
50+
ActiveLayer,
51+
TopDownStopAtFirst,
52+
TopDownAll
5353
};
5454

5555
enum LayerType
5656
{
57-
AllLayers=-1,
58-
VectorLayer,
59-
RasterLayer
57+
AllLayers = -1,
58+
VectorLayer,
59+
RasterLayer
6060
};
6161

6262
struct VectorResult
6363
{
64-
VectorResult(){}
65-
VectorResult(QgsVectorLayer * layer, QgsFeature feature, QMap< QString, QString > derivedAttributes):
66-
mLayer( layer ), mFeature( feature ), mDerivedAttributes( derivedAttributes ) {}
67-
QgsVectorLayer* mLayer;
68-
QgsFeature mFeature;
69-
QMap< QString, QString > mDerivedAttributes;
64+
VectorResult() {}
65+
VectorResult( QgsVectorLayer * layer, QgsFeature feature, QMap< QString, QString > derivedAttributes ):
66+
mLayer( layer ), mFeature( feature ), mDerivedAttributes( derivedAttributes ) {}
67+
QgsVectorLayer* mLayer;
68+
QgsFeature mFeature;
69+
QMap< QString, QString > mDerivedAttributes;
7070
};
7171

7272
struct RasterResult
7373
{
74-
RasterResult(){}
75-
RasterResult( QgsRasterLayer * layer, QString label, QMap< QString, QString > attributes, QMap< QString, QString > derivedAttributes):
76-
mLayer( layer ), mLabel( label ), mAttributes( attributes ), mDerivedAttributes( derivedAttributes ) {}
77-
QgsRasterLayer* mLayer;
78-
QString mLabel;
79-
QMap< QString, QString > mAttributes;
80-
QMap< QString, QString > mDerivedAttributes;
74+
RasterResult() {}
75+
RasterResult( QgsRasterLayer * layer, QString label, QMap< QString, QString > attributes, QMap< QString, QString > derivedAttributes ):
76+
mLayer( layer ), mLabel( label ), mAttributes( attributes ), mDerivedAttributes( derivedAttributes ) {}
77+
QgsRasterLayer* mLayer;
78+
QString mLabel;
79+
QMap< QString, QString > mAttributes;
80+
QMap< QString, QString > mDerivedAttributes;
8181
};
8282

8383
struct IdentifyResults
8484
{
85-
IdentifyResults(){}
86-
IdentifyResults ( QList<VectorResult> vectorResults , QList<RasterResult> rasterResults) :
87-
mVectorResults( vectorResults),
88-
mRasterResults( rasterResults )
89-
{}
90-
QList<VectorResult> mVectorResults;
91-
QList<RasterResult> mRasterResults;
85+
IdentifyResults() {}
86+
IdentifyResults( QList<VectorResult> vectorResults , QList<RasterResult> rasterResults ) :
87+
mVectorResults( vectorResults ),
88+
mRasterResults( rasterResults )
89+
{}
90+
QList<VectorResult> mVectorResults;
91+
QList<RasterResult> mRasterResults;
9292
};
9393

9494
//! constructor
@@ -115,7 +115,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
115115
@param layerList Performs the identification within the given list of layers. Default value is an empty list, i.e. uses all the layers.
116116
@param mode Identification mode. Can use Qgis default settings or a defined mode. Default mode is DefaultQgsSetting.
117117
@return true if identification succeeded and a feature has been found, false otherwise.*/
118-
bool identify(int x, int y, QList<QgsMapLayer*> layerList = QList<QgsMapLayer*>(), IdentifyMode mode = DefaultQgsSetting);
118+
bool identify( int x, int y, QList<QgsMapLayer*> layerList = QList<QgsMapLayer*>(), IdentifyMode mode = DefaultQgsSetting );
119119

120120
/** Performs the identification.
121121
To avoid beeing forced to specify IdentifyMode with a list of layers
@@ -125,7 +125,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
125125
@param mode Identification mode. Can use Qgis default settings or a defined mode.
126126
@param layerType Only performs identification in a certain type of layers (raster, vector). Default value is AllLayers.
127127
@return true if identification succeeded and a feature has been found, false otherwise.*/
128-
bool identify(int x, int y, IdentifyMode mode, LayerType layerType = AllLayers);
128+
bool identify( int x, int y, IdentifyMode mode, LayerType layerType = AllLayers );
129129

130130
/** Access to results */
131131
IdentifyResults &results();
@@ -144,7 +144,7 @@ class GUI_EXPORT QgsMapToolIdentify : public QgsMapTool
144144
@param layerList Performs the identification within the given list of layers.
145145
@param layerType Only performs identification in a certain type of layers (raster, vector).
146146
@return true if identification succeeded and a feature has been found, false otherwise.*/
147-
bool identify(int x, int y, IdentifyMode mode, QList<QgsMapLayer*> layerList, LayerType layerType = AllLayers);
147+
bool identify( int x, int y, IdentifyMode mode, QList<QgsMapLayer*> layerList, LayerType layerType = AllLayers );
148148
bool identifyLayer( QgsMapLayer *layer, int x, int y, LayerType layerType = AllLayers );
149149
bool identifyRasterLayer( QgsRasterLayer *layer, int x, int y );
150150
bool identifyVectorLayer( QgsVectorLayer *layer, int x, int y );

0 commit comments

Comments
 (0)
Please sign in to comment.