replace vertexes by vertices

follow up 6b418de
qgis · Oct 9, 2017 · 5107f99 · 5107f99
1 parent 201091e
commit 5107f99
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/analysis/network/qgsgraph.cpp b/src/analysis/network/qgsgraph.cpp
@@ -22,8 +22,8 @@
 
 int QgsGraph::addVertex( const QgsPointXY &pt )
 {
-  mGraphVertexes.append( QgsGraphVertex( pt ) );
-  return mGraphVertexes.size() - 1;
+  mGraphVertices.append( QgsGraphVertex( pt ) );
+  return mGraphVertices.size() - 1;
 }
 
 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
   mGraphEdges.push_back( e );
   int edgeIdx = mGraphEdges.size() - 1;
 
-  mGraphVertexes[ outVertexIdx ].mOutEdges.push_back( edgeIdx );
-  mGraphVertexes[ inVertexIdx ].mInEdges.push_back( edgeIdx );
+  mGraphVertices[ outVertexIdx ].mOutEdges.push_back( edgeIdx );
+  mGraphVertices[ inVertexIdx ].mInEdges.push_back( edgeIdx );
 
   return mGraphEdges.size() - 1;
 }
 
 const QgsGraphVertex &QgsGraph::vertex( int idx ) const
 {
-  return mGraphVertexes[ idx ];
+  return mGraphVertices[ idx ];
 }
 
 const QgsGraphEdge &QgsGraph::edge( int idx ) const
@@ -54,7 +54,7 @@ const QgsGraphEdge &QgsGraph::edge( int idx ) const
 
 int QgsGraph::vertexCount() const
 {
-  return mGraphVertexes.size();
+  return mGraphVertices.size();
 }
 
 int QgsGraph::edgeCount() const
@@ -65,9 +65,9 @@ int QgsGraph::edgeCount() const
 int QgsGraph::findVertex( const QgsPointXY &pt ) const
 {
   int i = 0;
-  for ( i = 0; i < mGraphVertexes.size(); ++i )
+  for ( i = 0; i < mGraphVertices.size(); ++i )
   {
-    if ( mGraphVertexes[ i ].point() == pt )
+    if ( mGraphVertices[ i ].point() == pt )
     {
       return i;
     }

diff --git a/src/analysis/network/qgsgraph.h b/src/analysis/network/qgsgraph.h
@@ -180,7 +180,7 @@ class ANALYSIS_EXPORT QgsGraph
     int findVertex( const QgsPointXY &pt ) const;
 
   private:
-    QVector<QgsGraphVertex> mGraphVertexes;
+    QVector<QgsGraphVertex> mGraphVertices;
 
     QVector<QgsGraphEdge> mGraphEdges;
 };

diff --git a/src/app/nodetool/qgsnodeeditor.cpp b/src/app/nodetool/qgsnodeeditor.cpp
@@ -343,7 +343,7 @@ void QgsNodeEditor::updateNodeSelection( const QItemSelection &selected, const Q
 
   mUpdatingNodeSelection = true;
 
-  mSelectedFeature->deselectAllVertexes();
+  mSelectedFeature->deselectAllVertices();
   Q_FOREACH ( const QModelIndex &index, mTableView->selectionModel()->selectedRows() )
   {
     int nodeIdx = index.row();

diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp
@@ -310,7 +310,7 @@ void QgsSelectedFeature::deselectVertex( int vertexNr )
   emit selectionChanged();
 }
 
-void QgsSelectedFeature::deselectAllVertexes()
+void QgsSelectedFeature::deselectAllVertices()
 {
   for ( int i = 0; i < mVertexMap.size(); i++ )
   {

diff --git a/src/app/nodetool/qgsselectedfeature.h b/src/app/nodetool/qgsselectedfeature.h
@@ -69,7 +69,7 @@ class QgsSelectedFeature: public QObject
     /**
      * Deselects all vertices of selected feature
      */
-    void deselectAllVertexes();
+    void deselectAllVertices();
 
     /**
      * Inverts selection of vertex with number