Revert redundant changes to ows provider

qgis · Sep 12, 2017 · 5f82705 · 5f82705
1 parent b657c1a
commit 5f82705
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 23 deletions.
diff --git a/src/providers/ows/CMakeLists.txt b/src/providers/ows/CMakeLists.txt
@@ -30,7 +30,6 @@ ADD_LIBRARY (owsprovider MODULE ${OWS_SRCS} ${OWS_MOC_SRCS})
 
 TARGET_LINK_LIBRARIES (owsprovider
   qgis_core
-  qgis_gui
 )
 
 IF (WITH_GUI)

diff --git a/src/providers/ows/qgsowsdataitems.cpp b/src/providers/ows/qgsowsdataitems.cpp
@@ -259,21 +259,26 @@ void QgsOWSRootItem::newConnection()
 static QStringList extensions = QStringList();
 static QStringList wildcards = QStringList();
 
-QGISEXTERN QList<QgsDataItemProvider *> *dataItemProviders()
+QGISEXTERN int dataCapabilities()
 {
-  QList<QgsDataItemProvider *> *providers = new QList<QgsDataItemProvider *>();
-
-  *providers
-      << new QgsOwsDataItemProvider;
-
-  return providers;
+  return QgsDataProvider::Net;
 }
 
-QgsDataItem *QgsOwsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
+QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
 {
   if ( path.isEmpty() )
   {
     return new QgsOWSRootItem( parentItem, QStringLiteral( "OWS" ), QStringLiteral( "ows:" ) );
   }
   return nullptr;
 }
+
+//QGISEXTERN QgsOWSSourceSelect * selectWidget( QWidget * parent, Qt::WindowFlags fl )
+QGISEXTERN QDialog *selectWidget( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
+{
+  Q_UNUSED( parent );
+  Q_UNUSED( fl );
+  Q_UNUSED( widgetMode );
+  //return new QgsOWSSourceSelect( parent, fl, widgetMode );
+  return nullptr;
+}
diff --git a/src/providers/ows/qgsowsdataitems.h b/src/providers/ows/qgsowsdataitems.h
@@ -16,10 +16,7 @@
 #define QGSOWSDATAITEMS_H
 
 #include "qgsdataitem.h"
-#include "qgsdataitemprovider.h"
-#include "qgsdataprovider.h"
 #include "qgsdatasourceuri.h"
-
 class QgsOWSConnectionItem : public QgsDataCollectionItem
 {
     Q_OBJECT
@@ -66,15 +63,4 @@ class QgsOWSRootItem : public QgsDataCollectionItem
 #endif
 };
 
-//! Provider for ows root data item
-class QgsOwsDataItemProvider : public QgsDataItemProvider
-{
-  public:
-    virtual QString name() override { return QStringLiteral( "OWS" ); }
-
-    virtual int capabilities() override { return QgsDataProvider::Net; }
-
-    virtual QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) override;
-};
-
 #endif // QGSOWSDATAITEMS_H