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

---
 src/meshlabplugins/filter_mls/apss.cpp        | 23 +++++++++---------
 src/meshlabplugins/filter_mls/filter_mls.pro  |  9 +++----
 src/meshlabplugins/filter_mls/mlsplugin.cpp   |  7 +-----
 src/meshlabplugins/filter_mls/rimls.cpp       | 24 +++++++++----------
 .../filter_perceptualmetric.pro               |  8 ++-----
 .../filter_plymc/filter_plymc.cpp             |  4 ----
 .../filter_plymc/filter_plymc.h               |  4 +---
 .../filter_plymc/filter_plymc.pro             | 13 ++++------
 .../filter_poisson/filter_poisson.cpp         |  7 +-----
 .../filter_poisson/filter_poisson.h           |  3 +--
 .../filter_poisson/filter_poisson.pro         | 10 +++-----
 11 files changed, 39 insertions(+), 73 deletions(-)

diff --git a/src/meshlabplugins/filter_mls/apss.cpp b/src/meshlabplugins/filter_mls/apss.cpp
index 5e7e8bdf0..ef52695af 100644
--- a/src/meshlabplugins/filter_mls/apss.cpp
+++ b/src/meshlabplugins/filter_mls/apss.cpp
@@ -19,15 +19,14 @@
 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
 * for more details.                                                         *
 *                                                                           *
-****************************************************************************/
-
-#include <qglobal.h>
-#include "apss.h"
-#include "apss.tpp"
-#include <meshlab/meshmodel.h>
-
-namespace GaelMls {
-
-template class APSS<CMeshO>;
-
-}
+****************************************************************************/
+
+#include <qglobal.h>
+#include "apss.h"
+#include "apss.tpp"
+#include <common/meshmodel.h>
+namespace GaelMls {
+
+template class APSS<CMeshO>;
+
+}
diff --git a/src/meshlabplugins/filter_mls/filter_mls.pro b/src/meshlabplugins/filter_mls/filter_mls.pro
index 53e157cec..1244215f9 100644
--- a/src/meshlabplugins/filter_mls/filter_mls.pro
+++ b/src/meshlabplugins/filter_mls/filter_mls.pro
@@ -1,4 +1,4 @@
-include(../../sharedfilter.pri)
+include(../../shared.pri)
 
 # CONFIG += debug
 
@@ -12,8 +12,7 @@ HEADERS +=	apss.h\
 		mlssurface.h \			
 		smallcomponentselection.h \
 		kdtree.h \			
-		mlsutils.h \	
-		../../meshlab/meshmodel.h
+		mlsutils.h 
 
 SOURCES +=	apss.cpp \
 		balltree.cpp \	
@@ -22,9 +21,7 @@ SOURCES +=	apss.cpp \
 		apss.tpp \		
 		kdtree.cpp \	
 		mlssurface.tpp \
-		rimls.tpp \	
-		../../meshlab/meshmodel.cpp \
-	$$GLEWCODE
+		rimls.tpp 
 
 TARGET = filter_mls
 
diff --git a/src/meshlabplugins/filter_mls/mlsplugin.cpp b/src/meshlabplugins/filter_mls/mlsplugin.cpp
index d6a1b2c86..f47ac7761 100644
--- a/src/meshlabplugins/filter_mls/mlsplugin.cpp
+++ b/src/meshlabplugins/filter_mls/mlsplugin.cpp
@@ -28,19 +28,14 @@
 #include <time.h>
 #include <iostream>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 #include <vcg/complex/trimesh/clean.h>
 #include <vcg/complex/trimesh/refine.h>
 #include <vcg/complex/trimesh/refine_loop.h>
-#include <vcg/complex/trimesh/update/selection.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
 #include <vcg/complex/trimesh/append.h>
 #include <vcg/complex/trimesh/create/advancing_front.h>
 #include <vcg/complex/trimesh/create/marching_cubes.h>
-#include <vcg/complex/trimesh/update/quality.h>
 #include "mlsmarchingcube.h"
 
 #include "mlsplugin.h"
diff --git a/src/meshlabplugins/filter_mls/rimls.cpp b/src/meshlabplugins/filter_mls/rimls.cpp
index f3bcb7bd0..3799a4ad8 100644
--- a/src/meshlabplugins/filter_mls/rimls.cpp
+++ b/src/meshlabplugins/filter_mls/rimls.cpp
@@ -19,15 +19,15 @@
 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
 * for more details.                                                         *
 *                                                                           *
-****************************************************************************/
-
-#include <qglobal.h>
-#include "rimls.h"
-#include "rimls.tpp"
-#include <meshlab/meshmodel.h>
-
-namespace GaelMls {
-
-template class RIMLS<CMeshO>;
-
-}
+****************************************************************************/
+
+#include <qglobal.h>
+#include "rimls.h"
+#include "rimls.tpp"
+#include <common/meshmodel.h>
+
+namespace GaelMls {
+
+template class RIMLS<CMeshO>;
+
+}
diff --git a/src/meshlabplugins/filter_perceptualmetric/filter_perceptualmetric.pro b/src/meshlabplugins/filter_perceptualmetric/filter_perceptualmetric.pro
index 24d4e07bd..3904b9e2c 100644
--- a/src/meshlabplugins/filter_perceptualmetric/filter_perceptualmetric.pro
+++ b/src/meshlabplugins/filter_perceptualmetric/filter_perceptualmetric.pro
@@ -1,13 +1,9 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
 HEADERS       += filter_perceptualmetric.h \
-                ../../meshlab/meshmodel.h \
                 perceptualmetrics.h
 				
-SOURCES       += filter_perceptualmetric.cpp \
-                ../../meshlab/meshmodel.cpp \ 
-                $$GLEWCODE
-
+SOURCES       += filter_perceptualmetric.cpp 
 TARGET        = filter_perceptualmetric
 
 CONFIG       += opengl
diff --git a/src/meshlabplugins/filter_plymc/filter_plymc.cpp b/src/meshlabplugins/filter_plymc/filter_plymc.cpp
index 8c2b77584..64b351437 100644
--- a/src/meshlabplugins/filter_plymc/filter_plymc.cpp
+++ b/src/meshlabplugins/filter_plymc/filter_plymc.cpp
@@ -26,10 +26,6 @@
 #include <math.h>
 #include <stdlib.h>
 #include <time.h>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
-
 #include <vcg/complex/trimesh/append.h>
 #include <vcg/complex/trimesh/clean.h>
 #include <vcg/complex/trimesh/update/normal.h>
diff --git a/src/meshlabplugins/filter_plymc/filter_plymc.h b/src/meshlabplugins/filter_plymc/filter_plymc.h
index 502bb60fc..8a4fffef7 100644
--- a/src/meshlabplugins/filter_plymc/filter_plymc.h
+++ b/src/meshlabplugins/filter_plymc/filter_plymc.h
@@ -25,9 +25,7 @@
 #define _FILTER_PLYMC_H_
 
 #include <QObject>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class PlyMCPlugin : public QObject, public MeshFilterInterface
 {
diff --git a/src/meshlabplugins/filter_plymc/filter_plymc.pro b/src/meshlabplugins/filter_plymc/filter_plymc.pro
index 3e2bf6598..413a3cae3 100644
--- a/src/meshlabplugins/filter_plymc/filter_plymc.pro
+++ b/src/meshlabplugins/filter_plymc/filter_plymc.pro
@@ -1,15 +1,10 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
-HEADERS       += filter_plymc.h \ 
-                ../../meshlab/interfaces.h \
-                ../../meshlab/meshmodel.h \
-volume.h\
-voxel.h
+HEADERS       += filter_plymc.h 							volume.h\
+		voxel.h
 
 SOURCES       += filter_plymc.cpp \
-../../../../vcglib/wrap/ply/plylib.cpp \
-        ../../meshlab/meshmodel.cpp \
-        $$GLEWCODE
+../../../../vcglib/wrap/ply/plylib.cpp 
 
 TARGET        = filter_plymc
 QT += opengl
diff --git a/src/meshlabplugins/filter_poisson/filter_poisson.cpp b/src/meshlabplugins/filter_poisson/filter_poisson.cpp
index c7eb24cc3..5b475db03 100644
--- a/src/meshlabplugins/filter_poisson/filter_poisson.cpp
+++ b/src/meshlabplugins/filter_poisson/filter_poisson.cpp
@@ -40,12 +40,7 @@ add samplefilter
 #include <stdlib.h>
 #include <time.h>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
-
-#include <vcg/complex/trimesh/clean.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
+#include <common/interfaces.h>
 #include <vcg/complex/trimesh/create/platonic.h>
 
 #include "filter_poisson.h"
diff --git a/src/meshlabplugins/filter_poisson/filter_poisson.h b/src/meshlabplugins/filter_poisson/filter_poisson.h
index 81f3f46a7..63962aceb 100644
--- a/src/meshlabplugins/filter_poisson/filter_poisson.h
+++ b/src/meshlabplugins/filter_poisson/filter_poisson.h
@@ -36,8 +36,7 @@ add sampleplugins
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class PoissonPlugin : public QObject, public MeshFilterInterface
 {
diff --git a/src/meshlabplugins/filter_poisson/filter_poisson.pro b/src/meshlabplugins/filter_poisson/filter_poisson.pro
index 485c3dafb..c970381c9 100644
--- a/src/meshlabplugins/filter_poisson/filter_poisson.pro
+++ b/src/meshlabplugins/filter_poisson/filter_poisson.pro
@@ -1,7 +1,6 @@
-include (../../sharedfilter.pri)
+include (../../shared.pri)
 
-HEADERS       += ../../meshlab/meshmodel.h \
-                filter_poisson.h
+HEADERS       += filter_poisson.h
 
 QMAKE_CXXFLAGS += -fpermissive
 
@@ -9,10 +8,7 @@ SOURCES += src/Factor.cpp \
            src/Geometry.cpp \
            src/MarchingCubes.cpp \
            src/MultiGridOctest.cpp \
-           filter_poisson.cpp \ 
-           ../../meshlab/meshmodel.cpp \
-           $$GLEWCODE
-
+           filter_poisson.cpp 
 
 HEADERS += src/Allocator.h \
            src/BinaryNode.h \