Split QgsGeoNodeConnection into two classes

nyalldawson · nyalldawson · commit 378a9e90dd3a · 2017-09-13T05:47:20.000+10:00
Move utility functions to QgsGeoNodeConnectionUtils
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -284,8 +284,6 @@
 %Include fieldformatter/qgsrelationreferencefieldformatter.sip
 %Include fieldformatter/qgsvaluemapfieldformatter.sip
 %Include fieldformatter/qgsvaluerelationfieldformatter.sip
-%Include geonode/qgsgeonodeconnection.sip
-%Include geonode/qgsgeonoderequest.sip
 %Include gps/qgsqtlocationconnection.sip
 %Include gps/qgsgpsconnectionregistry.sip
 %Include qgsapplication.sip
@@ -384,6 +382,7 @@
 %Include raster/qgsrasterdataprovider.sip
 %Include raster/qgsrasterinterface.sip
 %Include geometry/qgspoint.sip
+%Include geonode/qgsgeonoderequest.sip
 %Include gps/qgsgpsconnection.sip
 %Include gps/qgsgpsdetector.sip
 %Include gps/qgsnmeaconnection.sip
diff --git a/python/core/geonode/qgsgeonodeconnection.sip b/python/core/geonode/qgsgeonodeconnection.sip
@@ -1,86 +0,0 @@
-/************************************************************************
- * This file has been generated automatically from                      *
- *                                                                      *
- * src/core/geonode/qgsgeonodeconnection.h                              *
- *                                                                      *
- * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
- ************************************************************************/
-
-
-
-
-class QgsGeoNodeConnection
-{
-%Docstring
-!
-   GeoNode Connections management
-%End
-
-%TypeHeaderCode
-#include "qgsgeonodeconnection.h"
-%End
-  public:
-    explicit QgsGeoNodeConnection( const QString &connName );
-%Docstring
-Constructor
-%End
-
-    ~QgsGeoNodeConnection();
-%Docstring
-Destructor
-%End
-
-    QString connName() const;
-%Docstring
- :rtype: str
-%End
-    void setConnName( const QString &connName );
-
-    QgsDataSourceUri uri() const;
-%Docstring
- :rtype: QgsDataSourceUri
-%End
-    void setUri( const QgsDataSourceUri &uri );
-
-    static QStringList connectionList();
-%Docstring
-Retrieve all geonode connection
- :rtype: list of str
-%End
-
-    static void deleteConnection( const QString &name );
-%Docstring
-Delete connection with name, name
-%End
-
-    static QString selectedConnection();
-%Docstring
-Get selected connection
- :rtype: str
-%End
-
-    static void setSelectedConnection( const QString &name );
-%Docstring
-Set selected connection
-%End
-
-    static QString pathGeoNodeConnection();
-%Docstring
- :rtype: str
-%End
-
-    static QString pathGeoNodeConnectionDetails();
-%Docstring
- :rtype: str
-%End
-
-};
-
-
-/************************************************************************
- * This file has been generated automatically from                      *
- *                                                                      *
- * src/core/geonode/qgsgeonodeconnection.h                              *
- *                                                                      *
- * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
- ************************************************************************/
diff --git a/python/core/qgsdataitem.sip b/python/core/qgsdataitem.sip
@@ -257,6 +257,8 @@ Create path component replacing path separators
  :rtype: str
 %End
 
+    void setActions( QList<QAction *> actions );
+
     static void deleteLater( QVector<QgsDataItem *> &items );
 
     void moveToThread( QThread *targetThread );
diff --git a/src/core/geonode/qgsgeonodeconnection.cpp b/src/core/geonode/qgsgeonodeconnection.cpp
@@ -18,18 +18,17 @@
 #include "qgslogger.h"
 #include "qgsdatasourceuri.h"
 
-const QString QgsGeoNodeConnection::sPathGeoNodeConnection = "qgis/connections-geonode";
-const QString QgsGeoNodeConnection::sPathGeoNodeConnectionDetails = "qgis/GeoNode";
+const QString QgsGeoNodeConnectionUtils::sPathGeoNodeConnection = "qgis/connections-geonode";
+const QString QgsGeoNodeConnectionUtils::sPathGeoNodeConnectionDetails = "qgis/GeoNode";
 
 QgsGeoNodeConnection::QgsGeoNodeConnection( const QString &connName )
   : mConnName( connName )
 {
   QgsSettings settings;
 
-
 //  settings.Section
-  QString key = sPathGeoNodeConnection  + QStringLiteral( "/" ) + mConnName;
-  QString credentialsKey = sPathGeoNodeConnectionDetails + QStringLiteral( "/" ) + mConnName;
+  QString key = QgsGeoNodeConnectionUtils::pathGeoNodeConnection() + QStringLiteral( "/" ) + mConnName;
+  QString credentialsKey = QgsGeoNodeConnectionUtils::pathGeoNodeConnectionDetails() + QStringLiteral( "/" ) + mConnName;
 
   mUri.setParam( QStringLiteral( "url" ), settings.value( key + QStringLiteral( "/url" ), QString(), QgsSettings::Providers ).toString() );
 
@@ -61,55 +60,61 @@ QgsDataSourceUri QgsGeoNodeConnection::uri() const
   return mUri;
 }
 
-QStringList QgsGeoNodeConnection::connectionList()
+QString QgsGeoNodeConnection::connName() const
+{
+  return mConnName;
+}
+
+void QgsGeoNodeConnection::setConnName( const QString &connName )
+{
+  mConnName = connName;
+}
+
+void QgsGeoNodeConnection::setUri( const QgsDataSourceUri &uri )
+{
+  mUri = uri;
+}
+
+
+//
+// QgsGeoNodeConnectionUtils
+//
+
+
+QStringList QgsGeoNodeConnectionUtils::connectionList()
 {
   QgsSettings settings;
   // Add Section manually
   settings.beginGroup( QStringLiteral( "providers/qgis/connections-geonode" ) );
   return settings.childGroups();
 }
 
-void QgsGeoNodeConnection::deleteConnection( const QString &name )
+void QgsGeoNodeConnectionUtils::deleteConnection( const QString &name )
 {
   QgsSettings settings;
   // Add Section manually
   settings.remove( QStringLiteral( "providers/qgis/connections-geonode/" ) + name );
   settings.remove( QStringLiteral( "providers/qgis/geonode/" ) + name );
 }
 
-QString QgsGeoNodeConnection::selectedConnection()
+QString QgsGeoNodeConnectionUtils::selectedConnection()
 {
   QgsSettings settings;
   return settings.value( QStringLiteral( "qgis/connections-geonode/selected" ), QString(), QgsSettings::Providers ).toString();
 }
 
-void QgsGeoNodeConnection::setSelectedConnection( const QString &name )
+void QgsGeoNodeConnectionUtils::setSelectedConnection( const QString &name )
 {
   QgsSettings settings;
   settings.setValue( QStringLiteral( "qgis/connections-geonode/selected" ), name, QgsSettings::Providers );
 }
 
-QString QgsGeoNodeConnection::pathGeoNodeConnection()
+QString QgsGeoNodeConnectionUtils::pathGeoNodeConnection()
 {
   return sPathGeoNodeConnection;
 }
 
-QString QgsGeoNodeConnection::pathGeoNodeConnectionDetails()
+QString QgsGeoNodeConnectionUtils::pathGeoNodeConnectionDetails()
 {
   return sPathGeoNodeConnectionDetails;
 }
-
-QString QgsGeoNodeConnection::connName() const
-{
-  return mConnName;
-}
-
-void QgsGeoNodeConnection::setConnName( const QString &connName )
-{
-  mConnName = connName;
-}
-
-void QgsGeoNodeConnection::setUri( const QgsDataSourceUri &uri )
-{
-  mUri = uri;
-}
diff --git a/src/core/geonode/qgsgeonodeconnection.h b/src/core/geonode/qgsgeonodeconnection.h
@@ -19,9 +19,10 @@
 #include "qgis_core.h"
 #include "qgsdatasourceuri.h"
 
+SIP_NO_FILE
 
 /*!
- * \brief   GeoNode Connections management
+ * \brief GeoNode Connections management
  */
 class CORE_EXPORT QgsGeoNodeConnection
 {
@@ -39,6 +40,19 @@ class CORE_EXPORT QgsGeoNodeConnection
     QgsDataSourceUri uri() const;
     void setUri( const QgsDataSourceUri &uri );
 
+  private:
+
+    //! The connection name
+    QString mConnName;
+
+    //! Property of mUri
+    QgsDataSourceUri mUri;
+};
+
+class CORE_EXPORT QgsGeoNodeConnectionUtils
+{
+  public:
+
     //! Retrieve all geonode connection
     static QStringList connectionList();
 
@@ -56,15 +70,11 @@ class CORE_EXPORT QgsGeoNodeConnection
     static QString pathGeoNodeConnectionDetails();
 
   private:
+
     // Path in QSetting
     static const QString sPathGeoNodeConnection;
     static const QString sPathGeoNodeConnectionDetails;
 
-    //! The connection name
-    QString mConnName;
-
-    //! Property of mUri
-    QgsDataSourceUri mUri;
 };
 
 
diff --git a/src/gui/geonode/qgsgeonodenewconnection.cpp b/src/gui/geonode/qgsgeonodenewconnection.cpp
@@ -33,8 +33,8 @@ QgsGeoNodeNewConnection::QgsGeoNodeNewConnection( QWidget *parent, const QString
 {
   setupUi( this );
 
-  mBaseKey = QgsGeoNodeConnection::pathGeoNodeConnection();
-  mCredentialsBaseKey = QgsGeoNodeConnection::pathGeoNodeConnection();
+  mBaseKey = QgsGeoNodeConnectionUtils::pathGeoNodeConnection();
+  mCredentialsBaseKey = QgsGeoNodeConnectionUtils::pathGeoNodeConnection();
 
   mAuthConfigSelect = new QgsAuthConfigSelect( this );
   tabAuth->insertTab( 1, mAuthConfigSelect, tr( "Configurations" ) );
diff --git a/src/gui/geonode/qgsgeonodesourceselect.cpp b/src/gui/geonode/qgsgeonodesourceselect.cpp
@@ -118,7 +118,7 @@ void QgsGeoNodeSourceSelect::deleteConnectionsEntryList()
   QMessageBox::StandardButton result = QMessageBox::information( this, tr( "Confirm Delete" ), msg, QMessageBox::Ok | QMessageBox::Cancel );
   if ( result == QMessageBox::Ok )
   {
-    QgsGeoNodeConnection::deleteConnection( cmbConnections->currentText() );
+    QgsGeoNodeConnectionUtils::deleteConnection( cmbConnections->currentText() );
     cmbConnections->removeItem( cmbConnections->currentIndex() );
     if ( mModel )
     {
@@ -148,14 +148,14 @@ void QgsGeoNodeSourceSelect::deleteConnectionsEntryList()
 void QgsGeoNodeSourceSelect::populateConnectionList()
 {
   cmbConnections->clear();
-  cmbConnections->addItems( QgsGeoNodeConnection::connectionList() );
+  cmbConnections->addItems( QgsGeoNodeConnectionUtils::connectionList() );
 
   setConnectionListPosition();
 }
 
 void QgsGeoNodeSourceSelect::setConnectionListPosition()
 {
-  QString toSelect = QgsGeoNodeConnection::selectedConnection();
+  QString toSelect = QgsGeoNodeConnectionUtils::selectedConnection();
 
   cmbConnections->setCurrentIndex( cmbConnections->findText( toSelect ) );
 
diff --git a/src/providers/ows/qgsgeonodedataitems.cpp b/src/providers/ows/qgsgeonodedataitems.cpp
@@ -229,7 +229,7 @@ QVector<QgsDataItem *> QgsGeoNodeRootItem::createChildren()
 {
   QVector<QgsDataItem *> connections;
 
-  Q_FOREACH ( const QString &connName, QgsGeoNodeConnection::connectionList() )
+  Q_FOREACH ( const QString &connName, QgsGeoNodeConnectionUtils::connectionList() )
   {
     QgsGeoNodeConnection *connection = nullptr;
     connection = new QgsGeoNodeConnection( connName );
@@ -270,7 +270,7 @@ QgsDataItem *QgsGeoNodeDataItemProvider::createDataItem( const QString &path, Qg
   if ( path.startsWith( QLatin1String( "geonode:/" ) ) )
   {
     QString connectionName = path.split( '/' ).last();
-    if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )
+    if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )
     {
       QgsGeoNodeConnection *connection = new QgsGeoNodeConnection( connectionName );
       return new QgsGeoNodeConnectionItem( parentItem, QStringLiteral( "GeoNode" ), path, connection );
diff --git a/src/providers/ows/qgsgeonodedataitems.h b/src/providers/ows/qgsgeonodedataitems.h
@@ -36,7 +36,7 @@ class QgsGeoNodeConnectionItem : public QgsDataCollectionItem
     void editConnection();
     void deleteConnection()
     {
-      QgsGeoNodeConnection::deleteConnection( name() );
+      QgsGeoNodeConnectionUtils::deleteConnection( name() );
       mParent->refresh();
     };
 
diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp
@@ -220,7 +220,7 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat
   else if ( path.startsWith( QLatin1String( "geonode:/" ) ) )
   {
     QString connectionName = path.split( '/' ).last();
-    if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )
+    if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )
     {
       QgsGeoNodeConnection connection( connectionName );
 
@@ -244,7 +244,7 @@ QVector<QgsDataItem *> QgsWfsDataItemProvider::createDataItems( const QString &p
   if ( path.startsWith( QLatin1String( "geonode:/" ) ) )
   {
     QString connectionName = path.split( '/' ).last();
-    if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )
+    if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )
     {
       QgsGeoNodeConnection connection( connectionName );
 
diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp
@@ -559,7 +559,7 @@ QVector<QgsDataItem *> QgsWmsDataItemProvider::createDataItems( const QString &p
   if ( path.startsWith( QLatin1String( "geonode:/" ) ) )
   {
     QString connectionName = path.split( '/' ).last();
-    if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )
+    if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )
     {
       QgsGeoNodeConnection connection( connectionName );
 
@@ -575,7 +575,7 @@ QVector<QgsDataItem *> QgsWmsDataItemProvider::createDataItems( const QString &p
           QgsDebugMsg( encodedUri );
           QgsDataSourceUri uri;
           QgsSettings settings;
-          QString key( connection.pathGeoNodeConnection() + "/" + connectionName );
+          QString key( QgsGeoNodeConnectionUtils::pathGeoNodeConnection() + "/" + connectionName );
 
           QString dpiMode = settings.value( key + "/wms/dpiMode", "all", QgsSettings::Providers ).toString();
           uri.setParam( QStringLiteral( "url" ), encodedUri );
@@ -605,7 +605,7 @@ QVector<QgsDataItem *> QgsXyzTileDataItemProvider::createDataItems( const QStrin
   if ( path.startsWith( QLatin1String( "geonode:/" ) ) )
   {
     QString connectionName = path.split( '/' ).last();
-    if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )
+    if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )
     {
       QgsGeoNodeConnection connection( connectionName );
 
diff --git a/tests/src/core/testqgsgeonodeconnection.cpp b/tests/src/core/testqgsgeonodeconnection.cpp

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@ QgsGeoNodeNewConnection::QgsGeoNodeNewConnection( QWidget *parent, const QString`
`33`	`33`	`{`
`34`	`34`	`setupUi( this );`
`35`	`35`
`36`		`- mBaseKey = QgsGeoNodeConnection::pathGeoNodeConnection();`
`37`		`- mCredentialsBaseKey = QgsGeoNodeConnection::pathGeoNodeConnection();`
	`36`	`+ mBaseKey = QgsGeoNodeConnectionUtils::pathGeoNodeConnection();`
	`37`	`+ mCredentialsBaseKey = QgsGeoNodeConnectionUtils::pathGeoNodeConnection();`
`38`	`38`
`39`	`39`	`mAuthConfigSelect = new QgsAuthConfigSelect( this );`
`40`	`40`	`tabAuth->insertTab( 1, mAuthConfigSelect, tr( "Configurations" ) );`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ void QgsGeoNodeSourceSelect::deleteConnectionsEntryList()`
`118`	`118`	`QMessageBox::StandardButton result = QMessageBox::information( this, tr( "Confirm Delete" ), msg, QMessageBox::Ok \| QMessageBox::Cancel );`
`119`	`119`	`if ( result == QMessageBox::Ok )`
`120`	`120`	`{`
`121`		`- QgsGeoNodeConnection::deleteConnection( cmbConnections->currentText() );`
	`121`	`+ QgsGeoNodeConnectionUtils::deleteConnection( cmbConnections->currentText() );`
`122`	`122`	`cmbConnections->removeItem( cmbConnections->currentIndex() );`
`123`	`123`	`if ( mModel )`
`124`	`124`	`{`
`@@ -148,14 +148,14 @@ void QgsGeoNodeSourceSelect::deleteConnectionsEntryList()`
`148`	`148`	`void QgsGeoNodeSourceSelect::populateConnectionList()`
`149`	`149`	`{`
`150`	`150`	`cmbConnections->clear();`
`151`		`- cmbConnections->addItems( QgsGeoNodeConnection::connectionList() );`
	`151`	`+ cmbConnections->addItems( QgsGeoNodeConnectionUtils::connectionList() );`
`152`	`152`
`153`	`153`	`setConnectionListPosition();`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`void QgsGeoNodeSourceSelect::setConnectionListPosition()`
`157`	`157`	`{`
`158`		`- QString toSelect = QgsGeoNodeConnection::selectedConnection();`
	`158`	`+ QString toSelect = QgsGeoNodeConnectionUtils::selectedConnection();`
`159`	`159`
`160`	`160`	`cmbConnections->setCurrentIndex( cmbConnections->findText( toSelect ) );`
`161`	`161`
Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ QVector<QgsDataItem *> QgsGeoNodeRootItem::createChildren()`
`229`	`229`	`{`
`230`	`230`	`QVector<QgsDataItem *> connections;`
`231`	`231`
`232`		`- Q_FOREACH ( const QString &connName, QgsGeoNodeConnection::connectionList() )`
	`232`	`+ Q_FOREACH ( const QString &connName, QgsGeoNodeConnectionUtils::connectionList() )`
`233`	`233`	`{`
`234`	`234`	`QgsGeoNodeConnection *connection = nullptr;`
`235`	`235`	`connection = new QgsGeoNodeConnection( connName );`
`@@ -270,7 +270,7 @@ QgsDataItem *QgsGeoNodeDataItemProvider::createDataItem( const QString &path, Qg`
`270`	`270`	`if ( path.startsWith( QLatin1String( "geonode:/" ) ) )`
`271`	`271`	`{`
`272`	`272`	`QString connectionName = path.split( '/' ).last();`
`273`		`- if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )`
	`273`	`+ if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )`
`274`	`274`	`{`
`275`	`275`	`QgsGeoNodeConnection *connection = new QgsGeoNodeConnection( connectionName );`
`276`	`276`	`return new QgsGeoNodeConnectionItem( parentItem, QStringLiteral( "GeoNode" ), path, connection );`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class QgsGeoNodeConnectionItem : public QgsDataCollectionItem`
`36`	`36`	`void editConnection();`
`37`	`37`	`void deleteConnection()`
`38`	`38`	`{`
`39`		`- QgsGeoNodeConnection::deleteConnection( name() );`
	`39`	`+ QgsGeoNodeConnectionUtils::deleteConnection( name() );`
`40`	`40`	`mParent->refresh();`
`41`	`41`	`};`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ QgsDataItem *QgsWfsDataItemProvider::createDataItem( const QString &path, QgsDat`
`220`	`220`	`else if ( path.startsWith( QLatin1String( "geonode:/" ) ) )`
`221`	`221`	`{`
`222`	`222`	`QString connectionName = path.split( '/' ).last();`
`223`		`- if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )`
	`223`	`+ if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )`
`224`	`224`	`{`
`225`	`225`	`QgsGeoNodeConnection connection( connectionName );`
`226`	`226`
`@@ -244,7 +244,7 @@ QVector<QgsDataItem *> QgsWfsDataItemProvider::createDataItems( const QString &p`
`244`	`244`	`if ( path.startsWith( QLatin1String( "geonode:/" ) ) )`
`245`	`245`	`{`
`246`	`246`	`QString connectionName = path.split( '/' ).last();`
`247`		`- if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )`
	`247`	`+ if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )`
`248`	`248`	`{`
`249`	`249`	`QgsGeoNodeConnection connection( connectionName );`
`250`	`250`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ QVector<QgsDataItem *> QgsWmsDataItemProvider::createDataItems( const QString &p`
`559`	`559`	`if ( path.startsWith( QLatin1String( "geonode:/" ) ) )`
`560`	`560`	`{`
`561`	`561`	`QString connectionName = path.split( '/' ).last();`
`562`		`- if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )`
	`562`	`+ if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )`
`563`	`563`	`{`
`564`	`564`	`QgsGeoNodeConnection connection( connectionName );`
`565`	`565`
`@@ -575,7 +575,7 @@ QVector<QgsDataItem *> QgsWmsDataItemProvider::createDataItems( const QString &p`
`575`	`575`	`QgsDebugMsg( encodedUri );`
`576`	`576`	`QgsDataSourceUri uri;`
`577`	`577`	`QgsSettings settings;`
`578`		`- QString key( connection.pathGeoNodeConnection() + "/" + connectionName );`
	`578`	`+ QString key( QgsGeoNodeConnectionUtils::pathGeoNodeConnection() + "/" + connectionName );`
`579`	`579`
`580`	`580`	`QString dpiMode = settings.value( key + "/wms/dpiMode", "all", QgsSettings::Providers ).toString();`
`581`	`581`	`uri.setParam( QStringLiteral( "url" ), encodedUri );`
`@@ -605,7 +605,7 @@ QVector<QgsDataItem *> QgsXyzTileDataItemProvider::createDataItems( const QStrin`
`605`	`605`	`if ( path.startsWith( QLatin1String( "geonode:/" ) ) )`
`606`	`606`	`{`
`607`	`607`	`QString connectionName = path.split( '/' ).last();`
`608`		`- if ( QgsGeoNodeConnection::connectionList().contains( connectionName ) )`
	`608`	`+ if ( QgsGeoNodeConnectionUtils::connectionList().contains( connectionName ) )`
`609`	`609`	`{`
`610`	`610`	`QgsGeoNodeConnection connection( connectionName );`
`611`	`611`