Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
207
Issues
207
List
Boards
Labels
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
9bdec1f7
Commit
9bdec1f7
authored
Jun 13, 2018
by
Victor Poughon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'cpp14_override' into 'develop'
C++14: Replace ITK_OVERRIDE by override See merge request
!131
parents
49be930a
957c19d8
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
25 additions
and
25 deletions
+25
-25
Examples/Application/ApplicationExample.cxx
Examples/Application/ApplicationExample.cxx
+1
-1
Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
+1
-1
Examples/Filtering/CompositeFilterExample.cxx
Examples/Filtering/CompositeFilterExample.cxx
+2
-2
Examples/Filtering/GeometriesChangeSpatialReference.cxx
Examples/Filtering/GeometriesChangeSpatialReference.cxx
+2
-2
Examples/Registration/ImageRegistration1.cxx
Examples/Registration/ImageRegistration1.cxx
+2
-2
Examples/Registration/ImageRegistration2.cxx
Examples/Registration/ImageRegistration2.cxx
+2
-2
Examples/Registration/ImageRegistration5.cxx
Examples/Registration/ImageRegistration5.cxx
+2
-2
Examples/Registration/ImageRegistration9.cxx
Examples/Registration/ImageRegistration9.cxx
+2
-2
Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
+4
-4
Modules/Core/Common/include/otbLogger.h
Modules/Core/Common/include/otbLogger.h
+1
-1
Modules/Learning/Sampling/include/otbSampleAugmentationFilter.h
...s/Learning/Sampling/include/otbSampleAugmentationFilter.h
+3
-3
Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetBoolParameter.h
...appers/QtWidget/include/otbWrapperQtWidgetBoolParameter.h
+3
-3
No files found.
Examples/Application/ApplicationExample.cxx
View file @
9bdec1f7
...
@@ -97,7 +97,7 @@ private:
...
@@ -97,7 +97,7 @@ private:
// \code{DoInit()} method contains class information and description, parameter set up, and example values.
// \code{DoInit()} method contains class information and description, parameter set up, and example values.
// Software Guide : EndLatex
// Software Guide : EndLatex
void
DoInit
()
ITK_OVERRIDE
void
DoInit
()
override
{
{
// Software Guide : BeginLatex
// Software Guide : BeginLatex
...
...
Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
View file @
9bdec1f7
...
@@ -141,7 +141,7 @@ public:
...
@@ -141,7 +141,7 @@ public:
protected:
protected:
MyChangeDetectorImageFilter
()
{}
MyChangeDetectorImageFilter
()
{}
~
MyChangeDetectorImageFilter
()
ITK_OVERRIDE
{}
~
MyChangeDetectorImageFilter
()
override
{}
private:
private:
MyChangeDetectorImageFilter
(
const
Self
&
);
//purposely not implemented
MyChangeDetectorImageFilter
(
const
Self
&
);
//purposely not implemented
...
...
Examples/Filtering/CompositeFilterExample.cxx
View file @
9bdec1f7
...
@@ -96,7 +96,7 @@ public:
...
@@ -96,7 +96,7 @@ public:
itkTypeMacro
(
CompositeExampleImageFilter
,
itk
::
ImageToImageFilter
);
itkTypeMacro
(
CompositeExampleImageFilter
,
itk
::
ImageToImageFilter
);
/** Display */
/** Display */
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
override
;
// Software Guide : BeginLatex
// Software Guide : BeginLatex
//
//
...
@@ -135,7 +135,7 @@ protected:
...
@@ -135,7 +135,7 @@ protected:
RescalerType
;
RescalerType
;
// Software Guide : EndCodeSnippet
// Software Guide : EndCodeSnippet
void
GenerateData
()
ITK_OVERRIDE
;
void
GenerateData
()
override
;
private:
private:
...
...
Examples/Filtering/GeometriesChangeSpatialReference.cxx
View file @
9bdec1f7
...
@@ -102,11 +102,11 @@ protected:
...
@@ -102,11 +102,11 @@ protected:
/** Default constructor. */
/** Default constructor. */
MyReprojectionFilter
(){
}
MyReprojectionFilter
(){
}
/** Destructor. */
/** Destructor. */
~
MyReprojectionFilter
()
ITK_OVERRIDE
{
}
~
MyReprojectionFilter
()
override
{
}
private:
private:
OGRSpatialReference
*
DoDefineNewLayerSpatialReference
(
otb
::
ogr
::
Layer
const
&
itkNotUsed
(
source
))
const
ITK_OVERRIDE
OGRSpatialReference
*
DoDefineNewLayerSpatialReference
(
otb
::
ogr
::
Layer
const
&
itkNotUsed
(
source
))
const
override
{
{
return
m_osr
.
get
();
return
m_osr
.
get
();
}
}
...
...
Examples/Registration/ImageRegistration1.cxx
View file @
9bdec1f7
...
@@ -81,12 +81,12 @@ public:
...
@@ -81,12 +81,12 @@ public:
typedef
itk
::
RegularStepGradientDescentOptimizer
OptimizerType
;
typedef
itk
::
RegularStepGradientDescentOptimizer
OptimizerType
;
typedef
const
OptimizerType
*
OptimizerPointer
;
typedef
const
OptimizerType
*
OptimizerPointer
;
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
override
{
{
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
}
}
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
override
{
{
OptimizerPointer
optimizer
=
OptimizerPointer
optimizer
=
dynamic_cast
<
OptimizerPointer
>
(
object
);
dynamic_cast
<
OptimizerPointer
>
(
object
);
...
...
Examples/Registration/ImageRegistration2.cxx
View file @
9bdec1f7
...
@@ -100,12 +100,12 @@ public:
...
@@ -100,12 +100,12 @@ public:
typedef
itk
::
GradientDescentOptimizer
OptimizerType
;
typedef
itk
::
GradientDescentOptimizer
OptimizerType
;
typedef
const
OptimizerType
*
OptimizerPointer
;
typedef
const
OptimizerType
*
OptimizerPointer
;
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
override
{
{
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
}
}
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
override
{
{
OptimizerPointer
optimizer
=
OptimizerPointer
optimizer
=
dynamic_cast
<
OptimizerPointer
>
(
object
);
dynamic_cast
<
OptimizerPointer
>
(
object
);
...
...
Examples/Registration/ImageRegistration5.cxx
View file @
9bdec1f7
...
@@ -95,12 +95,12 @@ public:
...
@@ -95,12 +95,12 @@ public:
typedef
itk
::
RegularStepGradientDescentOptimizer
OptimizerType
;
typedef
itk
::
RegularStepGradientDescentOptimizer
OptimizerType
;
typedef
const
OptimizerType
*
OptimizerPointer
;
typedef
const
OptimizerType
*
OptimizerPointer
;
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
override
{
{
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
}
}
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
override
{
{
OptimizerPointer
optimizer
=
OptimizerPointer
optimizer
=
dynamic_cast
<
OptimizerPointer
>
(
object
);
dynamic_cast
<
OptimizerPointer
>
(
object
);
...
...
Examples/Registration/ImageRegistration9.cxx
View file @
9bdec1f7
...
@@ -90,12 +90,12 @@ public:
...
@@ -90,12 +90,12 @@ public:
typedef
itk
::
RegularStepGradientDescentOptimizer
OptimizerType
;
typedef
itk
::
RegularStepGradientDescentOptimizer
OptimizerType
;
typedef
const
OptimizerType
*
OptimizerPointer
;
typedef
const
OptimizerType
*
OptimizerPointer
;
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
itk
::
Object
*
caller
,
const
itk
::
EventObject
&
event
)
override
{
{
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
Execute
((
const
itk
::
Object
*
)
caller
,
event
);
}
}
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
ITK_OVERRIDE
void
Execute
(
const
itk
::
Object
*
object
,
const
itk
::
EventObject
&
event
)
override
{
{
OptimizerPointer
optimizer
=
OptimizerPointer
optimizer
=
dynamic_cast
<
OptimizerPointer
>
(
object
);
dynamic_cast
<
OptimizerPointer
>
(
object
);
...
...
Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
View file @
9bdec1f7
...
@@ -135,10 +135,10 @@ protected:
...
@@ -135,10 +135,10 @@ protected:
{
{
m_Image
=
nullptr
;
m_Image
=
nullptr
;
}
}
~
ImageUniqueValuesCalculator
()
ITK_OVERRIDE
~
ImageUniqueValuesCalculator
()
override
{
{
}
}
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
override
{
{
Superclass
::
PrintSelf
(
os
,
indent
);
Superclass
::
PrintSelf
(
os
,
indent
);
os
<<
indent
<<
"Image: "
<<
m_Image
.
GetPointer
()
<<
std
::
endl
;
os
<<
indent
<<
"Image: "
<<
m_Image
.
GetPointer
()
<<
std
::
endl
;
...
@@ -452,9 +452,9 @@ public:
...
@@ -452,9 +452,9 @@ public:
protected:
protected:
TernaryFunctorImageFilterWithNBands
()
{}
TernaryFunctorImageFilterWithNBands
()
{}
~
TernaryFunctorImageFilterWithNBands
()
ITK_OVERRIDE
{}
~
TernaryFunctorImageFilterWithNBands
()
override
{}
void
GenerateOutputInformation
()
ITK_OVERRIDE
void
GenerateOutputInformation
()
override
{
{
Superclass
::
GenerateOutputInformation
();
Superclass
::
GenerateOutputInformation
();
this
->
GetOutput
()
->
SetNumberOfComponentsPerPixel
(
m_NumberOfOutputBands
);
this
->
GetOutput
()
->
SetNumberOfComponentsPerPixel
(
m_NumberOfOutputBands
);
...
...
Modules/Core/Common/include/otbLogger.h
View file @
9bdec1f7
...
@@ -70,7 +70,7 @@ public:
...
@@ -70,7 +70,7 @@ public:
protected:
protected:
Logger
();
Logger
();
virtual
~
Logger
()
ITK_OVERRIDE
;
virtual
~
Logger
()
override
;
private:
private:
Logger
(
const
Self
&
);
//purposely not implemented
Logger
(
const
Self
&
);
//purposely not implemented
...
...
Modules/Learning/Sampling/include/otbSampleAugmentationFilter.h
View file @
9bdec1f7
...
@@ -123,15 +123,15 @@ public:
...
@@ -123,15 +123,15 @@ public:
protected:
protected:
SampleAugmentationFilter
();
SampleAugmentationFilter
();
~
SampleAugmentationFilter
()
ITK_OVERRIDE
{}
~
SampleAugmentationFilter
()
override
{}
/** Generate Data method*/
/** Generate Data method*/
void
GenerateData
()
ITK_OVERRIDE
;
void
GenerateData
()
override
;
/** DataObject pointer */
/** DataObject pointer */
typedef
itk
::
DataObject
::
Pointer
DataObjectPointer
;
typedef
itk
::
DataObject
::
Pointer
DataObjectPointer
;
DataObjectPointer
MakeOutput
(
DataObjectPointerArraySizeType
idx
)
ITK_OVERRIDE
;
DataObjectPointer
MakeOutput
(
DataObjectPointerArraySizeType
idx
)
override
;
using
Superclass
::
MakeOutput
;
using
Superclass
::
MakeOutput
;
...
...
Modules/Wrappers/QtWidget/include/otbWrapperQtWidgetBoolParameter.h
View file @
9bdec1f7
...
@@ -41,7 +41,7 @@ class OTBQtWidget_EXPORT QtWidgetBoolParameter : public QtWidgetParameterBase
...
@@ -41,7 +41,7 @@ class OTBQtWidget_EXPORT QtWidgetBoolParameter : public QtWidgetParameterBase
public:
public:
QtWidgetBoolParameter
(
BoolParameter
*
,
QtWidgetModel
*
);
QtWidgetBoolParameter
(
BoolParameter
*
,
QtWidgetModel
*
);
~
QtWidgetBoolParameter
()
ITK_OVERRIDE
;
~
QtWidgetBoolParameter
()
override
;
public
slots
:
public
slots
:
void
SetValue
(
bool
value
);
void
SetValue
(
bool
value
);
...
@@ -50,9 +50,9 @@ private:
...
@@ -50,9 +50,9 @@ private:
QtWidgetBoolParameter
(
const
QtWidgetBoolParameter
&
)
=
delete
;
QtWidgetBoolParameter
(
const
QtWidgetBoolParameter
&
)
=
delete
;
void
operator
=
(
const
QtWidgetBoolParameter
&
)
=
delete
;
void
operator
=
(
const
QtWidgetBoolParameter
&
)
=
delete
;
void
DoCreateWidget
()
ITK_OVERRIDE
;
void
DoCreateWidget
()
override
;
void
DoUpdateGUI
()
ITK_OVERRIDE
;
void
DoUpdateGUI
()
override
;
QToolButton
*
m_Button
;
QToolButton
*
m_Button
;
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment