Revert redundant changes to ows provider

This commit is contained in:
Nyall Dawson 2017-09-06 18:17:36 +10:00
parent b657c1ace6
commit 5f82705c55
3 changed files with 13 additions and 23 deletions

View File

@ -30,7 +30,6 @@ ADD_LIBRARY (owsprovider MODULE ${OWS_SRCS} ${OWS_MOC_SRCS})
TARGET_LINK_LIBRARIES (owsprovider
qgis_core
qgis_gui
)
IF (WITH_GUI)

View File

@ -259,17 +259,12 @@ 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() )
{
@ -277,3 +272,13 @@ QgsDataItem *QgsOwsDataItemProvider::createDataItem( const QString &path, QgsDat
}
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;
}

View File

@ -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