Commit 051ff6d5 authored by Martin Heistermann's avatar Martin Heistermann
Browse files

fix ODR conflict with Plugin-InfoSkeleton

parent 830dd17e
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include "infoDialog.hh" #include "InfoMeshDialog.hh"
InfoDialog::InfoDialog(QWidget *parent) InfoMeshDialog::InfoMeshDialog(QWidget *parent)
: QDialog(parent) : QDialog(parent)
{ {
setupUi(this); setupUi(this);
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include "ui_infoWidget.hh" #include "ui_infoMeshWidget.hh"
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
#endif #endif
class InfoDialog : public QDialog, public Ui::InfoWidget class InfoMeshDialog : public QDialog, public Ui::InfoMeshWidget
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit InfoDialog(QWidget *parent = 0); explicit InfoMeshDialog(QWidget *parent = 0);
}; };
...@@ -103,7 +103,7 @@ void InfoMeshObjectPlugin::pluginsInitialized() { ...@@ -103,7 +103,7 @@ void InfoMeshObjectPlugin::pluginsInitialized() {
infoBar_ = new InfoBar(); infoBar_ = new InfoBar();
// Create info dialog // Create info dialog
info_ = new InfoDialog(); info_ = new InfoMeshDialog();
connect(info_->valenceHistograms_pb, SIGNAL( clicked() ), connect(info_->valenceHistograms_pb, SIGNAL( clicked() ),
this, SLOT( slotShowHistogram() )); this, SLOT( slotShowHistogram() ));
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
#include <ObjectTypes/PolyMesh/PolyMesh.hh> #include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh> #include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include "infoDialog.hh" #include "InfoMeshDialog.hh"
#include "infoBar.hh" #include "infoBar.hh"
//== CLASS DEFINITION ========================================================= //== CLASS DEFINITION =========================================================
...@@ -140,7 +140,7 @@ class InfoMeshObjectPlugin : public QObject, BaseInterface, InformationInterface ...@@ -140,7 +140,7 @@ class InfoMeshObjectPlugin : public QObject, BaseInterface, InformationInterface
QString description() { return (QString(tr("Provides Information on Mesh Objects"))); }; QString description() { return (QString(tr("Provides Information on Mesh Objects"))); };
private : private :
InfoDialog* info_; InfoMeshDialog* info_;
InfoBar* infoBar_; InfoBar* infoBar_;
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>InfoWidget</class> <class>InfoMeshWidget</class>
<widget class="QDialog" name="InfoWidget"> <widget class="QDialog" name="InfoMeshWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -1859,7 +1859,7 @@ ...@@ -1859,7 +1859,7 @@
<connection> <connection>
<sender>pushButton</sender> <sender>pushButton</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>InfoWidget</receiver> <receiver>InfoMeshWidget</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
......
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