Skip to content

Commit 5107f99

Browse files
committed
replace vertexes by vertices
follow up 6b418de
1 parent 201091e commit 5107f99

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

src/analysis/network/qgsgraph.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
int QgsGraph::addVertex( const QgsPointXY &pt )
2424
{
25-
mGraphVertexes.append( QgsGraphVertex( pt ) );
26-
return mGraphVertexes.size() - 1;
25+
mGraphVertices.append( QgsGraphVertex( pt ) );
26+
return mGraphVertices.size() - 1;
2727
}
2828

2929
int QgsGraph::addEdge( int outVertexIdx, int inVertexIdx, const QVector< QVariant > &strategies )
@@ -36,15 +36,15 @@ int QgsGraph::addEdge( int outVertexIdx, int inVertexIdx, const QVector< QVarian
3636
mGraphEdges.push_back( e );
3737
int edgeIdx = mGraphEdges.size() - 1;
3838

39-
mGraphVertexes[ outVertexIdx ].mOutEdges.push_back( edgeIdx );
40-
mGraphVertexes[ inVertexIdx ].mInEdges.push_back( edgeIdx );
39+
mGraphVertices[ outVertexIdx ].mOutEdges.push_back( edgeIdx );
40+
mGraphVertices[ inVertexIdx ].mInEdges.push_back( edgeIdx );
4141

4242
return mGraphEdges.size() - 1;
4343
}
4444

4545
const QgsGraphVertex &QgsGraph::vertex( int idx ) const
4646
{
47-
return mGraphVertexes[ idx ];
47+
return mGraphVertices[ idx ];
4848
}
4949

5050
const QgsGraphEdge &QgsGraph::edge( int idx ) const
@@ -54,7 +54,7 @@ const QgsGraphEdge &QgsGraph::edge( int idx ) const
5454

5555
int QgsGraph::vertexCount() const
5656
{
57-
return mGraphVertexes.size();
57+
return mGraphVertices.size();
5858
}
5959

6060
int QgsGraph::edgeCount() const
@@ -65,9 +65,9 @@ int QgsGraph::edgeCount() const
6565
int QgsGraph::findVertex( const QgsPointXY &pt ) const
6666
{
6767
int i = 0;
68-
for ( i = 0; i < mGraphVertexes.size(); ++i )
68+
for ( i = 0; i < mGraphVertices.size(); ++i )
6969
{
70-
if ( mGraphVertexes[ i ].point() == pt )
70+
if ( mGraphVertices[ i ].point() == pt )
7171
{
7272
return i;
7373
}

src/analysis/network/qgsgraph.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ class ANALYSIS_EXPORT QgsGraph
180180
int findVertex( const QgsPointXY &pt ) const;
181181

182182
private:
183-
QVector<QgsGraphVertex> mGraphVertexes;
183+
QVector<QgsGraphVertex> mGraphVertices;
184184

185185
QVector<QgsGraphEdge> mGraphEdges;
186186
};

src/app/nodetool/qgsnodeeditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ void QgsNodeEditor::updateNodeSelection( const QItemSelection &selected, const Q
343343

344344
mUpdatingNodeSelection = true;
345345

346-
mSelectedFeature->deselectAllVertexes();
346+
mSelectedFeature->deselectAllVertices();
347347
Q_FOREACH ( const QModelIndex &index, mTableView->selectionModel()->selectedRows() )
348348
{
349349
int nodeIdx = index.row();

src/app/nodetool/qgsselectedfeature.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ void QgsSelectedFeature::deselectVertex( int vertexNr )
310310
emit selectionChanged();
311311
}
312312

313-
void QgsSelectedFeature::deselectAllVertexes()
313+
void QgsSelectedFeature::deselectAllVertices()
314314
{
315315
for ( int i = 0; i < mVertexMap.size(); i++ )
316316
{

src/app/nodetool/qgsselectedfeature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class QgsSelectedFeature: public QObject
6969
/**
7070
* Deselects all vertices of selected feature
7171
*/
72-
void deselectAllVertexes();
72+
void deselectAllVertices();
7373

7474
/**
7575
* Inverts selection of vertex with number

0 commit comments

Comments
 (0)