fix cppcheck issues

qgis · Feb 7, 2015 · dc93261 · dc93261
1 parent 205b136
commit dc93261
Show file tree

Hide file tree

Showing 37 changed files with 165 additions and 114 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -251,6 +251,8 @@ static void dumpBacktrace( unsigned int depth )
   }
 
   qgsFree( symbol );
+#else
+  Q_UNUSED( depth );
 #endif
 }
 

diff --git a/src/plugins/compass/qgscompassplugin.cpp b/src/plugins/compass/qgscompassplugin.cpp
@@ -48,9 +48,11 @@ static const QString sPluginIcon = ":/compass.svn";
 QgsCompassPlugin::QgsCompassPlugin( QgisInterface *themQGisIface )
     : QgisPlugin( sName, sDescription, sCategory, sPluginVersion, sPluginType )
     , mQGisIface( themQGisIface )
+    , mActionRunCompass( 0 )
+    , mActionAboutCompass( 0 )
+    , mQgsCompassPluginGui( 0 )
+    , mDock( 0 )
 {
-  /** Initialize the plugin */
-  mDock = NULL;
 }
 
 QgsCompassPlugin::~QgsCompassPlugin()

diff --git a/src/plugins/compass/qgscompassplugin.h b/src/plugins/compass/qgscompassplugin.h
@@ -85,8 +85,6 @@ class QgsCompassPlugin: public QObject, public QgisPlugin, private Ui::QgsCompas
     QString pluginDescriptionQString;
     //! Category of the plugin
     QString pluginCategoryQString;
-    //! Plugin type as defined in Plugin::PLUGINTYPE
-    int pluginType;
     //! Pointer to the QGIS interface object
     QgisInterface *mQGisIface;
     //! Pointer to the QAction object used in the menu and toolbar

diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp
@@ -75,6 +75,7 @@ CoordinateCapture::CoordinateCapture( QgisInterface * theQgisInterface )
     , mypCRSLabel( NULL )
     , mCanvasDisplayPrecision( 5 )
     , mQGisIface( theQgisInterface )
+    , mUserCrsDisplayPrecision( 5 )
     , mQActionPointer( NULL )
 {
 }

diff --git a/src/plugins/dxf2shp_converter/builder.cpp b/src/plugins/dxf2shp_converter/builder.cpp
@@ -43,7 +43,12 @@ Builder::Builder( std::string theFname,
     , fetchedprims( 0 )
     , fetchedtexts( 0 )
     , ignoringBlock( false )
+    , current_polyline_willclose( false )
+    , store_next_vertex_for_polyline_close( false )
     , current_polyline_pointcount( 0 )
+    , closePolyX( 0.0 )
+    , closePolyY( 0.0 )
+    , closePolyZ( 0.0 )
     , currentBlockX( 0.0 )
     , currentBlockY( 0.0 )
 {

diff --git a/src/plugins/dxf2shp_converter/dxf2shpconverter.h b/src/plugins/dxf2shp_converter/dxf2shpconverter.h
@@ -73,7 +73,6 @@ class dxf2shpConverter: public QObject, public QgisPlugin
     //
     ////////////////////////////////////////////////////////////////////
 
-    int mPluginType;
     //! Pointer to the QGIS interface object
     QgisInterface *mQGisIface;
     //!pointer to the qaction for this plugin

diff --git a/src/plugins/georeferencer/qgsgeorefplugin.h b/src/plugins/georeferencer/qgsgeorefplugin.h
@@ -103,7 +103,6 @@ class QgsGeorefPlugin: public QObject, public QgisPlugin
     //
     ////////////////////////////////////////////////////////////////////
 
-    int mPluginType;
     //! Pointer to the QGIS interface object
     QgisInterface *mQGisIface;
     //!pointer to the qaction for this plugin

diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp
@@ -35,7 +35,7 @@ using std::pow;
 class QgsLinearGeorefTransform : public QgsGeorefTransformInterface
 {
   public:
-    QgsLinearGeorefTransform() {}
+    QgsLinearGeorefTransform() : mParameters() {}
     ~QgsLinearGeorefTransform() {}
 
     bool getOriginScale( QgsPoint &origin, double &scaleX, double &scaleY ) const;
@@ -62,7 +62,7 @@ class QgsLinearGeorefTransform : public QgsGeorefTransformInterface
 class QgsHelmertGeorefTransform : public QgsGeorefTransformInterface
 {
   public:
-    QgsHelmertGeorefTransform() {}
+    QgsHelmertGeorefTransform() : mHelmertParameters() {}
     struct HelmertParameters
     {
       QgsPoint origin;
@@ -115,7 +115,7 @@ class QgsGDALGeorefTransform : public QgsGeorefTransformInterface
 class QgsProjectiveGeorefTransform : public QgsGeorefTransformInterface
 {
   public:
-    QgsProjectiveGeorefTransform() {}
+    QgsProjectiveGeorefTransform() : mParameters() {}
     ~QgsProjectiveGeorefTransform() {}
 
     bool updateParametersFromGCPs( const std::vector<QgsPoint> &mapCoords, const std::vector<QgsPoint> &pixelCoords ) override;

diff --git a/src/plugins/georeferencer/qgsrasterchangecoords.cpp b/src/plugins/georeferencer/qgsrasterchangecoords.cpp
@@ -27,8 +27,12 @@
 #endif
 
 QgsRasterChangeCoords::QgsRasterChangeCoords()
+    : mHasCrs( false )
+    , mUL_X( 0. )
+    , mUL_Y( 0. )
+    , mResX( 1. )
+    , mResY( 1. )
 {
-  mHasCrs = false;
 }
 
 void QgsRasterChangeCoords::setRaster( const QString &fileRaster )

diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
@@ -128,6 +128,11 @@ GlobePlugin::GlobePlugin( QgisInterface* theQgisInterface )
     , mTileSource( 0 )
     , mElevationManager( 0 )
     , mObjectPlacer( 0 )
+    , mControlCanvas( 0 )
+    , mSelectedLat( 0. )
+    , mSelectedLon( 0. )
+    , mSelectedElevation( 0. )
+    , mRootNode( 0 )
 {
   mIsGlobeRunning = false;
   //needed to be "seen" by other plugins by doing

diff --git a/src/plugins/globe/globe_plugin.h b/src/plugins/globe/globe_plugin.h
@@ -135,7 +135,6 @@ class GlobePlugin : public QObject, public QgisPlugin
     void setupControls();
 
   private://! Checks if the globe is open
-    int mPluginType;
     //! Pointer to the QGIS interface object
     QgisInterface *mQGisIface;
     //!pointer to the qaction for this plugin