resolve ODR violation with Plugin-IsotropicRemesher

Algorithms/AdaptiveRemesherT.hh

@@ -64,7 +64,7 @@
 #include "DiffGeoT.hh"
 #include <OpenMesh/Core/Utils/Property.hh>
 
-#include "../ProgressEmitter.hh"
+#include "../RemesherProgressEmitter.hh"
 
 //== NAMESPACES ===============================================================
 
@@ -87,7 +87,7 @@ public:
   typedef typename Mesh::VertexHandle  VertexHandle;
 
 
-  AdaptiveRemesherT(Mesh& _mesh, ProgressEmitter* _progress = NULL) : Base(_mesh, _progress) {}
+  AdaptiveRemesherT(Mesh& _mesh, RemesherProgressEmitter* _progress = NULL) : Base(_mesh, _progress) {}
 
   void remesh(Scalar        _error,
               Scalar        _min_edge_length,

Algorithms/BaseRemesherT.cc

@@ -82,7 +82,7 @@ namespace Remeshing {
 
 template <class Mesh>
 BaseRemesherT<Mesh>::
-BaseRemesherT(Mesh& _mesh, ProgressEmitter* _progress)
+BaseRemesherT(Mesh& _mesh, RemesherProgressEmitter* _progress)
   : mesh_(_mesh), refmesh_(0), bsp_(0), nothing_selected_(true),progress_(_progress) {
 
 }

Algorithms/BaseRemesherT.hh

@@ -69,7 +69,7 @@
 #include <OpenMesh/Core/Utils/Property.hh>
 #include <ACG/Geometry/bsp/TriangleBSPT.hh>
 
-#include "../ProgressEmitter.hh"
+#include "../RemesherProgressEmitter.hh"
 
 //== FORWARDDECLARATIONS ======================================================
 
@@ -99,7 +99,7 @@ public:
   typedef typename Mesh::VertexHandle  VertexHandle;
 
 
-  BaseRemesherT(Mesh& _mesh, ProgressEmitter* _progress = NULL);
+  BaseRemesherT(Mesh& _mesh, RemesherProgressEmitter* _progress = NULL);
   virtual ~BaseRemesherT();
 
   void remesh(unsigned int  _iters,
@@ -147,7 +147,7 @@ protected:
   OpenMesh::VPropHandleT<Point>   update_;
   OpenMesh::VPropHandleT<Scalar>  area_;
 
-  ProgressEmitter* progress_;
+  RemesherProgressEmitter* progress_;
 };
 
 

Algorithms/UniformRemesherT.hh

@@ -61,7 +61,7 @@
 
 #include "BaseRemesherT.hh"
 
-#include "../ProgressEmitter.hh"
+#include "../RemesherProgressEmitter.hh"
 
 //== NAMESPACES ===============================================================
 
@@ -84,7 +84,7 @@ public:
   typedef typename Mesh::VertexHandle  VertexHandle;
 
 
-  UniformRemesherT(Mesh& _mesh, ProgressEmitter* _progress = NULL) : Base(_mesh, _progress) {}
+  UniformRemesherT(Mesh& _mesh, RemesherProgressEmitter* _progress = NULL) : Base(_mesh, _progress) {}
 
 
   void remesh(Scalar        _edge_length,

RemesherPlugin.cc

@@ -65,7 +65,7 @@ RemesherPlugin::RemesherPlugin() :
 progress_(0) {
 
   if ( OpenFlipper::Options::gui() ) {
-    progress_ = new ProgressEmitter();
+    progress_ = new RemesherProgressEmitter();
 
     connect(progress_, SIGNAL(signalJobState(QString,int)), this, SIGNAL(setJobState(QString,int)), Qt::QueuedConnection);
     connect(progress_, SIGNAL(changeDescription(QString,QString)), this, SIGNAL(setJobDescription(QString,QString)), Qt::QueuedConnection);

RemesherPlugin.hh

@@ -62,7 +62,7 @@
 #include <ObjectTypes/PolyMesh/PolyMesh.hh>
 
 #include "RemesherToolbox.hh"
-#include "ProgressEmitter.hh"
+#include "RemesherProgressEmitter.hh"
 
 
 
@@ -133,7 +133,7 @@ public :
 private :
   RemesherToolBox* tool_;
 
-  ProgressEmitter* progress_;
+  RemesherProgressEmitter* progress_;
 
   QIcon* toolIcon_;
 

ProgressEmitter.hh → RemesherProgressEmitter.hh

@@ -53,7 +53,7 @@
 #include <QObject>
 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
 
-class ProgressEmitter : public QObject
+class RemesherProgressEmitter : public QObject
 {
   Q_OBJECT
   
@@ -64,7 +64,7 @@ class ProgressEmitter : public QObject
     void backupRequest(int _objId, QString _desc);
   
   public:
-    ProgressEmitter() : valid_(false) {}
+    RemesherProgressEmitter() : valid_(false) {}
     
     void attachJob(const QString& _jobId) {
         jobId_ = _jobId;