Moved arcgis dialogs to the provider directory

qgis · Jul 18, 2017 · f459790 · f459790
1 parent 73b66fa
commit f459790
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 17 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -247,7 +247,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgsshortcutsmanager.h"
 #include "qgssinglebandgrayrenderer.h"
 #include "qgssnappingwidget.h"
-#include "qgsarcgisservicesourceselect.h"
 #include "qgsstatisticalsummarydockwidget.h"
 #include "qgsstatusbar.h"
 #include "qgsstatusbarcoordinateswidget.h"

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -302,7 +302,6 @@ SET(QGIS_GUI_SRCS
   qgsoptionsdialogbase.cpp
   qgsorderbydialog.cpp
   qgsowssourceselect.cpp
-  qgsarcgisservicesourceselect.cpp
   qgspanelwidget.cpp
   qgspanelwidgetstack.cpp
   qgspasswordlineedit.cpp
@@ -458,7 +457,6 @@ SET(QGIS_GUI_MOC_HDRS
   qgsoptionswidgetfactory.h
   qgsorderbydialog.h
   qgsowssourceselect.h
-  qgsarcgisservicesourceselect.h
   qgspanelwidget.h
   qgspanelwidgetstack.h
   qgspasswordlineedit.h

diff --git a/src/providers/arcgisrest/CMakeLists.txt b/src/providers/arcgisrest/CMakeLists.txt
@@ -42,9 +42,11 @@ SET (AFS_MOC_HDRS
 IF (WITH_GUI)
   SET(AFS_SRCS ${AFS_SRCS}
     qgsafssourceselect.cpp
+    qgsarcgisservicesourceselect.cpp
   )
   SET(AFS_MOC_HDRS ${AFS_MOC_HDRS}
     qgsafssourceselect.h
+    qgsarcgisservicesourceselect.h
   )
 ENDIF ()
 
@@ -83,9 +85,11 @@ SET (AMS_MOC_HDRS
 IF (WITH_GUI)
   SET(AMS_SRCS ${AMS_SRCS}
     qgsamssourceselect.cpp
+    qgsarcgisservicesourceselect.cpp
   )
   SET(AMS_MOC_HDRS ${AMS_MOC_HDRS}
     qgsamssourceselect.h
+    qgsarcgisservicesourceselect.h
   )
 ENDIF ()
 

diff --git a/src/gui/qgsarcgisservicesourceselect.cpp → ...cgisrest/qgsarcgisservicesourceselect.cpp b/src/gui/qgsarcgisservicesourceselect.cpp → ...cgisrest/qgsarcgisservicesourceselect.cpp
diff --git a/src/gui/qgsarcgisservicesourceselect.h → ...arcgisrest/qgsarcgisservicesourceselect.h b/src/gui/qgsarcgisservicesourceselect.h → ...arcgisrest/qgsarcgisservicesourceselect.h
@@ -16,25 +16,12 @@
 #ifndef QGSARCGISSERVICESOURCESELECT_H
 #define QGSARCGISSERVICESOURCESELECT_H
 
-/// @cond PRIVATE
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the QGIS API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-
-
 #define SIP_NO_FILE
 
 #include "ui_qgsarcgisservicesourceselectbase.h"
 #include "qgsrectangle.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsabstractdatasourcewidget.h"
-#include "qgis_gui.h"
 
 class QStandardItemModel;
 class QSortFilterProxyModel;
@@ -44,7 +31,7 @@ class QgsOwsConnection;
 /**
  * Base class for listing ArcGis layers available from a remote service.
  */
-class GUI_EXPORT QgsArcGisServiceSourceSelect : public QgsAbstractDataSourceWidget, protected Ui::QgsArcGisServiceSourceSelectBase
+class QgsArcGisServiceSourceSelect : public QgsAbstractDataSourceWidget, protected Ui::QgsArcGisServiceSourceSelectBase
 {
     Q_OBJECT