From c2dac183f79bec09e9849155c07e288b337a0af5 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 29 Nov 2019 13:40:25 +0100 Subject: [PATCH] pal.cpp: use default implementation for constructor and destructor It is obvious that the constructor was a no-op. Regarding the destructor, taking a mutex around an object doesn't make sense because both the mutex and the object are member variables, so if the pal object is used correctly, the destructor should only be called after any other use of the object. And explicit clearing of a unordered_map is unnecessary. --- src/core/pal/pal.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/core/pal/pal.cpp b/src/core/pal/pal.cpp index 200ebbbcf38..5bdbb05de0a 100644 --- a/src/core/pal/pal.cpp +++ b/src/core/pal/pal.cpp @@ -46,11 +46,9 @@ using namespace pal; -Pal::Pal() -{ - // do not init and exit GEOS - we do it inside QGIS - //initGEOS( geosNotice, geosError ); -} +Pal::Pal() = default; + +Pal::~Pal() = default; void Pal::removeLayer( Layer *layer ) { @@ -70,16 +68,6 @@ void Pal::removeLayer( Layer *layer ) mMutex.unlock(); } -Pal::~Pal() -{ - mMutex.lock(); - mLayers.clear(); - mMutex.unlock(); - - // do not init and exit GEOS - we do it inside QGIS - //finishGEOS(); -} - Layer *Pal::addLayer( QgsAbstractLabelProvider *provider, const QString &layerName, QgsPalLayerSettings::Placement arrangement, double defaultPriority, bool active, bool toLabel, bool displayAll ) { mMutex.lock();