remaining cppcheck issues

qgis · Feb 7, 2015 · 6ed695a · 6ed695a
1 parent 2589b1a
commit 6ed695a
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 10 deletions.
diff --git a/src/plugins/globe/osgEarthUtil/Controls.cpp b/src/plugins/globe/osgEarthUtil/Controls.cpp
@@ -1801,18 +1801,19 @@ ControlNodeBin::draw( const ControlContext& context, bool newContext, int bin )
 
     if ( _sortingEnabled && _sortByDistance )
     {
-        for( ControlNodeCollection::iterator i = _controlNodes.begin(); i != _controlNodes.end(); ++i )
+        for( ControlNodeCollection::iterator i = _controlNodes.begin(); i != _controlNodes.end(); )
         {
             ControlNode* node = i->second.get();
             if ( node->getNumParents() == 0 )
             {
               _renderNodes.erase( node );
-              _controlNodes.erase( i );
+              _controlNodes.erase( i++ );
             }
             else
 	    {
 	      ControlNode::PerViewData& nodeData = node->getData( context._view );
 	      byDepth.insert( ControlNodePair(nodeData._screenPos.z(), node) );
+              ++i;
 	    }
         }
 

diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
@@ -44,6 +44,9 @@ class TestQgsAtlasComposition : public QObject
         , mLabel2( 0 )
         , mAtlasMap( 0 )
         , mOverview( 0 )
+        , mVectorLayer( 0 )
+        , mVectorLayer2( 0 )
+        , mAtlas( 0 )
     {}
 
   private slots:

diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp
@@ -53,7 +53,8 @@ class TestQgsDiagram : public QObject
 
   public:
     TestQgsDiagram()
-        : mPointsLayer( 0 )
+        : mTestHasError( false )
+        , mPointsLayer( 0 )
         , mComposition( 0 )
         , mPieDiagram( 0 )
         , mComposerMap( 0 )

diff --git a/tests/src/core/testqgsdiagramexpression.cpp b/tests/src/core/testqgsdiagramexpression.cpp
@@ -52,7 +52,8 @@ class TestQgsDiagramExpression : public QObject
     Q_OBJECT
   public:
     TestQgsDiagramExpression()
-        : mMapSettings( 0 )
+        : mTestHasError( false )
+        , mMapSettings( 0 )
         , mPointsLayer( 0 )
         , mComposition( 0 )
         , mPieDiagram( 0 )

diff --git a/tests/src/core/testqgsgradients.cpp b/tests/src/core/testqgsgradients.cpp
@@ -46,7 +46,8 @@ class TestQgsGradients : public QObject
 
   public:
     TestQgsGradients()
-        : mpPolysLayer( 0 )
+        : mTestHasError( false )
+        , mpPolysLayer( 0 )
         , mGradientFill( 0 )
         , mFillSymbol( 0 )
         , mSymbolRenderer( 0 )

diff --git a/tests/src/core/testqgsrasterfill.cpp b/tests/src/core/testqgsrasterfill.cpp
@@ -45,7 +45,8 @@ class TestQgsRasterFill : public QObject
 
   public:
     TestQgsRasterFill()
-        : mpPolysLayer( 0 )
+        : mTestHasError( false )
+        , mpPolysLayer( 0 )
         , mRasterFill( 0 )
         , mFillSymbol( 0 )
         , mSymbolRenderer( 0 )

diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp
@@ -42,7 +42,8 @@ class TestQgsRenderers : public QObject
 
   public:
     TestQgsRenderers()
-        : mpPointsLayer( 0 )
+        : mTestHasError( false )
+        , mpPointsLayer( 0 )
         , mpLinesLayer( 0 )
         , mpPolysLayer( 0 )
     {}

diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp
@@ -45,7 +45,8 @@ class TestQgsShapeburst : public QObject
     Q_OBJECT
   public:
     TestQgsShapeburst()
-        : mpPolysLayer()
+        : mTestHasError( false )
+        , mpPolysLayer()
         , mShapeburstFill( 0 )
         , mFillSymbol( 0 )
         , mSymbolRenderer( 0 )

diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp
@@ -72,7 +72,8 @@ class TestQgsVectorLayer : public QObject
     Q_OBJECT
   public:
     TestQgsVectorLayer()
-        : mpMapRenderer( 0 )
+        : mTestHasError( false )
+        , mpMapRenderer( 0 )
         , mpPointsLayer( 0 )
         , mpLinesLayer( 0 )
         , mpPolysLayer( 0 )

diff --git a/tests/src/gui/testqgsrasterhistogram.cpp b/tests/src/gui/testqgsrasterhistogram.cpp
@@ -38,10 +38,12 @@
 /** \ingroup UnitTests
  * This is a unit test to verify that raster histogram works
  */
-class TestRasterHistogram: public QObject
+class TestRasterHistogram : public QObject
 {
     Q_OBJECT
 
+    TestRasterHistogram() {}
+
   private:
 
     QString mDataDir;