added assign operator and copy constructor for copying all datasource…

… properties to a another/new instance
qgis · Apr 21, 2023 · 654dd44 · 654dd44
1 parent c4afd27
commit 654dd44
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 18 deletions.
diff --git a/src/providers/wfs/qgswfsdatasourceuri.cpp b/src/providers/wfs/qgswfsdatasourceuri.cpp
@@ -151,6 +151,25 @@ QgsWFSDataSourceURI::QgsWFSDataSourceURI( const QString &uri )
   }
 }
 
+QgsWFSDataSourceURI::QgsWFSDataSourceURI( const QgsWFSDataSourceURI& other )
+  : mURI( other.mURI )
+  , mAuth( other.mAuth )
+  , mGetEndpoints( other.mGetEndpoints )
+  , mPostEndpoints( other.mPostEndpoints )
+  , mDeprecatedURI( other.mDeprecatedURI )
+{
+}
+
+QgsWFSDataSourceURI& QgsWFSDataSourceURI::operator=( const QgsWFSDataSourceURI &other )
+{
+  mURI = other.mURI;
+  mAuth = other.mAuth;
+  mGetEndpoints = other.mGetEndpoints;
+  mPostEndpoints = other.mPostEndpoints;
+  mDeprecatedURI = other.mDeprecatedURI;
+  return *this;
+}
+
 bool QgsWFSDataSourceURI::isValid() const
 {
   return mURI.hasParam( QgsWFSConstants::URI_PARAM_URL ) &&
@@ -469,17 +488,7 @@ void QgsWFSDataSourceURI::setGetEndpoints( const QgsStringMap &map )
   mGetEndpoints = map;
 }
 
-QgsStringMap QgsWFSDataSourceURI::getGetEndpoints() const
-{
-  return mGetEndpoints;
-}
-
 void QgsWFSDataSourceURI::setPostEndpoints( const QgsStringMap &map )
 {
   mPostEndpoints = map;
-}
-
-QgsStringMap QgsWFSDataSourceURI::getPostEndpoints() const
-{
-  return mPostEndpoints;
 }
diff --git a/src/providers/wfs/qgswfsdatasourceuri.h b/src/providers/wfs/qgswfsdatasourceuri.h
@@ -42,6 +42,9 @@ class QgsWFSDataSourceURI
 
     explicit QgsWFSDataSourceURI( const QString &uri );
 
+    //! Copy constructor
+    QgsWFSDataSourceURI( const QgsWFSDataSourceURI& other );
+
     //! Returns whether the URI is a valid one
     bool isValid() const;
 
@@ -140,21 +143,18 @@ class QgsWFSDataSourceURI
     //! Sets Get DCP endpoints
     void setGetEndpoints( const QgsStringMap &map );
 
-    //! Return Get DCP endpoints
-    QgsStringMap getGetEndpoints() const;
-
     //! Sets Post DCP endpoints
     void setPostEndpoints( const QgsStringMap &map );
 
-    //! Return Post DCP endpoints
-    QgsStringMap getPostEndpoints() const;
-
     //! Return set of unknown parameter keys in the URI.
     QSet<QString> unknownParamKeys() const;
 
     //! Whether the initial GetFeature request, used to determine if gml:description/name/identifiers are used, should be skipped
     bool skipInitialGetFeature() const;
 
+    //! Assigment operator
+    QgsWFSDataSourceURI& operator=( const QgsWFSDataSourceURI &other );
+
   private:
     QgsDataSourceUri    mURI;
     QgsAuthorizationSettings mAuth;

diff --git a/src/providers/wfs/qgswfsshareddata.cpp b/src/providers/wfs/qgswfsshareddata.cpp
@@ -49,8 +49,7 @@ bool QgsWFSSharedData::isRestrictedToRequestBBOX() const
 QgsWFSSharedData *QgsWFSSharedData::clone() const
 {
   QgsWFSSharedData *copy = new QgsWFSSharedData( mURI.uri( true ) );
-  copy->mURI.setGetEndpoints(mURI.getGetEndpoints());
-  copy->mURI.setPostEndpoints(mURI.getPostEndpoints());	
+  copy->mURI = mURI;
   copy->mWFSVersion = mWFSVersion;
   copy->mGeometryAttribute = mGeometryAttribute;
   copy->mLayerPropertiesList = mLayerPropertiesList;