fix ODR conflict with Plugin-InfoSkeleton

infoDialog.cc → InfoMeshDialog.cc

@@ -47,9 +47,9 @@
 *                                                                            *
 \*===========================================================================*/
 
-#include "infoDialog.hh"
+#include "InfoMeshDialog.hh"
 
-InfoDialog::InfoDialog(QWidget *parent)
+InfoMeshDialog::InfoMeshDialog(QWidget *parent)
     : QDialog(parent)
 {
     setupUi(this);

infoDialog.hh → InfoMeshDialog.hh

@@ -47,7 +47,7 @@
 *                                                                            *
 \*===========================================================================*/
 
-#include "ui_infoWidget.hh"
+#include "ui_infoMeshWidget.hh"
 
 #if QT_VERSION >= 0x050000 
   #include <QtWidgets>
@@ -56,11 +56,11 @@
 #endif
 
 
-class InfoDialog : public QDialog, public Ui::InfoWidget
+class InfoMeshDialog : public QDialog, public Ui::InfoMeshWidget
 {
   Q_OBJECT
 
   public:
-    explicit InfoDialog(QWidget *parent = 0);
+    explicit InfoMeshDialog(QWidget *parent = 0);
 };
 

MeshObjectInfoPlugin.cc

@@ -103,7 +103,7 @@ void InfoMeshObjectPlugin::pluginsInitialized() {
     infoBar_ = new InfoBar();
 
     // Create info dialog
-    info_ = new InfoDialog();
+    info_ = new InfoMeshDialog();
 
     connect(info_->valenceHistograms_pb, SIGNAL( clicked() ),
             this, SLOT( slotShowHistogram() ));

MeshObjectInfoPlugin.hh

@@ -70,7 +70,7 @@
 #include <ObjectTypes/PolyMesh/PolyMesh.hh>
 #include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
 
-#include "infoDialog.hh"
+#include "InfoMeshDialog.hh"
 #include "infoBar.hh"
 
 //== CLASS DEFINITION =========================================================
@@ -140,7 +140,7 @@ class InfoMeshObjectPlugin : public QObject, BaseInterface, InformationInterface
     QString description() { return (QString(tr("Provides Information on Mesh Objects"))); };
 
   private :
-    InfoDialog* info_;
+    InfoMeshDialog* info_;
 
     InfoBar* infoBar_;
     

infoWidget.ui → infoMeshWidget.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>InfoWidget</class>
- <widget class="QDialog" name="InfoWidget">
+ <class>InfoMeshWidget</class>
+ <widget class="QDialog" name="InfoMeshWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -1859,7 +1859,7 @@
   <connection>
    <sender>pushButton</sender>
    <signal>clicked()</signal>
-   <receiver>InfoWidget</receiver>
+   <receiver>InfoMeshWidget</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">