Move selectWidget() and dataCapabilities() to data items file where i…

…t belongs
qgis · Oct 19, 2011 · 2572388 · 2572388
1 parent c219045
commit 2572388
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 33 deletions.
diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp
@@ -223,6 +223,17 @@ void QgsPGRootItem::newConnection()
 
 // ---------------------------------------------------------------------------
 
+QGISEXTERN QgsPgSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
+{
+  // TODO: this should be somewhere else
+  return new QgsPgSourceSelect( parent, fl );
+}
+
+QGISEXTERN int dataCapabilities()
+{
+  return  QgsDataProvider::Database;
+}
+
 QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
 {
   Q_UNUSED( thePath );

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -37,7 +37,6 @@
 
 #include "qgspostgresprovider.h"
 #include "qgspostgresconnection.h"
-#include "qgspgsourceselect.h"
 
 #include "qgslogger.h"
 
@@ -4395,16 +4394,6 @@ QGISEXTERN bool isProvider()
   return true;
 }
 // ---------------------------------------------------------------------------
-QGISEXTERN QgsPgSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
-{
-  // TODO: this should be somewhere else
-  return new QgsPgSourceSelect( parent, fl );
-}
-
-QGISEXTERN int dataCapabilities()
-{
-  return  QgsDataProvider::Database;
-}
 
 QGISEXTERN QgsVectorLayerImport::ImportError createEmptyLayer(
   const QString& uri,

diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -169,6 +169,12 @@ void QgsWFSRootItem::newConnection()
   }
 }
 
+// ---------------------------------------------------------------------------
+
+QGISEXTERN QgsWFSSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
+{
+  return new QgsWFSSourceSelect( parent, fl );
+}
 
 QGISEXTERN int dataCapabilities()
 {

diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -2301,12 +2301,3 @@ QGISEXTERN bool isProvider()
 {
   return true;
 }
-
-// ---------------------------------------------------------------------------
-
-#include "qgswfssourceselect.h"
-
-QGISEXTERN QgsWFSSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
-{
-  return new QgsWFSSourceSelect( parent, fl );
-}
diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -248,10 +248,19 @@ void QgsWMSRootItem::newConnection()
 
 // ---------------------------------------------------------------------------
 
+QGISEXTERN QgsWMSSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
+{
+  return new QgsWMSSourceSelect( parent, fl );
+}
+
+QGISEXTERN int dataCapabilities()
+{
+  return  QgsDataProvider::Net;
+}
+
 QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
 {
   Q_UNUSED( thePath );
 
   return new QgsWMSRootItem( parentItem, "WMS", "wms:" );
 }
-
diff --git a/src/providers/wms/qgswmsdataitems.h b/src/providers/wms/qgswmsdataitems.h
@@ -1,6 +1,7 @@
 #ifndef QGSWMSDATAITEMS_H
 #define QGSWMSDATAITEMS_H
 
+#include "qgsdataitem.h"
 #include "qgswmsprovider.h"
 
 class QgsWMSConnectionItem : public QgsDataCollectionItem

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -26,7 +26,6 @@
 #include "qgslogger.h"
 #include "qgswmsprovider.h"
 #include "qgswmsconnection.h"
-#include "qgswmssourceselect.h"
 
 #include <cmath>
 
@@ -3155,13 +3154,3 @@ QGISEXTERN bool isProvider()
   return true;
 }
 
-// ---------------------------------------------------------------------------
-QGISEXTERN QgsWMSSourceSelect * selectWidget( QWidget * parent, Qt::WFlags fl )
-{
-  return new QgsWMSSourceSelect( parent, fl );
-}
-
-QGISEXTERN int dataCapabilities()
-{
-  return  QgsDataProvider::Net;
-}
diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h
@@ -21,14 +21,14 @@
 #define QGSWMSPROVIDER_H
 
 #include "qgsrasterdataprovider.h"
-#include "qgsdataitem.h"
 #include "qgsrectangle.h"
 
 #include <QString>
 #include <QStringList>
 #include <QDomElement>
 #include <QMap>
 #include <QVector>
+#include <QUrl>
 
 class QgsCoordinateTransform;
 class QNetworkAccessManager;