Merge pull request #9441 from m-kuhn/code_style

Code style
qgis · Mar 9, 2019 · dd24298 · dd24298
2 parents 3057fd6 + d3a12dc
commit dd24298
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 25 deletions.
diff --git a/src/core/qgslabelingengine.cpp b/src/core/qgslabelingengine.cpp
@@ -85,12 +85,12 @@ QgsLabelingEngine::~QgsLabelingEngine()
 QList< QgsMapLayer * > QgsLabelingEngine::participatingLayers() const
 {
   QSet< QgsMapLayer * > layers;
-  Q_FOREACH ( QgsAbstractLabelProvider *provider, mProviders )
+  for ( QgsAbstractLabelProvider *provider : mProviders )
   {
     if ( provider->layer() )
       layers << provider->layer();
   }
-  Q_FOREACH ( QgsAbstractLabelProvider *provider, mSubProviders )
+  for ( QgsAbstractLabelProvider *provider : mSubProviders )
   {
     if ( provider->layer() )
       layers << provider->layer();
@@ -154,16 +154,13 @@ void QgsLabelingEngine::processProvider( QgsAbstractLabelProvider *provider, Qgs
     case QgsPalLayerSettings::ShowAll:
       upsdnlabels = pal::Layer::ShowAll;
       break;
-    default:
-      Q_ASSERT( "unsupported upside-down label setting" && false );
-      return;
   }
   l->setUpsidedownLabels( upsdnlabels );
 
 
-  QList<QgsLabelFeature *> features = provider->labelFeatures( context );
+  const QList<QgsLabelFeature *> features = provider->labelFeatures( context );
 
-  Q_FOREACH ( QgsLabelFeature *feature, features )
+  for ( QgsLabelFeature *feature : features )
   {
     try
     {
@@ -178,7 +175,8 @@ void QgsLabelingEngine::processProvider( QgsAbstractLabelProvider *provider, Qgs
   }
 
   // any sub-providers?
-  Q_FOREACH ( QgsAbstractLabelProvider *subProvider, provider->subProviders() )
+  const auto subproviders = provider->subProviders();
+  for ( QgsAbstractLabelProvider *subProvider : subproviders )
   {
     mSubProviders << subProvider;
     processProvider( subProvider, context, p );
@@ -194,7 +192,6 @@ void QgsLabelingEngine::run( QgsRenderContext &context )
   pal::SearchMethod s;
   switch ( settings.searchMethod() )
   {
-    default:
     case QgsLabelingEngineSettings::Chain:
       s = pal::CHAIN;
       break;
@@ -224,7 +221,7 @@ void QgsLabelingEngine::run( QgsRenderContext &context )
 
 
   // for each provider: get labels and register them in PAL
-  Q_FOREACH ( QgsAbstractLabelProvider *provider, mProviders )
+  for ( QgsAbstractLabelProvider *provider : qgis::as_const( mProviders ) )
   {
     bool appendedLayerScope = false;
     if ( QgsMapLayer *ml = provider->layer() )

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1633,7 +1633,6 @@ void QgsPalLayerSettings::registerFeature( const QgsFeature &f, QgsRenderContext
       quadOffsetY = -1.0;
       break;
     case QuadrantOver:
-    default:
       break;
   }
 
@@ -2133,7 +2132,7 @@ bool QgsPalLayerSettings::dataDefinedValEval( DataDefinedValueType valType,
       case DDOpacity:
       {
         bool ok;
-        int size = exprVal.toDouble( &ok );
+        int size = exprVal.toInt( &ok );
         if ( ok && size >= 0 && size <= 100 )
         {
           dataDefinedValues.insert( p, QVariant( size ) );

diff --git a/src/core/qgsvectorlayerlabelprovider.cpp b/src/core/qgsvectorlayerlabelprovider.cpp
@@ -47,13 +47,7 @@ QgsVectorLayerLabelProvider::QgsVectorLayerLabelProvider( QgsVectorLayer *layer,
 
   if ( withFeatureLoop )
   {
-    mSource = new QgsVectorLayerFeatureSource( layer );
-    mOwnsSource = true;
-  }
-  else
-  {
-    mSource = nullptr;
-    mOwnsSource = false;
+    mSource = qgis::make_unique<QgsVectorLayerFeatureSource>( layer );
   }
 
   init();
@@ -94,9 +88,6 @@ void QgsVectorLayerLabelProvider::init()
 QgsVectorLayerLabelProvider::~QgsVectorLayerLabelProvider()
 {
   qDeleteAll( mLabels );
-
-  if ( mOwnsSource )
-    delete mSource;
 }
 
 

diff --git a/src/core/qgsvectorlayerlabelprovider.h b/src/core/qgsvectorlayerlabelprovider.h
@@ -108,9 +108,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider
     //! Layer's CRS
     QgsCoordinateReferenceSystem mCrs;
     //! Layer's feature source
-    QgsAbstractFeatureSource *mSource = nullptr;
-    //! Whether layer's feature source is owned
-    bool mOwnsSource;
+    std::unique_ptr<QgsAbstractFeatureSource> mSource;
 
     //! List of generated
     QList<QgsLabelFeature *> mLabels;