From 049564ff9a2f6e1b80ef2a5cc4776ac7ca8eafe0 Mon Sep 17 00:00:00 2001
From: Paolo Cignoni cignoni <paolo.cignoni@isti.cnr.it>
Date: Fri, 4 Dec 2009 14:57:49 +0000
Subject: [PATCH] Updated pros and sources to comply to the new common library
 system

---
 src/meshlabplugins/editsegment/editsegment.h  | 12 +------
 src/meshlabplugins/filter_ao/AOGLWidget.h     |  5 +--
 src/meshlabplugins/filter_ao/filter_ao.cpp    | 34 ++++---------------
 .../filter_curvature_from_sliding.h           | 13 +------
 src/meshlabplugins/filter_mls/mlsplugin.h     |  3 +-
 .../perceptualmetrics.h                       |  3 +-
 src/sampleplugins/sampleedit/sampleedit.h     |  6 +---
 7 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/src/meshlabplugins/editsegment/editsegment.h b/src/meshlabplugins/editsegment/editsegment.h
index 769765e92..bb65c17bd 100644
--- a/src/meshlabplugins/editsegment/editsegment.h
+++ b/src/meshlabplugins/editsegment/editsegment.h
@@ -25,19 +25,9 @@
 #define EDITSEGMENT_H
 
 #include <QObject>
-#include <QStringList>
-#include <QList>
-#include <QDockWidget>
-#include <QDialog>
-#include <QDebug>
-#include <QMap>
-
+#include <common/interfaces.h>
 #include <meshlab/glarea.h>
-#include <vcg/math/matrix44.h>
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
 #include <meshcutdialog.h>
-#include <wrap/gui/trackball.h>
 
 #include <cutting.h>
 
diff --git a/src/meshlabplugins/filter_ao/AOGLWidget.h b/src/meshlabplugins/filter_ao/AOGLWidget.h
index 4f0e41ebe..f8b4e2e59 100644
--- a/src/meshlabplugins/filter_ao/AOGLWidget.h
+++ b/src/meshlabplugins/filter_ao/AOGLWidget.h
@@ -26,11 +26,8 @@
 
 #include <GL/glew.h>
 #include <QObject>
-#include <QDialog>
-#include <QGLWidget>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class AmbientOcclusionPlugin;
 
diff --git a/src/meshlabplugins/filter_ao/filter_ao.cpp b/src/meshlabplugins/filter_ao/filter_ao.cpp
index 907430f6d..217d04d74 100644
--- a/src/meshlabplugins/filter_ao/filter_ao.cpp
+++ b/src/meshlabplugins/filter_ao/filter_ao.cpp
@@ -21,37 +21,15 @@
 *                                                                           *
 ****************************************************************************/
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <algorithm>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
-
-#include <vcg/space/box3.h>
-#include <vcg/math/gen_normal.h>
-#include <vcg/complex/trimesh/clean.h>
-#include <vcg/complex/trimesh/update/color.h>
-#include <vcg/complex/trimesh/update/normal.h>
-#include <vcg/complex/trimesh/update/quality.h>
-
-#include <wrap/gl/trimesh.h>
-
-#include <QtGui>
-#include <QGLContext>
-#include <QGLFormat>
-#include <QTextStream>
-#include <QDataStream>
-#include <QString>
-#include <QFile>
-#include <QTime>
 #include <GL/glew.h>
+#include "AOGLWidget.h"
+#include "filter_ao.h"
+
+#include <vcg/math/gen_normal.h>
+
 #include <wrap/qt/checkGLError.h>
 
-#include "filter_ao.h"
-#include "AOGLWidget.h"
+
 #include <iostream>
 
 #define AMBOCC_MAX_TEXTURE_SIZE 2048
diff --git a/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.h b/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.h
index 989bfe54b..c366948da 100644
--- a/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.h
+++ b/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.h
@@ -19,16 +19,6 @@
 * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)          *
 * for more details.                                                         *
 *                                                                           *
-****************************************************************************/
-/****************************************************************************
-  History
-$Log: sampleplugins.h,v $
-Revision 1.2  2006/11/29 00:59:21  cignoni
-Cleaned plugins interface; changed useless help class into a plain string
-
-Revision 1.1  2006/09/25 09:24:39  e_cerisoli
-add sampleplugins
-
 ****************************************************************************/
 
 #ifndef SAMPLEFILTERSPLUGIN_H
@@ -36,8 +26,7 @@ add sampleplugins
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class SlidingCurvaturePlugin : public QObject, public MeshFilterInterface
 {
diff --git a/src/meshlabplugins/filter_mls/mlsplugin.h b/src/meshlabplugins/filter_mls/mlsplugin.h
index ba40dcf4c..412ee11cc 100644
--- a/src/meshlabplugins/filter_mls/mlsplugin.h
+++ b/src/meshlabplugins/filter_mls/mlsplugin.h
@@ -26,8 +26,7 @@
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class MlsPlugin : public QObject, public MeshFilterInterface
 {
diff --git a/src/meshlabplugins/filter_perceptualmetric/perceptualmetrics.h b/src/meshlabplugins/filter_perceptualmetric/perceptualmetrics.h
index e21ab6c37..fd392fefc 100644
--- a/src/meshlabplugins/filter_perceptualmetric/perceptualmetrics.h
+++ b/src/meshlabplugins/filter_perceptualmetric/perceptualmetrics.h
@@ -31,8 +31,7 @@ $Log: perceptualmetrics.h,v $
 
 #include <QObject>
 
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 #include <vcg/complex/trimesh/stat.h>
 
 template <class MeshType>
diff --git a/src/sampleplugins/sampleedit/sampleedit.h b/src/sampleplugins/sampleedit/sampleedit.h
index aadf0aa32..5345c3c32 100644
--- a/src/sampleplugins/sampleedit/sampleedit.h
+++ b/src/sampleplugins/sampleedit/sampleedit.h
@@ -25,11 +25,7 @@
 #define SAMPLEEDITPLUGIN_H
 
 #include <QObject>
-#include <QStringList>
-#include <QList>
-
-#include <meshlab/meshmodel.h>
-#include <meshlab/interfaces.h>
+#include <common/interfaces.h>
 
 class SampleEditPlugin : public QObject, public MeshEditInterface
 {