Skip to content
Permalink
Browse files

Fix rebase leftovers

  • Loading branch information
NEDJIMAbelgacem committed Nov 18, 2020
1 parent 1137e5f commit aa3593cc499d8c94b2157d749669b0cfc3c7c39b
@@ -26,7 +26,6 @@ QgsPointCloud3DSymbol::~QgsPointCloud3DSymbol() { }

QgsAbstract3DSymbol *QgsPointCloud3DSymbol::clone() const
{
// TODO: fix memory leak
QgsPointCloud3DSymbol *result = new QgsPointCloud3DSymbol;
result->mEnabled = mEnabled;
result->mPointSize = mPointSize;
@@ -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.
else
pointCloudLayerPropertiesDialog.restoreLastPage();

if ( !page.isEmpty() )
pointCloudLayerPropertiesDialog.setCurrentPage( page );

for ( QgsMapLayerConfigWidgetFactory *factory : qgis::as_const( mMapLayerPanelFactories ) )
{
pointCloudLayerPropertiesDialog.addPropertiesPageFactory( factory );
@@ -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;

0 comments on commit aa3593c

Please sign in to comment.
You can’t perform that action at this time.