Skip to content
Permalink
Browse files

Move remaining geonode classes from gui->app

  • Loading branch information
nyalldawson committed Sep 6, 2017
1 parent 5f82705 commit 29539e67121eadf2c6c70c3f6aeda7991a2150de
@@ -143,7 +143,6 @@ IF (WITH_GUI)
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
${CMAKE_SOURCE_DIR}/src/gui/effects
${CMAKE_SOURCE_DIR}/src/gui/geonode
${CMAKE_SOURCE_DIR}/src/gui/layertree
${CMAKE_SOURCE_DIR}/src/gui/layout
${CMAKE_SOURCE_DIR}/src/gui/locator
@@ -382,7 +382,7 @@
%Include raster/qgsrasterdataprovider.sip
%Include raster/qgsrasterinterface.sip
%Include geometry/qgspoint.sip
%Include geonode/qgsgeonoderequest.sip
%Include geocms/geonode/qgsgeonoderequest.sip
%Include gps/qgsgpsconnection.sip
%Include gps/qgsgpsdetector.sip
%Include gps/qgsnmeaconnection.sip

This file was deleted.

@@ -276,7 +276,6 @@
%Include editorwidgets/qgsspinbox.sip
%Include editorwidgets/qgsvaluemapsearchwidgetwrapper.sip
%Include editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip
%Include geonode/qgsgeonodenewconnection.sip
%Include layertree/qgscustomlayerorderwidget.sip
%Include layertree/qgslayertreemapcanvasbridge.sip
%Include layertree/qgslayertreeview.sip
@@ -155,6 +155,7 @@ SET(QGIS_APP_SRCS

geocms/qgsgeocmsproviderregistry.cpp
geocms/geonode/qgsgeonodedataitems.cpp
geocms/geonode/qgsgeonodenewconnection.cpp
geocms/geonode/qgsgeonodesourceselect.cpp

layout/qgslayoutaddpagesdialog.cpp
@@ -338,6 +339,7 @@ SET (QGIS_APP_MOC_HDRS
composer/qgsatlascompositionwidget.h

geocms/geonode/qgsgeonodedataitems.h
geocms/geonode/qgsgeonodenewconnection.h
geocms/geonode/qgsgeonodesourceselect.h

layout/qgslayoutaddpagesdialog.h
@@ -529,7 +531,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/symbology
${CMAKE_SOURCE_DIR}/src/gui/attributetable
${CMAKE_SOURCE_DIR}/src/gui/auth
${CMAKE_SOURCE_DIR}/src/gui/geonode
${CMAKE_SOURCE_DIR}/src/gui/ogr
${CMAKE_SOURCE_DIR}/src/gui/raster
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
@@ -577,7 +578,6 @@ INCLUDE_DIRECTORIES(
../gui/symbology
../gui/attributetable
../gui/auth
../gui/geonode
../gui/ogr
../gui/raster
../gui/editorwidgets
File renamed without changes.
@@ -19,11 +19,10 @@
#define QGSGEONODENEWCONNECTION_H

#include "ui_qgsnewgeonodeconnectionbase.h"
#include "qgis_gui.h"
#include "qgsguiutils.h"
#include "qgsauthconfigselect.h"

class GUI_EXPORT QgsGeoNodeNewConnection : public QDialog, private Ui::QgsNewGeoNodeConnectionBase
class QgsGeoNodeNewConnection : public QDialog, private Ui::QgsNewGeoNodeConnectionBase
{
Q_OBJECT

@@ -150,8 +150,6 @@ SET(QGIS_GUI_SRCS
editorwidgets/qgsvaluerelationsearchwidgetwrapper.cpp
editorwidgets/qgsvaluerelationwidgetfactory.cpp

geonode/qgsgeonodenewconnection.cpp

layertree/qgscustomlayerorderwidget.cpp
layertree/qgslayertreeembeddedconfigwidget.cpp
layertree/qgslayertreeembeddedwidgetregistry.cpp
@@ -646,8 +644,6 @@ SET(QGIS_GUI_MOC_HDRS
editorwidgets/qgsvaluerelationsearchwidgetwrapper.h
editorwidgets/qgsvaluerelationwidgetwrapper.h

geonode/qgsgeonodenewconnection.h

layertree/qgscustomlayerorderwidget.h
layertree/qgslayertreeembeddedconfigwidget.h
layertree/qgslayertreeembeddedwidgetsimpl.h
@@ -836,15 +832,12 @@ INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/gui/layertree
${CMAKE_SOURCE_DIR}/src/gui/layout
${CMAKE_SOURCE_DIR}/src/gui/effects
${CMAKE_SOURCE_DIR}/src/gui/geonode
${CMAKE_SOURCE_DIR}/src/gui/ogr
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/annotations
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/composer
${CMAKE_SOURCE_DIR}/src/core/fieldformatter
${CMAKE_SOURCE_DIR}/src/core/geocms
${CMAKE_SOURCE_DIR}/src/core/geocms/geonode
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/core/layout

0 comments on commit 29539e6

Please sign in to comment.
You can’t perform that action at this time.