]> Creatis software - clitk.git/commitdiff
Remove warnings with c++11
authortbaudier <thomas.baudier@creatis.insa-lyon.fr>
Wed, 26 Apr 2017 13:18:01 +0000 (15:18 +0200)
committertbaudier <thomas.baudier@creatis.insa-lyon.fr>
Wed, 26 Apr 2017 13:18:01 +0000 (15:18 +0200)
itk/clitkExplosionControlledThresholdConnectedImageFilter.h
itk/clitkInvertVFFilter.h
itk/clitkInvertVFFilter.txx
itk/clitkLocallyAdaptiveBinaryThresholdImageFunction.h
itk/clitkLocallyAdaptiveThresholdConnectedImageFilter.h
vv/vvQProgressDialogITKCommand.h

index 9211418f070c60998e06d2107b502bc8c8fca1e7..f7a31dcf99d1e4777c65a67e425a939453434699 100644 (file)
@@ -62,7 +62,7 @@ public:
   typedef typename OutputImageType::RegionType OutputImageRegionType; 
   typedef typename OutputImageType::PixelType  OutputImagePixelType; 
   
-  void PrintSelf ( std::ostream& os, itk::Indent indent ) const;
+  void PrintSelf ( std::ostream& os, itk::Indent indent ) const ITK_OVERRIDE;
 
   /** Clear the seeds */
   void ClearSeeds();
@@ -178,11 +178,11 @@ protected:
   unsigned int m_MinimumSize;
 
   // Override since the filter needs all the data for the algorithm
-  void GenerateInputRequestedRegion();
+  void GenerateInputRequestedRegion() ITK_OVERRIDE;
 
   // Override since the filter produces the entire dataset
-  void EnlargeOutputRequestedRegion(itk::DataObject *output);
-  void GenerateData();
+  void EnlargeOutputRequestedRegion(itk::DataObject *output) ITK_OVERRIDE;
+  void GenerateData() ITK_OVERRIDE;
   
 private:
   ExplosionControlledThresholdConnectedImageFilter(const Self&); //purposely not implemented
index 8475241a3171d1b4edb2a8a50c1b5b8a5a92211d..52edcd922238be7a444694d062d66b593b2df5c1 100644 (file)
@@ -65,7 +65,7 @@ namespace clitk
     //Set Methods(inline)
     itkSetMacro( Verbose, bool);
     itkSetMacro( EdgePaddingValue, PixelType );
-    void SetNumberOfThreads(unsigned int r )
+    void SetNumberOfThreads(unsigned int r ) ITK_OVERRIDE
     {
       m_NumberOfThreadsIsGiven=true;
       m_NumberOfThreads=r;
@@ -78,7 +78,7 @@ namespace clitk
   protected:
     InvertVFFilter();
     ~InvertVFFilter() {};
-    void GenerateData( );
+    void GenerateData( ) ITK_OVERRIDE;
     
     bool m_Verbose;
     bool m_NumberOfThreadsIsGiven;
index c32782f08b84558f1bcf2cc4fa6f59976f94bd4f..4b982308cf2afcf906e0fd955f2bbad3c8b27be6 100644 (file)
@@ -74,8 +74,8 @@ protected:
   ~HelperClass1() {};
 
   //the actual processing
-  void BeforeThreadedGenerateData();
-  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+  void BeforeThreadedGenerateData() ITK_OVERRIDE;
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) ITK_OVERRIDE;
 
   //member data
   typename  WeightsImageType::Pointer m_Weights;
@@ -289,7 +289,7 @@ protected:
 
 
   //the actual processing
-  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId );
+  void ThreadedGenerateData(const OutputImageRegionType& outputRegionForThread, itk::ThreadIdType threadId ) ITK_OVERRIDE;
 
   //member data
   typename     WeightsImageType::Pointer m_Weights;
index 6b32e829dace22bb256dd1bfdf57da7d420fb741..f05c892d14b95cbbe16f7772ebd35c01da64e6c1 100644 (file)
@@ -71,17 +71,17 @@ public:
   itkGetConstReferenceMacro(Radius, InputSizeType);
 
   /** Evalulate the function at specified index */
-  virtual bool EvaluateAtIndex( const IndexType& index ) const;
+  virtual bool EvaluateAtIndex( const IndexType& index ) const ITK_OVERRIDE;
   
   /** Evaluate the function at non-integer positions */
-  virtual bool Evaluate( const PointType& point ) const
+  virtual bool Evaluate( const PointType& point ) const ITK_OVERRIDE
     { 
     IndexType index;
     this->ConvertPointToNearestIndex( point, index );
     return this->EvaluateAtIndex( index ); 
     }
   virtual bool EvaluateAtContinuousIndex( 
-    const ContinuousIndexType& cindex ) const
+    const ContinuousIndexType& cindex ) const ITK_OVERRIDE
     { 
     IndexType index;
     this->ConvertContinuousIndexToNearestIndex( cindex, index );
@@ -108,7 +108,7 @@ public:
 protected:
   LocallyAdaptiveBinaryThresholdImageFunction();
   ~LocallyAdaptiveBinaryThresholdImageFunction(){};
-  void PrintSelf(std::ostream& os, itk::Indent indent) const;
+  void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
 
 private:
   LocallyAdaptiveBinaryThresholdImageFunction( const Self& ); //purposely not implemented
index dc71f7fea7853739f7ad26289b1732d54a75a017..2d38caaefde6adf5d56cd33292913cfd48699fc1 100644 (file)
@@ -61,7 +61,7 @@ public:
   typedef typename OutputImageType::RegionType OutputImageRegionType; 
   typedef typename OutputImageType::PixelType  OutputImagePixelType; 
   
-  void PrintSelf ( std::ostream& os, itk::Indent indent ) const;
+  void PrintSelf ( std::ostream& os, itk::Indent indent ) const ITK_OVERRIDE;
 
   /** Clear the seeds */
   void ClearSeeds();
@@ -145,11 +145,11 @@ protected:
   double m_MaximumSD;
 
   // Override since the filter needs all the data for the algorithm
-  void GenerateInputRequestedRegion();
+  void GenerateInputRequestedRegion() ITK_OVERRIDE;
 
   // Override since the filter produces the entire dataset
-  void EnlargeOutputRequestedRegion(itk::DataObject *output);
-  void GenerateData();
+  void EnlargeOutputRequestedRegion(itk::DataObject *output) ITK_OVERRIDE;
+  void GenerateData() ITK_OVERRIDE;
   
 private:
   LocallyAdaptiveThresholdConnectedImageFilter(const Self&); //purposely not implemented
index 8ac997924a0bd4a2fbd720f68b71001a51ab885e..39e0f0fddfabee2b6ebddef40b538eb8c88208e5 100644 (file)
@@ -33,8 +33,8 @@ public:
 
     void Initialize(QString title, float sec, int max);
 
-    void Execute(itk::Object *caller, const itk::EventObject & event);
-    void Execute(const itk::Object *caller, const itk::EventObject & event);
+    void Execute(itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE;
+    void Execute(const itk::Object *caller, const itk::EventObject & event) ITK_OVERRIDE;
 
 protected:
     vvQProgressDialogITKCommand();