From 0d080202aeb7ca3bfafa2b4b477f440c9179523a Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Sat, 5 Dec 2009 00:49:24 +0000
Subject: [PATCH] Updated pros and sources to comply to the new common library
 system

---
 .../filter_sampling/filter_sampling.cpp            | 10 +---------
 .../filter_sampling/filter_sampling.h              |  4 +---
 .../filter_sampling/filter_sampling.pro            |  8 ++------
 src/meshlabplugins/filter_select/filter_select.pro |  2 +-
 src/meshlabplugins/filter_select/meshselect.h      |  6 +-----
 src/meshlabplugins/filter_slice/filter_slice.pro   | 14 +++-----------
 src/meshlabplugins/filter_unsharp/filter_unsharp.h |  6 +-----
 .../filter_unsharp/filter_unsharp.pro              |  2 +-
 .../filter_zippering/filter_zippering.cpp          | 14 +-------------
 .../filter_zippering/filter_zippering.h            |  3 +--
 .../filter_zippering/filter_zippering.pro          |  2 +-
 src/meshlabplugins/io_3ds/io_3ds.pro               |  2 +-
 src/meshlabplugins/io_3ds/meshio.h                 |  3 +--
 src/meshlabplugins/io_collada/io_collada.h         |  6 +-----
 src/meshlabplugins/io_collada/io_collada.pro       |  2 +-
 src/meshlabplugins/io_epoch/epoch_io.h             |  6 +-----
 src/meshlabplugins/io_epoch/epoch_reconstruction.h |  6 ++----
 src/meshlabplugins/io_epoch/io_epoch.pro           |  2 +-
 src/meshlabplugins/io_expe/io_expe.h               |  3 +--
 src/meshlabplugins/io_expe/io_expe.pro             | 13 +++----------
 src/meshlabplugins/io_gts/io_gts.h                 |  3 +--
 src/meshlabplugins/io_gts/io_gts.pro               |  2 +-
 src/meshlabplugins/io_pdb/io_pdb.h                 |  4 +---
 src/meshlabplugins/io_pdb/io_pdb.pro               |  2 +-
 src/meshlabplugins/io_tri/io_tri.h                 |  3 +--
 src/meshlabplugins/io_tri/io_tri.pro               |  2 +-
 src/meshlabplugins/io_u3d/io_u3d.h                 |  3 +--
 src/meshlabplugins/io_u3d/io_u3d.pro               |  2 +-
 src/meshlabplugins/io_x3d/io_x3d.h                 |  3 +--
 src/meshlabplugins/io_x3d/io_x3d.pro               |  2 +-
 30 files changed, 36 insertions(+), 104 deletions(-)

diff --git a/src/meshlabplugins/filter_sampling/filter_sampling.cpp b/src/meshlabplugins/filter_sampling/filter_sampling.cpp
index 2535df7f9..eec33804d 100644
--- a/src/meshlabplugins/filter_sampling/filter_sampling.cpp
+++ b/src/meshlabplugins/filter_sampling/filter_sampling.cpp
@@ -32,23 +32,15 @@ $Log: samplefilter.cpp,v $
 #include <time.h>
 #include <limits>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include "filter_sampling.h"
 
 #include <vcg/complex/trimesh/clean.h>
-#include <vcg/complex/trimesh/update/position.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/flag.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/quality.h>
 #include <vcg/complex/trimesh/point_sampling.h>
 #include <vcg/complex/trimesh/create/resampler.h>
 #include <vcg/complex/trimesh/clustering.h>
 #include <vcg/simplex/face/distance.h>
-#include <vcg/complex/trimesh/update/color.h>
 #include <vcg/complex/trimesh/geodesic.h>
 #include <vcg/space/index/grid_static_ptr.h>
-#include "filter_sampling.h"
 #include "voronoi_clustering.h"
 
 using namespace vcg;
diff --git a/src/meshlabplugins/filter_sampling/filter_sampling.h b/src/meshlabplugins/filter_sampling/filter_sampling.h
index ab1846d7e..1a005b8cc 100644
--- a/src/meshlabplugins/filter_sampling/filter_sampling.h
+++ b/src/meshlabplugins/filter_sampling/filter_sampling.h
@@ -35,9 +35,7 @@ add sampleplugins
 #define FILTERDOCSAMPLINGPLUGIN_H
 
 #include <QObject>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class FilterDocSampling : public QObject, public MeshFilterInterface
 {
diff --git a/src/meshlabplugins/filter_sampling/filter_sampling.pro b/src/meshlabplugins/filter_sampling/filter_sampling.pro
index 2669b66ef..a46d0db64 100644
--- a/src/meshlabplugins/filter_sampling/filter_sampling.pro
+++ b/src/meshlabplugins/filter_sampling/filter_sampling.pro
@@ -1,13 +1,9 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += filter_sampling.h \
-				../../meshlab/meshmodel.h \
 		$$VCGDIR/vcg/complex/trimesh/point_sampling.h
 				
-SOURCES       += filter_sampling.cpp\
-				../../meshlab/meshmodel.cpp \
-		$$GLEWCODE
-
+SOURCES       += filter_sampling.cpp
 TARGET        = filter_sampling
 
 CONFIG       += opengl
diff --git a/src/meshlabplugins/filter_select/filter_select.pro b/src/meshlabplugins/filter_select/filter_select.pro
index 3a1737f4c..576661d62 100644
--- a/src/meshlabplugins/filter_select/filter_select.pro
+++ b/src/meshlabplugins/filter_select/filter_select.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += meshselect.h
 SOURCES       += meshselect.cpp
diff --git a/src/meshlabplugins/filter_select/meshselect.h b/src/meshlabplugins/filter_select/meshselect.h
index e082211f1..5221e408d 100644
--- a/src/meshlabplugins/filter_select/meshselect.h
+++ b/src/meshlabplugins/filter_select/meshselect.h
@@ -25,11 +25,7 @@
 #define FILTER_SELECT_H
 
 #include <QObject>
-#include <QStringList>
-#include <QList>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 
 class SelectionFilterPlugin : public QObject, public MeshFilterInterface
diff --git a/src/meshlabplugins/filter_slice/filter_slice.pro b/src/meshlabplugins/filter_slice/filter_slice.pro
index 96fa44895..1f7e28136 100644
--- a/src/meshlabplugins/filter_slice/filter_slice.pro
+++ b/src/meshlabplugins/filter_slice/filter_slice.pro
@@ -1,19 +1,11 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += filter_slice.h \
                 filter_slice_functors.h \
-                kdtree.h \ 
-     ../../meshlab/meshmodel.h
-		
- 
-SOURCES       += filter_slice.cpp \
-                $$GLEWCODE \
-                ../../meshlab/meshmodel.cpp
-
+                kdtree.h 		
+SOURCES       += filter_slice.cpp 
 TARGET        = filter_slice
 
-#FORMS	      = svgpro.ui
-
 QT           += opengl
 
 
diff --git a/src/meshlabplugins/filter_unsharp/filter_unsharp.h b/src/meshlabplugins/filter_unsharp/filter_unsharp.h
index 001ac746f..acbed8e48 100644
--- a/src/meshlabplugins/filter_unsharp/filter_unsharp.h
+++ b/src/meshlabplugins/filter_unsharp/filter_unsharp.h
@@ -24,11 +24,7 @@
 #define FilterUnsharp_PLUGIN_H
 
 #include <QObject>
-#include <QStringList>
-#include <QString>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 
 class FilterUnsharp : public QObject, public MeshFilterInterface
diff --git a/src/meshlabplugins/filter_unsharp/filter_unsharp.pro b/src/meshlabplugins/filter_unsharp/filter_unsharp.pro
index 5837adac5..cc06b8d9b 100644
--- a/src/meshlabplugins/filter_unsharp/filter_unsharp.pro
+++ b/src/meshlabplugins/filter_unsharp/filter_unsharp.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += filter_unsharp.h \
 		$$VCGDIR/vcg/complex/trimesh/crease_cut.h
diff --git a/src/meshlabplugins/filter_zippering/filter_zippering.cpp b/src/meshlabplugins/filter_zippering/filter_zippering.cpp
index 6317b7338..7a4b16714 100644
--- a/src/meshlabplugins/filter_zippering/filter_zippering.cpp
+++ b/src/meshlabplugins/filter_zippering/filter_zippering.cpp
@@ -27,28 +27,16 @@
 ****************************************************************************/
 
 #include <QtGui>
-#include <cmath>
-#include <time.h>
+#include "filter_zippering.h"
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
-
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/update/flag.h>
 #include <vcg/simplex/face/topology.h>
 #include <vcg/simplex/face/pos.h>
-#include <vcg/simplex/vertex/component_ocf.h>
-#include <vcg/complex/trimesh/allocate.h>
 #include <vcg/complex/trimesh/append.h>
 #include <vcg/complex/trimesh/clean.h>
 #include <vcg/complex/trimesh/hole.h>
-#include <vcg/complex/trimesh/update/topology.h>
 #include <vcg/space/intersection2.h>
-#include <vcg/math/matrix44.h>
 #include <wrap/gl/glu_tesselator.h>
 
-#include "filter_zippering.h"
 
 //#define REDUNDANCY_ONLY 1
 //#define REFINE_PATCH_ONLY 1
diff --git a/src/meshlabplugins/filter_zippering/filter_zippering.h b/src/meshlabplugins/filter_zippering/filter_zippering.h
index c34cf0216..d1b31a76f 100644
--- a/src/meshlabplugins/filter_zippering/filter_zippering.h
+++ b/src/meshlabplugins/filter_zippering/filter_zippering.h
@@ -29,8 +29,7 @@
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 #include <vcg/complex/trimesh/closest.h>
 #include <vcg/space/index/grid_static_ptr.h>
diff --git a/src/meshlabplugins/filter_zippering/filter_zippering.pro b/src/meshlabplugins/filter_zippering/filter_zippering.pro
index dc7478462..d66cb7d33 100644
--- a/src/meshlabplugins/filter_zippering/filter_zippering.pro
+++ b/src/meshlabplugins/filter_zippering/filter_zippering.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 HEADERS += filter_zippering.h
 SOURCES += filter_zippering.cpp
     
diff --git a/src/meshlabplugins/io_3ds/io_3ds.pro b/src/meshlabplugins/io_3ds/io_3ds.pro
index fd3f3cff0..12eb19484 100644
--- a/src/meshlabplugins/io_3ds/io_3ds.pro
+++ b/src/meshlabplugins/io_3ds/io_3ds.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS		= meshio.h \
 			$$VCGDIR/wrap/ply/plylib.h \
diff --git a/src/meshlabplugins/io_3ds/meshio.h b/src/meshlabplugins/io_3ds/meshio.h
index f6e7602e2..6ffc3e33d 100644
--- a/src/meshlabplugins/io_3ds/meshio.h
+++ b/src/meshlabplugins/io_3ds/meshio.h
@@ -27,8 +27,7 @@
 #include <QStringList>
 #include <QString>
 
-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>
 
 class ExtraMeshIOPlugin : public QObject, public MeshIOInterface
 {
diff --git a/src/meshlabplugins/io_collada/io_collada.h b/src/meshlabplugins/io_collada/io_collada.h
index 15c6255b5..64d2f71e4 100644
--- a/src/meshlabplugins/io_collada/io_collada.h
+++ b/src/meshlabplugins/io_collada/io_collada.h
@@ -44,11 +44,7 @@
 #define COLLADAIOPLUGIN_H
 
 #include <QObject>
-#include <QStringList>
-#include <QString>
-
-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>
 
 class ColladaIOPlugin : public QObject, public MeshIOInterface
 {
diff --git a/src/meshlabplugins/io_collada/io_collada.pro b/src/meshlabplugins/io_collada/io_collada.pro
index cf34c8102..ccc8b11cc 100644
--- a/src/meshlabplugins/io_collada/io_collada.pro
+++ b/src/meshlabplugins/io_collada/io_collada.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += io_collada.h \
 		$$VCGDIR/wrap/io_trimesh/export_dae.h \
diff --git a/src/meshlabplugins/io_epoch/epoch_io.h b/src/meshlabplugins/io_epoch/epoch_io.h
index 036d2caaa..9caf5ecc3 100644
--- a/src/meshlabplugins/io_epoch/epoch_io.h
+++ b/src/meshlabplugins/io_epoch/epoch_io.h
@@ -44,11 +44,7 @@
 #define EXTRAIOPLUGINV3D_H
 
 #include <QObject>
-#include <QStringList>
-#include <QString>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 #include "v3dImportDialog.h"
 
 class EpochIO : public QObject, public MeshIOInterface
diff --git a/src/meshlabplugins/io_epoch/epoch_reconstruction.h b/src/meshlabplugins/io_epoch/epoch_reconstruction.h
index bc11e149b..5cca065ba 100644
--- a/src/meshlabplugins/io_epoch/epoch_reconstruction.h
+++ b/src/meshlabplugins/io_epoch/epoch_reconstruction.h
@@ -24,11 +24,9 @@
 #ifndef _EPOCH_RECONSTRUCTION_H
 #define _EPOCH_RECONSTRUCTION_H
 
-#include <QtXml/QDomDocument>
-#include <QtXml/QDomElement>
-#include <QtXml/QDomNode>
+#include <QtXml>
 
-#include <meshlab/meshmodel.h>
+#include <common/meshmodel.h>
 
 #include "radial_distortion.h"
 #include "epoch_camera.h"
diff --git a/src/meshlabplugins/io_epoch/io_epoch.pro b/src/meshlabplugins/io_epoch/io_epoch.pro
index 86ed63716..01244ffad 100644
--- a/src/meshlabplugins/io_epoch/io_epoch.pro
+++ b/src/meshlabplugins/io_epoch/io_epoch.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 TEMPLATE      = lib
 CONFIG       += plugin 
diff --git a/src/meshlabplugins/io_expe/io_expe.h b/src/meshlabplugins/io_expe/io_expe.h
index 314871d17..9f9ee9940 100644
--- a/src/meshlabplugins/io_expe/io_expe.h
+++ b/src/meshlabplugins/io_expe/io_expe.h
@@ -26,8 +26,7 @@
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class ExpeIOPlugin : public QObject, public MeshIOInterface
 {
diff --git a/src/meshlabplugins/io_expe/io_expe.pro b/src/meshlabplugins/io_expe/io_expe.pro
index cb8610e48..928b0cf52 100644
--- a/src/meshlabplugins/io_expe/io_expe.pro
+++ b/src/meshlabplugins/io_expe/io_expe.pro
@@ -1,12 +1,5 @@
-include (../../sharedfilter.pri)
-
-HEADERS       += io_expe.h \
-				../../meshlab/meshmodel.h
-
-SOURCES       += io_expe.cpp \
-				../../meshlab/meshmodel.cpp \
-				$$GLEWCODE
-
+include (../../shared.pri)
+HEADERS       += io_expe.h 
+SOURCES       += io_expe.cpp 
 TARGET        = io_expe
-
 CONFIG       += opengl
\ No newline at end of file
diff --git a/src/meshlabplugins/io_gts/io_gts.h b/src/meshlabplugins/io_gts/io_gts.h
index 9196030e4..73120a3a8 100644
--- a/src/meshlabplugins/io_gts/io_gts.h
+++ b/src/meshlabplugins/io_gts/io_gts.h
@@ -26,8 +26,7 @@
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class GtsIOPlugin : public QObject, public MeshIOInterface
 {
diff --git a/src/meshlabplugins/io_gts/io_gts.pro b/src/meshlabplugins/io_gts/io_gts.pro
index cd0e7f043..bdca72b04 100644
--- a/src/meshlabplugins/io_gts/io_gts.pro
+++ b/src/meshlabplugins/io_gts/io_gts.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += io_gts.h
 
diff --git a/src/meshlabplugins/io_pdb/io_pdb.h b/src/meshlabplugins/io_pdb/io_pdb.h
index b98570d58..cdcc2a4bb 100644
--- a/src/meshlabplugins/io_pdb/io_pdb.h
+++ b/src/meshlabplugins/io_pdb/io_pdb.h
@@ -24,10 +24,8 @@
 #ifndef PDBIOPLUGIN_H
 #define PDBIOPLUGIN_H
 
-#include <QString>
 
-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>
 
 class PDBIOPlugin : public QObject, public MeshIOInterface
 {
diff --git a/src/meshlabplugins/io_pdb/io_pdb.pro b/src/meshlabplugins/io_pdb/io_pdb.pro
index 955f965e7..c835a1d93 100644
--- a/src/meshlabplugins/io_pdb/io_pdb.pro
+++ b/src/meshlabplugins/io_pdb/io_pdb.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += io_pdb.h \
 		$$VCGDIR/wrap/ply/plylib.h 
diff --git a/src/meshlabplugins/io_tri/io_tri.h b/src/meshlabplugins/io_tri/io_tri.h
index e3a8cfa9d..307dbbfa7 100755
--- a/src/meshlabplugins/io_tri/io_tri.h
+++ b/src/meshlabplugins/io_tri/io_tri.h
@@ -31,8 +31,7 @@
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class TriIOPlugin : public QObject, public MeshIOInterface
 {
diff --git a/src/meshlabplugins/io_tri/io_tri.pro b/src/meshlabplugins/io_tri/io_tri.pro
index 9ff889f11..d40903959 100755
--- a/src/meshlabplugins/io_tri/io_tri.pro
+++ b/src/meshlabplugins/io_tri/io_tri.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += io_tri.h 
 				
diff --git a/src/meshlabplugins/io_u3d/io_u3d.h b/src/meshlabplugins/io_u3d/io_u3d.h
index 594dc2e1e..d940c8d3e 100644
--- a/src/meshlabplugins/io_u3d/io_u3d.h
+++ b/src/meshlabplugins/io_u3d/io_u3d.h
@@ -28,8 +28,7 @@
 #include <QList>
 #include <QString>
 
-#include "../../meshlab/meshmodel.h"
-#include "../../meshlab/interfaces.h"
+#include <common/interfaces.h>
 #include <wrap/io_trimesh/export_u3d.h>
 #include <wrap/io_trimesh/export_idtf.h>
 
diff --git a/src/meshlabplugins/io_u3d/io_u3d.pro b/src/meshlabplugins/io_u3d/io_u3d.pro
index b8d48a019..3e1dbfb84 100644
--- a/src/meshlabplugins/io_u3d/io_u3d.pro
+++ b/src/meshlabplugins/io_u3d/io_u3d.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 				
 HEADERS       += io_u3d.h \
 				$$VCGDIR/wrap/io_trimesh/export_u3d.h
diff --git a/src/meshlabplugins/io_x3d/io_x3d.h b/src/meshlabplugins/io_x3d/io_x3d.h
index 109fa0efe..743fb22df 100644
--- a/src/meshlabplugins/io_x3d/io_x3d.h
+++ b/src/meshlabplugins/io_x3d/io_x3d.h
@@ -34,8 +34,7 @@
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class IoX3DPlugin : public QObject, public MeshIOInterface
 {
diff --git a/src/meshlabplugins/io_x3d/io_x3d.pro b/src/meshlabplugins/io_x3d/io_x3d.pro
index 1e80ca86b..f53174873 100644
--- a/src/meshlabplugins/io_x3d/io_x3d.pro
+++ b/src/meshlabplugins/io_x3d/io_x3d.pro
@@ -1,4 +1,4 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += io_x3d.h import_x3d.h\
 		export_x3d.h util_x3d.h \