remove unnecessary changes

qgis · Apr 8, 2021 · a547f17 · a547f17
1 parent f9b7184
commit a547f17
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -5654,11 +5654,7 @@ QgsVectorTileLayer *QgisApp::addVectorTileLayerPrivate( const QString &url, cons
   return layer.release();
 }
 
-QgsPointCloudLayer *QgisApp::addPointCloudLayerPrivate(
-  const QString &uri,
-  const QString &baseName,
-  const QString &providerKey,
-  bool guiWarning )
+QgsPointCloudLayer *QgisApp::addPointCloudLayerPrivate( const QString &uri, const QString &baseName, const QString &providerKey, bool guiWarning )
 {
   QgsCanvasRefreshBlocker refreshBlocker;
   QgsSettings settings;
@@ -7458,10 +7454,8 @@ bool QgisApp::openLayer( const QString &fileName, bool allowInteractive )
         break;
 
       case QgsMapLayerType::PointCloudLayer:
-      {
         ok = static_cast< bool >( addPointCloudLayerPrivate( fileName, fileInfo.completeBaseName(), candidateProviders.at( 0 ).metadata()->key(), false ) );
-      }
-      break;
+        break;
     }
   }
 

diff --git a/src/core/providers/ept/qgseptprovider.cpp b/src/core/providers/ept/qgseptprovider.cpp
@@ -35,11 +35,10 @@
 QgsEptProvider::QgsEptProvider(
   const QString &uri,
   const QgsDataProvider::ProviderOptions &options,
-  const QString &dataSourceType,
   QgsDataProvider::ReadFlags flags )
   : QgsPointCloudDataProvider( uri, options, flags )
 {
-  if ( dataSourceType == QStringLiteral( "remote" ) )
+  if ( uri.startsWith( QStringLiteral( "http" ), Qt::CaseSensitivity::CaseInsensitive ) )
     mIndex.reset( new QgsRemoteEptPointCloudIndex );
   else
     mIndex.reset( new QgsEptPointCloudIndex );
@@ -133,7 +132,7 @@ QgsEptProviderMetadata::QgsEptProviderMetadata():
 
 QgsEptProvider *QgsEptProviderMetadata::createProvider( const QString &uri, const QgsDataProvider::ProviderOptions &options, QgsDataProvider::ReadFlags flags )
 {
-  return new QgsEptProvider( uri, options, "", flags );
+  return new QgsEptProvider( uri, options, flags );
 }
 
 QList<QgsDataItemProvider *> QgsEptProviderMetadata::dataItemProviders() const

diff --git a/src/core/providers/ept/qgseptprovider.h b/src/core/providers/ept/qgseptprovider.h
@@ -38,7 +38,6 @@ class QgsEptProvider: public QgsPointCloudDataProvider
   public:
     QgsEptProvider( const QString &uri,
                     const QgsDataProvider::ProviderOptions &providerOptions,
-                    const QString &dataSourceType,
                     QgsDataProvider::ReadFlags flags = QgsDataProvider::ReadFlags() );
 
     ~QgsEptProvider();

diff --git a/src/core/qgsprovidermetadata.h b/src/core/qgsprovidermetadata.h
@@ -43,7 +43,6 @@ class QgsTransaction;
 class QgsRasterDataProvider;
 class QgsMeshDataProvider;
 class QgsAbstractDatabaseProviderConnection;
-class QgsEptProvider;
 
 struct QgsMesh;
 

diff --git a/src/core/qgsproviderregistry.h b/src/core/qgsproviderregistry.h
@@ -39,7 +39,6 @@ class QgsCoordinateReferenceSystem;
 class QgsDataItemProvider;
 class QgsDataItem;
 class QgsRasterDataProvider;
-class QgsEptProvider;
 
 /**
  * \ingroup core