From 90be6ee042d4955acbc4728c3ecbc6f0ac053f9f Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Sat, 5 Dec 2009 00:43:23 +0000 Subject: [PATCH] Updated pros and sources to comply to the new common library system --- .../edit_phototexturing.pro | 4 -- .../edit_pickpoints/edit_pickpoints.pro | 4 +- .../edit_pickpoints/edit_pickpoints_factory.h | 3 +- .../edit_pickpoints/editpickpoints.h | 8 +--- .../edit_pickpoints/pickedPoints.h | 5 +-- .../edit_pickpoints/pickpointsDialog.cpp | 4 +- .../edit_pickpoints/pickpointsDialog.h | 44 +++++++++---------- .../edit_select/edit_select.pro | 3 +- .../edit_straightener/edit_straightener.pro | 3 +- .../edit_straightener_factory.h | 4 +- .../edit_straightener/editstraightener.h | 6 +-- .../editalign/edit_align_factory.h | 3 +- .../editmeasure/edit_measure_factory.h | 3 +- src/meshlabplugins/editmeasure/editmeasure.h | 3 +- .../editmeasure/editmeasure.pro | 1 - src/meshlabplugins/editrgbtri/controlPoint.h | 2 +- .../editrgbtri/edit_rgbtri_factory.h | 4 +- src/meshlabplugins/editrgbtri/modButterfly.h | 2 +- src/meshlabplugins/editrgbtri/rgbInfo.h | 8 +--- src/meshlabplugins/editrgbtri/rgbPrimitives.h | 3 +- src/meshlabplugins/editrgbtri/rgbt.h | 12 +---- .../editsegment/edit_segment_factory.h | 3 +- .../editsegment/editsegment.pro | 1 - .../editslice/edit_slice_factory.h | 4 +- src/meshlabplugins/editslice/editslice.h | 9 +--- src/meshlabplugins/editslice/editslice.pro | 1 - src/meshlabplugins/filter_ao/AOGLWidget.h | 2 +- src/meshlabplugins/filter_ao/filter_ao.h | 5 +-- src/meshlabplugins/filter_ao/filter_ao.pro | 5 +-- .../filter_autoalign/filter_autoalign.cpp | 7 --- .../filter_autoalign/filter_autoalign.h | 3 +- .../filter_autoalign/filter_autoalign.pro | 2 +- src/meshlabplugins/filter_clean/align_tools.h | 2 +- src/meshlabplugins/filter_clean/cleanfilter.h | 7 +-- .../filter_clean/filter_clean.pro | 2 +- .../filter_create/filter_create.cpp | 4 -- .../filter_create/filter_create.h | 4 +- .../filter_create/filter_create.pro | 2 +- .../filter_curvature_from_sliding.pro | 2 +- .../filter_feature_alignment.pro | 14 +++--- .../filter_isoparametrization.h | 7 +-- .../filter_isoparametrization.pro | 10 ++--- .../filter_measure/filter_measure.cpp | 8 ---- .../filter_measure/filter_measure.h | 3 +- .../filter_measure/filter_measure.pro | 7 +-- 45 files changed, 69 insertions(+), 174 deletions(-) diff --git a/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro b/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro index 80877b1fc..3e8a9c013 100644 --- a/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro +++ b/src/meshlabplugins/edit_phototexturing/edit_phototexturing.pro @@ -23,15 +23,11 @@ SOURCES += edit_phototex_factory.cpp \ ../../external/TSAI30B3//cal_util.c \ ../../external/TSAI30B3//cal_main.c \ ../../external/TSAI30B3//cal_eval.c \ - #src/Poly/PolyCameraCalibration.cpp \ - #src/Poly/Polynom3_444.cpp \ src/SmartBlendTextureMerger.cpp \ src/WinnerTakesAllTextureMerger.cpp \ src/QuadTree/QuadTreeNode.cpp \ $$VCGDIR/wrap/gui/trackball.cpp\ $$VCGDIR/wrap/gui/trackmode.cpp \ - $$GLEWDIR/src/glew.c \ - ../../common/filterparameter.cpp \ ../../meshlab/stdpardialog.cpp diff --git a/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro b/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro index 11a5bbfb8..a55e899a8 100755 --- a/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro +++ b/src/meshlabplugins/edit_pickpoints/edit_pickpoints.pro @@ -12,9 +12,7 @@ SOURCES += edit_pickpoints_factory.cpp \ pickpointsDialog.cpp \ pickedPoints.cpp \ pickPointsTemplate.cpp \ - ../../meshlab/stdpardialog.cpp \ - ../../common/filterparameter.cpp \ - $$GLEWCODE + ../../meshlab/stdpardialog.cpp RESOURCES += editpickpoints.qrc diff --git a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h index aa342812d..d53e8d97c 100644 --- a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h +++ b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h @@ -25,9 +25,8 @@ #ifndef EditPickPointsFactoryPLUGIN_H #define EditPickPointsFactoryPLUGIN_H -#include #include -#include +#include class EditPickPointsFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/edit_pickpoints/editpickpoints.h b/src/meshlabplugins/edit_pickpoints/editpickpoints.h index 8fd080770..05836d718 100644 --- a/src/meshlabplugins/edit_pickpoints/editpickpoints.h +++ b/src/meshlabplugins/edit_pickpoints/editpickpoints.h @@ -30,13 +30,7 @@ #ifndef EDIT_PickPoints_PLUGIN_H #define EDIT_PickPoints_PLUGIN_H -#include -#include -#include - -#include -#include - +#include #include "pickpointsDialog.h" class EditPickPointsPlugin : public QObject, public MeshEditInterface diff --git a/src/meshlabplugins/edit_pickpoints/pickedPoints.h b/src/meshlabplugins/edit_pickpoints/pickedPoints.h index fcd4fbcfd..474c64a9f 100644 --- a/src/meshlabplugins/edit_pickpoints/pickedPoints.h +++ b/src/meshlabplugins/edit_pickpoints/pickedPoints.h @@ -32,10 +32,7 @@ #ifndef PICKED_POINTS_H #define PICKED_POINTS_H -#include -#include - -#include +#include //our points class PickedPoint diff --git a/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp b/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp index 213e1ae2d..e158046c3 100644 --- a/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp +++ b/src/meshlabplugins/edit_pickpoints/pickpointsDialog.cpp @@ -30,12 +30,10 @@ #include +#include #include -#include #include -#include - #include "editpickpoints.h" #include "pickpointsDialog.h" diff --git a/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h b/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h index efdc78c51..dc2a4b216 100644 --- a/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h +++ b/src/meshlabplugins/edit_pickpoints/pickpointsDialog.h @@ -1,24 +1,24 @@ -/**************************************************************************** -* MeshLab o o * -* An extendible mesh processor o o * -* _ O _ * -* Copyright(C) 2005, 2009 \/)\/ * -* Visual Computing Lab /\/| * -* ISTI - Italian National Research Council | * -* \ * -* All rights reserved. * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * -* for more details. * -* * +/**************************************************************************** +* MeshLab o o * +* An extendible mesh processor o o * +* _ O _ * +* Copyright(C) 2005, 2009 \/)\/ * +* Visual Computing Lab /\/| * +* ISTI - Italian National Research Council | * +* \ * +* All rights reserved. * +* * +* This program is free software; you can redistribute it and/or modify * +* it under the terms of the GNU General Public License as published by * +* the Free Software Foundation; either version 2 of the License, or * +* (at your option) any later version. * +* * +* This program is distributed in the hope that it will be useful, * +* but WITHOUT ANY WARRANTY; without even the implied warranty of * +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * +* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * +* for more details. * +* * ****************************************************************************/ /* A class to represent the ui for the pickpoints plugin @@ -31,7 +31,7 @@ #include -#include +#include #include #include "pickedPoints.h" diff --git a/src/meshlabplugins/edit_select/edit_select.pro b/src/meshlabplugins/edit_select/edit_select.pro index 545d9a558..2f336e649 100644 --- a/src/meshlabplugins/edit_select/edit_select.pro +++ b/src/meshlabplugins/edit_select/edit_select.pro @@ -4,8 +4,7 @@ HEADERS = edit_select_factory.h \ edit_select.h SOURCES = edit_select_factory.cpp \ - edit_select.cpp \ - $$GLEWCODE + edit_select.cpp TARGET = edit_select diff --git a/src/meshlabplugins/edit_straightener/edit_straightener.pro b/src/meshlabplugins/edit_straightener/edit_straightener.pro index 84b14563c..0d43e661d 100644 --- a/src/meshlabplugins/edit_straightener/edit_straightener.pro +++ b/src/meshlabplugins/edit_straightener/edit_straightener.pro @@ -8,8 +8,7 @@ SOURCES += $$VCGDIR/wrap/gui/trackball.cpp \ $$VCGDIR/wrap/gui/trackmode.cpp \ $$VCGDIR/wrap/gui/coordinateframe.cpp \ $$VCGDIR/wrap/gui/activecoordinateframe.cpp \ - $$VCGDIR/wrap/gui/rubberband.cpp \ - $$GLEWCODE + $$VCGDIR/wrap/gui/rubberband.cpp # Input HEADERS += edit_straightener_factory.h \ diff --git a/src/meshlabplugins/edit_straightener/edit_straightener_factory.h b/src/meshlabplugins/edit_straightener/edit_straightener_factory.h index d93b4c6f4..915763a17 100644 --- a/src/meshlabplugins/edit_straightener/edit_straightener_factory.h +++ b/src/meshlabplugins/edit_straightener/edit_straightener_factory.h @@ -25,9 +25,7 @@ #ifndef EditStraightenerFactoryPLUGIN_H #define EditStraightenerFactoryPLUGIN_H -#include -#include -#include +#include class EditStraightenerFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/edit_straightener/editstraightener.h b/src/meshlabplugins/edit_straightener/editstraightener.h index a88f45100..5ba56c232 100644 --- a/src/meshlabplugins/edit_straightener/editstraightener.h +++ b/src/meshlabplugins/edit_straightener/editstraightener.h @@ -45,14 +45,12 @@ first version #define EDITSTRAIGHTENER_H #include -#include -#include +#include +#include #include #include -#include -#include #include "editstraightenerdialog.h" diff --git a/src/meshlabplugins/editalign/edit_align_factory.h b/src/meshlabplugins/editalign/edit_align_factory.h index b5eb2b288..e621b6198 100644 --- a/src/meshlabplugins/editalign/edit_align_factory.h +++ b/src/meshlabplugins/editalign/edit_align_factory.h @@ -25,9 +25,8 @@ #ifndef EditAlignFactoryPLUGIN_H #define EditAlignFactoryPLUGIN_H -#include #include -#include +#include class EditAlignFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/editmeasure/edit_measure_factory.h b/src/meshlabplugins/editmeasure/edit_measure_factory.h index 09f026fb1..e5603ddc1 100644 --- a/src/meshlabplugins/editmeasure/edit_measure_factory.h +++ b/src/meshlabplugins/editmeasure/edit_measure_factory.h @@ -25,9 +25,8 @@ #ifndef EditMeasureFactoryPLUGIN_H #define EditMeasureFactoryPLUGIN_H -#include #include -#include +#include class EditMeasureFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/editmeasure/editmeasure.h b/src/meshlabplugins/editmeasure/editmeasure.h index 211cef3ba..e3f8b52e9 100644 --- a/src/meshlabplugins/editmeasure/editmeasure.h +++ b/src/meshlabplugins/editmeasure/editmeasure.h @@ -32,8 +32,7 @@ $Log: editmeasure.h,v $ #include #include -#include -#include +#include #include class EditMeasurePlugin : public QObject, public MeshEditInterface diff --git a/src/meshlabplugins/editmeasure/editmeasure.pro b/src/meshlabplugins/editmeasure/editmeasure.pro index 99ff7f6d0..d0f925218 100644 --- a/src/meshlabplugins/editmeasure/editmeasure.pro +++ b/src/meshlabplugins/editmeasure/editmeasure.pro @@ -5,7 +5,6 @@ HEADERS = edit_measure_factory.h \ SOURCES = edit_measure_factory.cpp \ editmeasure.cpp \ - $$GLEWCODE \ $$VCGDIR/wrap/gui/rubberband.cpp TARGET = editmeasure diff --git a/src/meshlabplugins/editrgbtri/controlPoint.h b/src/meshlabplugins/editrgbtri/controlPoint.h index 6035a7a7b..89f24aec0 100644 --- a/src/meshlabplugins/editrgbtri/controlPoint.h +++ b/src/meshlabplugins/editrgbtri/controlPoint.h @@ -26,7 +26,7 @@ #include #include "rgbInfo.h" -#include +#include #include "rgbPrimitives.h" #include "topologicalOp.h" diff --git a/src/meshlabplugins/editrgbtri/edit_rgbtri_factory.h b/src/meshlabplugins/editrgbtri/edit_rgbtri_factory.h index 42c7e330b..1cbf70047 100644 --- a/src/meshlabplugins/editrgbtri/edit_rgbtri_factory.h +++ b/src/meshlabplugins/editrgbtri/edit_rgbtri_factory.h @@ -25,9 +25,7 @@ #ifndef EditRGBtriFactoryPLUGIN_H #define EditRGBtriFactoryPLUGIN_H -#include -#include -#include +#include class EditRGBtriFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/editrgbtri/modButterfly.h b/src/meshlabplugins/editrgbtri/modButterfly.h index 71a0eaaa5..15b785f65 100644 --- a/src/meshlabplugins/editrgbtri/modButterfly.h +++ b/src/meshlabplugins/editrgbtri/modButterfly.h @@ -26,7 +26,7 @@ #include #include "rgbInfo.h" -#include +#include #include "rgbPrimitives.h" #include "topologicalOp.h" diff --git a/src/meshlabplugins/editrgbtri/rgbInfo.h b/src/meshlabplugins/editrgbtri/rgbInfo.h index 145df600f..44fd23c90 100644 --- a/src/meshlabplugins/editrgbtri/rgbInfo.h +++ b/src/meshlabplugins/editrgbtri/rgbInfo.h @@ -23,14 +23,8 @@ * for more details. * ****************************************************************************/ -#include -#include -#include -#include -#include +#include #include -#include "vcg/simplex/face/component.h" -#include namespace rgbt { diff --git a/src/meshlabplugins/editrgbtri/rgbPrimitives.h b/src/meshlabplugins/editrgbtri/rgbPrimitives.h index 43c4852c5..71f0febb6 100644 --- a/src/meshlabplugins/editrgbtri/rgbPrimitives.h +++ b/src/meshlabplugins/editrgbtri/rgbPrimitives.h @@ -24,9 +24,8 @@ ****************************************************************************/ #include "rgbInfo.h" -#include +#include #include "topologicalOp.h" -#include #include "controlPoint.h" #include "modButterfly.h" diff --git a/src/meshlabplugins/editrgbtri/rgbt.h b/src/meshlabplugins/editrgbtri/rgbt.h index 767ab76cf..78b17d08b 100755 --- a/src/meshlabplugins/editrgbtri/rgbt.h +++ b/src/meshlabplugins/editrgbtri/rgbt.h @@ -24,17 +24,7 @@ #define RGBT_H #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include #include "widgetRgbT.h" #include "rgbInfo.h" diff --git a/src/meshlabplugins/editsegment/edit_segment_factory.h b/src/meshlabplugins/editsegment/edit_segment_factory.h index 30a13a3bf..4b4df3b64 100644 --- a/src/meshlabplugins/editsegment/edit_segment_factory.h +++ b/src/meshlabplugins/editsegment/edit_segment_factory.h @@ -25,9 +25,8 @@ #ifndef EditSegmentFactoryPLUGIN_H #define EditSegmentFactoryPLUGIN_H -#include #include -#include +#include class EditSegmentFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/editsegment/editsegment.pro b/src/meshlabplugins/editsegment/editsegment.pro index 90d4618a5..13dad42d9 100644 --- a/src/meshlabplugins/editsegment/editsegment.pro +++ b/src/meshlabplugins/editsegment/editsegment.pro @@ -9,7 +9,6 @@ HEADERS = edit_segment_factory.h \ SOURCES = edit_segment_factory.cpp \ editsegment.cpp \ - $$GLEWCODE \ meshcutdialog.cpp \ colorpiker.cpp diff --git a/src/meshlabplugins/editslice/edit_slice_factory.h b/src/meshlabplugins/editslice/edit_slice_factory.h index 23e9026ff..eabdc5207 100644 --- a/src/meshlabplugins/editslice/edit_slice_factory.h +++ b/src/meshlabplugins/editslice/edit_slice_factory.h @@ -25,9 +25,7 @@ #ifndef EditSliceFactoryPLUGIN_H #define EditSliceFactoryPLUGIN_H -#include -#include -#include +#include class EditSliceFactory : public QObject, public MeshEditInterfaceFactory { diff --git a/src/meshlabplugins/editslice/editslice.h b/src/meshlabplugins/editslice/editslice.h index dc0a34fbd..8e9fd1223 100644 --- a/src/meshlabplugins/editslice/editslice.h +++ b/src/meshlabplugins/editslice/editslice.h @@ -24,19 +24,12 @@ #ifndef SLIDEPLUGIN_H #define SLIDEPLUGIN_H -#include -#include -#include #include "svgpro.h" #include "slicedialog.h" -#include -#include +#include #include #include - -#include -#include #include #include #include diff --git a/src/meshlabplugins/editslice/editslice.pro b/src/meshlabplugins/editslice/editslice.pro index 49add0d86..500e7be32 100644 --- a/src/meshlabplugins/editslice/editslice.pro +++ b/src/meshlabplugins/editslice/editslice.pro @@ -8,7 +8,6 @@ HEADERS = edit_slice_factory.h \ SOURCES = edit_slice_factory.cpp \ editslice.cpp \ slicedialog.cpp\ - $$GLEWCODE \ $$VCGDIR/wrap/gui/trackball.cpp \ $$VCGDIR/wrap/gui/trackmode.cpp \ svgpro.cpp diff --git a/src/meshlabplugins/filter_ao/AOGLWidget.h b/src/meshlabplugins/filter_ao/AOGLWidget.h index f8b4e2e59..89dad13eb 100644 --- a/src/meshlabplugins/filter_ao/AOGLWidget.h +++ b/src/meshlabplugins/filter_ao/AOGLWidget.h @@ -25,7 +25,7 @@ #define __VCG_AOGLWIDGET #include -#include +#include #include diff --git a/src/meshlabplugins/filter_ao/filter_ao.h b/src/meshlabplugins/filter_ao/filter_ao.h index 039ee8379..bdecd8e70 100644 --- a/src/meshlabplugins/filter_ao/filter_ao.h +++ b/src/meshlabplugins/filter_ao/filter_ao.h @@ -26,10 +26,7 @@ #include -#include -#include -#include -#include +#include #include class AOGLWidget; class AmbientOcclusionPlugin : public QObject, public MeshFilterInterface diff --git a/src/meshlabplugins/filter_ao/filter_ao.pro b/src/meshlabplugins/filter_ao/filter_ao.pro index 5bfb3ba5c..b08b93693 100644 --- a/src/meshlabplugins/filter_ao/filter_ao.pro +++ b/src/meshlabplugins/filter_ao/filter_ao.pro @@ -1,10 +1,9 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) TARGET = filter_ao QT += opengl HEADERS += ./filter_ao.h AOGLWidget.h +SOURCES += ./filter_ao.cpp AOGLWidget.cpp -SOURCES += ./filter_ao.cpp AOGLWidget.cpp \ - $$GLEWCODE diff --git a/src/meshlabplugins/filter_autoalign/filter_autoalign.cpp b/src/meshlabplugins/filter_autoalign/filter_autoalign.cpp index 3eaf4db83..919a9e24d 100644 --- a/src/meshlabplugins/filter_autoalign/filter_autoalign.cpp +++ b/src/meshlabplugins/filter_autoalign/filter_autoalign.cpp @@ -26,14 +26,7 @@ #include #include #include - -#include -#include - #include -#include -#include -#include #include #include diff --git a/src/meshlabplugins/filter_autoalign/filter_autoalign.h b/src/meshlabplugins/filter_autoalign/filter_autoalign.h index 1a448837b..36c4cb0cd 100644 --- a/src/meshlabplugins/filter_autoalign/filter_autoalign.h +++ b/src/meshlabplugins/filter_autoalign/filter_autoalign.h @@ -26,8 +26,7 @@ #include -#include -#include +#include class FilterAutoalign : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_autoalign/filter_autoalign.pro b/src/meshlabplugins/filter_autoalign/filter_autoalign.pro index 0a72145ff..b45ee65be 100644 --- a/src/meshlabplugins/filter_autoalign/filter_autoalign.pro +++ b/src/meshlabplugins/filter_autoalign/filter_autoalign.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += ../../meshlabplugins/editalign/align/AlignPair.h \ ../../meshlabplugins/editalign/align/OccupancyGrid.h \ diff --git a/src/meshlabplugins/filter_clean/align_tools.h b/src/meshlabplugins/filter_clean/align_tools.h index a9325ca05..b8202fd5c 100644 --- a/src/meshlabplugins/filter_clean/align_tools.h +++ b/src/meshlabplugins/filter_clean/align_tools.h @@ -33,7 +33,7 @@ #include -#include +#include #include #include diff --git a/src/meshlabplugins/filter_clean/cleanfilter.h b/src/meshlabplugins/filter_clean/cleanfilter.h index d9d9d50af..a04f87782 100644 --- a/src/meshlabplugins/filter_clean/cleanfilter.h +++ b/src/meshlabplugins/filter_clean/cleanfilter.h @@ -62,12 +62,7 @@ #define EXTRAIOPLUGINV3D_H #include -#include -#include - -#include -#include - +#include class CleanFilter : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_clean/filter_clean.pro b/src/meshlabplugins/filter_clean/filter_clean.pro index f1d945fa9..f16a5c876 100644 --- a/src/meshlabplugins/filter_clean/filter_clean.pro +++ b/src/meshlabplugins/filter_clean/filter_clean.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += cleanfilter.h \ ../../common/filterparameter.h diff --git a/src/meshlabplugins/filter_create/filter_create.cpp b/src/meshlabplugins/filter_create/filter_create.cpp index 93e7015a5..245c3bb46 100644 --- a/src/meshlabplugins/filter_create/filter_create.cpp +++ b/src/meshlabplugins/filter_create/filter_create.cpp @@ -23,11 +23,7 @@ #include -#include -#include #include -#include -#include #include "filter_create.h" // Constructor usually performs only two simple tasks of filling the two lists diff --git a/src/meshlabplugins/filter_create/filter_create.h b/src/meshlabplugins/filter_create/filter_create.h index fa84e5a4b..5e2049fa6 100644 --- a/src/meshlabplugins/filter_create/filter_create.h +++ b/src/meshlabplugins/filter_create/filter_create.h @@ -25,9 +25,7 @@ #define FILTER_CREATE_H #include - -#include -#include +#include class FilterCreate : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_create/filter_create.pro b/src/meshlabplugins/filter_create/filter_create.pro index 344229761..507734c68 100644 --- a/src/meshlabplugins/filter_create/filter_create.pro +++ b/src/meshlabplugins/filter_create/filter_create.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += filter_create.h diff --git a/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.pro b/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.pro index ac4f3d474..69fbb672e 100644 --- a/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.pro +++ b/src/meshlabplugins/filter_curvature_from_sliding/filter_curvature_from_sliding.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += filter_curvature_from_sliding.h diff --git a/src/meshlabplugins/filter_feature_alignment/filter_feature_alignment.pro b/src/meshlabplugins/filter_feature_alignment/filter_feature_alignment.pro index 7d6548f9e..099715198 100644 --- a/src/meshlabplugins/filter_feature_alignment/filter_feature_alignment.pro +++ b/src/meshlabplugins/filter_feature_alignment/filter_feature_alignment.pro @@ -1,13 +1,12 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) ANNDIR = ../../external/ann_1.1.1 INCLUDEPATH += $$ANNDIR/include LIBS += -L$$ANNDIR/lib \ -lANN QT += opengl QT += xml -HEADERS = ../../meshlab/interfaces.h \ - ../../meshlab/meshmodel.h \ - ../filter_mls/apss.h \ +HEADERS = + ../filter_mls/apss.h \ ../filter_mls/priorityqueue.h \ ../filter_mls/balltree.h \ ../filter_mls/implicits.h \ @@ -24,8 +23,7 @@ SOURCES = filter_feature_alignment.cpp \ ../filter_mls/apss.tpp \ ../filter_mls/kdtree.cpp \ ../filter_mls/mlssurface.tpp \ - ../../meshlab/meshmodel.cpp \ - ../edit_pickpoints/pickedPoints.cpp \ - $$GLEWCODE -TARGET = filter_feature_alignment + ../edit_pickpoints/pickedPoints.cpp + + TARGET = filter_feature_alignment CONFIG += opengl diff --git a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h index 8e955ce7e..115afe41b 100644 --- a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h +++ b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h @@ -25,17 +25,12 @@ #define FILTERISOPARAMPLUGIN_H #include -#include -#include -#include #include #include #include #include #include -#include -#include -#include +#include //#include //#include diff --git a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro index 6a18ae763..40d68e34f 100644 --- a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro +++ b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro @@ -1,4 +1,4 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += ./diamond_sampler.h \ ./diam_parametrization.h \ @@ -18,13 +18,9 @@ HEADERS += ./diamond_sampler.h \ ./uv_grid.h \ ./defines.h \ ./filter_isoparametrization.h\ - ./stat_remeshing.h\ - ../../meshlab/meshmodel.h - + ./stat_remeshing.h -SOURCES += ./filter_isoparametrization.cpp \ - ../../meshlab/meshmodel.cpp \ - $$GLEWCODE +SOURCES += ./filter_isoparametrization.cpp TARGET = filter_isoparametrization INCLUDEPATH += ./ \ diff --git a/src/meshlabplugins/filter_measure/filter_measure.cpp b/src/meshlabplugins/filter_measure/filter_measure.cpp index 19b142f29..cc1678283 100644 --- a/src/meshlabplugins/filter_measure/filter_measure.cpp +++ b/src/meshlabplugins/filter_measure/filter_measure.cpp @@ -26,17 +26,9 @@ #include #include #include - -#include -#include - #include #include #include -#include -#include -#include -#include #include #include diff --git a/src/meshlabplugins/filter_measure/filter_measure.h b/src/meshlabplugins/filter_measure/filter_measure.h index 3f7949b7c..085112892 100644 --- a/src/meshlabplugins/filter_measure/filter_measure.h +++ b/src/meshlabplugins/filter_measure/filter_measure.h @@ -26,8 +26,7 @@ #include -#include -#include +#include class FilterMeasurePlugin : public QObject, public MeshFilterInterface { diff --git a/src/meshlabplugins/filter_measure/filter_measure.pro b/src/meshlabplugins/filter_measure/filter_measure.pro index bee9e70b1..cbaf58004 100644 --- a/src/meshlabplugins/filter_measure/filter_measure.pro +++ b/src/meshlabplugins/filter_measure/filter_measure.pro @@ -1,10 +1,7 @@ -include (../../sharedfilter.pri) +include (../../shared.pri) HEADERS += filter_measure.h - -SOURCES += filter_measure.cpp \ - $$GLEWCODE - +SOURCES += filter_measure.cpp TARGET = filter_measure CONFIG += opengl