Skip to content

GitLab

otb
otb
Commit b3e93bf9 authored by Manuel Grizonnet's avatar Manuel Grizonnet
Browse files
Options

Merge branch 'txx_to_hxx' into 'develop' 

rename files with txx extension to hxx

See merge request !152
parents 01f22368 11d9f46f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68718 additions and 68718 deletions

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
Plain diff Email patch
CMake/OTBModuleHeaderTest.cmake
View file @ b3e93bf9
......@@ -46,7 +46,7 @@ if(NOT OTB_USE_OPENCV)
SET(BANNED_HEADERS "${BANNED_HEADERS} otbDecisionTreeMachineLearningModelFactory.h otbDecisionTreeMachineLearningModel.h otbKNearestNeighborsMachineLearningModelFactory.h otbKNearestNeighborsMachineLearningModel.h otbRandomForestsMachineLearningModelFactory.h otbRandomForestsMachineLearningModel.h otbSVMMachineLearningModelFactory.h otbSVMMachineLearningModel.h otbGradientBoostedTreeMachineLearningModelFactory.h otbGradientBoostedTreeMachineLearningModel.h otbBoostMachineLearningModelFactory.h otbBoostMachineLearningModel.h otbNeuralNetworkMachineLearningModelFactory.h otbNeuralNetworkMachineLearningModel.h otbNormalBayesMachineLearningModelFactory.h otbNormalBayesMachineLearningModel.h otbRequiresOpenCVCheck.h otbOpenCVUtils.h otbCvRTreesWrapper.h")
endif()
if(NOT OTB_USE_SHARK)
SET(BANNED_HEADERS "${BANNED_HEADERS} otbSharkRandomForestsMachineLearningModel.h otbSharkRandomForestsMachineLearningModel.txx otbSharkUtils.h otbRequiresSharkCheck.h otbSharkRandomForestsMachineLearningModelFactory.h otbSharkKMeansMachineLearningModel.h otbSharkKMeansMachineLearningModel.txx otbSharkKMeansMachineLearningModelFactory.h otbSharkKMeansMachineLearningModelFactory.txx")
SET(BANNED_HEADERS "${BANNED_HEADERS} otbSharkRandomForestsMachineLearningModel.h otbSharkRandomForestsMachineLearningModel.hxx otbSharkUtils.h otbRequiresSharkCheck.h otbSharkRandomForestsMachineLearningModelFactory.h otbSharkKMeansMachineLearningModel.h otbSharkKMeansMachineLearningModel.hxx otbSharkKMeansMachineLearningModelFactory.h otbSharkKMeansMachineLearningModelFactory.hxx")
endif()
if(NOT OTB_USE_LIBSVM)
SET(BANNED_HEADERS "${BANNED_HEADERS} otbLibSVMMachineLearningModel.h otbLibSVMMachineLearningModelFactory.h")
......
Documentation/SoftwareGuide/Examples/RunExamples.pl
View file @ b3e93bf9
......@@ -2,7 +2,7 @@
#
#
# This Script is used to infer figure dependencies from the .cxx/.txx source
# This Script is used to infer figure dependencies from the .cxx/.hxx source
# files in the Insight/Examples directory.
#
# This automatic generation mechanism guaranties that the figures
......@@ -77,7 +77,7 @@ $numArgs = $#ARGV + 1;
if( $numArgs < 5 )
{
print "Usage arguments: \n";
print " Name of the .cxx/.txx file (with extension).\n";
print " Name of the .cxx/.hxx file (with extension).\n";
print " OTBExecsDirectoryPath \n";
print " Cmake file to be generated\n";
print " Name of the TEX file generated, so dependencies can be specified\n";
......@@ -121,7 +121,7 @@ sub GetArgsAndFilenames {
#Exec file anme is assumed to be the same as the source filename
my $volume; my $directories;
($volume,$directories,$inputsourcefile) = File::Spec->splitpath( $inputfilename );
$inputsourcefile =~ m/(.*)(\.cxx|\.CXX|\.txx|\.TXX)/;
$inputsourcefile =~ m/(.*)(\.cxx|\.CXX|\.hxx|\.HXX)/;
my $execfilenamebase = $1;
#If the paths have a trailing /, remove it.
......
Documentation/SoftwareGuide/Latex/Introduction.tex
View file @ b3e93bf9
......@@ -200,7 +200,7 @@ aware of.
\url{http://www.orfeo-toolbox.org/doxygen/}.
\item[Header Files.] Each OTB class is implemented with a .h and
.cxx/.txx file (.txx file for templated classes). All methods
.cxx/.hxx file (.hxx file for templated classes). All methods
found in the .h header files are documented and provide a quick way
to find documentation for a particular method. (Indeed, Doxygen uses
the header documentation to produces its output.)
......
Documentation/SoftwareGuide/Latex/Iterators.tex
View file @ b3e93bf9
......@@ -397,15 +397,15 @@ tasks more efficient or easier to implement.
%./Common/itkFloodFilledFunctionConditionalIterator.h (BaseClass)
%[ here are all classes where these filters are used:
% ./BasicFilters/itkConfidenceConnectedImageFilter.txx (ImageFunction)
% ./BasicFilters/itkConnectedThresholdImageFilter.txx (ImageFunction)
% ./BasicFilters/itkIsolatedConnectedImageFilter.txx (ImageFunction)
% ./BasicFilters/itkNeighborhoodConnectedImageFilter.txx (ImageFunction)
% ./BasicFilters/itkConfidenceConnectedImageFilter.hxx (ImageFunction)
% ./BasicFilters/itkConnectedThresholdImageFilter.hxx (ImageFunction)
% ./BasicFilters/itkIsolatedConnectedImageFilter.hxx (ImageFunction)
% ./BasicFilters/itkNeighborhoodConnectedImageFilter.hxx (ImageFunction)
%
% ./Common/itkBinaryBallStructuringElement.txx (SpatialFunction)
% ./Common/itkBloxCoreAtomImage.txx (SpatialFunction)
% ./BasicFilters/itkBloxBoundaryPointToCoreAtomImageFilter.txx (SpatialFunction)
% ./BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.txx (SpatialFunction)
% ./Common/itkBinaryBallStructuringElement.hxx (SpatialFunction)
% ./Common/itkBloxCoreAtomImage.hxx (SpatialFunction)
% ./BasicFilters/itkBloxBoundaryPointToCoreAtomImageFilter.hxx (SpatialFunction)
% ./BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.hxx (SpatialFunction)
%]
%\subsection{itk::FloodFilledImageFunctionConditionalIterator}
......
Documentation/SoftwareGuide/Latex/SystemOverview.tex
View file @ b3e93bf9
......@@ -152,7 +152,7 @@ simplest syntax errors.
In ITK and OTB classes are defined by a maximum of two files: a header \code{.h} file
and an implementation file---\code{.cxx} if a non-templated class, and a
\code{.txx} if a templated class.
\code{.hxx} if a templated class.
The header files contain class declarations
and formatted comments that are used by the Doxygen documentation
system to automatically produce HTML manual pages.
......
Documentation/SoftwareGuide/Latex/WriteAFilter.tex
View file @ b3e93bf9
......@@ -521,12 +521,12 @@ defaults (usually zero) for all parameters. The copy constructor and
assignment operator should be declared \code{private} and not implemented,
to prevent instantiating the filter without the factory methods (above).
Finally, the template implementation code (in the \code{.txx} file) should
Finally, the template implementation code (in the \code{.hxx} file) should
be included, bracketed by a test for manual instantiation, thus:
\begin{verbatim}
#ifndef ITK_MANUAL_INSTANTIATION
#include "itkExampleFilter.txx"
#include "itkExampleFilter.hxx"
#endif
\end{verbatim}
......
Documentation/SoftwareGuide/Latex/WriteModules.tex
View file @ b3e93bf9
......@@ -85,7 +85,7 @@ if(NOT OTB_SOURCE_DIR)
\section{The include folder}
The include folder will contain all your headers (*.h files) and template method boy files (*.txx or *.hxx). It does not require any additional file (in particular, no CMakeLists.txt file is required).
The include folder will contain all your headers (*.h files) and template method boy files (*.hxx or *.hxx). It does not require any additional file (in particular, no CMakeLists.txt file is required).
\section{The src folder }
......
Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
View file @ b3e93bf9
......@@ -152,7 +152,7 @@ private:
// Software Guide : BeginLatex
//
// Pay attention to the fact that no \code{.txx} file is needed, since
// Pay attention to the fact that no \code{.hxx} file is needed, since
// filtering operation is implemented in the
// \doxygen{otb}{BinaryFunctorNeighborhoodImageFilter} class. So all
// the algorithmics part is inside the functor.
......
Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
View file @ b3e93bf9
......@@ -61,7 +61,7 @@ std::ostream & Join(std::ostream &os, TRange const& range, std::string const& se
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
// #include "otbJoinContainer.txx"
// #include "otbJoinContainer.hxx"
#endif
#endif // otbJoinContainer_h
Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
View file @ b3e93bf9
......@@ -172,7 +172,7 @@ private:
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
// #include "otbGeometriesSet.txx"
// #include "otbGeometriesSet.hxx"
#endif
#endif // otbGeometriesSet_h
Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
View file @ b3e93bf9
......@@ -394,7 +394,7 @@ protected:
} // end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
#include "otbGeometriesToGeometriesFilter.txx"
#include "otbGeometriesToGeometriesFilter.hxx"
#endif