Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rouault committed Nov 29, 2019
1 parent 6d4c995 commit c2dac18
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions src/core/pal/pal.cpp
Expand Up @@ -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 )
{
Expand All @@ -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();
Expand Down

0 comments on commit c2dac18

Please sign in to comment.