Merge pull request #33150 from rouault/cleanup_pal_constructor_destru…

…ctor [cleanup] pal.cpp: remove useless constructor and destructor
qgis · Nov 30, 2019 · 80cf602 · 80cf602
2 parents 23fb486 + c2dac18
commit 80cf602
Showing 1 changed file with 3 additions and 15 deletions.
diff --git 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();