Skip to content

Commit 8a3c1ef

Browse files
nyalldawsonnyalldawson
authored
Merge pull request #3840 from DelazJ/selectedfeaturesids
Replace selectedFeaturesIds by selectedFeatureIds
2 parents ea661e5 + e0912b8 commit 8a3c1ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+108
-99
lines changed

‎doc/api_break.dox

+9
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,14 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
199199
<tr><td>QgsApplication<td>defaultStyleV2Path<td>defaultStylePath
200200
<tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
201201
<tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
202+
<tr><td>QgsIFeatureSelectionManager<td>selectedFeaturesIds<td>selectedFeatureIds
202203
<tr><td>QgsSymbolLayerUtils<td>createSymbolLayerV2ListFromSld<td>createSymbolLayerListFromSld
203204
<tr><td>QgsVectorLayer<td>editorWidgetV2Config<td>editorWidgetConfig
204205
<tr><td>QgsVectorLayer<td>editorWidgetV2Text<td>editorWidgetText
205206
<tr><td>QgsVectorLayer<td>editorWidgetV2Type<td>editorWidgetType
206207
<tr><td>QgsVectorLayer<td>deleteVertexV2<td>deleteVertex
207208
<tr><td>QgsVectorLayer<td>rendererV2<td>renderer
209+
<tr><td>QgsVectorLayer<td>selectedFeaturesIds<td>selectedFeatureIds
208210
<tr><td>QgsVectorLayerEditUtils<td>deleteVertexV2<td>deleteVertex
209211
<tr><td>QgsComposerSymbolItem<td>symbolV2<td>symbol
210212
<tr><td>QgsServerInterface<td>capabiblitiesCache<td>capabilitiesCache
@@ -988,6 +990,12 @@ QgsHighlight {#qgis_api_break_3_0_QgsHighlight}
988990
- The QgsHighlight constructor now takes a geometry reference, not a pointer.
989991

990992

993+
QgsIFeatureSelectionManager {#qgis_api_break_3_0_QgsIFeatureSelectionManager}
994+
---------------------------
995+
996+
- selectedFeaturesIds() has been renamed to selectedFeatureIds()
997+
998+
991999
QgsJSONExporter {#qgis_api_break_3_0_QgsJSONExporter}
9921000
---------------
9931001

@@ -1578,6 +1586,7 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.
15781586
- Signal layerDeleted() has been removed. Replaced by Qt signal destroyed().
15791587
- Deprecated editor widget methods and enums and structs: struct RangeData, enum FeatureFormSuppress, enum EditType, addAttributeEditorWidget(), editorWidgetV2(), editorWidgetConfig(), attributeEditorElements(), editType(), setEditType(), editorLayout(), setEditorLayout, setEditorWidgetV2Config(), setCheckedState(), editForm(), setEditForm(), featureFormSuppress(), setFeatureFormSuppress(), editFormInit(), setEditFormInit(), valueMap(), range(), dateFormat(), fieldEditable(), labelOnTop(), setFieldEditable() and setLabelOnTop(). Use editFormConfig()
15801588
- select() replaced by selectByRect()
1589+
- selectedFeaturesIds() replaced by selectedFeatureIds()
15811590
- setSelectedFeatures() replaced by selectByIds()
15821591
- applyNamedStyle() replaced by applyNamedStyle()
15831592
- isReadOnly() use readOnly()

‎python/core/qgsvectorlayer.sip

+3-3
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
572572
*
573573
* @return A list of { @link QgsFeature } 's
574574
*
575-
* @see selectedFeaturesIds()
575+
* @see selectedFeatureIds()
576576
* @see selectedFeaturesIterator() which is more memory friendly when handling large selections
577577
*/
578578
QgsFeatureList selectedFeatures() const;
@@ -585,7 +585,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
585585
*
586586
* @return Iterator over the selected features
587587
*
588-
* @see selectedFeaturesIds()
588+
* @see selectedFeatureIds()
589589
* @see selectedFeatures()
590590
*/
591591
QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() ) const;
@@ -596,7 +596,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
596596
* @return A list of { @link QgsFeatureId } 's
597597
* @see selectedFeatures()
598598
*/
599-
const QgsFeatureIds &selectedFeaturesIds() const;
599+
const QgsFeatureIds &selectedFeatureIds() const;
600600

601601
/** Returns the bounding box of the selected features. If there is no selection, QgsRectangle(0,0,0,0) is returned */
602602
QgsRectangle boundingBoxOfSelected() const;

‎python/gui/attributetable/qgsifeatureselectionmanager.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class QgsIFeatureSelectionManager : QObject
6363
* @return A list of { @link QgsFeatureId } 's
6464
* @see selectedFeatures()
6565
*/
66-
virtual const QgsFeatureIds &selectedFeaturesIds() const = 0;
66+
virtual const QgsFeatureIds &selectedFeatureIds() const = 0;
6767

6868
signals:
6969
/**

‎python/plugins/processing/algs/qgis/SelectByAttributeSum.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def processAlgorithm(self, progress):
6363
fieldName = self.getParameterValue(self.FIELD)
6464
value = self.getParameterValue(self.VALUE)
6565

66-
selected = layer.selectedFeaturesIds()
66+
selected = layer.selectedFeatureIds()
6767
if len(selected) == 0:
6868
GeoAlgorithmExecutionException(
6969
self.tr('There is no selection in the input layer. '

‎python/plugins/processing/algs/qgis/SelectByExpression.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def defineCharacteristics(self):
6161
def processAlgorithm(self, progress):
6262
filename = self.getParameterValue(self.LAYERNAME)
6363
layer = dataobjects.getObjectFromUri(filename)
64-
oldSelection = set(layer.selectedFeaturesIds())
64+
oldSelection = set(layer.selectedFeatureIds())
6565
method = self.getParameterValue(self.METHOD)
6666

6767
if method == 0:

‎python/plugins/processing/algs/qgis/SelectByLocation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def processAlgorithm(self, progress):
8787
predicates = self.getParameterValue(self.PREDICATE)
8888
precision = self.getParameterValue(self.PRECISION)
8989

90-
oldSelection = set(inputLayer.selectedFeaturesIds())
90+
oldSelection = set(inputLayer.selectedFeatureIds())
9191
inputLayer.removeSelection()
9292
index = vector.spatialindex(inputLayer)
9393

‎src/analysis/vector/qgsgeometryanalyzer.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ bool QgsGeometryAnalyzer::simplify( QgsVectorLayer* layer,
5858
if ( onlySelectedFeatures )
5959
{
6060
//use QgsVectorLayer::featureAtId
61-
const QgsFeatureIds selection = layer->selectedFeaturesIds();
61+
const QgsFeatureIds selection = layer->selectedFeatureIds();
6262
if ( p )
6363
{
6464
p->setMaximum( selection.size() );
@@ -173,7 +173,7 @@ bool QgsGeometryAnalyzer::centroids( QgsVectorLayer* layer, const QString& shape
173173
if ( onlySelectedFeatures )
174174
{
175175
//use QgsVectorLayer::featureAtId
176-
const QgsFeatureIds selection = layer->selectedFeaturesIds();
176+
const QgsFeatureIds selection = layer->selectedFeatureIds();
177177
if ( p )
178178
{
179179
p->setMaximum( selection.size() );
@@ -396,7 +396,7 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
396396
if ( onlySelectedFeatures )
397397
{
398398
//use QgsVectorLayer::featureAtId
399-
const QgsFeatureIds selection = layer->selectedFeaturesIds();
399+
const QgsFeatureIds selection = layer->selectedFeatureIds();
400400
QgsFeatureIds::const_iterator it = selection.constBegin();
401401
for ( ; it != selection.constEnd(); ++it )
402402
{
@@ -447,7 +447,7 @@ bool QgsGeometryAnalyzer::convexHull( QgsVectorLayer* layer, const QString& shap
447447
if ( onlySelectedFeatures )
448448
{
449449
//use QgsVectorLayer::featureAtId
450-
const QgsFeatureIds selection = layer->selectedFeaturesIds();
450+
const QgsFeatureIds selection = layer->selectedFeatureIds();
451451
if ( p )
452452
{
453453
p->setMaximum( selection.size() );
@@ -594,7 +594,7 @@ bool QgsGeometryAnalyzer::dissolve( QgsVectorLayer* layer, const QString& shapef
594594
if ( onlySelectedFeatures )
595595
{
596596
//use QgsVectorLayer::featureAtId
597-
const QgsFeatureIds selection = layer->selectedFeaturesIds();
597+
const QgsFeatureIds selection = layer->selectedFeatureIds();
598598
QgsFeatureIds::const_iterator it = selection.constBegin();
599599
for ( ; it != selection.constEnd(); ++it )
600600
{
@@ -626,7 +626,7 @@ bool QgsGeometryAnalyzer::dissolve( QgsVectorLayer* layer, const QString& shapef
626626
if ( onlySelectedFeatures )
627627
{
628628
//use QgsVectorLayer::featureAtId
629-
const QgsFeatureIds selection = layer->selectedFeaturesIds();
629+
const QgsFeatureIds selection = layer->selectedFeatureIds();
630630
if ( p )
631631
{
632632
p->setMaximum( selection.size() );
@@ -744,7 +744,7 @@ bool QgsGeometryAnalyzer::buffer( QgsVectorLayer* layer, const QString& shapefil
744744
if ( onlySelectedFeatures )
745745
{
746746
//use QgsVectorLayer::featureAtId
747-
const QgsFeatureIds selection = layer->selectedFeaturesIds();
747+
const QgsFeatureIds selection = layer->selectedFeatureIds();
748748
if ( p )
749749
{
750750
p->setMaximum( selection.size() );

‎src/analysis/vector/qgsoverlayanalyzer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ bool QgsOverlayAnalyzer::intersection( QgsVectorLayer* layerA, QgsVectorLayer* l
5858
//take only selection
5959
if ( onlySelectedFeatures )
6060
{
61-
QgsFeatureIds selectionB = layerB->selectedFeaturesIds();
61+
QgsFeatureIds selectionB = layerB->selectedFeatureIds();
6262
QgsFeatureRequest req = QgsFeatureRequest().setFilterFids( selectionB ).setSubsetOfAttributes( QgsAttributeList() );
6363
QgsSpatialIndex index = QgsSpatialIndex( layerB->getFeatures( req ) );
6464

6565
//use QgsVectorLayer::featureAtId
66-
const QgsFeatureIds selectionA = layerA->selectedFeaturesIds();
66+
const QgsFeatureIds selectionA = layerA->selectedFeatureIds();
6767
if ( p )
6868
{
6969
p->setMaximum( selectionA.size() );

‎src/app/qgisapp.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -6516,7 +6516,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget* parent, bool promptCo
65166516
}
65176517

65186518
//validate selection
6519-
int numberOfSelectedFeatures = vlayer->selectedFeaturesIds().size();
6519+
int numberOfSelectedFeatures = vlayer->selectedFeatureIds().size();
65206520
if ( numberOfSelectedFeatures == 0 )
65216521
{
65226522
messageBar()->pushMessage( tr( "No Features Selected" ),
@@ -7023,7 +7023,7 @@ void QgisApp::mergeAttributesOfSelectedFeatures()
70237023
}
70247024

70257025
//get selected feature ids (as a QSet<int> )
7026-
const QgsFeatureIds& featureIdSet = vl->selectedFeaturesIds();
7026+
const QgsFeatureIds& featureIdSet = vl->selectedFeatureIds();
70277027
if ( featureIdSet.size() < 2 )
70287028
{
70297029
messageBar()->pushMessage(
@@ -7051,7 +7051,7 @@ void QgisApp::mergeAttributesOfSelectedFeatures()
70517051
QSet<int> toSkip = d.skippedAttributeIndexes();
70527052

70537053
bool firstFeature = true;
7054-
Q_FOREACH ( QgsFeatureId fid, vl->selectedFeaturesIds() )
7054+
Q_FOREACH ( QgsFeatureId fid, vl->selectedFeatureIds() )
70557055
{
70567056
for ( int i = 0; i < merged.count(); ++i )
70577057
{
@@ -7165,7 +7165,7 @@ void QgisApp::mergeSelectedFeatures()
71657165
}
71667166

71677167
//get selected feature ids (as a QSet<int> )
7168-
const QgsFeatureIds& featureIdSet = vl->selectedFeaturesIds();
7168+
const QgsFeatureIds& featureIdSet = vl->selectedFeatureIds();
71697169
if ( featureIdSet.size() < 2 )
71707170
{
71717171
messageBar()->pushMessage(
@@ -7176,7 +7176,7 @@ void QgisApp::mergeSelectedFeatures()
71767176
}
71777177

71787178
//get initial selection (may be altered by attribute merge dialog later)
7179-
QgsFeatureIds featureIds = vl->selectedFeaturesIds();
7179+
QgsFeatureIds featureIds = vl->selectedFeatureIds();
71807180
QgsFeatureList featureList = vl->selectedFeatures(); //get QList<QgsFeature>
71817181
bool canceled;
71827182
QgsGeometry unionGeom = unionGeometries( vl, featureList, canceled );
@@ -7199,7 +7199,7 @@ void QgisApp::mergeSelectedFeatures()
71997199
return;
72007200
}
72017201

7202-
QgsFeatureIds featureIdsAfter = vl->selectedFeaturesIds();
7202+
QgsFeatureIds featureIdsAfter = vl->selectedFeatureIds();
72037203

72047204
if ( featureIdsAfter.size() < 2 )
72057205
{

‎src/app/qgsattributeactiondialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ void QgsAttributeActionDialog::addDefaultActions()
306306
insertRow( pos++, QgsAction::GenericPython, tr( "Clicked coordinates (Run feature actions tool)" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nQtWidgets.QMessageBox.information(None, \"Clicked coords\", \"layer: [% @layer_id %]\\ncoords: ([% @click_x %],[% @click_y %])\")" ), QLatin1String( "" ), false, tr( "Clicked Coordinate" ), QSet<QString>() << QStringLiteral( "Canvas" ) );
307307
insertRow( pos++, QgsAction::OpenUrl, tr( "Open file" ), QStringLiteral( "[% \"PATH\" %]" ), QLatin1String( "" ), false, tr( "Open file" ), QSet<QString>() << QStringLiteral( "Feature" ) << QStringLiteral( "Canvas" ) );
308308
insertRow( pos++, QgsAction::OpenUrl, tr( "Search on web based on attribute's value" ), QStringLiteral( "http://www.google.com/search?q=[% \"ATTRIBUTE\" %]" ), QLatin1String( "" ), false, tr( "Search Web" ), QSet<QString>() << QStringLiteral( "Field" ) );
309-
insertRow( pos++, QgsAction::GenericPython, tr( "List feature ids" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nlayer = QgsMapLayerRegistry.instance().mapLayer('[% @layer_id %]')\nif layer.selectedFeatureCount():\n ids = layer.selectedFeaturesIds()\nelse:\n ids = [f.id() for f in layer.getFeatures()]\n\nQtWidgets.QMessageBox.information(None, \"Feature ids\", ', '.join([str(id) for id in ids]))" ), QLatin1String( "" ), false, tr( "List feature ids" ), QSet<QString>() << QStringLiteral( "Layer" ) );
309+
insertRow( pos++, QgsAction::GenericPython, tr( "List feature ids" ), QStringLiteral( "from qgis.PyQt import QtWidgets\n\nlayer = QgsMapLayerRegistry.instance().mapLayer('[% @layer_id %]')\nif layer.selectedFeatureCount():\n ids = layer.selectedFeatureIds()\nelse:\n ids = [f.id() for f in layer.getFeatures()]\n\nQtWidgets.QMessageBox.information(None, \"Feature ids\", ', '.join([str(id) for id in ids]))" ), QLatin1String( "" ), false, tr( "List feature ids" ), QSet<QString>() << QStringLiteral( "Layer" ) );
310310
}
311311

312312
void QgsAttributeActionDialog::itemDoubleClicked( QTableWidgetItem* item )

‎src/app/qgsattributetabledialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ void QgsAttributeTableDialog::updateFieldFromExpression()
436436

437437
void QgsAttributeTableDialog::updateFieldFromExpressionSelected()
438438
{
439-
QgsFeatureIds filteredIds = mLayer->selectedFeaturesIds();
439+
QgsFeatureIds filteredIds = mLayer->selectedFeatureIds();
440440
runFieldCalculation( mLayer, mFieldCombo->currentText(), mUpdateExpressionText->asExpression(), filteredIds );
441441
}
442442

‎src/app/qgsfieldcalculator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void QgsFieldCalculator::accept()
276276
QgsFeatureRequest req = QgsFeatureRequest().setFlags( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry );
277277
if ( mOnlyUpdateSelectedCheckBox->isChecked() )
278278
{
279-
req.setFilterFids( mVectorLayer->selectedFeaturesIds() );
279+
req.setFilterFids( mVectorLayer->selectedFeatureIds() );
280280
}
281281
QgsFeatureIterator fit = mVectorLayer->getFeatures( req );
282282
while ( fit.nextFeature( feature ) )

‎src/app/qgsidentifyresultsdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,7 @@ void QgsIdentifyResultsDialog::toggleFeatureSelection()
19151915
if ( !vl )
19161916
return;
19171917

1918-
if ( vl->selectedFeaturesIds().contains( item->feature().id() ) )
1918+
if ( vl->selectedFeatureIds().contains( item->feature().id() ) )
19191919
vl->deselect( item->feature().id() );
19201920
else
19211921
vl->select( item->feature().id() );

‎src/app/qgsmaptoolmovefeature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ void QgsMapToolMoveFeature::cadCanvasReleaseEvent( QgsMapMouseEvent* e )
130130
}
131131
else
132132
{
133-
mMovedFeatures = vlayer->selectedFeaturesIds();
133+
mMovedFeatures = vlayer->selectedFeatureIds();
134134

135135
mRubberBand = createRubberBand( vlayer->geometryType() );
136136
QgsFeature feat;

‎src/app/qgsmaptooloffsetcurve.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ QgsGeometry QgsMapToolOffsetCurve::createOriginGeometry( QgsVectorLayer* vl, con
284284
}
285285

286286
//for background layers, try to merge selected entries together if snapped feature is contained in selection
287-
const QgsFeatureIds& selection = vl->selectedFeaturesIds();
287+
const QgsFeatureIds& selection = vl->selectedFeatureIds();
288288
if ( selection.size() < 1 || !selection.contains( match.featureId() ) )
289289
{
290290
return convertToSingleLine( snappedFeature.geometry(), partVertexNr, mMultiPartGeometry );

‎src/app/qgsmaptoolrotatefeature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent* e )
279279
}
280280
else
281281
{
282-
mRotatedFeatures = vlayer->selectedFeaturesIds();
282+
mRotatedFeatures = vlayer->selectedFeatureIds();
283283

284284
mRubberBand = createRubberBand( vlayer->geometryType() ) ;
285285

‎src/app/qgsmaptoolselectutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ void QgsMapToolSelectUtils::selectSingleFeature( QgsMapCanvas* canvas, const Qgs
129129
if ( e->modifiers() & Qt::ShiftModifier || e->modifiers() & Qt::ControlModifier )
130130
{
131131
QgsFeatureId selectId = *selectedFeatures.constBegin();
132-
QgsFeatureIds layerSelectedFeatures = vlayer->selectedFeaturesIds();
132+
QgsFeatureIds layerSelectedFeatures = vlayer->selectedFeatureIds();
133133
if ( layerSelectedFeatures.contains( selectId ) )
134134
behaviour = QgsVectorLayer::RemoveFromSelection;
135135
else

‎src/app/qgsmergeattributesdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ void QgsMergeAttributesDialog::on_mRemoveFeatureFromSelectionButton_clicked()
464464
selectedRowChanged();
465465

466466
//remove feature from the vector layer selection
467-
QgsFeatureIds selectedIds = mVectorLayer->selectedFeaturesIds();
467+
QgsFeatureIds selectedIds = mVectorLayer->selectedFeatureIds();
468468
selectedIds.remove( featureId );
469469
mVectorLayer->selectByIds( selectedIds );
470470
mMapCanvas->repaint();

‎src/core/qgsexpression.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1493,7 +1493,7 @@ static QVariant fcnIsSelected( const QVariantList& values, const QgsExpressionCo
14931493
return QVariant( QVariant::Bool );
14941494
}
14951495

1496-
return layer->selectedFeaturesIds().contains( feature.id() );
1496+
return layer->selectedFeatureIds().contains( feature.id() );
14971497
}
14981498

14991499
static QVariant fcnNumSelected( const QVariantList& values, const QgsExpressionContext* context, QgsExpression* parent )

‎src/core/qgsofflineediting.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
627627

628628
if ( onlySelected )
629629
{
630-
QgsFeatureIds selectedFids = layer->selectedFeaturesIds();
630+
QgsFeatureIds selectedFids = layer->selectedFeatureIds();
631631
if ( !selectedFids.isEmpty() )
632632
req.setFilterFids( selectedFids );
633633
}
@@ -636,7 +636,7 @@ QgsVectorLayer* QgsOfflineEditing::copyVectorLayer( QgsVectorLayer* layer, sqlit
636636

637637
if ( req.filterType() == QgsFeatureRequest::FilterFids )
638638
{
639-
emit progressModeSet( QgsOfflineEditing::CopyFeatures, layer->selectedFeaturesIds().size() );
639+
emit progressModeSet( QgsOfflineEditing::CopyFeatures, layer->selectedFeatureIds().size() );
640640
}
641641
else
642642
{

‎src/core/qgsvectorfilewriter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2379,7 +2379,7 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
23792379
QgsFeatureRequest req;
23802380
if ( options.onlySelectedFeatures )
23812381
{
2382-
req.setFilterFids( layer->selectedFeaturesIds() );
2382+
req.setFilterFids( layer->selectedFeatureIds() );
23832383
}
23842384
QgsFeatureIterator fit = layer->getFeatures( req );
23852385
QgsFeature fet;
@@ -2455,7 +2455,7 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
24552455
}
24562456
req.setSubsetOfAttributes( attributes );
24572457
if ( options.onlySelectedFeatures )
2458-
req.setFilterFids( layer->selectedFeaturesIds() );
2458+
req.setFilterFids( layer->selectedFeatureIds() );
24592459
QgsFeatureIterator fit = layer->getFeatures( req );
24602460

24612461
//create symbol table if needed

‎src/core/qgsvectorlayer.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ void QgsVectorLayer::selectByExpression( const QString& expression, QgsVectorLay
325325

326326
if ( behaviour == AddToSelection )
327327
{
328-
newSelection = selectedFeaturesIds();
328+
newSelection = selectedFeatureIds();
329329
}
330330
QgsFeature feat;
331331
while ( features.nextFeature( feat ) )
@@ -339,7 +339,7 @@ void QgsVectorLayer::selectByExpression( const QString& expression, QgsVectorLay
339339
QgsExpression exp( expression );
340340
exp.prepare( &context );
341341

342-
QgsFeatureIds oldSelection = selectedFeaturesIds();
342+
QgsFeatureIds oldSelection = selectedFeatureIds();
343343
QgsFeatureRequest request = QgsFeatureRequest().setFilterFids( oldSelection );
344344

345345
//refine request
@@ -2466,7 +2466,7 @@ int QgsVectorLayer::selectedFeatureCount() const
24662466
return mSelectedFeatureIds.size();
24672467
}
24682468

2469-
const QgsFeatureIds& QgsVectorLayer::selectedFeaturesIds() const
2469+
const QgsFeatureIds& QgsVectorLayer::selectedFeatureIds() const
24702470
{
24712471
return mSelectedFeatureIds;
24722472
}

0 commit comments

Comments
 (0)