From b657c1ace69410b2b14325ab4f51c90c0ea6f39d Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 6 Sep 2017 18:14:24 +1000 Subject: [PATCH] Move GeoNode data items from OWS provider to app --- src/app/CMakeLists.txt | 2 ++ .../ows => app/geocms/geonode}/qgsgeonodedataitems.cpp | 1 - .../ows => app/geocms/geonode}/qgsgeonodedataitems.h | 0 src/app/geocms/qgsgeocmsproviderregistry.cpp | 6 ++++++ src/app/qgisapp.cpp | 6 ++++-- src/providers/ows/CMakeLists.txt | 5 +---- src/providers/ows/qgsowsdataitems.cpp | 6 +----- src/providers/ows/qgsowsdataitems.h | 1 - 8 files changed, 14 insertions(+), 13 deletions(-) rename src/{providers/ows => app/geocms/geonode}/qgsgeonodedataitems.cpp (99%) rename src/{providers/ows => app/geocms/geonode}/qgsgeonodedataitems.h (100%) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 8b0a6837e8b..448963de834 100755 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -154,6 +154,7 @@ SET(QGIS_APP_SRCS composer/qgsatlascompositionwidget.cpp geocms/qgsgeocmsproviderregistry.cpp + geocms/geonode/qgsgeonodedataitems.cpp geocms/geonode/qgsgeonodesourceselect.cpp layout/qgslayoutaddpagesdialog.cpp @@ -336,6 +337,7 @@ SET (QGIS_APP_MOC_HDRS composer/qgscompositionwidget.h composer/qgsatlascompositionwidget.h + geocms/geonode/qgsgeonodedataitems.h geocms/geonode/qgsgeonodesourceselect.h layout/qgslayoutaddpagesdialog.h diff --git a/src/providers/ows/qgsgeonodedataitems.cpp b/src/app/geocms/geonode/qgsgeonodedataitems.cpp similarity index 99% rename from src/providers/ows/qgsgeonodedataitems.cpp rename to src/app/geocms/geonode/qgsgeonodedataitems.cpp index b0921d966fb..575bb611846 100644 --- a/src/providers/ows/qgsgeonodedataitems.cpp +++ b/src/app/geocms/geonode/qgsgeonodedataitems.cpp @@ -13,7 +13,6 @@ * * ***************************************************************************/ -#include "qgsowsdataitems.h" #include "qgslogger.h" #include "qgsgeonodedataitems.h" #include "qgsproviderregistry.h" diff --git a/src/providers/ows/qgsgeonodedataitems.h b/src/app/geocms/geonode/qgsgeonodedataitems.h similarity index 100% rename from src/providers/ows/qgsgeonodedataitems.h rename to src/app/geocms/geonode/qgsgeonodedataitems.h diff --git a/src/app/geocms/qgsgeocmsproviderregistry.cpp b/src/app/geocms/qgsgeocmsproviderregistry.cpp index 0b74a630ff0..260e3dd3a26 100644 --- a/src/app/geocms/qgsgeocmsproviderregistry.cpp +++ b/src/app/geocms/qgsgeocmsproviderregistry.cpp @@ -14,9 +14,11 @@ ***************************************************************************/ #include "qgsgeocmsproviderregistry.h" +#include "qgsdataitemproviderregistry.h" #include "qgsgui.h" #include "qgssourceselectproviderregistry.h" #include "geocms/geonode/qgsgeonodesourceselect.h" +#include "geocms/geonode/qgsgeonodedataitems.h" QgsGeoCmsProviderRegistry::QgsGeoCmsProviderRegistry() { @@ -25,5 +27,9 @@ QgsGeoCmsProviderRegistry::QgsGeoCmsProviderRegistry() void QgsGeoCmsProviderRegistry::init() { + // source select providers QgsGui::sourceSelectProviderRegistry()->addProvider( new QgsGeoNodeSourceSelectProvider() ); + + // data item providers + QgsApplication::dataItemProviderRegistry()->addProvider( new QgsGeoNodeDataItemProvider() ); } diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index ab49bd5658d..24207e3ccee 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -1081,6 +1081,10 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh QgsStyle::defaultStyle(); endProfile(); + startProfile( QStringLiteral( "Loading GeoCMS providers" ) ); + mGeoCmsProviderRegistry.reset( new QgsGeoCmsProviderRegistry() ); + endProfile(); + mSplash->showMessage( tr( "QGIS Ready!" ), Qt::AlignHCenter | Qt::AlignBottom ); QgsMessageLog::logMessage( QgsApplication::showSettings(), QString(), QgsMessageLog::INFO ); @@ -1166,8 +1170,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh connect( QgsApplication::taskManager(), &QgsTaskManager::allTasksFinished, taskProgress, &QWinTaskbarProgress::hide ); #endif - mGeoCmsProviderRegistry.reset( new QgsGeoCmsProviderRegistry() ); - // supposedly all actions have been added, now register them to the shortcut manager QgsGui::shortcutsManager()->registerAllChildren( this ); diff --git a/src/providers/ows/CMakeLists.txt b/src/providers/ows/CMakeLists.txt index b837898090d..5084fa7cca8 100644 --- a/src/providers/ows/CMakeLists.txt +++ b/src/providers/ows/CMakeLists.txt @@ -1,19 +1,16 @@ SET(OWS_SRCS qgsowsprovider.cpp qgsowsdataitems.cpp - qgsgeonodedataitems.cpp) +) SET(OWS_MOC_HDRS qgsowsprovider.h qgsowsdataitems.h - qgsgeonodedataitems.h ) INCLUDE_DIRECTORIES ( - ${CMAKE_SOURCE_DIR}/src/gui/geonode ${CMAKE_SOURCE_DIR}/src/core ${CMAKE_SOURCE_DIR}/src/core/expression ${CMAKE_SOURCE_DIR}/src/core/geometry - ${CMAKE_SOURCE_DIR}/src/core/geocms/geonode ${CMAKE_SOURCE_DIR}/src/core/auth ${CMAKE_SOURCE_DIR}/src/core/metadata ${CMAKE_SOURCE_DIR}/src/gui diff --git a/src/providers/ows/qgsowsdataitems.cpp b/src/providers/ows/qgsowsdataitems.cpp index 0edaec71043..3b979e8383d 100644 --- a/src/providers/ows/qgsowsdataitems.cpp +++ b/src/providers/ows/qgsowsdataitems.cpp @@ -23,9 +23,6 @@ #include "qgsnewhttpconnection.h" #include "qgsowssourceselect.h" #endif -#include "qgsgeonodeconnection.h" -#include "qgsgeonodenewconnection.h" -#include "qgsgeonodedataitems.h" #include "qgsapplication.h" @@ -267,8 +264,7 @@ QGISEXTERN QList *dataItemProviders() QList *providers = new QList(); *providers - << new QgsOwsDataItemProvider - << new QgsGeoNodeDataItemProvider; + << new QgsOwsDataItemProvider; return providers; } diff --git a/src/providers/ows/qgsowsdataitems.h b/src/providers/ows/qgsowsdataitems.h index ac99d861150..bc8b99a6f29 100644 --- a/src/providers/ows/qgsowsdataitems.h +++ b/src/providers/ows/qgsowsdataitems.h @@ -19,7 +19,6 @@ #include "qgsdataitemprovider.h" #include "qgsdataprovider.h" #include "qgsdatasourceuri.h" -#include "qgsgeonodeconnection.h" class QgsOWSConnectionItem : public QgsDataCollectionItem {