Remove QgsMapToolVertexEdit class - not needed anymore

qgis · Jan 20, 2015 · 28cbf57 · 28cbf57
1 parent f8fc8a0
commit 28cbf57
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 89 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -87,7 +87,6 @@ SET(QGIS_APP_SRCS
   qgsmaptoolsplitparts.cpp
   qgsmaptoolsvgannotation.cpp
   qgsmaptooltextannotation.cpp
-  qgsmaptoolvertexedit.cpp
 
   nodetool/qgsmaptoolnodetool.cpp
   nodetool/qgsselectedfeature.cpp
@@ -235,7 +234,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsmaptoolsimplify.h
   qgsmaptoolsplitfeatures.h
   qgsmaptoolsplitparts.h
-  qgsmaptoolvertexedit.h
 
   nodetool/qgsmaptoolnodetool.h
   nodetool/qgsselectedfeature.h

diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -47,7 +47,7 @@ struct QgsFeatureIdFilter : public QgsPointLocator::MatchFilter
 };
 
 QgsMapToolNodeTool::QgsMapToolNodeTool( QgsMapCanvas* canvas )
-    : QgsMapToolVertexEdit( canvas )
+    : QgsMapToolEdit( canvas )
     , mSelectedFeature( 0 )
     , mMoving( true )
     , mClicked( false )

diff --git a/src/app/nodetool/qgsmaptoolnodetool.h b/src/app/nodetool/qgsmaptoolnodetool.h
@@ -17,7 +17,7 @@
 #define QGSMAPTOOLNODETOOL_H
 
 #include "qgsfeature.h"
-#include "qgsmaptoolvertexedit.h"
+#include "qgsmaptooledit.h"
 #include "qgspoint.h"
 
 class QRubberBand;
@@ -32,7 +32,7 @@ class QgsSelectedFeature;
 typedef QSet<int> Vertexes;
 
 /**A maptool to move/deletes/adds vertices of line or polygon features*/
-class QgsMapToolNodeTool: public QgsMapToolVertexEdit
+class QgsMapToolNodeTool: public QgsMapToolEdit
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -267,7 +267,6 @@
 #include "qgsmaptoolsplitfeatures.h"
 #include "qgsmaptoolsplitparts.h"
 #include "qgsmaptooltextannotation.h"
-#include "qgsmaptoolvertexedit.h"
 #include "qgsmaptoolzoom.h"
 #include "qgsmaptoolsimplify.h"
 #include "qgsmeasuretool.h"

diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp
@@ -23,7 +23,7 @@
 #include <limits>
 
 QgsMapToolDeleteRing::QgsMapToolDeleteRing( QgsMapCanvas* canvas )
-    : QgsMapToolVertexEdit( canvas )
+    : QgsMapToolEdit( canvas )
     , mRubberBand( 0 )
 {
   mToolName = tr( "Delete ring" );

diff --git a/src/app/qgsmaptooldeletering.h b/src/app/qgsmaptooldeletering.h
@@ -16,13 +16,13 @@
 #ifndef QGSMAPTOOLDELETERING_H
 #define QGSMAPTOOLDELETERING_H
 
-#include "qgsmaptoolvertexedit.h"
+#include "qgsmaptooledit.h"
 #include "qgsrubberband.h"
 
 class QgsVertexMarker;
 /**Map tool to delete vertices from line/polygon features*/
 
-class APP_EXPORT QgsMapToolDeleteRing : public QgsMapToolVertexEdit
+class APP_EXPORT QgsMapToolDeleteRing : public QgsMapToolEdit
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolvertexedit.cpp b/src/app/qgsmaptoolvertexedit.cpp
diff --git a/src/app/qgsmaptoolvertexedit.h b/src/app/qgsmaptoolvertexedit.h