Skip to content

Commit f3fe558

Browse files
committedJun 23, 2017
Move all app/ogr and datasource manager dialog to GUI
1 parent 5c6e794 commit f3fe558

12 files changed

+29
-17
lines changed
 

‎src/app/CMakeLists.txt

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ SET(QGIS_APP_SRCS
6161
qgsversioninfo.cpp
6262
qgswelcomepageitemsmodel.cpp
6363
qgswelcomepage.cpp
64-
qgsdatasourcemanagerdialog.cpp
6564

6665
qgsmaptooladdfeature.cpp
6766
qgsmaptooladdpart.cpp
@@ -159,11 +158,6 @@ SET(QGIS_APP_SRCS
159158
locator/qgsinbuiltlocatorfilters.cpp
160159
locator/qgslocatoroptionswidget.cpp
161160

162-
ogr/qgsogrhelperfunctions.cpp
163-
ogr/qgsopenvectorlayerdialog.cpp
164-
ogr/qgsnewogrconnection.cpp
165-
ogr/qgsvectorlayersaveasdialog.cpp
166-
167161
gps/qgsgpsinformationwidget.cpp
168162
gps/qgsgpsmarker.cpp
169163

@@ -248,7 +242,6 @@ SET (QGIS_APP_MOC_HDRS
248242
qgsversioninfo.h
249243
qgswelcomepageitemsmodel.h
250244
qgswelcomepage.h
251-
qgsdatasourcemanagerdialog.h
252245

253246
qgsmaptooladdfeature.h
254247
qgsmaptoolannotation.h
@@ -340,10 +333,6 @@ SET (QGIS_APP_MOC_HDRS
340333
locator/qgsinbuiltlocatorfilters.h
341334
locator/qgslocatoroptionswidget.h
342335

343-
ogr/qgsopenvectorlayerdialog.h
344-
ogr/qgsnewogrconnection.h
345-
ogr/qgsvectorlayersaveasdialog.h
346-
347336
gps/qgsgpsinformationwidget.h
348337

349338
openstreetmap/qgsosmdownloaddialog.h
@@ -510,6 +499,7 @@ INCLUDE_DIRECTORIES(
510499
${CMAKE_SOURCE_DIR}/src/gui/symbology-ng
511500
${CMAKE_SOURCE_DIR}/src/gui/attributetable
512501
${CMAKE_SOURCE_DIR}/src/gui/auth
502+
${CMAKE_SOURCE_DIR}/src/gui/ogr
513503
${CMAKE_SOURCE_DIR}/src/gui/raster
514504
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
515505
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
@@ -554,14 +544,14 @@ INCLUDE_DIRECTORIES(
554544
../gui/symbology-ng
555545
../gui/attributetable
556546
../gui/auth
547+
../gui/ogr
557548
../gui/raster
558549
../gui/editorwidgets
559550
../gui/editorwidgets/core
560551
../gui/layertree
561552
../plugins
562553
../python
563554
gps
564-
ogr
565555
openstreetmap
566556
dwg
567557
dwg/libdxfrw

‎src/gui/CMakeLists.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,12 @@ SET(QGIS_GUI_SRCS
162162
locator/qgslocatorfilter.cpp
163163
locator/qgslocatorwidget.cpp
164164

165+
ogr/qgsopenvectorlayerdialog.cpp
166+
ogr/qgsogrhelperfunctions.cpp
167+
ogr/qgsnewogrconnection.cpp
168+
ogr/qgsopenvectorlayerdialog.cpp
169+
ogr/qgsvectorlayersaveasdialog.cpp
170+
165171
qgisinterface.cpp
166172
qgsactionmenu.cpp
167173
qgsadvanceddigitizingcanvasitem.cpp
@@ -324,6 +330,7 @@ SET(QGIS_GUI_SRCS
324330
qgsvariableeditorwidget.cpp
325331
qgsvertexmarker.cpp
326332
qgsfiledownloader.cpp
333+
qgsdatasourcemanagerdialog.cpp
327334
)
328335

329336
SET(QGIS_GUI_MOC_HDRS
@@ -474,6 +481,13 @@ SET(QGIS_GUI_MOC_HDRS
474481
qgsuserinputdockwidget.h
475482
qgsvariableeditorwidget.h
476483
qgsfiledownloader.h
484+
qgsdatasourcemanagerdialog.h
485+
486+
ogr/qgsopenvectorlayerdialog.h
487+
ogr/qgsogrhelperfunctions.h
488+
ogr/qgsnewogrconnection.h
489+
ogr/qgsvectorlayersaveasdialog.h
490+
477491

478492
raster/qgsmultibandcolorrendererwidget.h
479493
raster/qgspalettedrendererwidget.h
@@ -661,6 +675,13 @@ SET(QGIS_GUI_HDRS
661675
qgsbrowserdockwidget_p.h
662676
qgsvertexmarker.h
663677
qgsfiledownloader.h
678+
qgsdatasourcemanagerdialog.h
679+
680+
ogr/qgsopenvectorlayerdialog.h
681+
ogr/qgsogrhelperfunctions.h
682+
ogr/qgsnewogrconnection.h
683+
ogr/qgsvectorlayersaveasdialog.h
684+
664685

665686
attributetable/qgsfeaturemodel.h
666687

@@ -749,6 +770,7 @@ SET(QGIS_GUI_UI_HDRS
749770
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssqlcomposerdialogbase.h
750771
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgssublayersdialogbase.h
751772
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgstablewidgetuibase.h
773+
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsopenvectorlayerdialogbase.h
752774
)
753775

754776
IF(ENABLE_MODELTEST)
@@ -767,6 +789,7 @@ INCLUDE_DIRECTORIES(
767789
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
768790
${CMAKE_SOURCE_DIR}/src/gui/layertree
769791
${CMAKE_SOURCE_DIR}/src/gui/effects
792+
${CMAKE_SOURCE_DIR}/src/gui/ogr
770793
${CMAKE_SOURCE_DIR}/src/core
771794
${CMAKE_SOURCE_DIR}/src/core/annotations
772795
${CMAKE_SOURCE_DIR}/src/core/auth
File renamed without changes.

‎src/app/ogr/qgsopenvectorlayerdialog.cpp renamed to ‎src/gui/ogr/qgsopenvectorlayerdialog.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,5 +489,3 @@ void QgsOpenVectorLayerDialog::on_cmbConnections_currentIndexChanged( const QStr
489489
setSelectedConnection();
490490
}
491491
//********************end auto connected slots *****************/
492-
493-

‎src/app/ogr/qgsvectorlayersaveasdialog.h renamed to ‎src/gui/ogr/qgsvectorlayersaveasdialog.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
#include "qgshelp.h"
2424
#include "qgsfields.h"
2525
#include "qgsvectorfilewriter.h"
26-
#include "qgis_app.h"
26+
#include "qgis_gui.h"
2727

2828
class QgsVectorLayer;
2929

3030
/**
3131
* Class to select destination file, type and CRS for ogr layers
3232
*/
33-
class APP_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSaveAsDialogBase
33+
class GUI_EXPORT QgsVectorLayerSaveAsDialog : public QDialog, private Ui::QgsVectorLayerSaveAsDialogBase
3434
{
3535
Q_OBJECT
3636

‎src/app/qgsdatasourcemanagerdialog.h renamed to ‎src/gui/qgsdatasourcemanagerdialog.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include "qgsguiutils.h"
2424
#include "qgsmimedatautils.h"
2525
#include "qgshelp.h"
26+
#include "qgis_gui.h"
2627

2728
class QgsBrowserDockWidget;
2829
class QgsRasterLayer;
@@ -33,7 +34,7 @@ namespace Ui
3334
class QgsDataSourceManagerDialog;
3435
}
3536

36-
class QgsDataSourceManagerDialog : public QgsOptionsDialogBase
37+
class GUI_EXPORT QgsDataSourceManagerDialog : public QgsOptionsDialogBase
3738
{
3839
Q_OBJECT
3940

0 commit comments

Comments
 (0)
Please sign in to comment.