From 70bfe7cb637e855da76402331d34d2e77ab72402 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Sun, 3 Apr 2011 23:29:16 +0000
Subject: [PATCH] Corrections of include paths to comply the new folder
 arrangement of the VCG library (sample plugins and meshlabserver)

---
 src/meshlabserver/mainserver.cpp                        | 5 -----
 src/sampleplugins/filtercreateiso/filtercreateiso.cpp   | 6 ++----
 src/sampleplugins/filtergeodesic/filtergeodesic.cpp     | 4 ----
 src/sampleplugins/filtergeodesic/filtergeodesic.h       | 2 +-
 src/sampleplugins/io_m/io_m.cpp                         | 5 +----
 src/sampleplugins/sample_xmlfilter/sample_xmlfilter.pro | 2 +-
 src/sampleplugins/sampleedit/sampleedit.cpp             | 1 -
 src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp   | 1 -
 8 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/meshlabserver/mainserver.cpp b/src/meshlabserver/mainserver.cpp
index ed14db41a..aeed6ee97 100644
--- a/src/meshlabserver/mainserver.cpp
+++ b/src/meshlabserver/mainserver.cpp
@@ -26,11 +26,6 @@
 #include <common/pluginmanager.h>
 #include <common/filterscript.h>
 
-#include <wrap/io_trimesh/io_mask.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
-#include <vcg/complex/trimesh/clean.h>
-
 class FilterData
 {
 public:
diff --git a/src/sampleplugins/filtercreateiso/filtercreateiso.cpp b/src/sampleplugins/filtercreateiso/filtercreateiso.cpp
index e02367a90..65b080320 100644
--- a/src/sampleplugins/filtercreateiso/filtercreateiso.cpp
+++ b/src/sampleplugins/filtercreateiso/filtercreateiso.cpp
@@ -34,10 +34,8 @@ Added the new sample filter plugin that removes border faces
 #include "filtercreateiso.h"
 
 #include <vcg/math/perlin_noise.h>
-#include <vcg/complex/trimesh/create/marching_cubes.h>
-#include <vcg/complex/trimesh/create/mc_trivial_walker.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/bounding.h>
+#include <vcg/complex/algorithms/create/marching_cubes.h>
+#include <vcg/complex/algorithms/create/mc_trivial_walker.h>
 
 using namespace std;
 using namespace vcg;
diff --git a/src/sampleplugins/filtergeodesic/filtergeodesic.cpp b/src/sampleplugins/filtergeodesic/filtergeodesic.cpp
index bba2ddb2a..775dfc387 100644
--- a/src/sampleplugins/filtergeodesic/filtergeodesic.cpp
+++ b/src/sampleplugins/filtergeodesic/filtergeodesic.cpp
@@ -37,10 +37,6 @@
 
 #include "filtergeodesic.h"
 
-#include <vcg/complex/trimesh/update/quality.h>
-#include <vcg/complex/trimesh/update/color.h>
-#include <vcg/complex/trimesh/clean.h>
-
 using namespace std;
 using namespace vcg;
 
diff --git a/src/sampleplugins/filtergeodesic/filtergeodesic.h b/src/sampleplugins/filtergeodesic/filtergeodesic.h
index fc01e14ff..996906f6e 100644
--- a/src/sampleplugins/filtergeodesic/filtergeodesic.h
+++ b/src/sampleplugins/filtergeodesic/filtergeodesic.h
@@ -25,7 +25,7 @@
 
 #include <QObject>
 #include <common/interfaces.h>
-#include <vcg/complex/trimesh/geodesic.h>
+#include <vcg/complex/algorithms/geodesic.h>
 
 
 class FilterGeodesic : public QObject, public MeshFilterInterface
diff --git a/src/sampleplugins/io_m/io_m.cpp b/src/sampleplugins/io_m/io_m.cpp
index 0cc71bbfb..8a07500c7 100644
--- a/src/sampleplugins/io_m/io_m.cpp
+++ b/src/sampleplugins/io_m/io_m.cpp
@@ -29,10 +29,7 @@
 
 #include "io_m.h"
 
-#include <wrap/io_trimesh/export_smf.h>
-#include <wrap/io_trimesh/import_smf.h>
-#include <vcg/complex/trimesh/allocate.h>
-#include <vcg/complex/trimesh/polygon_support.h>
+#include <vcg/complex/algorithms/polygon_support.h>
 #include "export_m.h"
 
 #include <QMessageBox>
diff --git a/src/sampleplugins/sample_xmlfilter/sample_xmlfilter.pro b/src/sampleplugins/sample_xmlfilter/sample_xmlfilter.pro
index d1b42ce02..43c6be155 100644
--- a/src/sampleplugins/sample_xmlfilter/sample_xmlfilter.pro
+++ b/src/sampleplugins/sample_xmlfilter/sample_xmlfilter.pro
@@ -6,4 +6,4 @@ SOURCES       += sample_xmlfilter.cpp \
 		
 TARGET        = sample_xmlfilter
 
-INSTALLS += sample_xmlfilter.xml
\ No newline at end of file
+#INSTALLS += sample_xmlfilter.xml
diff --git a/src/sampleplugins/sampleedit/sampleedit.cpp b/src/sampleplugins/sampleedit/sampleedit.cpp
index 2d1044b7e..951bb1a0e 100644
--- a/src/sampleplugins/sampleedit/sampleedit.cpp
+++ b/src/sampleplugins/sampleedit/sampleedit.cpp
@@ -31,7 +31,6 @@ $Log: meshedit.cpp,v $
 #include <meshlab/glarea.h>
 #include "sampleedit.h"
 #include <wrap/gl/pick.h>
-#include<vcg/complex/trimesh/append.h>
 #include<wrap/qt/gl_label.h>
 
 using namespace std;
diff --git a/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp b/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp
index 0420406ce..a22d4d614 100644
--- a/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp
+++ b/src/sampleplugins/samplefilterdyn/samplefilterdyn.cpp
@@ -24,7 +24,6 @@
 #include <QtGui>
 #include <common/interfaces.h>
 #include <vcg/math/perlin_noise.h>
-#include <vcg/complex/trimesh/clean.h>
 #include <wrap/qt/col_qt_convert.h>