From 58930683688a18da8f51c6deeae400eff29cbd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 22 Apr 2020 08:56:53 +0200 Subject: [PATCH] Fixed redefinitions --- src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh | 6 +++--- src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc | 2 +- src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh b/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh index c5b5e81f..e8e96ca7 100644 --- a/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh +++ b/src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh @@ -66,18 +66,18 @@ typedef OpenMesh::TriMesh_ArrayKernelT Mesh; -class MeshViewerWidget : public MeshViewerWidgetT +class MeshViewerWidgetSubdivider : public MeshViewerWidgetT { public: typedef MeshViewerWidgetT Base; /// default constructor - explicit MeshViewerWidget(QWidget* _parent=0) + explicit MeshViewerWidgetSubdivider(QWidget* _parent=0) : Base(_parent) {} /// destructor - ~MeshViewerWidget() {} + ~MeshViewerWidgetSubdivider() {} /// open mesh inline bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) override diff --git a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc index 7434a8b9..64a9fcdc 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc +++ b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc @@ -98,7 +98,7 @@ SubdivideWidget(QWidget* _parent, const char* _name) // sel_topo_type will be set when adding the radio button.; // examiner widget - viewer_widget_ = new MeshViewerWidget(); + viewer_widget_ = new MeshViewerWidgetSubdivider(); vbox->addWidget(viewer_widget_); diff --git a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh index c87b2210..2a247596 100644 --- a/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh +++ b/src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh @@ -116,7 +116,7 @@ private slots: private: // widgets - MeshViewerWidget* viewer_widget_; + MeshViewerWidgetSubdivider* viewer_widget_; QTimer *timer_;