From 8470d00960209b0ef932723b74a86241c4bb85a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de>
Date: Wed, 22 Apr 2020 08:21:21 +0200
Subject: [PATCH] Fixed redifinition

---
 cmake/ACGQt.cmake                                     |  2 --
 src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh |  6 +++---
 src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh      | 10 +++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/cmake/ACGQt.cmake b/cmake/ACGQt.cmake
index 994594df..271d15df 100644
--- a/cmake/ACGQt.cmake
+++ b/cmake/ACGQt.cmake
@@ -102,9 +102,7 @@ macro (acg_qt5)
     set(CMAKE_AUTOMOC ON)
 
     if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.17") 
-
       cmake_policy(SET CMP0100 NEW)
-      message("Version greater 3.17, enable policy")
     endif()
 
 
diff --git a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
index 6069ca3b..f5cda39f 100644
--- a/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
+++ b/src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
@@ -91,18 +91,18 @@ struct MyTraits : public DEFAULT_TRAITS
 };
 
 typedef TRIMESH_KERNEL<MyTraits>                     mesh_t;
-typedef MeshViewerWidgetT<mesh_t>                    MeshViewerWidget;
+typedef MeshViewerWidgetT<mesh_t>                    MeshViewerWidgetDecimaterBase;
 
 //== CLASS DEFINITION =========================================================
 
 
-class DecimaterViewerWidget : public MeshViewerWidget
+class DecimaterViewerWidget : public MeshViewerWidgetDecimaterBase
 {
   Q_OBJECT
    
 public:
   
-  typedef MeshViewerWidget inherited_t;
+  typedef MeshViewerWidgetDecimaterBase inherited_t;
 
   typedef Decimater::DecimaterT<mesh_t>                decimater_t;  
   typedef Decimater::ModQuadricT< mesh_t >::Handle        mod_quadric_t;
diff --git a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh
index 4dbd182e..cb3c8528 100644
--- a/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh
+++ b/src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh
@@ -63,7 +63,7 @@ using namespace OpenMesh;
 using namespace OpenMesh::Attributes;
 
 
-struct MyTraits : public OpenMesh::DefaultTraits
+struct ProgTraits : public OpenMesh::DefaultTraits
 {
   VertexAttributes  ( OpenMesh::Attributes::Normal       |
                       OpenMesh::Attributes::Status       );
@@ -74,21 +74,21 @@ struct MyTraits : public OpenMesh::DefaultTraits
 };
 
   
-typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits>  MyMesh;
-typedef MeshViewerWidgetT<MyMesh>                 MeshViewerWidget;
+typedef OpenMesh::TriMesh_ArrayKernelT<ProgTraits>  MyMesh;
+typedef MeshViewerWidgetT<MyMesh>                 MeshViewerWidgetProgBase;
 
 
 //== CLASS DEFINITION =========================================================
 
 	      
 
-class ProgViewerWidget : public MeshViewerWidget
+class ProgViewerWidget : public MeshViewerWidgetProgBase
 {
   Q_OBJECT
    
 public:
 
-  typedef MeshViewerWidget Base;
+  typedef MeshViewerWidgetProgBase Base;
   typedef ProgViewerWidget This;