From 446d8cf14e69ce531955f947e4f90092c3dd07f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 20 Feb 2019 11:49:15 +0100 Subject: [PATCH 1/2] Removed old templates folder --- ...erWidgetT.cc => MeshViewerWidgetT_impl.hh} | 0 ...enMeshNodeT.cc => SoOpenMeshNodeT_impl.hh} | 0 ...erWidgetT.cc => MeshViewerWidgetT_impl.hh} | 0 ...erWidgetT.cc => MeshViewerWidgetT_impl.hh} | 0 .../{NormalConeT.cc => NormalConeT_impl.hh} | 0 .../IO/{OMFormatT.cc => OMFormatT_impl.hh} | 0 .../{ArrayKernelT.cc => ArrayKernelT_impl.hh} | 0 .../Mesh/{PolyMeshT.cc => PolyMeshT_impl.hh} | 0 .../Mesh/{TriMeshT.cc => TriMeshT_impl.hh} | 0 .../Core/Templates/{newClassT.hh => bla.hh} | 20 ++-- .../Templates/{newClassT.cc => blaT_impl.hh} | 6 +- src/OpenMesh/Core/Templates/newClass.cc | 71 ------------ src/OpenMesh/Core/Templates/newClass.hh | 103 ------------------ src/OpenMesh/Core/Templates/newClass.sh | 9 -- src/OpenMesh/Core/Templates/newClassT.sh | 9 -- .../{SingletonT.cc => SingletonT_impl.hh} | 0 ...seDecimaterT.cc => BaseDecimaterT_impl.hh} | 0 .../{DecimaterT.cc => DecimaterT_impl.hh} | 0 .../{McDecimaterT.cc => McDecimaterT_impl.hh} | 0 ...dDecimaterT.cc => MixedDecimaterT_impl.hh} | 0 ...spectRatioT.cc => ModAspectRatioT_impl.hh} | 0 ...dEdgeLengthT.cc => ModEdgeLengthT_impl.hh} | 0 ...ModHausdorffT.cc => ModHausdorffT_impl.hh} | 0 .../{ModProgMeshT.cc => ModProgMeshT_impl.hh} | 0 .../{ModQuadricT.cc => ModQuadricT_impl.hh} | 0 .../{SmartTaggerT.cc => SmartTaggerT_impl.hh} | 0 ...herT.cc => JacobiLaplaceSmootherT_impl.hh} | 0 ...eSmootherT.cc => LaplaceSmootherT_impl.hh} | 0 .../{SmootherT.cc => SmootherT_impl.hh} | 0 .../{CompositeT.cc => CompositeT_impl.hh} | 0 .../Composite/{RulesT.cc => RulesT_impl.hh} | 0 ...CatmullClarkT.cc => CatmullClarkT_impl.hh} | 0 .../{CompositeT.cc => CompositeT_impl.hh} | 0 .../{MeshCheckerT.cc => MeshCheckerT_impl.hh} | 0 .../{StripifierT.cc => StripifierT_impl.hh} | 0 35 files changed, 13 insertions(+), 205 deletions(-) rename src/OpenMesh/Apps/QtViewer/{MeshViewerWidgetT.cc => MeshViewerWidgetT_impl.hh} (100%) rename src/OpenMesh/Apps/Unsupported/IvViewer/{SoOpenMeshNodeT.cc => SoOpenMeshNodeT_impl.hh} (100%) rename src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/{MeshViewerWidgetT.cc => MeshViewerWidgetT_impl.hh} (100%) rename src/OpenMesh/Apps/Unsupported/Streaming/Client/{MeshViewerWidgetT.cc => MeshViewerWidgetT_impl.hh} (100%) rename src/OpenMesh/Core/Geometry/{NormalConeT.cc => NormalConeT_impl.hh} (100%) rename src/OpenMesh/Core/IO/{OMFormatT.cc => OMFormatT_impl.hh} (100%) rename src/OpenMesh/Core/Mesh/{ArrayKernelT.cc => ArrayKernelT_impl.hh} (100%) rename src/OpenMesh/Core/Mesh/{PolyMeshT.cc => PolyMeshT_impl.hh} (100%) rename src/OpenMesh/Core/Mesh/{TriMeshT.cc => TriMeshT_impl.hh} (100%) rename src/OpenMesh/Core/Templates/{newClassT.hh => bla.hh} (92%) rename src/OpenMesh/Core/Templates/{newClassT.cc => blaT_impl.hh} (97%) delete mode 100644 src/OpenMesh/Core/Templates/newClass.cc delete mode 100644 src/OpenMesh/Core/Templates/newClass.hh delete mode 100644 src/OpenMesh/Core/Templates/newClass.sh delete mode 100644 src/OpenMesh/Core/Templates/newClassT.sh rename src/OpenMesh/Core/Utils/{SingletonT.cc => SingletonT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{BaseDecimaterT.cc => BaseDecimaterT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{DecimaterT.cc => DecimaterT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{McDecimaterT.cc => McDecimaterT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{MixedDecimaterT.cc => MixedDecimaterT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{ModAspectRatioT.cc => ModAspectRatioT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{ModEdgeLengthT.cc => ModEdgeLengthT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{ModHausdorffT.cc => ModHausdorffT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{ModProgMeshT.cc => ModProgMeshT_impl.hh} (100%) rename src/OpenMesh/Tools/Decimater/{ModQuadricT.cc => ModQuadricT_impl.hh} (100%) rename src/OpenMesh/Tools/SmartTagger/{SmartTaggerT.cc => SmartTaggerT_impl.hh} (100%) rename src/OpenMesh/Tools/Smoother/{JacobiLaplaceSmootherT.cc => JacobiLaplaceSmootherT_impl.hh} (100%) rename src/OpenMesh/Tools/Smoother/{LaplaceSmootherT.cc => LaplaceSmootherT_impl.hh} (100%) rename src/OpenMesh/Tools/Smoother/{SmootherT.cc => SmootherT_impl.hh} (100%) rename src/OpenMesh/Tools/Subdivider/Adaptive/Composite/{CompositeT.cc => CompositeT_impl.hh} (100%) rename src/OpenMesh/Tools/Subdivider/Adaptive/Composite/{RulesT.cc => RulesT_impl.hh} (100%) rename src/OpenMesh/Tools/Subdivider/Uniform/{CatmullClarkT.cc => CatmullClarkT_impl.hh} (100%) rename src/OpenMesh/Tools/Subdivider/Uniform/Composite/{CompositeT.cc => CompositeT_impl.hh} (100%) rename src/OpenMesh/Tools/Utils/{MeshCheckerT.cc => MeshCheckerT_impl.hh} (100%) rename src/OpenMesh/Tools/Utils/{StripifierT.cc => StripifierT_impl.hh} (100%) 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 -- GitLab From faa1a7917d2ab63417fcb216fb483374fb96df22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 20 Feb 2019 12:14:46 +0100 Subject: [PATCH 2/2] Get rid of the T.cc naming for template implementations --- Doc/changelog.docu | 1 + Doc/misc.docu | 1 + cmake/ACGCommon.cmake | 9 ---- .../Decimating/DecimaterGui/CMakeLists.txt | 6 +-- src/OpenMesh/Apps/ProgViewer/CMakeLists.txt | 5 +- src/OpenMesh/Apps/QtViewer/CMakeLists.txt | 3 -- .../Apps/QtViewer/MeshViewerWidgetT.hh | 2 +- .../Subdivider/SubdividerGui/CMakeLists.txt | 7 ++- .../Unsupported/IvViewer/SoOpenMeshNodeT.hh | 2 +- .../Streaming-qt4/Client/MeshViewerWidgetT.hh | 2 +- .../Streaming/Client/MeshViewerWidgetT.hh | 2 +- .../VDProgMesh/Synthesizer/CMakeLists.txt | 5 +- src/OpenMesh/Core/CMakeLists.txt | 50 +++++++------------ src/OpenMesh/Core/Geometry/NormalConeT.hh | 2 +- src/OpenMesh/Core/IO/OMFormat.hh | 2 +- src/OpenMesh/Core/Mesh/ArrayKernel.hh | 2 +- src/OpenMesh/Core/Mesh/PolyMeshT.hh | 2 +- src/OpenMesh/Core/Mesh/TriMeshT.hh | 2 +- src/OpenMesh/Core/Utils/SingletonT.hh | 2 +- src/OpenMesh/Tools/CMakeLists.txt | 32 ++++-------- .../Tools/Decimater/BaseDecimaterT.hh | 2 +- .../Tools/Decimater/BaseDecimaterT_impl.hh | 2 +- src/OpenMesh/Tools/Decimater/DecimaterT.hh | 2 +- .../Tools/Decimater/DecimaterT_impl.hh | 2 +- src/OpenMesh/Tools/Decimater/McDecimaterT.hh | 2 +- .../Tools/Decimater/McDecimaterT_impl.hh | 2 +- .../Tools/Decimater/MixedDecimaterT.hh | 4 +- .../Tools/Decimater/MixedDecimaterT_impl.hh | 2 +- .../Tools/Decimater/ModAspectRatioT.hh | 2 +- .../Tools/Decimater/ModAspectRatioT_impl.hh | 2 +- .../Tools/Decimater/ModEdgeLengthT.hh | 2 +- .../Tools/Decimater/ModEdgeLengthT_impl.hh | 2 +- src/OpenMesh/Tools/Decimater/ModHausdorffT.hh | 2 +- .../Tools/Decimater/ModHausdorffT_impl.hh | 2 +- src/OpenMesh/Tools/Decimater/ModProgMeshT.hh | 2 +- .../Tools/Decimater/ModProgMeshT_impl.hh | 2 +- src/OpenMesh/Tools/Decimater/ModQuadricT.hh | 2 +- .../Tools/Decimater/ModQuadricT_impl.hh | 2 +- .../Tools/SmartTagger/SmartTaggerT.hh | 2 +- .../Tools/Smoother/JacobiLaplaceSmootherT.hh | 2 +- .../Smoother/JacobiLaplaceSmootherT_impl.hh | 2 +- .../Tools/Smoother/LaplaceSmootherT.hh | 2 +- .../Tools/Smoother/LaplaceSmootherT_impl.hh | 2 +- src/OpenMesh/Tools/Smoother/SmootherT.hh | 2 +- src/OpenMesh/Tools/Smoother/SmootherT_impl.hh | 2 +- .../Adaptive/Composite/CompositeT.hh | 2 +- .../Adaptive/Composite/CompositeT_impl.hh | 2 +- .../Subdivider/Adaptive/Composite/RulesT.hh | 2 +- .../Adaptive/Composite/RulesT_impl.hh | 2 +- .../Tools/Subdivider/Uniform/CatmullClarkT.hh | 2 +- .../Uniform/Composite/CompositeT.hh | 2 +- .../Uniform/Composite/CompositeT_impl.hh | 2 +- src/OpenMesh/Tools/Utils/MeshCheckerT.hh | 2 +- src/OpenMesh/Tools/Utils/StripifierT.hh | 2 +- 54 files changed, 80 insertions(+), 129 deletions(-) diff --git a/Doc/changelog.docu b/Doc/changelog.docu index d551a433..5ff01c21 100644 --- a/Doc/changelog.docu +++ b/Doc/changelog.docu @@ -12,6 +12,7 @@ Breaking changes:
  • Don't run and test on VS2013 anymore. As VS2013 still lacks some C++11 features, we remove it from our list of supported platforms
    • +
  • (Only internally breaking change:)Get rid of the T.cc naming for template implementations. New names end with T_impl.hh. This avoids all the missing files in the IDE GUIs due to the filtered T.cc files. Also the install targets could be simplified due to this change. For OpenMesh users, this change should be transparent.
Core diff --git a/Doc/misc.docu b/Doc/misc.docu index 73db2d39..b960c382 100644 --- a/Doc/misc.docu +++ b/Doc/misc.docu @@ -7,6 +7,7 @@ The following naming conventions are used for the %OpenMesh code: Files: \li \c MyClass.cc for C++-Implementation of class \c MyClass + \li \c MyClassT_impl.hh for Header only C++-Implementation of template class \c MyClass \li \c MyClass.hh for C++-Header of class \c MyClass Classes: diff --git a/cmake/ACGCommon.cmake b/cmake/ACGCommon.cmake index dcab028f..65a38530 100644 --- a/cmake/ACGCommon.cmake +++ b/cmake/ACGCommon.cmake @@ -158,15 +158,6 @@ macro (acg_append_files ret ext) endforeach () endmacro () -# drop all "*T.cc" files from list -macro (acg_drop_templates list) - foreach (_file ${${list}}) - if (_file MATCHES "T.cc$") - list (REMOVE_ITEM ${list} ${_file}) - endif () - endforeach () -endmacro () - # get all files in directory, but ignore svn macro (acg_get_files_in_dir ret dir) file (GLOB_RECURSE __files RELATIVE "${dir}" "${dir}/*") diff --git a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt index 9c978e32..f37d996b 100644 --- a/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt @@ -13,17 +13,15 @@ set (directories # collect all header and source files acg_append_files (headers "*.hh" ${directories}) +list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh") + set (sources ../../QtViewer/QGLViewerWidget.cc - ../../QtViewer/MeshViewerWidgetT.cc ../DecimaterViewerWidget.cc ../decimaterviewer.cc ) -# remove template cc files from source file list -acg_drop_templates (sources) - if (WIN32) acg_add_executable (DecimaterGui WIN32 ${sources} ${headers}) else () diff --git a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt index d3e4abb9..f963a5e9 100644 --- a/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/ProgViewer/CMakeLists.txt @@ -11,13 +11,10 @@ acg_append_files (headers "*.hh" .) acg_append_files (sources "*.cc" .) list (APPEND sources "../QtViewer/QGLViewerWidget.cc") -list (APPEND sources "../QtViewer/MeshViewerWidgetT.cc") list (APPEND headers "../QtViewer/QGLViewerWidget.hh") list (APPEND headers "../QtViewer/MeshViewerWidgetT.hh") - -# remove template cc files from source file list -acg_drop_templates (sources) +list (APPEND headers "../QtViewer/MeshViewerWidgetT_impl.hh") if (WIN32) acg_add_executable( ProgViewer WIN32 ${sources} ${headers}) diff --git a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt index 65fd94eb..62a327b6 100644 --- a/src/OpenMesh/Apps/QtViewer/CMakeLists.txt +++ b/src/OpenMesh/Apps/QtViewer/CMakeLists.txt @@ -14,9 +14,6 @@ set (directories acg_append_files (headers "*.hh" ${directories}) acg_append_files (sources "*.cc" ${directories}) -# remove template cc files from source file list -acg_drop_templates (sources) - if (WIN32) acg_add_executable (QtViewer WIN32 ${sources} ${headers}) else () diff --git a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh index 22cd4e3d..02d97139 100644 --- a/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh +++ b/src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh @@ -192,7 +192,7 @@ protected: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC) # define OPENMESH_MESHVIEWERWIDGET_TEMPLATES -# include "MeshViewerWidgetT.cc" +# include "MeshViewerWidgetT_impl.hh" #endif //============================================================================= diff --git a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt index 32fdbf44..a092cc58 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt +++ b/src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt @@ -14,16 +14,15 @@ set (directories # collect all header and source files acg_append_files (headers "*.hh" ${directories}) +list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh") + + set (sources ../../QtViewer/QGLViewerWidget.cc - ../../QtViewer/MeshViewerWidgetT.cc ../SubdivideWidget.cc ../qtsubdivider.cc ) -# remove template cc files from source file list -acg_drop_templates (sources) - if (WIN32) acg_add_executable (SubdividerGui WIN32 ${sources} ${headers}) else () diff --git a/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh index 46e533bb..98bdb17a 100644 --- a/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh +++ b/src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh @@ -123,7 +123,7 @@ private: //============================================================================= #if defined(INCLUDE_TEMPLATES) && !defined(OPENMESH_SOOPENMESHNODE_CC) # define OPENMESH_SOOPENMESHMODE_TEMPLATES -# include "SoOpenMeshNodeT.cc" +# include "SoOpenMeshNodeT_impl.hh" #endif //============================================================================= #endif // OPENMESH_SOOPENMESHNODE_HH diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh index 56c16ac6..2ce8bc92 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh +++ b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh @@ -168,7 +168,7 @@ protected: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC) # define OPENMESH_MESHVIEWERWIDGET_TEMPLATES -# include "MeshViewerWidgetT.cc" +# include "MeshViewerWidgetT_impl.hh" #endif //============================================================================= #endif // OPENMESHAPPS_MESHVIEWERWIDGETT_HH defined diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh b/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh index 56c16ac6..2ce8bc92 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh @@ -168,7 +168,7 @@ protected: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESHAPPS_MESHVIEWERWIDGET_CC) # define OPENMESH_MESHVIEWERWIDGET_TEMPLATES -# include "MeshViewerWidgetT.cc" +# include "MeshViewerWidgetT_impl.hh" #endif //============================================================================= #endif // OPENMESHAPPS_MESHVIEWERWIDGETT_HH defined diff --git a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt index d5b02d7f..e17e6b55 100644 --- a/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt +++ b/src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt @@ -10,13 +10,10 @@ acg_append_files (headers "*.hh" .) acg_append_files (sources "*.cc" .) list (APPEND sources "../../QtViewer/QGLViewerWidget.cc") -list (APPEND sources "../../QtViewer/MeshViewerWidgetT.cc") list (APPEND headers "../../QtViewer/QGLViewerWidget.hh") list (APPEND headers "../../QtViewer/MeshViewerWidgetT.hh") - -# remove template cc files from source file list -acg_drop_templates (sources) +list (APPEND headers "../../QtViewer/MeshViewerWidgetT_impl.hh") if (WIN32) acg_add_executable (Synthesizer WIN32 ${sources} ${headers}) diff --git a/src/OpenMesh/Core/CMakeLists.txt b/src/OpenMesh/Core/CMakeLists.txt index 83b11eb2..753e20ac 100644 --- a/src/OpenMesh/Core/CMakeLists.txt +++ b/src/OpenMesh/Core/CMakeLists.txt @@ -24,10 +24,6 @@ set (directories acg_append_files (headers "*.hh" ${directories}) acg_append_files (sources "*.cc" ${directories}) -#Drop the template only cc files -acg_drop_templates(sources) - - # Disable Library installation when not building OpenMesh on its own but as part of another project! if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh") set(ACG_NO_LIBRARY_INSTALL true) @@ -81,16 +77,16 @@ endif() # Install Header Files (Apple) if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE ) - FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*T.cc" ) - FILE(GLOB files_install_IO "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.inl" ) - FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*T.cc" ) - FILE(GLOB files_install_IO_exporter "${CMAKE_CURRENT_SOURCE_DIR}/IO/exporter/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/exporter/*T.cc" ) - FILE(GLOB files_install_IO_reader "${CMAKE_CURRENT_SOURCE_DIR}/IO/reader/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/reader/*T.cc" ) - FILE(GLOB files_install_IO_writer "${CMAKE_CURRENT_SOURCE_DIR}/IO/writer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/writer/*T.cc" ) - FILE(GLOB files_install_Mesh "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/*T.cc" ) - FILE(GLOB files_install_Mesh_Gen "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/gen/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/gen/*T.cc" ) - FILE(GLOB files_install_System "${CMAKE_CURRENT_SOURCE_DIR}/System/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/System/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/System/config.h" ) - FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*T.cc" ) + FILE(GLOB files_install_Geometry "${CMAKE_CURRENT_SOURCE_DIR}/Geometry/*.hh" ) + FILE(GLOB files_install_IO "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/IO/*.inl" ) + FILE(GLOB files_install_IO_importer "${CMAKE_CURRENT_SOURCE_DIR}/IO/importer/*.hh" ) + FILE(GLOB files_install_IO_exporter "${CMAKE_CURRENT_SOURCE_DIR}/IO/exporter/*.hh" ) + FILE(GLOB files_install_IO_reader "${CMAKE_CURRENT_SOURCE_DIR}/IO/reader/*.hh" ) + FILE(GLOB files_install_IO_writer "${CMAKE_CURRENT_SOURCE_DIR}/IO/writer/*.hh" ) + FILE(GLOB files_install_Mesh "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/*.hh" ) + FILE(GLOB files_install_Mesh_Gen "${CMAKE_CURRENT_SOURCE_DIR}/Mesh/gen/*.hh" ) + FILE(GLOB files_install_System "${CMAKE_CURRENT_SOURCE_DIR}/System/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/System/config.h" ) + FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" ) INSTALL(FILES ${files_install_Geometry} DESTINATION include/OpenMesh/Core/Geometry ) INSTALL(FILES ${files_install_IO} DESTINATION include/OpenMesh/Core/IO ) INSTALL(FILES ${files_install_IO_importer} DESTINATION include/OpenMesh/Core/IO/importer ) @@ -118,17 +114,6 @@ install(DIRECTORY . PATTERN "Templates" EXCLUDE PATTERN "Debian*" EXCLUDE) -#install Template cc files (required by headers) -install(DIRECTORY . - DESTINATION include/OpenMesh/Core - FILES_MATCHING - PATTERN "*T.cc" - PATTERN "CVS" EXCLUDE - PATTERN ".svn" EXCLUDE - PATTERN "tmp" EXCLUDE - PATTERN "Templates" EXCLUDE - PATTERN "Debian*" EXCLUDE) - #install the config file install(FILES System/config.h DESTINATION include/OpenMesh/Core/System) @@ -138,14 +123,13 @@ install(DIRECTORY IO/ FILES_MATCHING PATTERN "*.inl" PATTERN "CVS" EXCLUDE - PATTERN ".svn" EXCLUDE - PATTERN "reader" EXCLUDE - PATTERN "writer" EXCLUDE - PATTERN "importer" EXCLUDE - PATTERN "exporter" EXCLUDE - PATTERN "tmp" EXCLUDE - PATTERN "Debian*" EXCLUDE ) - + PATTERN ".svn" EXCLUDE + PATTERN "reader" EXCLUDE + PATTERN "writer" EXCLUDE + PATTERN "importer" EXCLUDE + PATTERN "exporter" EXCLUDE + PATTERN "tmp" EXCLUDE + PATTERN "Debian*" EXCLUDE ) endif () diff --git a/src/OpenMesh/Core/Geometry/NormalConeT.hh b/src/OpenMesh/Core/Geometry/NormalConeT.hh index a8e426ce..9baaf588 100644 --- a/src/OpenMesh/Core/Geometry/NormalConeT.hh +++ b/src/OpenMesh/Core/Geometry/NormalConeT.hh @@ -119,7 +119,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_NORMALCONE_C) #define OPENMESH_NORMALCONE_TEMPLATES -#include "NormalConeT.cc" +#include "NormalConeT_impl.hh" #endif //============================================================================= #endif // OPENMESH_NORMALCONE_HH defined diff --git a/src/OpenMesh/Core/IO/OMFormat.hh b/src/OpenMesh/Core/IO/OMFormat.hh index 207c1645..96b2a4fc 100644 --- a/src/OpenMesh/Core/IO/OMFormat.hh +++ b/src/OpenMesh/Core/IO/OMFormat.hh @@ -741,7 +741,7 @@ namespace OMFormat { //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_IO_OMFORMAT_CC) # define OPENMESH_IO_OMFORMAT_TEMPLATES -# include "OMFormatT.cc" +# include "OMFormatT_impl.hh" #endif //============================================================================= #endif diff --git a/src/OpenMesh/Core/Mesh/ArrayKernel.hh b/src/OpenMesh/Core/Mesh/ArrayKernel.hh index 5e0e9740..b6d76792 100644 --- a/src/OpenMesh/Core/Mesh/ArrayKernel.hh +++ b/src/OpenMesh/Core/Mesh/ArrayKernel.hh @@ -903,7 +903,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_ARRAY_KERNEL_C) # define OPENMESH_ARRAY_KERNEL_TEMPLATES -# include "ArrayKernelT.cc" +# include "ArrayKernelT_impl.hh" #endif //============================================================================= #endif // OPENMESH_ARRAY_KERNEL_HH defined diff --git a/src/OpenMesh/Core/Mesh/PolyMeshT.hh b/src/OpenMesh/Core/Mesh/PolyMeshT.hh index e21fc5d7..33e89c31 100644 --- a/src/OpenMesh/Core/Mesh/PolyMeshT.hh +++ b/src/OpenMesh/Core/Mesh/PolyMeshT.hh @@ -628,7 +628,7 @@ const LHS mesh_cast(const PolyMeshT *rhs) { //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_POLYMESH_C) # define OPENMESH_POLYMESH_TEMPLATES -# include "PolyMeshT.cc" +# include "PolyMeshT_impl.hh" #endif //============================================================================= #endif // OPENMESH_POLYMESHT_HH defined diff --git a/src/OpenMesh/Core/Mesh/TriMeshT.hh b/src/OpenMesh/Core/Mesh/TriMeshT.hh index 582f71f5..7859a12b 100644 --- a/src/OpenMesh/Core/Mesh/TriMeshT.hh +++ b/src/OpenMesh/Core/Mesh/TriMeshT.hh @@ -428,7 +428,7 @@ public: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_TRIMESH_C) #define OPENMESH_TRIMESH_TEMPLATES -#include "TriMeshT.cc" +#include "TriMeshT_impl.hh" #endif //============================================================================= #endif // OPENMESH_TRIMESH_HH defined diff --git a/src/OpenMesh/Core/Utils/SingletonT.hh b/src/OpenMesh/Core/Utils/SingletonT.hh index 1f0fe395..2945debb 100644 --- a/src/OpenMesh/Core/Utils/SingletonT.hh +++ b/src/OpenMesh/Core/Utils/SingletonT.hh @@ -142,7 +142,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SINGLETON_C) # define OPENMESH_SINGLETON_TEMPLATES -# include "SingletonT.cc" +# include "SingletonT_impl.hh" #endif //============================================================================= #endif // __SINGLETON_HH__ diff --git a/src/OpenMesh/Tools/CMakeLists.txt b/src/OpenMesh/Tools/CMakeLists.txt index 728a367a..f00145b1 100644 --- a/src/OpenMesh/Tools/CMakeLists.txt +++ b/src/OpenMesh/Tools/CMakeLists.txt @@ -22,9 +22,6 @@ set (directories acg_append_files (headers "*.hh" ${directories}) acg_append_files (sources "*.cc" ${directories}) -#Drop the template only cc files -acg_drop_templates(sources) - IF(WIN32 AND NOT MINGW) acg_append_files (sources "*.c" ${directories}) ENDIF(WIN32 AND NOT MINGW) @@ -78,15 +75,15 @@ endif() # Install Header Files (Apple) if ( NOT ACG_PROJECT_MACOS_BUNDLE AND APPLE ) - FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*T.cc" ) - FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*T.cc" ) - FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*T.cc" ) - FILE(GLOB files_install_Smoother "${CMAKE_CURRENT_SOURCE_DIR}/Smoother/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Smoother/*T.cc" ) - FILE(GLOB files_install_Subdivider_Adaptive "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Adaptive/Composite/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Adaptive/Composite/*T.cc" ) - FILE(GLOB files_install_Subdivider_Uniform "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/*T.cc" ) - FILE(GLOB files_install_Subdivider_Uniform_Composite "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/Composite/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/Composite/*T.cc" ) - FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*T.cc" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/getopt.h" ) - FILE(GLOB files_install_VDPM "${CMAKE_CURRENT_SOURCE_DIR}/VDPM/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/VDPM/*T.cc" ) + FILE(GLOB files_install_Decimater "${CMAKE_CURRENT_SOURCE_DIR}/Decimater/*.hh" ) + FILE(GLOB files_install_Dualizer "${CMAKE_CURRENT_SOURCE_DIR}/Dualizer/*.hh" ) + FILE(GLOB files_install_KERNEL_OSG "${CMAKE_CURRENT_SOURCE_DIR}/Kernel_OSG/*.hh" ) + FILE(GLOB files_install_Smoother "${CMAKE_CURRENT_SOURCE_DIR}/Smoother/*.hh" ) + FILE(GLOB files_install_Subdivider_Adaptive "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Adaptive/Composite/*.hh" ) + FILE(GLOB files_install_Subdivider_Uniform "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/*.hh" ) + FILE(GLOB files_install_Subdivider_Uniform_Composite "${CMAKE_CURRENT_SOURCE_DIR}/Subdivider/Uniform/Composite/*.hh" ) + FILE(GLOB files_install_Utils "${CMAKE_CURRENT_SOURCE_DIR}/Utils/*.hh" "${CMAKE_CURRENT_SOURCE_DIR}/Utils/getopt.h" ) + FILE(GLOB files_install_VDPM "${CMAKE_CURRENT_SOURCE_DIR}/VDPM/*.hh" ) INSTALL(FILES ${files_install_Decimater} DESTINATION include/OpenMesh/Tools/Decimater ) INSTALL(FILES ${files_install_Dualizer} DESTINATION include/OpenMesh/Tools/Dualizer ) INSTALL(FILES ${files_install_KERNEL_OSG} DESTINATION include/OpenMesh/Tools/Kernel_OSG ) @@ -113,17 +110,6 @@ install(DIRECTORY . PATTERN "Templates" EXCLUDE PATTERN "Debian*" EXCLUDE) -#install Template cc files (required by headers) -install(DIRECTORY . - DESTINATION include/OpenMesh/Tools - FILES_MATCHING - PATTERN "*T.cc" - PATTERN "CVS" EXCLUDE - PATTERN ".svn" EXCLUDE - PATTERN "tmp" EXCLUDE - PATTERN "Templates" EXCLUDE - PATTERN "Debian*" EXCLUDE) - #install the config file install(FILES Utils/getopt.h DESTINATION include/OpenMesh/Tools/Utils) diff --git a/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh b/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh index 24def882..97c2d064 100644 --- a/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/BaseDecimaterT.hh @@ -277,7 +277,7 @@ private: //------------------------------------------------------- private data //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_BASE_DECIMATER_DECIMATERT_CC) #define OPENMESH_BASE_DECIMATER_TEMPLATES -#include "BaseDecimaterT.cc" +#include "BaseDecimaterT_impl.hh" #endif //============================================================================= #endif // OPENMESH_BASE_DECIMATER_DECIMATERT_HH defined diff --git a/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh index c5748d6d..780dfa34 100644 --- a/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/BaseDecimaterT_impl.hh @@ -39,7 +39,7 @@ * * * ========================================================================= */ -/** \file DecimaterT.cc +/** \file DecimaterT_impl.cc */ //============================================================================= diff --git a/src/OpenMesh/Tools/Decimater/DecimaterT.hh b/src/OpenMesh/Tools/Decimater/DecimaterT.hh index c203e88a..ceddd554 100644 --- a/src/OpenMesh/Tools/Decimater/DecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/DecimaterT.hh @@ -209,7 +209,7 @@ private: //------------------------------------------------------- private data //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_DECIMATERT_CC) #define OPENMESH_DECIMATER_TEMPLATES -#include "DecimaterT.cc" +#include "DecimaterT_impl.hh" #endif //============================================================================= #endif // OPENMESH_DECIMATER_DECIMATERT_HH defined diff --git a/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh index 24b3b195..7f61a777 100644 --- a/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/DecimaterT_impl.hh @@ -40,7 +40,7 @@ * ========================================================================= */ -/** \file DecimaterT.cc +/** \file DecimaterT_impl.hh */ //============================================================================= diff --git a/src/OpenMesh/Tools/Decimater/McDecimaterT.hh b/src/OpenMesh/Tools/Decimater/McDecimaterT.hh index 0946fe96..9b38a383 100644 --- a/src/OpenMesh/Tools/Decimater/McDecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/McDecimaterT.hh @@ -138,7 +138,7 @@ private: //------------------------------------------------------- private data //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_MULTIPLE_CHOICE_DECIMATER_DECIMATERT_CC) #define OPENMESH_MULTIPLE_CHOICE_DECIMATER_TEMPLATES -#include "McDecimaterT.cc" +#include "McDecimaterT_impl.hh" #endif //============================================================================= #endif // OPENMESH_MC_DECIMATER_DECIMATERT_HH defined diff --git a/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh index aea2edbe..f0edc676 100644 --- a/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/McDecimaterT_impl.hh @@ -40,7 +40,7 @@ * ========================================================================= */ -/** \file McDecimaterT.cc +/** \file McDecimaterT_impl.hh */ //============================================================================= diff --git a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh index 368e338c..24dc94f1 100644 --- a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh +++ b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.hh @@ -40,7 +40,7 @@ * ========================================================================= */ -/** \file MixedDecimaterT.cc +/** \file MixedDecimaterT.hh */ //============================================================================= @@ -123,7 +123,7 @@ private: //------------------------------------------------------- private data //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_MIXED_DECIMATER_DECIMATERT_CC) #define OPENMESH_MIXED_DECIMATER_TEMPLATES -#include "MixedDecimaterT.cc" +#include "MixedDecimaterT_impl.hh" #endif //============================================================================= #endif // OPENMESH_MIXED_DECIMATER_DECIMATERT_HH diff --git a/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh b/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh index 1bca8be1..6b86b8d1 100644 --- a/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/MixedDecimaterT_impl.hh @@ -40,7 +40,7 @@ * ========================================================================= */ -/** \file MixedDecimaterT.cc +/** \file MixedDecimaterT_impl.hh */ //============================================================================= diff --git a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh index 2eb1db0d..4977fa6d 100644 --- a/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh +++ b/src/OpenMesh/Tools/Decimater/ModAspectRatioT.hh @@ -142,7 +142,7 @@ class ModAspectRatioT: public ModBaseT { //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODASPECTRATIOT_C) #define OPENMESH_DECIMATER_MODASPECTRATIOT_TEMPLATES -#include "ModAspectRatioT.cc" +#include "ModAspectRatioT_impl.hh" #endif //============================================================================= #endif // OPENMESH_DECIMATER_MODASPECTRATIOT_HH defined diff --git a/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh b/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh index ef4ac9ae..8575b79c 100644 --- a/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModAspectRatioT_impl.hh @@ -40,7 +40,7 @@ * ========================================================================= */ -/** \file ModAspectRatioT.cc +/** \file ModAspectRatioT_impl.hh */ //============================================================================= diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh index 6063dce6..4b7ec155 100644 --- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh +++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh @@ -115,7 +115,7 @@ class ModEdgeLengthT: public ModBaseT { //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODEDGELENGTHT_C) #define MODEDGELENGTHT_TEMPLATES -#include "ModEdgeLengthT.cc" +#include "ModEdgeLengthT_impl.hh" #endif //============================================================================= #endif // OPENMESH_DECIMATER_MODEDGELENGTHT_HH defined diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh index d50eec81..084946f0 100644 --- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT_impl.hh @@ -40,7 +40,7 @@ * ========================================================================= */ -/** \file ModEdgeLengthT.cc +/** \file ModEdgeLengthT_impl.hh */ //============================================================================= diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh index 30310cba..7d7d040b 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT.hh @@ -153,7 +153,7 @@ class ModHausdorffT: public ModBaseT { //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODHAUSDORFFT_C) #define OPENMESH_DECIMATER_MODHAUSDORFFT_TEMPLATES -#include "ModHausdorffT.cc" +#include "ModHausdorffT_impl.hh" #endif //============================================================================= #endif // OPENMESH_DECIMATER_MODHAUSDORFFT_HH defined diff --git a/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh b/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh index 315bc722..bde59f39 100644 --- a/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh @@ -40,7 +40,7 @@ * ========================================================================= */ -/** \file ModHausdorffT.cc +/** \file ModHausdorffT_impl.hh */ diff --git a/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh b/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh index e7b89ee0..5d1c3c65 100644 --- a/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh +++ b/src/OpenMesh/Tools/Decimater/ModProgMeshT.hh @@ -185,7 +185,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODPROGMESH_CC) #define OSG_MODPROGMESH_TEMPLATES -#include "ModProgMeshT.cc" +#include "ModProgMeshT_impl.hh" #endif //============================================================================= #endif // OPENMESH_TOOLS_PROGMESHT_HH defined diff --git a/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh b/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh index a31f8c09..1f657851 100644 --- a/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModProgMeshT_impl.hh @@ -41,7 +41,7 @@ -/** \file ModProgMeshT.cc +/** \file ModProgMeshT_impl.hh */ diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh index 7514a8a6..9d86a067 100644 --- a/src/OpenMesh/Tools/Decimater/ModQuadricT.hh +++ b/src/OpenMesh/Tools/Decimater/ModQuadricT.hh @@ -183,7 +183,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_DECIMATER_MODQUADRIC_CC) #define OSG_MODQUADRIC_TEMPLATES -#include "ModQuadricT.cc" +#include "ModQuadricT_impl.hh" #endif //============================================================================= #endif // OSG_MODQUADRIC_HH defined diff --git a/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh b/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh index f75b6991..88ea66db 100644 --- a/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh +++ b/src/OpenMesh/Tools/Decimater/ModQuadricT_impl.hh @@ -41,7 +41,7 @@ -/** \file ModQuadricT.cc +/** \file ModQuadricT_impl.hh Bodies of template member function. */ diff --git a/src/OpenMesh/Tools/SmartTagger/SmartTaggerT.hh b/src/OpenMesh/Tools/SmartTagger/SmartTaggerT.hh index 182b0d5e..77dd65ad 100644 --- a/src/OpenMesh/Tools/SmartTagger/SmartTaggerT.hh +++ b/src/OpenMesh/Tools/SmartTagger/SmartTaggerT.hh @@ -236,6 +236,6 @@ public: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SMARTTAGGERT_C) #define OPENMESH_SMARTTAGGERT_TEMPLATES -#include "SmartTaggerT.cc" +#include "SmartTaggerT_impl.hh" #endif diff --git a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh index 1085cbc1..ee7e8900 100644 --- a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.hh @@ -104,7 +104,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_JACOBI_LAPLACE_SMOOTHERT_C) #define OPENMESH_JACOBI_LAPLACE_SMOOTHERT_TEMPLATES -#include "JacobiLaplaceSmootherT.cc" +#include "JacobiLaplaceSmootherT_impl.hh" #endif //============================================================================= #endif // OPENMESH_JACOBI_LAPLACE_SMOOTHERT_HH defined diff --git a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh index 46bb91c8..461b85df 100644 --- a/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh +++ b/src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT_impl.hh @@ -41,7 +41,7 @@ -/** \file JacobiLaplaceSmootherT.cc +/** \file JacobiLaplaceSmootherT_impl.hh */ diff --git a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh index c580b80e..32e8cfca 100644 --- a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT.hh @@ -118,7 +118,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_LAPLACE_SMOOTHERT_C) #define OPENMESH_LAPLACE_SMOOTHERT_TEMPLATES -#include "LaplaceSmootherT.cc" +#include "LaplaceSmootherT_impl.hh" #endif //============================================================================= #endif // OPENMESH_LAPLACE_SMOOTHERT_HH defined diff --git a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh index 1d29e023..780ff09f 100644 --- a/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh +++ b/src/OpenMesh/Tools/Smoother/LaplaceSmootherT_impl.hh @@ -41,7 +41,7 @@ -/** \file LaplaceSmootherT.cc +/** \file LaplaceSmootherT_impl.hh */ diff --git a/src/OpenMesh/Tools/Smoother/SmootherT.hh b/src/OpenMesh/Tools/Smoother/SmootherT.hh index 0feab32c..90714768 100644 --- a/src/OpenMesh/Tools/Smoother/SmootherT.hh +++ b/src/OpenMesh/Tools/Smoother/SmootherT.hh @@ -247,7 +247,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SMOOTHERT_C) #define OPENMESH_SMOOTHERT_TEMPLATES -#include "SmootherT.cc" +#include "SmootherT_impl.hh" #endif //============================================================================= #endif // OPENMESH_SMOOTHER_SMOOTHERT_HH defined diff --git a/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh b/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh index d54dcd48..b9bee5c5 100644 --- a/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh +++ b/src/OpenMesh/Tools/Smoother/SmootherT_impl.hh @@ -41,7 +41,7 @@ -/** \file SmootherT.cc +/** \file SmootherT_impl.hh */ diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh index b33e56f5..bb341216 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT.hh @@ -304,7 +304,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SUBDIVIDER_ADAPTIVE_COMPOSITET_CC) # define OPENMESH_SUBDIVIDER_TEMPLATES -# include "CompositeT.cc" +# include "CompositeT_impl.hh" #endif //============================================================================= #endif // OPENMESH_SUBDIVIDER_ADAPTIVE_COMPOSITET_HH defined diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh index ea36521b..e13bb0a4 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/CompositeT_impl.hh @@ -39,7 +39,7 @@ * * * ========================================================================= */ -/** \file Adaptive/Composite/CompositeT.cc +/** \file Adaptive/Composite/CompositeT_impl.hh */ diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh index d039c7c2..0fdf3e79 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.hh @@ -530,7 +530,7 @@ public: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SUBDIVIDER_ADAPTIVE_RULEST_CC) # define OPENMESH_SUBDIVIDER_TEMPLATES -# include "RulesT.cc" +# include "RulesT_impl.hh" #endif //============================================================================= #endif // OPENMESH_SUBDIVIDER_ADAPTIVE_RULEST_HH defined diff --git a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh index a5141332..8de1456e 100644 --- a/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT_impl.hh @@ -41,7 +41,7 @@ -/** \file RulesT.cc +/** \file RulesT_impl.hh */ diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh index 06342109..2d6faa35 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.hh @@ -167,7 +167,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SUBDIVIDER_UNIFORM_CATMULLCLARK_CC) # define OPENMESH_SUBDIVIDER_TEMPLATES -# include "CatmullClarkT.cc" +# include "CatmullClarkT_impl.hh" #endif //============================================================================= #endif // OPENMESH_SUBDIVIDER_UNIFORM_CATMULLCLARKT_HH defined diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh index f16962dc..66327cd0 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.hh @@ -238,7 +238,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_SUBDIVIDER_UNIFORM_COMPOSITE_CC) #define OPENMESH_SUBDIVIDER_TEMPLATES -#include "CompositeT.cc" +#include "CompositeT_impl.hh" #endif //============================================================================= #endif // COMPOSITET_HH defined diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh index 91213b6a..55e5e196 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh +++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh @@ -41,7 +41,7 @@ -/** \file Uniform/Composite/CompositeT.cc +/** \file Uniform/Composite/CompositeT_impl.hh */ diff --git a/src/OpenMesh/Tools/Utils/MeshCheckerT.hh b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh index 95efff8f..193359d8 100644 --- a/src/OpenMesh/Tools/Utils/MeshCheckerT.hh +++ b/src/OpenMesh/Tools/Utils/MeshCheckerT.hh @@ -119,7 +119,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_MESHCHECKER_C) #define OPENMESH_MESHCHECKER_TEMPLATES -#include "MeshCheckerT.cc" +#include "MeshCheckerT_impl.hh" #endif //============================================================================= #endif // OPENMESH_MESHCHECKER_HH defined diff --git a/src/OpenMesh/Tools/Utils/StripifierT.hh b/src/OpenMesh/Tools/Utils/StripifierT.hh index 2197157a..4f27a856 100644 --- a/src/OpenMesh/Tools/Utils/StripifierT.hh +++ b/src/OpenMesh/Tools/Utils/StripifierT.hh @@ -146,7 +146,7 @@ private: //============================================================================= #if defined(OM_INCLUDE_TEMPLATES) && !defined(OPENMESH_STRIPIFIERT_C) #define OPENMESH_STRIPIFIERT_TEMPLATES -#include "StripifierT.cc" +#include "StripifierT_impl.hh" #endif //============================================================================= #endif // OPENMESH_STRIPIFIERT_HH defined -- GitLab