diff --git a/src/core/pointcloud/qgscopcpointcloudindex.cpp b/src/core/pointcloud/qgscopcpointcloudindex.cpp index 54ee395d9a1..19e1d679441 100644 --- a/src/core/pointcloud/qgscopcpointcloudindex.cpp +++ b/src/core/pointcloud/qgscopcpointcloudindex.cpp @@ -53,14 +53,6 @@ QgsCopcPointCloudIndex::QgsCopcPointCloudIndex() = default; QgsCopcPointCloudIndex::~QgsCopcPointCloudIndex() = default; -std::unique_ptr QgsCopcPointCloudIndex::clone() const -{ - QgsCopcPointCloudIndex *clone = new QgsCopcPointCloudIndex; - QMutexLocker locker( &mHierarchyMutex ); - copyCommonProperties( clone ); - return std::unique_ptr( clone ); -} - void QgsCopcPointCloudIndex::load( const QString &urlString ) { QUrl url = urlString; @@ -432,22 +424,6 @@ QgsPointCloudNode QgsCopcPointCloudIndex::getNode( const QgsPointCloudNodeId &id return QgsPointCloudNode( id, pointCount, children, bounds.width() / mSpan, bounds ); } -void QgsCopcPointCloudIndex::copyCommonProperties( QgsCopcPointCloudIndex *destination ) const -{ - QgsAbstractPointCloudIndex::copyCommonProperties( destination ); - - // QgsCopcPointCloudIndex specific fields - destination->mIsValid = mIsValid; - destination->mAccessType = mAccessType; - destination->mUri = mUri; - if ( mAccessType == Qgis::PointCloudAccessType::Local ) - destination->mCopcFile.open( QgsLazDecoder::toNativePath( mUri ), std::ios::binary ); - destination->mCopcInfoVlr = mCopcInfoVlr; - destination->mHierarchyNodePos = mHierarchyNodePos; - destination->mOriginalMetadata = mOriginalMetadata; - destination->mLazInfo.reset( new QgsLazInfo( *mLazInfo ) ); -} - QByteArray QgsCopcPointCloudIndex::readRange( uint64_t offset, uint64_t length ) const { if ( mAccessType == Qgis::PointCloudAccessType::Local ) diff --git a/src/core/pointcloud/qgscopcpointcloudindex.h b/src/core/pointcloud/qgscopcpointcloudindex.h index 7b8b0459a99..2f43a02045c 100644 --- a/src/core/pointcloud/qgscopcpointcloudindex.h +++ b/src/core/pointcloud/qgscopcpointcloudindex.h @@ -46,8 +46,6 @@ class CORE_EXPORT QgsCopcPointCloudIndex: public QgsAbstractPointCloudIndex explicit QgsCopcPointCloudIndex(); ~QgsCopcPointCloudIndex(); - std::unique_ptr clone() const override; - void load( const QString &fileName ) override; bool hasNode( const QgsPointCloudNodeId &n ) const override; @@ -77,12 +75,6 @@ class CORE_EXPORT QgsCopcPointCloudIndex: public QgsAbstractPointCloudIndex */ QgsPointCloudStatistics metadataStatistics() const override; - /** - * Copies common properties to the \a destination index - * \since QGIS 3.26 - */ - void copyCommonProperties( QgsCopcPointCloudIndex *destination ) const; - /** * Returns one datapoint, "CopcGpsTimeFlag": The gps time flag from global_encoding field in LAS header, * 0 indicates GPS week time (seconds passed since the beginning of the week) diff --git a/src/core/pointcloud/qgseptpointcloudindex.cpp b/src/core/pointcloud/qgseptpointcloudindex.cpp index 7f23e4e9f0a..0668f0d84e6 100644 --- a/src/core/pointcloud/qgseptpointcloudindex.cpp +++ b/src/core/pointcloud/qgseptpointcloudindex.cpp @@ -55,14 +55,6 @@ QgsEptPointCloudIndex::QgsEptPointCloudIndex() QgsEptPointCloudIndex::~QgsEptPointCloudIndex() = default; -std::unique_ptr QgsEptPointCloudIndex::clone() const -{ - QgsEptPointCloudIndex *clone = new QgsEptPointCloudIndex; - QMutexLocker locker( &mHierarchyMutex ); - copyCommonProperties( clone ); - return std::unique_ptr( clone ); -} - void QgsEptPointCloudIndex::load( const QString &urlString ) { QUrl url = urlString; @@ -651,23 +643,6 @@ Qgis::PointCloudAccessType QgsEptPointCloudIndex::accessType() const return mAccessType; } -void QgsEptPointCloudIndex::copyCommonProperties( QgsEptPointCloudIndex *destination ) const -{ - QgsAbstractPointCloudIndex::copyCommonProperties( destination ); - - // QgsEptPointCloudIndex specific fields - destination->mIsValid = mIsValid; - destination->mAccessType = mAccessType; - destination->mDataType = mDataType; - destination->mUrlDirectoryPart = mUrlDirectoryPart; - destination->mWkt = mWkt; - destination->mHierarchyNodes = mHierarchyNodes; - destination->mPointCount = mPointCount; - destination->mMetadataStats = mMetadataStats; - destination->mAttributeClasses = mAttributeClasses; - destination->mOriginalMetadata = mOriginalMetadata; -} - #undef PROVIDER_KEY #undef PROVIDER_DESCRIPTION diff --git a/src/core/pointcloud/qgseptpointcloudindex.h b/src/core/pointcloud/qgseptpointcloudindex.h index c01e4d45651..be20979cde5 100644 --- a/src/core/pointcloud/qgseptpointcloudindex.h +++ b/src/core/pointcloud/qgseptpointcloudindex.h @@ -41,8 +41,6 @@ class CORE_EXPORT QgsEptPointCloudIndex: public QgsAbstractPointCloudIndex explicit QgsEptPointCloudIndex(); ~QgsEptPointCloudIndex(); - std::unique_ptr clone() const override; - void load( const QString &fileName ) override; std::unique_ptr nodeData( const QgsPointCloudNodeId &n, const QgsPointCloudRequest &request ) override; @@ -58,12 +56,6 @@ class CORE_EXPORT QgsEptPointCloudIndex: public QgsAbstractPointCloudIndex bool isValid() const override; Qgis::PointCloudAccessType accessType() const override; - /** - * Copies common properties to the \a destination index - * \since QGIS 3.26 - */ - void copyCommonProperties( QgsEptPointCloudIndex *destination ) const; - protected: bool loadSchema( const QByteArray &dataJson ); void loadManifest( const QByteArray &manifestJson ); diff --git a/src/core/pointcloud/qgspointcloudeditingindex.cpp b/src/core/pointcloud/qgspointcloudeditingindex.cpp index 913a83de5a3..8d84b211569 100644 --- a/src/core/pointcloud/qgspointcloudeditingindex.cpp +++ b/src/core/pointcloud/qgspointcloudeditingindex.cpp @@ -47,11 +47,6 @@ QgsPointCloudEditingIndex::QgsPointCloudEditingIndex( QgsPointCloudLayer *layer mIsValid = true; } -std::unique_ptr QgsPointCloudEditingIndex::clone() const -{ - return nullptr; -} - void QgsPointCloudEditingIndex::load( const QString & ) { return; diff --git a/src/core/pointcloud/qgspointcloudeditingindex.h b/src/core/pointcloud/qgspointcloudeditingindex.h index b7087d74207..68fa0a62245 100644 --- a/src/core/pointcloud/qgspointcloudeditingindex.h +++ b/src/core/pointcloud/qgspointcloudeditingindex.h @@ -39,7 +39,6 @@ class CORE_EXPORT QgsPointCloudEditingIndex : public QgsAbstractPointCloudIndex //! Ctor explicit QgsPointCloudEditingIndex( QgsPointCloudLayer *layer ); - std::unique_ptr clone() const override; void load( const QString &fileName ) override; bool isValid() const override; Qgis::PointCloudAccessType accessType() const override; diff --git a/src/core/pointcloud/qgspointcloudindex.h b/src/core/pointcloud/qgspointcloudindex.h index 708adbbdd73..4eb140d4edb 100644 --- a/src/core/pointcloud/qgspointcloudindex.h +++ b/src/core/pointcloud/qgspointcloudindex.h @@ -218,13 +218,6 @@ class CORE_EXPORT QgsAbstractPointCloudIndex explicit QgsAbstractPointCloudIndex(); virtual ~QgsAbstractPointCloudIndex(); - /** - * Returns a clone of the current point cloud index object - * \note It is the responsibility of the caller to handle the ownership and delete the object. - * \since QGIS 3.26 - */ - virtual std::unique_ptr clone() const = 0; - //! Loads the index from the file virtual void load( const QString &fileName ) = 0;