Fixed redefinitions

This commit is contained in:
Jan Möbius
2020-04-22 08:56:53 +02:00
parent a8821c05f0
commit 5893068368
3 changed files with 5 additions and 5 deletions

View File

@@ -66,18 +66,18 @@ typedef OpenMesh::TriMesh_ArrayKernelT<Traits> Mesh;
class MeshViewerWidget : public MeshViewerWidgetT<Mesh> class MeshViewerWidgetSubdivider : public MeshViewerWidgetT<Mesh>
{ {
public: public:
typedef MeshViewerWidgetT<Mesh> Base; typedef MeshViewerWidgetT<Mesh> Base;
/// default constructor /// default constructor
explicit MeshViewerWidget(QWidget* _parent=0) explicit MeshViewerWidgetSubdivider(QWidget* _parent=0)
: Base(_parent) : Base(_parent)
{} {}
/// destructor /// destructor
~MeshViewerWidget() {} ~MeshViewerWidgetSubdivider() {}
/// open mesh /// open mesh
inline bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) override inline bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt) override

View File

@@ -98,7 +98,7 @@ SubdivideWidget(QWidget* _parent, const char* _name)
// sel_topo_type will be set when adding the radio button.; // sel_topo_type will be set when adding the radio button.;
// examiner widget // examiner widget
viewer_widget_ = new MeshViewerWidget(); viewer_widget_ = new MeshViewerWidgetSubdivider();
vbox->addWidget(viewer_widget_); vbox->addWidget(viewer_widget_);

View File

@@ -116,7 +116,7 @@ private slots:
private: private:
// widgets // widgets
MeshViewerWidget* viewer_widget_; MeshViewerWidgetSubdivider* viewer_widget_;
QTimer *timer_; QTimer *timer_;