Move all app/ogr and datasource manager dialog to GUI

qgis · Jun 23, 2017 · f3fe558 · f3fe558
1 parent 5c6e794
commit f3fe558
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 17 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -61,7 +61,6 @@ SET(QGIS_APP_SRCS
   qgsversioninfo.cpp
   qgswelcomepageitemsmodel.cpp
   qgswelcomepage.cpp
-  qgsdatasourcemanagerdialog.cpp
 
   qgsmaptooladdfeature.cpp
   qgsmaptooladdpart.cpp
@@ -159,11 +158,6 @@ SET(QGIS_APP_SRCS
   locator/qgsinbuiltlocatorfilters.cpp
   locator/qgslocatoroptionswidget.cpp
 
-  ogr/qgsogrhelperfunctions.cpp
-  ogr/qgsopenvectorlayerdialog.cpp
-  ogr/qgsnewogrconnection.cpp
-  ogr/qgsvectorlayersaveasdialog.cpp
-
   gps/qgsgpsinformationwidget.cpp
   gps/qgsgpsmarker.cpp
 
@@ -248,7 +242,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsversioninfo.h
   qgswelcomepageitemsmodel.h
   qgswelcomepage.h
-  qgsdatasourcemanagerdialog.h
 
   qgsmaptooladdfeature.h
   qgsmaptoolannotation.h
@@ -340,10 +333,6 @@ SET (QGIS_APP_MOC_HDRS
   locator/qgsinbuiltlocatorfilters.h
   locator/qgslocatoroptionswidget.h
 
-  ogr/qgsopenvectorlayerdialog.h
-  ogr/qgsnewogrconnection.h
-  ogr/qgsvectorlayersaveasdialog.h
-
   gps/qgsgpsinformationwidget.h
 
   openstreetmap/qgsosmdownloaddialog.h
@@ -510,6 +499,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
   ${CMAKE_SOURCE_DIR}/src/gui/attributetable
   ${CMAKE_SOURCE_DIR}/src/gui/auth
+  ${CMAKE_SOURCE_DIR}/src/gui/ogr
   ${CMAKE_SOURCE_DIR}/src/gui/raster
   ${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
   ${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
@@ -554,14 +544,14 @@ INCLUDE_DIRECTORIES(
   ../gui/symbology-ng
   ../gui/attributetable
   ../gui/auth
+  ../gui/ogr
   ../gui/raster
   ../gui/editorwidgets
   ../gui/editorwidgets/core
   ../gui/layertree
   ../plugins
   ../python
   gps
-  ogr
   openstreetmap
   dwg
   dwg/libdxfrw

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -162,6 +162,12 @@ SET(QGIS_GUI_SRCS
   locator/qgslocatorfilter.cpp
   locator/qgslocatorwidget.cpp
 
+  ogr/qgsopenvectorlayerdialog.cpp
+  ogr/qgsogrhelperfunctions.cpp
+  ogr/qgsnewogrconnection.cpp
+  ogr/qgsopenvectorlayerdialog.cpp
+  ogr/qgsvectorlayersaveasdialog.cpp
+
   qgisinterface.cpp
   qgsactionmenu.cpp
   qgsadvanceddigitizingcanvasitem.cpp
@@ -324,6 +330,7 @@ SET(QGIS_GUI_SRCS
   qgsvariableeditorwidget.cpp
   qgsvertexmarker.cpp
   qgsfiledownloader.cpp
+  qgsdatasourcemanagerdialog.cpp
 )
 
 SET(QGIS_GUI_MOC_HDRS
@@ -474,6 +481,13 @@ SET(QGIS_GUI_MOC_HDRS
   qgsuserinputdockwidget.h
   qgsvariableeditorwidget.h
   qgsfiledownloader.h
+  qgsdatasourcemanagerdialog.h
+
+  ogr/qgsopenvectorlayerdialog.h
+  ogr/qgsogrhelperfunctions.h
+  ogr/qgsnewogrconnection.h
+  ogr/qgsvectorlayersaveasdialog.h
+
 
   raster/qgsmultibandcolorrendererwidget.h
   raster/qgspalettedrendererwidget.h
@@ -661,6 +675,13 @@ SET(QGIS_GUI_HDRS
   qgsbrowserdockwidget_p.h
   qgsvertexmarker.h
   qgsfiledownloader.h
+  qgsdatasourcemanagerdialog.h
+
+  ogr/qgsopenvectorlayerdialog.h
+  ogr/qgsogrhelperfunctions.h
+  ogr/qgsnewogrconnection.h
+  ogr/qgsvectorlayersaveasdialog.h
+
 
   attributetable/qgsfeaturemodel.h
 
@@ -749,6 +770,7 @@ SET(QGIS_GUI_UI_HDRS
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssqlcomposerdialogbase.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssublayersdialogbase.h
   ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgstablewidgetuibase.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsopenvectorlayerdialogbase.h
 )
 
 IF(ENABLE_MODELTEST)
@@ -767,6 +789,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
   ${CMAKE_SOURCE_DIR}/src/gui/layertree
   ${CMAKE_SOURCE_DIR}/src/gui/effects
+  ${CMAKE_SOURCE_DIR}/src/gui/ogr
   ${CMAKE_SOURCE_DIR}/src/core
   ${CMAKE_SOURCE_DIR}/src/core/annotations
   ${CMAKE_SOURCE_DIR}/src/core/auth

diff --git a/src/app/ogr/qgsnewogrconnection.cpp → src/gui/ogr/qgsnewogrconnection.cpp b/src/app/ogr/qgsnewogrconnection.cpp → src/gui/ogr/qgsnewogrconnection.cpp
diff --git a/src/app/ogr/qgsnewogrconnection.h → src/gui/ogr/qgsnewogrconnection.h b/src/app/ogr/qgsnewogrconnection.h → src/gui/ogr/qgsnewogrconnection.h
diff --git a/src/app/ogr/qgsogrhelperfunctions.cpp → src/gui/ogr/qgsogrhelperfunctions.cpp b/src/app/ogr/qgsogrhelperfunctions.cpp → src/gui/ogr/qgsogrhelperfunctions.cpp
diff --git a/src/app/ogr/qgsogrhelperfunctions.h → src/gui/ogr/qgsogrhelperfunctions.h b/src/app/ogr/qgsogrhelperfunctions.h → src/gui/ogr/qgsogrhelperfunctions.h
diff --git a/src/app/ogr/qgsopenvectorlayerdialog.cpp → src/gui/ogr/qgsopenvectorlayerdialog.cpp b/src/app/ogr/qgsopenvectorlayerdialog.cpp → src/gui/ogr/qgsopenvectorlayerdialog.cpp
@@ -489,5 +489,3 @@ void QgsOpenVectorLayerDialog::on_cmbConnections_currentIndexChanged( const QStr
   setSelectedConnection();
 }
 //********************end auto connected slots *****************/
-
-
diff --git a/src/app/ogr/qgsopenvectorlayerdialog.h → src/gui/ogr/qgsopenvectorlayerdialog.h b/src/app/ogr/qgsopenvectorlayerdialog.h → src/gui/ogr/qgsopenvectorlayerdialog.h
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp → src/gui/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp → src/gui/ogr/qgsvectorlayersaveasdialog.cpp
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.h → src/gui/ogr/qgsvectorlayersaveasdialog.h b/src/app/ogr/qgsvectorlayersaveasdialog.h → src/gui/ogr/qgsvectorlayersaveasdialog.h
@@ -23,14 +23,14 @@
 #include "qgshelp.h"
 #include "qgsfields.h"
 #include "qgsvectorfilewriter.h"
-#include "qgis_app.h"
+#include "qgis_gui.h"
 
 class QgsVectorLayer;
 
 /**
  *  Class to select destination file, type and CRS for ogr layers
  */
-class APP_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSaveAsDialogBase
+class GUI_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSaveAsDialogBase
 {
     Q_OBJECT
 

diff --git a/src/app/qgsdatasourcemanagerdialog.cpp → src/gui/qgsdatasourcemanagerdialog.cpp b/src/app/qgsdatasourcemanagerdialog.cpp → src/gui/qgsdatasourcemanagerdialog.cpp
diff --git a/src/app/qgsdatasourcemanagerdialog.h → src/gui/qgsdatasourcemanagerdialog.h b/src/app/qgsdatasourcemanagerdialog.h → src/gui/qgsdatasourcemanagerdialog.h
@@ -23,6 +23,7 @@
 #include "qgsguiutils.h"
 #include "qgsmimedatautils.h"
 #include "qgshelp.h"
+#include "qgis_gui.h"
 
 class QgsBrowserDockWidget;
 class QgsRasterLayer;
@@ -33,7 +34,7 @@ namespace Ui
   class QgsDataSourceManagerDialog;
 }
 
-class QgsDataSourceManagerDialog : public QgsOptionsDialogBase
+class GUI_EXPORT QgsDataSourceManagerDialog : public QgsOptionsDialogBase
 {
     Q_OBJECT