Fix rebase leftovers

qgis · Nov 18, 2020 · aa3593c · aa3593c
1 parent 1137e5f
commit aa3593c
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 9 deletions.
diff --git a/src/3d/symbols/qgspointcloud3dsymbol.cpp b/src/3d/symbols/qgspointcloud3dsymbol.cpp
@@ -26,7 +26,6 @@ QgsPointCloud3DSymbol::~QgsPointCloud3DSymbol() {  }
 
 QgsAbstract3DSymbol *QgsPointCloud3DSymbol::clone() const
 {
-  // TODO: fix memory leak
   QgsPointCloud3DSymbol *result = new QgsPointCloud3DSymbol;
   result->mEnabled = mEnabled;
   result->mPointSize = mPointSize;

diff --git a/src/app/pointcloud/qgspointcloudlayerproperties.h b/src/app/pointcloud/qgspointcloudlayerproperties.h
@@ -72,9 +72,6 @@ class QgsPointCloudLayerProperties : public QgsOptionsDialogBase, private Ui::Qg
     QgsMapCanvas *mMapCanvas = nullptr;
     QgsMetadataWidget *mMetadataWidget = nullptr;
 
-    //! A list of additional pages provided by plugins
-    QList<QgsMapLayerConfigWidget *> mLayerPropertiesPages;
-
     /**
      * Previous layer style. Used to reset style to previous state if new style
      * was loaded but dialog is canceled.

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -16269,9 +16269,6 @@ void QgisApp::showLayerProperties( QgsMapLayer *mapLayer, const QString &page )
       else
         pointCloudLayerPropertiesDialog.restoreLastPage();
 
-      if ( !page.isEmpty() )
-        pointCloudLayerPropertiesDialog.setCurrentPage( page );
-
       for ( QgsMapLayerConfigWidgetFactory *factory : qgis::as_const( mMapLayerPanelFactories ) )
       {
         pointCloudLayerPropertiesDialog.addPropertiesPageFactory( factory );

diff --git a/src/app/qgslayerstylingwidget.cpp b/src/app/qgslayerstylingwidget.cpp
@@ -790,8 +790,6 @@ bool QgsLayerStyleManagerWidgetFactory::supportsLayer( QgsMapLayer *layer ) cons
       return false;  // TODO
 
     case QgsMapLayerType::PointCloudLayer:
-      return true;
-
     case QgsMapLayerType::PluginLayer:
     case QgsMapLayerType::AnnotationLayer:
       return false;