From 6390bd2634a3191e3384564f7b6bb8da4db4dba5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Wed, 23 Aug 2023 09:09:16 +0200
Subject: [PATCH] Renamed some traits

---
 src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh | 4 ++--
 src/OpenMesh/Apps/Smoothing/smooth.cc                 | 4 ++--
 src/OpenMesh/Apps/mconvert/mconvert.cc                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
index e51045b5..ac347af7 100644
--- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
+++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
@@ -84,13 +84,13 @@
 
 using namespace OpenMesh;
 
-struct MyTraits : public DEFAULT_TRAITS
+struct MyDecimaterViewerWidgetTraits : public DEFAULT_TRAITS
 {
   VertexAttributes  ( Attributes::Normal       );
   FaceAttributes    ( Attributes::Normal       );  
 };
 
-typedef TRIMESH_KERNEL<MyTraits>                     mesh_t;
+typedef TRIMESH_KERNEL<MyDecimaterViewerWidgetTraits>                     mesh_t;
 typedef MeshViewerWidgetT<mesh_t>                    MeshViewerWidgetDecimaterBase;
 
 //== CLASS DEFINITION =========================================================
diff --git a/src/OpenMesh/Apps/Smoothing/smooth.cc b/src/OpenMesh/Apps/Smoothing/smooth.cc
index ebebdbd3..ffb039df 100644
--- a/src/OpenMesh/Apps/Smoothing/smooth.cc
+++ b/src/OpenMesh/Apps/Smoothing/smooth.cc
@@ -54,7 +54,7 @@ using namespace OpenMesh;
 using namespace Smoother;
 
 
-struct MyTraits : public OpenMesh::DefaultTraits
+struct MySmoothingTraits : public OpenMesh::DefaultTraits
 {
 #if 1
   typedef OpenMesh::Vec3f Point;
@@ -65,7 +65,7 @@ struct MyTraits : public OpenMesh::DefaultTraits
 #endif
 };
 
-typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits>  MyMesh;
+typedef OpenMesh::TriMesh_ArrayKernelT<MySmoothingTraits>  MyMesh;
 
 
 //-----------------------------------------------------------------------------
diff --git a/src/OpenMesh/Apps/mconvert/mconvert.cc b/src/OpenMesh/Apps/mconvert/mconvert.cc
index 566275bd..bec6e9db 100644
--- a/src/OpenMesh/Apps/mconvert/mconvert.cc
+++ b/src/OpenMesh/Apps/mconvert/mconvert.cc
@@ -53,7 +53,7 @@
 #include <OpenMesh/Tools/Utils/getopt.h>
 
 
-struct MyTraits : public OpenMesh::DefaultTraits
+struct MyMConvertTraits : public OpenMesh::DefaultTraits
 {
   VertexAttributes  ( OpenMesh::Attributes::Normal       |
 		      OpenMesh::Attributes::Color        |
@@ -64,7 +64,7 @@ struct MyTraits : public OpenMesh::DefaultTraits
 };
 
   
-typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits> MyMesh;
+typedef OpenMesh::TriMesh_ArrayKernelT<MyMConvertTraits> MyMesh;
 
 void usage_and_exit(int xcode)
 {