diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.cc b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh similarity index 100% rename from src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.cc rename to src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh diff --git a/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.cc b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT_impl.hh similarity index 100% rename from src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.cc rename to src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT_impl.hh diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT_impl.hh similarity index 100% rename from src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.cc rename to src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT_impl.hh diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT_impl.hh similarity index 100% rename from src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.cc rename to src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT_impl.hh diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.cc b/src/OpenMesh/Core/Geometry/NormalConeT_impl.hh similarity index 100% rename from src/OpenMesh/Core/Geometry/NormalConeT.cc rename to src/OpenMesh/Core/Geometry/NormalConeT_impl.hh diff --git a/src/OpenMesh/Core/IO/OMFormatT.cc b/src/OpenMesh/Core/IO/OMFormatT_impl.hh similarity index 100% rename from src/OpenMesh/Core/IO/OMFormatT.cc rename to src/OpenMesh/Core/IO/OMFormatT_impl.hh diff --git a/src/OpenMesh/Core/Mesh/ArrayKernelT.cc b/src/OpenMesh/Core/Mesh/ArrayKernelT_impl.hh similarity index 100% rename from src/OpenMesh/Core/Mesh/ArrayKernelT.cc rename to src/OpenMesh/Core/Mesh/ArrayKernelT_impl.hh diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT.cc b/src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh similarity index 100% rename from src/OpenMesh/Core/Mesh/PolyMeshT.cc rename to src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh diff --git a/src/OpenMesh/Core/Mesh/TriMeshT.cc b/src/OpenMesh/Core/Mesh/TriMeshT_impl.hh similarity index 100% rename from src/OpenMesh/Core/Mesh/TriMeshT.cc rename to src/OpenMesh/Core/Mesh/TriMeshT_impl.hh diff --git a/src/OpenMesh/Core/Templates/newClassT.hh b/src/OpenMesh/Core/Templates/bla.hh similarity index 92% rename from src/OpenMesh/Core/Templates/newClassT.hh rename to src/OpenMesh/Core/Templates/bla.hh index 7a06ec51..73403667 100644 --- a/src/OpenMesh/Core/Templates/newClassT.hh +++ b/src/OpenMesh/Core/Templates/bla.hh @@ -43,7 +43,7 @@ //============================================================================= // -// CLASS newClass +// CLASS bla // //============================================================================= #ifndef DOXY_IGNORE_THIS @@ -67,7 +67,7 @@ namespace OpenMesh { -/** \class newClassT newClassT.hh +/** \class blaT blaT.hh Brief Description. @@ -75,24 +75,24 @@ namespace OpenMesh { */ template <> -class newClassT +class blaT { public: /// Default constructor - newClassT() {} + blaT() {} /// Destructor - ~newClassT() {} + ~blaT() {} private: /// Copy constructor (not used) - newClassT(const newClassT& _rhs); + blaT(const blaT& _rhs); /// Assignment operator (not used) - newClassT& operator=(const newClassT& _rhs); + blaT& operator=(const blaT& _rhs); }; @@ -100,9 +100,9 @@ private: //============================================================================= } // namespace OpenMesh //============================================================================= -#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_NEWCLASS_C) -#define OPENMESH_NEWCLASS_TEMPLATES -#include "newClass.cc" +#if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_BLA_C) +#define OPENMESH_BLA_TEMPLATES +#include "blaT_impl.hh" #endif //============================================================================= #endif // OPENMESH_NEWCLASST_HH defined diff --git a/src/OpenMesh/Core/Templates/newClassT.cc b/src/OpenMesh/Core/Templates/blaT_impl.hh similarity index 97% rename from src/OpenMesh/Core/Templates/newClassT.cc rename to src/OpenMesh/Core/Templates/blaT_impl.hh index a26978ec..64c3b6df 100644 --- a/src/OpenMesh/Core/Templates/newClassT.cc +++ b/src/OpenMesh/Core/Templates/blaT_impl.hh @@ -43,15 +43,15 @@ //============================================================================= // -// CLASS newClass - IMPLEMENTATION +// CLASS bla - IMPLEMENTATION // //============================================================================= -#define OPENMESH_NEWCLASS_C +#define OPENMESH_BLA_C //== INCLUDES ================================================================= -#include +#include //== NAMESPACES =============================================================== diff --git a/src/OpenMesh/Core/Templates/newClass.cc b/src/OpenMesh/Core/Templates/newClass.cc deleted file mode 100644 index e7ec51a2..00000000 --- a/src/OpenMesh/Core/Templates/newClass.cc +++ /dev/null @@ -1,71 +0,0 @@ -/* ========================================================================= * - * * - * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * - * Department of Computer Graphics and Multimedia * - * All rights reserved. * - * www.openmesh.org * - * * - *---------------------------------------------------------------------------* - * This file is part of OpenMesh. * - *---------------------------------------------------------------------------* - * * - * Redistribution and use in source and binary forms, with or without * - * modification, are permitted provided that the following conditions * - * are met: * - * * - * 1. Redistributions of source code must retain the above copyright notice, * - * this list of conditions and the following disclaimer. * - * * - * 2. Redistributions in binary form must reproduce the above copyright * - * notice, this list of conditions and the following disclaimer in the * - * documentation and/or other materials provided with the distribution. * - * * - * 3. Neither the name of the copyright holder nor the names of its * - * contributors may be used to endorse or promote products derived from * - * this software without specific prior written permission. * - * * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER * - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * * - * ========================================================================= */ - - - -//============================================================================= -// -// CLASS newClass - IMPLEMENTATION -// -//============================================================================= - - -//== INCLUDES ================================================================= - -#include - - -//== NAMESPACES =============================================================== - -namespace OpenMesh { - - -//== IMPLEMENTATION ========================================================== - - - -//----------------------------------------------------------------------------- - - - -//============================================================================= -} // namespace OpenMesh -//============================================================================= diff --git a/src/OpenMesh/Core/Templates/newClass.hh b/src/OpenMesh/Core/Templates/newClass.hh deleted file mode 100644 index f87025e1..00000000 --- a/src/OpenMesh/Core/Templates/newClass.hh +++ /dev/null @@ -1,103 +0,0 @@ -/* ========================================================================= * - * * - * OpenMesh * - * Copyright (c) 2001-2015, RWTH-Aachen University * - * Department of Computer Graphics and Multimedia * - * All rights reserved. * - * www.openmesh.org * - * * - *---------------------------------------------------------------------------* - * This file is part of OpenMesh. * - *---------------------------------------------------------------------------* - * * - * Redistribution and use in source and binary forms, with or without * - * modification, are permitted provided that the following conditions * - * are met: * - * * - * 1. Redistributions of source code must retain the above copyright notice, * - * this list of conditions and the following disclaimer. * - * * - * 2. Redistributions in binary form must reproduce the above copyright * - * notice, this list of conditions and the following disclaimer in the * - * documentation and/or other materials provided with the distribution. * - * * - * 3. Neither the name of the copyright holder nor the names of its * - * contributors may be used to endorse or promote products derived from * - * this software without specific prior written permission. * - * * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER * - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * * - * ========================================================================= */ - - - -//============================================================================= -// -// CLASS newClass -// -//============================================================================= -#ifndef DOXY_IGNORE_THIS -#ifndef OPENMESH_NEWCLASS_HH -#define OPENMESH_NEWCLASS_HH - - -//== INCLUDES ================================================================= - - -//== FORWARDDECLARATIONS ====================================================== - - -//== NAMESPACES =============================================================== - -namespace OpenMesh { - - -//== CLASS DEFINITION ========================================================= - - -/** \class newClass newClass.hh - - Brief Description. - - A more elaborate description follows. -*/ - -class newClass -{ -public: - - /// Default constructor - newClass() {} - - /// Destructor - ~newClass() {} - - -private: - - /// Copy constructor (not used) - newClass(const newClass& _rhs); - - /// Assignment operator (not used) - newClass& operator=(const newClass& _rhs); - -}; - - -//============================================================================= -} // namespace OpenMesh -//============================================================================= -#endif // OPENMESH_NEWCLASS_HH defined -#endif // DOXY_IGNORE_THIS -//============================================================================= - diff --git a/src/OpenMesh/Core/Templates/newClass.sh b/src/OpenMesh/Core/Templates/newClass.sh deleted file mode 100644 index 7ea19a72..00000000 --- a/src/OpenMesh/Core/Templates/newClass.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -A=`echo $1_ | tr '[:lower:]' '[:upper:]'` - -sed -e s/newClass/$1/g -e s/NEWCLASS_/$A/g < newClass.cc > tmp_newClass.cc -sed -e s/newClass/$1/g -e s/NEWCLASS_/$A/g < newClass.hh > tmp_newClass.hh - -mv -i tmp_newClass.cc $1.cc && echo $1.cc - ok -mv -i tmp_newClass.hh $1.hh && echo $1.hh - ok diff --git a/src/OpenMesh/Core/Templates/newClassT.sh b/src/OpenMesh/Core/Templates/newClassT.sh deleted file mode 100644 index 70232447..00000000 --- a/src/OpenMesh/Core/Templates/newClassT.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -A=`echo $1_ | tr '[:lower:]' '[:upper:]'` - -sed -e s/newClass/$1/g -e s/NEWCLASS_/$A/g < newClassT.cc > tmp_newClass.cc -sed -e s/newClass/$1/g -e s/NEWCLASS_/$A/g < newClassT.hh > tmp_newClass.hh - -mv -i tmp_newClass.cc $1.cc && echo $1.cc - ok -mv -i tmp_newClass.hh $1.hh && echo $1.hh - ok diff --git a/src/OpenMesh/Core/Utils/SingletonT.cc b/src/OpenMesh/Core/Utils/SingletonT_impl.hh similarity index 100% rename from src/OpenMesh/Core/Utils/SingletonT.cc rename to src/OpenMesh/Core/Utils/SingletonT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/BaseDecimaterT.cc b/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/BaseDecimaterT.cc rename to src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/DecimaterT.cc b/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/DecimaterT.cc rename to src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/McDecimaterT.cc b/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/McDecimaterT.cc rename to src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc b/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc rename to src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc b/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/ModAspectRatioT.cc rename to src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc rename to src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.cc b/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/ModHausdorffT.cc rename to src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/ModProgMeshT.cc b/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/ModProgMeshT.cc rename to src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT.cc b/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Decimater/ModQuadricT.cc rename to src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh diff --git a/src/OpenMesh/Tools/SmartTagger/SmartTaggerT.cc b/src/OpenMesh/Tools/SmartTagger/SmartTaggerT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/SmartTagger/SmartTaggerT.cc rename to src/OpenMesh/Tools/SmartTagger/SmartTaggerT_impl.hh diff --git a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc rename to src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh diff --git a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Smoother/LaplaceSmootherT.cc rename to src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh diff --git a/src/OpenMesh/Tools/Smoother/SmootherT.cc b/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Smoother/SmootherT.cc rename to src/OpenMesh/Tools/Smoother/SmootherT_impl.hh diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.cc rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc rename to src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc rename to src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT_impl.hh diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc rename to src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh diff --git a/src/OpenMesh/Tools/Utils/MeshCheckerT.cc b/src/OpenMesh/Tools/Utils/MeshCheckerT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Utils/MeshCheckerT.cc rename to src/OpenMesh/Tools/Utils/MeshCheckerT_impl.hh diff --git a/src/OpenMesh/Tools/Utils/StripifierT.cc b/src/OpenMesh/Tools/Utils/StripifierT_impl.hh similarity index 100% rename from src/OpenMesh/Tools/Utils/StripifierT.cc rename to src/OpenMesh/Tools/Utils/StripifierT_impl.hh