From: Leonardo Florez <leonardo@iMac-de-Andrea.local>
Date: Thu, 16 Feb 2017 21:13:05 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins
X-Git-Tag: v0.1~8^2
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;ds=sidebyside;h=42de9bd72fb773eb94d03b36a08c404cd82769a1;hp=-c;p=cpPlugins.git

Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins
---

42de9bd72fb773eb94d03b36a08c404cd82769a1
diff --combined lib/cpPlugins/Pipeline/ProcessObject.h
index 5692222,6456097..c2ce34c
--- a/lib/cpPlugins/Pipeline/ProcessObject.h
+++ b/lib/cpPlugins/Pipeline/ProcessObject.h
@@@ -45,14 -45,14 +45,14 @@@ namespace cpPlugin
        void PrintExecutionOn( );
        void PrintExecutionOff( );
        bool GetPrintExecution( ) const;
 -      bool SetPrintExecution( bool v );
 +      void SetPrintExecution( bool v );
        void SetPrintExecutionStream( std::ofstream* s );
  
        Parameters* GetParameters( );
        const Parameters* GetParameters( ) const;
  
 -      virtual void SetITK( itk::LightObject* o );
 -      virtual void SetVTK( vtkObjectBase* o );
 +      virtual void SetITK( itk::LightObject* o ) override;
 +      virtual void SetVTK( vtkObjectBase* o ) override;
  
        // "Getters"
        std::set< std::string > GetInputsNames( ) const;
@@@ -104,7 -104,7 +104,7 @@@
        void Disconnect( );
  
        // Pipeline execution
-       virtual void Modified( ) const cpPlugins_OVERRIDE;
+       virtual void Modified( ) const override;
        virtual void Update( );
  
        // Qt dialog creation