Commit e9a75f06 authored by Martin Heistermann's avatar Martin Heistermann

resolve ODR violation with Plugin-SelectionMeshObject

parent 5ae33201
......@@ -47,10 +47,10 @@
* *
\*===========================================================================*/
#include "ParameterWidget.hh"
#include "VolMeshParamWidget.hh"
ParameterWidget::ParameterWidget(QWidget* _parent)
VolMeshParamWidget::VolMeshParamWidget(QWidget* _parent)
: QWidget(_parent) {
setupUi(this);
}
......@@ -47,7 +47,7 @@
* *
\*===========================================================================*/
#include "ui_ParameterWidget.hh"
#include "ui_VolMeshParamWidget.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -56,11 +56,11 @@
#endif
class ParameterWidget : public QWidget, public Ui::ParameterWidget
class VolMeshParamWidget : public QWidget, public Ui::VolMeshParamWidget
{
Q_OBJECT
public:
explicit ParameterWidget(QWidget* _parent = 0);
explicit VolMeshParamWidget(QWidget* _parent = 0);
};
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ParameterWidget</class>
<widget class="QWidget" name="ParameterWidget">
<class>VolMeshParamWidget</class>
<widget class="QWidget" name="VolMeshParamWidget">
<property name="geometry">
<rect>
<x>0</x>
......
......@@ -48,7 +48,7 @@
\*===========================================================================*/
#include "VolumeMeshSelectionPlugin.hh"
#include "ParameterWidget.hh"
#include "VolMeshParamWidget.hh"
// Primitive type icons
#define VERTEX_TYPE "selection_vertex.png"
......@@ -100,7 +100,7 @@ void VolumeMeshSelectionPlugin::initializePlugin() {
// Tell core about all scriptable slots
updateSlotDescriptions();
if(!OpenFlipper::Options::nogui())
parameterWidget_ = new ParameterWidget(nullptr);
parameterWidget_ = new VolMeshParamWidget(nullptr);
}
//==============================================================================================
......
......@@ -72,7 +72,7 @@
#include <ObjectTypes/TetrahedralMesh/TetrahedralMesh.hh>
#endif
class ParameterWidget;
class VolMeshParamWidget;
class VolumeMeshSelectionPlugin : public QObject, BaseInterface, KeyInterface,
INIInterface, BackupInterface, LoggingInterface, ScriptInterface, SelectionInterface
......@@ -375,7 +375,7 @@ private:
PrimitiveType allSupportedTypes_;
PrimitiveType floodFillSupportedTypes_;
ParameterWidget* parameterWidget_;
VolMeshParamWidget* parameterWidget_;
double max_angle_;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment