Remove QgsSnappingDialog

qgis · Oct 20, 2016 · f604668 · f604668
1 parent 85c105d
commit f604668
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 951 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -119,7 +119,6 @@ SET(QGIS_APP_SRCS
   qgsstatisticalsummarydockwidget.cpp
   qgssubstitutionlistwidget.cpp
   qgstextannotationdialog.cpp
-  qgssnappingdialog.cpp
   qgssvgannotationdialog.cpp
   qgsundowidget.cpp
   qgstipgui.cpp
@@ -294,7 +293,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsrelationmanagerdialog.h
   qgsrelationadddlg.h
   qgsselectbyformdialog.h
-  qgssnappingdialog.h
   qgssponsors.h
   qgsstatisticalsummarydockwidget.h
   qgssubstitutionlistwidget.h

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -215,7 +215,6 @@
 #include "qgsselectbyformdialog.h"
 #include "qgsshortcutsmanager.h"
 #include "qgssinglebandgrayrenderer.h"
-#include "qgssnappingdialog.h"
 #include "qgssnappingwidget.h"
 #include "qgssourceselectdialog.h"
 #include "qgssponsors.h"
@@ -814,9 +813,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
   QString mainSnappingWidgetMode = QSettings().value( "/qgis/mainSnappingWidgetMode", "dialog" ).toString();
   if ( mainSnappingWidgetMode == "dock" )
   {
-    QgsSnappingDock* dock = new QgsSnappingDock( tr( "Snapping and Digitizing Options" ), QgisApp::instance() );
+    QgsDockWidget* dock = new QgsDockWidget( tr( "Snapping and Digitizing Options" ), QgisApp::instance() );
     dock->setAllowedAreas( Qt::AllDockWidgetAreas );
     dock->setWidget( mSnappingDialogWidget );
+    dock->setObjectName( "Snapping and Digitizing Options" );
     addDockWidget( Qt::LeftDockWidgetArea, dock );
     mSnappingDialogContainer = dock;
     dock->hide();

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -92,7 +92,6 @@ class QAuthenticator;
 
 class QgsBrowserDockWidget;
 class QgsAdvancedDigitizingDockWidget;
-class QgsSnappingDialog;
 class QgsGPSInformationWidget;
 class QgsStatisticalSummaryDockWidget;
 class QgsMapCanvasTracer;

diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
@@ -31,7 +31,6 @@
 #include "qgsmaplayerregistry.h"
 #include "qgsproject.h"
 #include "qgsprojectlayergroupdialog.h"
-#include "qgssnappingdialog.h"
 #include "qgsrasterlayer.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"