Taking care of CppCheck issues #2

application/gui/adjusterwidgets/abstractadjusterwidget.h

@@ -63,7 +63,7 @@ namespace campvis {
          * Creates a new AbstractAdjusterWidget.
          * \param   parent      parent Qt widget
          */
-        AbstractAdjusterWidget(QWidget* parent = 0);
+        explicit AbstractAdjusterWidget(QWidget* parent = 0);
 
         /**
          * Return the adjuster's current value.

application/gui/adjusterwidgets/doubleadjusterwidget.h

@@ -43,7 +43,7 @@ namespace campvis {
          * Creates a new DoubleAdjusterWidget.
          * \param   parent      parent Qt widget
          */
-        DoubleAdjusterWidget(QWidget* parent = 0);
+        explicit DoubleAdjusterWidget(QWidget* parent = 0);
 
         /**
          * Returns how many decimals the adjuster will use for displaying and doubleerpreting doubles.

application/gui/adjusterwidgets/intadjusterwidget.h

@@ -42,7 +42,7 @@ namespace campvis {
          * Creates a new IntAdjusterWidget.
          * \param   parent      Parent Qt widget
          */
-        IntAdjusterWidget(QWidget* parent = 0);
+        explicit IntAdjusterWidget(QWidget* parent = 0);
 
         /**
          * Change the adjuster's current value.

application/gui/properties/abstractpropertywidget.cpp

@@ -59,7 +59,6 @@ namespace campvis {
         }
 
         _property->s_changed.connect(this, &AbstractPropertyWidget::onPropertyChanged);
-        // cppcheck-suppress pureVirtualCall
         connect(this, SIGNAL(s_propertyChanged(const AbstractProperty*)), this, SLOT(updateWidgetFromProperty()));
     }
 

application/gui/properties/abstractpropertywidget.h

@@ -82,7 +82,7 @@ namespace campvis {
         /**
          * Gets called when the property has changed, so that widget can update its state.
          */
-        virtual void updateWidgetFromProperty() = 0;
+        virtual void updateWidgetFromProperty() {};
 
     signals:
         /**

application/gui/properties/propertycollectionwidget.h

@@ -48,7 +48,7 @@ namespace campvis {
          * Creates a new PropertyCollectionWidget.
          * \param   parent  Parent widget, may be 0.
          */
-        PropertyCollectionWidget(QWidget* parent = 0);
+        explicit PropertyCollectionWidget(QWidget* parent = 0);
 
         /**
          * Destructor.

application/gui/properties/tfgeometrymanipulator.h

@@ -46,7 +46,7 @@ namespace campvis {
          * Creates a new AbstractTFGeometryManipulator for the given Geometry1DTransferFunction.
          * \param   viewportSize    Viewport size (extent of the OpenGL rendering canvas)
          */
-        AbstractTFGeometryManipulator(const cgt::ivec2& viewportSize);
+        explicit AbstractTFGeometryManipulator(const cgt::ivec2& viewportSize);
 
         /**
          * Pure virtual Destructor

core/classification/tfgeometry2d.cpp

@@ -98,7 +98,7 @@ namespace campvis {
 
     namespace {
         struct KeyPointSorter {
-            KeyPointSorter(const cgt::vec2& center)
+            explicit KeyPointSorter(const cgt::vec2& center)
                 : _center(center)
             {};
 

core/datastructures/abstractimagerepresentation.h

@@ -46,7 +46,7 @@ namespace campvis {
          * Creates a new abstract representation for the image \a parent.
          * \param   parent  Image this representation represents, must not be 0.
          */
-        AbstractImageRepresentation(ImageData* parent);
+        explicit AbstractImageRepresentation(ImageData* parent);
 
         /**
          * Virtual Destructor.

core/datastructures/datacontainer.h

@@ -56,7 +56,7 @@ namespace campvis {
          * Creates a new empty DataContainer
          * \param   name    The name of the new DataContainer
          */
-        DataContainer(const std::string& name);
+        explicit DataContainer(const std::string& name);
 
         /**
          * Destructor of the DataContainer. Will disconnect all DataHandles from this container.

core/pipeline/abstractpipeline.h

@@ -67,7 +67,7 @@ namespace campvis {
          * \param   dc  Pointer to the DataContainer containing local working set of data for this 
          *              pipeline, must not be 0, must be valid the whole lifetime of this pipeline.
          */
-        AbstractPipeline(DataContainer* dc);
+        explicit AbstractPipeline(DataContainer* dc);
 
         /**
          * Virtual Destructor

core/pipeline/abstractprocessor.h

@@ -67,7 +67,7 @@ namespace campvis {
              * Constructs a new Scoped lock, locking \a p and unlocking \a p on destruction.
              * \param   p                   Processor to lock
              */
-            ScopedLock(AbstractProcessor* p) 
+            explicit ScopedLock(AbstractProcessor* p) 
                 : _p(p)
             {
                 _p->lockProcessor();

core/pipeline/abstractworkflow.h

@@ -86,7 +86,7 @@ namespace campvis {
         /**
          * Default constructor
          */
-        AbstractWorkflow(const std::string& title);
+        explicit AbstractWorkflow(const std::string& title);
 
         /**
          * Default virtual destructor.

core/pipeline/autoevaluationpipeline.h

@@ -47,7 +47,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        AutoEvaluationPipeline(DataContainer* dc);
+        explicit AutoEvaluationPipeline(DataContainer* dc);
 
         /**
          * Virtual Destructor

core/tools/glreduction.h

@@ -63,7 +63,7 @@ namespace campvis {
          * Constructor
          * \param   reductionOperator   Operation to be performed by reduction
          */
-        GlReduction(ReductionOperator reductionOperator);
+        explicit GlReduction(ReductionOperator reductionOperator);
 
         /**
          * Destructor

core/tools/textfileparser.h

@@ -52,7 +52,7 @@ namespace campvis {
     public:
         struct CAMPVIS_CORE_API TokenGroup {
         public:
-			TokenGroup(bool caseSensitiveKeys)
+			explicit TokenGroup(bool caseSensitiveKeys)
 				: _caseSensitiveKeys(caseSensitiveKeys)
 			{};
 

ext/cgt/glcontextmanager.h

@@ -126,7 +126,7 @@ namespace cgt {
      */
     class CGT_API GLContextScopedLock {
     public:
-        GLContextScopedLock(GLCanvas* context)
+        explicit GLContextScopedLock(GLCanvas* context)
             : _context(context)
         {
             if (_context) {

ext/cgt/gpucapabilities.h

@@ -68,7 +68,7 @@ public:
      */
     class CGT_API GlVersion {
         public:
-        GlVersion(int major = 0, int minor = 0, int release = 0);
+        explicit GlVersion(int major = 0, int minor = 0, int release = 0);
 
         /**
          * Parse OpenGL version string as specified:
@@ -174,7 +174,7 @@ public:
      * on the graphics card before initGL() is called. Otherwise GpuCapabilities tries to
      * detect GL values while initGL() isn't called yet and produces a crash.
      */
-    GpuCapabilities(bool detectCaps = true);
+    explicit GpuCapabilities(bool detectCaps = true);
 
     virtual ~GpuCapabilities() {}
 

ext/cgt/gpucapabilitieswindows.cpp

@@ -900,8 +900,6 @@ bool GpuCapabilitiesWindows::createVersionStringFromDigits(FileVersion &fileVers
     return true;
 }
 
-std::string GpuCapabilitiesWindows::loggerCat_ = "cgt.GpuCapabilitiesWindows";
-
 } // namespace cgt
 
 #endif //WIN32

ext/cgt/gpucapabilitieswindows.h

@@ -133,8 +133,6 @@ public:
 
 protected:
 
-    static std::string loggerCat_;
-
 #ifdef CGT_WITH_WMI
 
     /**

ext/cgt/job.h

@@ -26,30 +26,6 @@
  *                                                                    *
  **********************************************************************/
 
-// ================================================================================================
-// 
-// This file is part of the CAMPVis Software Framework.
-// 
-// If not explicitly stated otherwise: Copyright (C) 2012-2014, all rights reserved,
-//      Christian Schulte zu Berge <christian.szb@in.tum.de>
-//      Chair for Computer Aided Medical Procedures
-//      Technische Universitaet Muenchen
-//      Boltzmannstr. 3, 85748 Garching b. Muenchen, Germany
-// 
-// For a full list of authors and contributors, please refer to the file "AUTHORS.txt".
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 
-// except in compliance with the License. You may obtain a copy of the License at
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the 
-// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
-// either express or implied. See the License for the specific language governing permissions 
-// and limitations under the License.
-// 
-// ================================================================================================
-
 #ifndef JOB_H__
 #define JOB_H__
 
@@ -296,7 +272,7 @@ namespace cgt {
      */
     class CGT_API CallFunctionObjectJob : public AbstractJob {
     public:
-        CallFunctionObjectJob(std::function<void(void)> fn) 
+        explicit CallFunctionObjectJob(std::function<void(void)> fn) 
         : _fn(fn)
         {
         }

ext/cgt/logmanager.h

@@ -182,7 +182,7 @@ template class CGT_API Singleton<LogManager>;
  */
 class CGT_API LogManager : public Singleton<LogManager> {
 public:
-    LogManager(const std::string& logDir = "");
+    explicit LogManager(const std::string& logDir = "");
     ~LogManager();
 
     /// Initialize logmanager, put all logfiles in logDir

ext/cgt/opengljobprocessor.h

@@ -73,6 +73,10 @@ namespace cgt {
             ~ScopedSynchronousGlJobExecution();
 
         private:
+            // disable copying
+            explicit ScopedSynchronousGlJobExecution(const ScopedSynchronousGlJobExecution& rhs);
+            ScopedSynchronousGlJobExecution& operator=(ScopedSynchronousGlJobExecution rhs);
+
             cgt::GLContextScopedLock* _lock;
         };
 

ext/cgt/vertexarrayobject.h

@@ -51,7 +51,7 @@ namespace cgt {
      */
     class CGT_API VertexArrayObject {
     public:
-        VertexArrayObject(bool autoBind = true) throw (cgt::Exception);
+        explicit VertexArrayObject(bool autoBind = true) throw (cgt::Exception);
 
         /**
          * Destructor, deletes the whole VAO.

modules/advancedusvis/pipelines/advancedusvis.h

@@ -40,7 +40,7 @@ namespace campvis {
         /**
          * Creates a VisualizationPipeline. 
          */
-        AdvancedUsVis(DataContainer* dc);
+        explicit AdvancedUsVis(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/advancedusvis/pipelines/cmbatchgeneration.h

@@ -41,7 +41,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline. 
          */
-        CmBatchGeneration(DataContainer* dc);
+        explicit CmBatchGeneration(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/advancedusvis/pipelines/predicatedemoachilles.h

@@ -50,7 +50,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        PredicateDemoAchilles(DataContainer* dc);
+        explicit PredicateDemoAchilles(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/advancedusvis/pipelines/predicatedemocarotid.h

@@ -51,7 +51,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        PredicateDemoCarotid(DataContainer* dc);
+        explicit PredicateDemoCarotid(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/advancedusvis/pipelines/predicatedemocarotid2.h

@@ -51,7 +51,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        PredicateDemoCarotid2(DataContainer* dc);
+        explicit PredicateDemoCarotid2(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/advancedusvis/pipelines/predicatedemoshoulder.h

@@ -50,7 +50,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        PredicateDemoShoulder(DataContainer* dc);
+        explicit PredicateDemoShoulder(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/advancedusvis/pipelines/predicatedemosmallheart.h

@@ -50,7 +50,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        PredicateDemoSmallHeart(DataContainer* dc);
+        explicit PredicateDemoSmallHeart(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/advancedusvis/processors/advancedusfusion.h

@@ -53,7 +53,7 @@ namespace campvis {
         /**
          * Constructs a new AdvancedUsFusion Processor
          **/
-        AdvancedUsFusion(IVec2Property* viewportSizeProp);
+        explicit AdvancedUsFusion(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/advancedusvis/processors/pointpredicateevaluator.h

@@ -49,7 +49,7 @@ namespace campvis {
         /**
          * Constructs a new PointPredicateEvaluator Processor
          **/
-        PointPredicateEvaluator(IVec2Property* viewportSizeProp);
+        explicit PointPredicateEvaluator(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/advancedusvis/processors/pointpredicateraycaster.h

@@ -47,7 +47,7 @@ namespace campvis {
         /**
          * Constructs a new PointPredicateRaycaster Processor
          **/
-        PointPredicateRaycaster(IVec2Property* viewportSizeProp);
+        explicit PointPredicateRaycaster(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/advancedusvis/processors/predicatevolumeexplorer.h

@@ -45,7 +45,7 @@ namespace campvis {
          * \param   viewportSizeProp    Pointer to the property defining the viewport size, must not be 0.
          * \param   raycaster           Raycaster to use for rendering, must not be 0, VolumeRenderer will take ownership.
          **/
-        PredicateVolumeExplorer(IVec2Property* viewportSizeProp);
+        explicit PredicateVolumeExplorer(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/advancedusvis/processors/scanlinedistributioncomputation.h

@@ -54,7 +54,7 @@ namespace campvis {
         /**
          * Constructs a new ScanlineDistributionComputation Processor
          **/
-        ScanlineDistributionComputation(IVec2Property* viewportSizeProp);
+        explicit ScanlineDistributionComputation(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/base/processors/trackballcameraprovider.h

@@ -60,7 +60,7 @@ namespace campvis {
         /**
          * Constructs a new TrackballCameraProvider Processor
          **/
-        TrackballCameraProvider(IVec2Property* canvasSize);
+        explicit TrackballCameraProvider(IVec2Property* canvasSize);
 
         /**
          * Destructor

modules/campcom/pipelines/streamingmhddemo.h

@@ -36,7 +36,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        StreamingMhdDemo(DataContainer* dc);
+        explicit StreamingMhdDemo(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/cudaconfidencemaps/pipelines/cudaconfidencemapsdemo.h

@@ -50,7 +50,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        CudaConfidenceMapsDemo(DataContainer *dc);
+        explicit CudaConfidenceMapsDemo(DataContainer *dc);
 
         /**
          * Virtual Destructor

modules/cudaconfidencemaps/processors/usfanrenderer.h

@@ -46,7 +46,7 @@ namespace campvis {
         /**
          * Constructs a new UsFanRenderer Processor
          **/
-        UsFanRenderer(IVec2Property* viewportSizeProp);
+        explicit UsFanRenderer(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/dti/processors/fiberrenderer.h

@@ -58,7 +58,7 @@ namespace dti {
         /**
          * Constructs a new FiberRenderer Processor
          **/
-        FiberRenderer(IVec2Property* viewportSizeProp);
+        explicit FiberRenderer(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/fontrendering/pipelines/fontrenderingdemo.h

@@ -39,7 +39,7 @@ namespace fontrendering {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        FontRenderingDemo(DataContainer* dc);
+        explicit FontRenderingDemo(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/fontrendering/processors/textrenderer.h

@@ -45,7 +45,7 @@ namespace fontrendering {
         /**
          * Constructs a new TextRenderer Processor.
          **/
-        TextRenderer(IVec2Property* viewportSizeProp);
+        explicit TextRenderer(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/io/processors/genericimagereader.cpp

@@ -43,7 +43,7 @@
 namespace campvis {
     namespace {
         struct checkExtension {
-            checkExtension(const std::string& str) : _str(str) {}
+            explicit checkExtension(const std::string& str) : _str(str) {}
 
             bool operator()(const std::pair<AbstractImageReader*, MetaProperty*>& v) const { 
                 return v.first->acceptsExtension(this->_str); 

modules/itk/core/genericimagerepresentationitk.h

@@ -31,7 +31,6 @@
 #include "modules/itk/core/itktypetraits.h"
 
 #include <itkImage.h>
-#include <itkImportImageFilter.h>
 
 #include <cstring>  // needed for memcpy
 

modules/itk/core/imagerepresentationconversionitk.h

@@ -36,6 +36,8 @@
 
 #include "modules/itk/core/genericimagerepresentationitk.h"
 
+#include <itkImportImageFilter.h>
+
 namespace campvis {
 
 // = Declare converter classes ====================================================================

modules/itk/pipelines/itkfilterdemo.h

@@ -41,7 +41,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        ItkFilterDemo(DataContainer* dc);
+        explicit ItkFilterDemo(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/itk/pipelines/itkregistrationdemo.h

@@ -41,7 +41,7 @@ namespace campvis {
         /**
         * Creates a AutoEvaluationPipeline.
         */
-        ItkRegistrationDemo(DataContainer* dc);
+        explicit ItkRegistrationDemo(DataContainer* dc);
 
         /**
         * Virtual Destructor

modules/itk/pipelines/itksegmentationdemo.h

@@ -40,7 +40,7 @@ namespace campvis {
         /**
         * Creates a AutoEvaluationPipeline.
         */
-        ItkSegmentationDemo(DataContainer* dc);
+        explicit ItkSegmentationDemo(DataContainer* dc);
 
         /**
         * Virtual Destructor

modules/itk/processors/itksegmentation.h

@@ -44,7 +44,7 @@ namespace campvis {
         /**
         * Constructs a new ItkSegmentation Processor
         **/
-        ItkSegmentation(IVec2Property* viewportSizeProp);
+        explicit ItkSegmentation(IVec2Property* viewportSizeProp);
 
         /**
         * Destructor

modules/ivus_tc/pipelines/ivustcdemo.h

@@ -43,7 +43,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        IvusTcDemo(DataContainer* dc);
+        explicit IvusTcDemo(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/ivus_tc/processors/ivusbatchreader.h

@@ -41,7 +41,7 @@ namespace campvis {
         /**
          * Constructs a new IvusBatchReader Processor
          **/
-        IvusBatchReader(IVec2Property* viewportSizeProp);
+        explicit IvusBatchReader(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/ivus_tc/processors/ivustcraycaster.h

@@ -47,7 +47,7 @@ namespace campvis {
         /**
          * Constructs a new IvusTcRaycaster Processor
          **/
-        IvusTcRaycaster(IVec2Property* viewportSizeProp);
+        explicit IvusTcRaycaster(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/ivus_tc/processors/ivustcsliceextractor.h

@@ -38,7 +38,7 @@ namespace campvis {
         /**
          * Constructs a new IvusTcSliceExtractor Processor
          **/
-        IvusTcSliceExtractor(IVec2Property* viewportSizeProp);
+        explicit IvusTcSliceExtractor(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/ixpv/pipelines/ixpvdemo.h

@@ -52,7 +52,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        IxpvDemo(DataContainer* dc);
+        explicit IxpvDemo(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/ixpv/processors/ixpvcompositor.h

@@ -49,7 +49,7 @@ namespace campvis {
         /**
          * Constructs a new IxpvCompositor Processor
          **/
-        IxpvCompositor(IVec2Property* viewportSizeProp);
+        explicit IxpvCompositor(IVec2Property* viewportSizeProp);
 
         /**
          * Destructor

modules/microscopysegmentation/pipelines/microscopyimagesegmentationdemo.h

@@ -41,7 +41,7 @@ namespace campvis {
         /**
          * Creates a AutoEvaluationPipeline.
          */
-        MicroscopyImageSegmentationDemo(DataContainer* dc);
+        explicit MicroscopyImageSegmentationDemo(DataContainer* dc);
 
         /**
          * Virtual Destructor

modules/microscopysegmentation/processors/microscopyimagesegmentation.h

@@ -58,7 +58,7 @@ namespace campvis {
      */
     class CAMPVIS_MODULES_API ContourObject {
     public:
-        ContourObject(std::string name);
+        explicit ContourObject(std::string name);
         virtual ~ContourObject();