add cppcheck fixes

qgis · Oct 3, 2015 · 1b4ca62 · 1b4ca62
1 parent e694474
commit 1b4ca62
Show file tree

Hide file tree

Showing 202 changed files with 348 additions and 343 deletions.
diff --git a/doc/CODING.t2t b/doc/CODING.t2t
@@ -831,7 +831,7 @@ The class **must** inherit from QObject and include the Q_OBJECT macro.
 ```
 class TestQgsRasterLayer: public QObject
 {
-  Q_OBJECT;
+  Q_OBJECT
 ```
 
 All our test methods are implemented as **private slots**. The QtTest framework

diff --git a/src/app/composer/qgsattributeselectiondialog.h b/src/app/composer/qgsattributeselectiondialog.h
@@ -44,7 +44,7 @@ class QgsComposerColumnAlignmentDelegate : public QItemDelegate
     Q_OBJECT
 
   public:
-    QgsComposerColumnAlignmentDelegate( QObject *parent = 0 );
+    explicit QgsComposerColumnAlignmentDelegate( QObject *parent = 0 );
     QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
     void setEditorData( QWidget *editor, const QModelIndex &index ) const override;
     void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override;
@@ -81,7 +81,7 @@ class QgsComposerColumnWidthDelegate : public QItemDelegate
     Q_OBJECT
 
   public:
-    QgsComposerColumnWidthDelegate( QObject *parent = 0 );
+    explicit QgsComposerColumnWidthDelegate( QObject *parent = 0 );
     QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
     void setEditorData( QWidget *editor, const QModelIndex &index ) const override;
     void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override;
@@ -98,7 +98,7 @@ class QgsComposerColumnSortOrderDelegate : public QItemDelegate
     Q_OBJECT
 
   public:
-    QgsComposerColumnSortOrderDelegate( QObject *parent = 0 );
+    explicit QgsComposerColumnSortOrderDelegate( QObject *parent = 0 );
     QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
     void setEditorData( QWidget *editor, const QModelIndex &index ) const override;
     void setModelData( QWidget *editor, QAbstractItemModel *model, const QModelIndex &index ) const override;

diff --git a/src/app/composer/qgscomposerarrowwidget.h b/src/app/composer/qgscomposerarrowwidget.h
@@ -27,7 +27,7 @@ class QgsComposerArrowWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
 {
     Q_OBJECT
   public:
-    QgsComposerArrowWidget( QgsComposerArrow* arrow );
+    explicit QgsComposerArrowWidget( QgsComposerArrow* arrow );
     ~QgsComposerArrowWidget();
 
   private:

diff --git a/src/app/composer/qgscomposerlabelwidget.h b/src/app/composer/qgscomposerlabelwidget.h
@@ -30,7 +30,7 @@ class QgsComposerLabelWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
 {
     Q_OBJECT
   public:
-    QgsComposerLabelWidget( QgsComposerLabel* label );
+    explicit QgsComposerLabelWidget( QgsComposerLabel* label );
 
   public slots:
     void on_mHtmlCheckBox_stateChanged( int i );

diff --git a/src/app/composer/qgscomposerlegendwidget.h b/src/app/composer/qgscomposerlegendwidget.h
@@ -34,7 +34,7 @@ class QgsComposerLegendWidget: public QgsComposerItemBaseWidget, private Ui::Qgs
     Q_OBJECT
 
   public:
-    QgsComposerLegendWidget( QgsComposerLegend* legend );
+    explicit QgsComposerLegendWidget( QgsComposerLegend* legend );
     ~QgsComposerLegendWidget();
 
     /** Updates the legend layers and groups*/

diff --git a/src/app/composer/qgscomposermanager.h b/src/app/composer/qgscomposermanager.h
@@ -30,7 +30,7 @@ class QgsComposerNameDelegate : public QItemDelegate
     Q_OBJECT
 
   public:
-    QgsComposerNameDelegate( QObject *parent = 0 );
+    explicit QgsComposerNameDelegate( QObject *parent = 0 );
 
     QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option,
                            const QModelIndex &index ) const override;

diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h
@@ -33,8 +33,7 @@ class QgsComposerMapWidget: public QgsComposerItemBaseWidget, private Ui::QgsCom
     Q_OBJECT
 
   public:
-
-    QgsComposerMapWidget( QgsComposerMap* composerMap );
+    explicit QgsComposerMapWidget( QgsComposerMap* composerMap );
     virtual ~QgsComposerMapWidget();
 
   public slots:

diff --git a/src/app/composer/qgscomposerpicturewidget.h b/src/app/composer/qgscomposerpicturewidget.h
@@ -31,8 +31,7 @@ class QgsComposerPictureWidget: public QgsComposerItemBaseWidget, private Ui::Qg
     Q_OBJECT
 
   public:
-
-    QgsComposerPictureWidget( QgsComposerPicture* picture );
+    explicit QgsComposerPictureWidget( QgsComposerPicture* picture );
     ~QgsComposerPictureWidget();
 
     /** Add the icons of the standard directories to the preview*/

diff --git a/src/app/composer/qgscomposerscalebarwidget.h b/src/app/composer/qgscomposerscalebarwidget.h
@@ -30,7 +30,7 @@ class QgsComposerScaleBarWidget: public QgsComposerItemBaseWidget, private Ui::Q
     Q_OBJECT
 
   public:
-    QgsComposerScaleBarWidget( QgsComposerScaleBar* scaleBar );
+    explicit QgsComposerScaleBarWidget( QgsComposerScaleBar* scaleBar );
     ~QgsComposerScaleBarWidget();
 
   public slots:

diff --git a/src/app/composer/qgscomposershapewidget.h b/src/app/composer/qgscomposershapewidget.h
@@ -28,7 +28,7 @@ class QgsComposerShapeWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
 {
     Q_OBJECT
   public:
-    QgsComposerShapeWidget( QgsComposerShape* composerShape );
+    explicit QgsComposerShapeWidget( QgsComposerShape* composerShape );
     ~QgsComposerShapeWidget();
 
   private:

diff --git a/src/app/composer/qgscomposertablewidget.h b/src/app/composer/qgscomposertablewidget.h
@@ -27,7 +27,7 @@ class QgsComposerTableWidget: public QgsComposerItemBaseWidget, private Ui::QgsC
 {
     Q_OBJECT
   public:
-    QgsComposerTableWidget( QgsComposerAttributeTable* table );
+    explicit QgsComposerTableWidget( QgsComposerAttributeTable* table );
     ~QgsComposerTableWidget();
 
   protected:

diff --git a/src/app/gps/qgsgpsmarker.h b/src/app/gps/qgsgpsmarker.h
@@ -29,8 +29,7 @@ class QPainter;
 class QgsGpsMarker : public QgsMapCanvasItem
 {
   public:
-
-    QgsGpsMarker( QgsMapCanvas* mapCanvas );
+    explicit QgsGpsMarker( QgsMapCanvas* mapCanvas );
 
     void setCenter( const QgsPoint& point );
 

diff --git a/src/app/nodetool/qgsmaptoolnodetool.h b/src/app/nodetool/qgsmaptoolnodetool.h
@@ -31,7 +31,7 @@ class QgsMapToolNodeTool: public QgsMapToolEdit
 {
     Q_OBJECT
   public:
-    QgsMapToolNodeTool( QgsMapCanvas* canvas );
+    explicit QgsMapToolNodeTool( QgsMapCanvas* canvas );
     virtual ~QgsMapToolNodeTool();
 
     void canvasMoveEvent( QgsMapMouseEvent* e ) override;

diff --git a/src/app/pluginmanager/qgspluginitemdelegate.h b/src/app/pluginmanager/qgspluginitemdelegate.h
@@ -26,7 +26,7 @@ class QgsPluginItemDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
   public:
-    QgsPluginItemDelegate( QObject * parent = 0 );
+    explicit QgsPluginItemDelegate( QObject * parent = 0 );
     QSize sizeHint( const QStyleOptionViewItem & theOption, const QModelIndex & theIndex ) const override;
     void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
 };

diff --git a/src/app/pluginmanager/qgspluginsortfilterproxymodel.h b/src/app/pluginmanager/qgspluginsortfilterproxymodel.h
@@ -42,7 +42,7 @@ class QgsPluginSortFilterProxyModel : public QSortFilterProxyModel
     Q_OBJECT
 
   public:
-    QgsPluginSortFilterProxyModel( QObject *parent = 0 );
+    explicit QgsPluginSortFilterProxyModel( QObject *parent = 0 );
 
     //! (Re)configire the status filter
     void setAcceptedStatuses( QStringList statuses );

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -7176,7 +7176,7 @@ QList<QgsMapLayer *> QgisApp::editableLayers( bool modified ) const
     if ( !vl )
       continue;
 
-    if ( vl->isEditable() && ( !modified || ( modified && vl->isModified() ) ) )
+    if ( vl->isEditable() && ( !modified || vl->isModified() ) )
       editLayers << vl;
   }
   return editLayers;
@@ -7760,7 +7760,7 @@ void QgisApp::showPluginManager()
 class QgsPythonRunnerImpl : public QgsPythonRunner
 {
   public:
-    QgsPythonRunnerImpl( QgsPythonUtils* pythonUtils ) : mPythonUtils( pythonUtils ) {}
+    explicit QgsPythonRunnerImpl( QgsPythonUtils* pythonUtils ) : mPythonUtils( pythonUtils ) {}
 
     virtual bool runCommand( QString command, QString messageOnError = QString() ) override
     {

diff --git a/src/app/qgsalignrasterdialog.cpp b/src/app/qgsalignrasterdialog.cpp
@@ -44,7 +44,7 @@ static QString _rasterLayerName( const QString& filename )
 /** Helper class to report progress */
 struct QgsAlignRasterDialogProgress : public QgsAlignRaster::ProgressHandler
 {
-  QgsAlignRasterDialogProgress( QProgressBar* pb ) : mPb( pb ) {}
+  explicit QgsAlignRasterDialogProgress( QProgressBar* pb ) : mPb( pb ) {}
   virtual bool progress( double complete ) override
   {
     mPb->setValue(( int ) qRound( complete * 100 ) );

diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -49,7 +49,7 @@ items on the tree view although the drop is actually managed by qgis app.
 class QgsDockBrowserTreeView : public QgsBrowserTreeView
 {
   public:
-    QgsDockBrowserTreeView( QWidget* parent ) : QgsBrowserTreeView( parent )
+    explicit QgsDockBrowserTreeView( QWidget* parent ) : QgsBrowserTreeView( parent )
     {
       setDragDropMode( QTreeView::DragDrop ); // sets also acceptDrops + dragEnabled
       setSelectionMode( QAbstractItemView::ExtendedSelection );
@@ -91,8 +91,7 @@ Utility class for filtering browser items
 class QgsBrowserTreeFilterProxyModel : public QSortFilterProxyModel
 {
   public:
-
-    QgsBrowserTreeFilterProxyModel( QObject *parent )
+    explicit QgsBrowserTreeFilterProxyModel( QObject *parent )
         : QSortFilterProxyModel( parent ), mModel( 0 )
         , mFilter( "" ), mPatternSyntax( "normal" ), mCaseSensitivity( Qt::CaseInsensitive )
     {

diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
@@ -45,7 +45,7 @@ class QgsBrowserPropertiesWidget : public QWidget
 {
     Q_OBJECT
   public:
-    QgsBrowserPropertiesWidget( QWidget* parent = 0 );
+    explicit QgsBrowserPropertiesWidget( QWidget* parent = 0 );
     static QgsBrowserPropertiesWidget* createWidget( QgsDataItem* item, QWidget* parent = 0 );
     virtual void setItem( QgsDataItem* item ) { Q_UNUSED( item ) }
     /** Set content widget, usually item paramWidget. Takes ownership. */
@@ -63,7 +63,7 @@ class QgsBrowserLayerProperties : public QgsBrowserPropertiesWidget, private Ui:
 {
     Q_OBJECT
   public:
-    QgsBrowserLayerProperties( QWidget* parent = 0 );
+    explicit QgsBrowserLayerProperties( QWidget* parent = 0 );
     void setItem( QgsDataItem* item ) override;
 
     virtual void setCondensedMode( bool condensedMode ) override;
@@ -76,7 +76,7 @@ class QgsBrowserDirectoryProperties : public QgsBrowserPropertiesWidget , privat
 {
     Q_OBJECT
   public:
-    QgsBrowserDirectoryProperties( QWidget* parent = 0 );
+    explicit QgsBrowserDirectoryProperties( QWidget* parent = 0 );
 
     void setItem( QgsDataItem* item ) override;
   private:

diff --git a/src/app/qgsdxfexportdialog.h b/src/app/qgsdxfexportdialog.h
@@ -34,7 +34,7 @@ class FieldSelectorDelegate : public QItemDelegate
 {
     Q_OBJECT
   public:
-    FieldSelectorDelegate( QObject *parent = 0 );
+    explicit FieldSelectorDelegate( QObject *parent = 0 );
 
     QWidget *createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const override;
     void setEditorData( QWidget *editor, const QModelIndex &index ) const override;

diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h
@@ -80,7 +80,7 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope
     class DragList : public QTableWidget
     {
       public:
-        DragList( QWidget* parent = 0 )
+        explicit DragList( QWidget* parent = 0 )
             : QTableWidget( parent )
         {}
 
@@ -98,7 +98,7 @@ class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPrope
     class DesignerTree : public QTreeWidget
     {
       public:
-        DesignerTree( QWidget* parent = 0 )
+        explicit DesignerTree( QWidget* parent = 0 )
             : QTreeWidget( parent )
         {}
         QTreeWidgetItem* addItem( QTreeWidgetItem* parent, DesignerTreeItemData data );

diff --git a/src/app/qgsmaptooladdcircularstring.h b/src/app/qgsmaptooladdcircularstring.h
@@ -38,7 +38,7 @@ class QgsMapToolAddCircularString: public QgsMapToolCapture
     void setParentTool( QgsMapTool* newTool, QgsMapTool* oldTool );
 
   protected:
-    QgsMapToolAddCircularString( QgsMapCanvas* canvas ); //forbidden
+    explicit QgsMapToolAddCircularString( QgsMapCanvas* canvas ); //forbidden
 
     QgsMapToolCapture* mParentTool;
     /** Circular string points (in map coordinates)*/

diff --git a/src/app/qgsmaptoolpinlabels.cpp b/src/app/qgsmaptoolpinlabels.cpp
@@ -233,9 +233,8 @@ void QgsMapToolPinLabels::removePinnedHighlights()
 
 void QgsMapToolPinLabels::pinUnpinLabels( const QgsRectangle& ext, QMouseEvent * e )
 {
-
-  bool doUnpin = e->modifiers() & Qt::ShiftModifier ? true : false;
-  bool toggleUnpinOrPin = e->modifiers() & Qt::ControlModifier ? true : false;
+  bool doUnpin = e->modifiers() & Qt::ShiftModifier;
+  bool toggleUnpinOrPin = e->modifiers() & Qt::ControlModifier;
 
   // get list of all drawn labels from all layers within, or touching, chosen extent
   bool labelChanged = false;

diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
@@ -51,7 +51,7 @@ void QgsMapToolSelect::canvasReleaseEvent( QgsMapMouseEvent* e )
   QgsMapToolSelectUtils::expandSelectRectangle( selectRect, vlayer, e->pos() );
   QgsMapToolSelectUtils::setRubberBand( mCanvas, selectRect, &rubberBand );
   QgsGeometry* selectGeom = rubberBand.asGeometry();
-  bool doDifference = e->modifiers() & Qt::ControlModifier ? true : false;
+  bool doDifference = e->modifiers() & Qt::ControlModifier;
   QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, false, doDifference, true );
   delete selectGeom;
   rubberBand.reset( QGis::Polygon );

diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp
@@ -106,7 +106,7 @@ void QgsMapToolSelectFeatures::canvasReleaseEvent( QgsMapMouseEvent* e )
     QgsGeometry* selectGeom = mRubberBand->asGeometry();
     if ( !mDragging )
     {
-      bool doDifference = e->modifiers() & Qt::ControlModifier ? true : false;
+      bool doDifference = e->modifiers() & Qt::ControlModifier;
       QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, false, doDifference, true );
     }
     else

diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
@@ -233,7 +233,7 @@ void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas,
 
 void QgsMapToolSelectUtils::setSelectFeatures( QgsMapCanvas* canvas, QgsGeometry* selectGeometry, QMouseEvent * e )
 {
-  bool doContains = e->modifiers() & Qt::ShiftModifier ? true : false;
-  bool doDifference = e->modifiers() & Qt::ControlModifier ? true : false;
+  bool doContains = e->modifiers() & Qt::ShiftModifier;
+  bool doDifference = e->modifiers() & Qt::ControlModifier;
   setSelectFeatures( canvas, selectGeometry, doContains, doDifference );
 }
diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -118,7 +118,7 @@ void QgsMapToolShowHideLabels::showHideLabels( QMouseEvent * e )
     return;
   }
 
-  bool doHide = e->modifiers() & Qt::ShiftModifier ? true : false;
+  bool doHide = e->modifiers() & Qt::ShiftModifier;
 
   QgsFeatureIds selectedFeatIds;
 

diff --git a/src/app/qgsmaptoolsplitparts.h b/src/app/qgsmaptoolsplitparts.h
@@ -24,7 +24,7 @@ class QgsMapToolSplitParts: public QgsMapToolCapture
 {
     Q_OBJECT
   public:
-    QgsMapToolSplitParts( QgsMapCanvas* canvas );
+    explicit QgsMapToolSplitParts( QgsMapCanvas* canvas );
     virtual ~QgsMapToolSplitParts();
     void cadCanvasReleaseEvent( QgsMapMouseEvent * e ) override;
 };

diff --git a/src/app/qgsnewspatialitelayerdialog.cpp b/src/app/qgsnewspatialitelayerdialog.cpp
@@ -154,7 +154,7 @@ QString QgsNewSpatialiteLayerDialog::selectedType() const
     return "MULTIPOLYGON";
   }
 
-  Q_ASSERT( "no type selected" == 0 );
+  Q_ASSERT( !"no type selected" );
   return "";
 }
 

diff --git a/src/app/qgssettingstree.h b/src/app/qgssettingstree.h
@@ -52,7 +52,7 @@ class QgsSettingsTree : public QTreeWidget
     Q_OBJECT
 
   public:
-    QgsSettingsTree( QWidget *parent = 0 );
+    explicit QgsSettingsTree( QWidget *parent = 0 );
 
     void setSettingsObject( QSettings *settings );
     QSize sizeHint() const override;

diff --git a/src/app/qgsvariantdelegate.h b/src/app/qgsvariantdelegate.h
@@ -49,7 +49,7 @@ class QgsVariantDelegate : public QItemDelegate
     Q_OBJECT
 
   public:
-    QgsVariantDelegate( QObject* parent = 0 );
+    explicit QgsVariantDelegate( QObject* parent = 0 );
 
     void paint( QPainter* painter, const QStyleOptionViewItem& option,
                 const QModelIndex& index ) const override;

diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -490,7 +490,7 @@ void QgsVectorLayerProperties::syncToLayer( void )
   // NOTE: this is not ideal, but a quick fix for QGIS 2.0 release
   bool ok;
   bool dl = QgsProject::instance()->readBoolEntry( "DeprecatedLabels", "/Enabled", false, &ok );
-  if ( !ok || ( ok && !dl ) ) // project not flagged or set to use deprecated labels
+  if ( !ok || !dl ) // project not flagged or set to use deprecated labels
   {
     if ( mOptsPage_LabelsOld )
     {

diff --git a/src/app/qgswelcomepage.h b/src/app/qgswelcomepage.h
@@ -28,7 +28,7 @@ class QgsWelcomePage : public QWidget
     Q_OBJECT
 
   public:
-    QgsWelcomePage( QWidget* parent = 0 );
+    explicit QgsWelcomePage( QWidget* parent = 0 );
 
     ~QgsWelcomePage();
 

diff --git a/src/app/qgswelcomepageitemsmodel.h b/src/app/qgswelcomepageitemsmodel.h
@@ -25,7 +25,7 @@ class QgsWelcomePageItemDelegate : public QStyledItemDelegate
     Q_OBJECT
 
   public:
-    QgsWelcomePageItemDelegate( QObject * parent = 0 );
+    explicit QgsWelcomePageItemDelegate( QObject * parent = 0 );
     void paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const override;
     QSize sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const override;
 };
@@ -51,7 +51,7 @@ class QgsWelcomePageItemsModel : public QAbstractListModel
       QString crs;
     };
 
-    QgsWelcomePageItemsModel( QObject* parent = 0 );
+    explicit QgsWelcomePageItemsModel( QObject* parent = 0 );
 
     void setRecentProjects( const QList<RecentProjectData>& recentProjects );