From f1aaa5d506ce832db076f88a047ff73ff5a1050e Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Wed, 27 Nov 2019 17:29:54 -0600
Subject: [PATCH] Remove direct references to "external" from source files

---
 src/fgt/filter_decompose/filter_decompose.pro                 | 2 +-
 src/fgt/filter_decompose/graph_builder.h                      | 2 +-
 src/meshlabplugins/edit_align/edit_align.pro                  | 2 +-
 src/meshlabplugins/edit_align/point_matching_scale.cpp        | 2 +-
 src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro      | 2 ++
 src/meshlabplugins/edit_mutualcorrs/levmarmethods.h           | 2 +-
 src/meshlabplugins/edit_mutualcorrs/solver.cpp                | 4 ++--
 src/meshlabplugins/edit_mutualcorrs/solver.h                  | 2 +-
 .../filter_mutualglobal/filter_mutualglobal.pro               | 1 +
 src/meshlabplugins/filter_mutualglobal/levmarmethods.h        | 2 +-
 src/meshlabplugins/filter_mutualglobal/solver.cpp             | 4 ++--
 src/meshlabplugins/filter_mutualglobal/solver.h               | 2 +-
 .../filter_mutualinfoxml/filter_mutualinfoxml.pro             | 2 ++
 src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h       | 2 +-
 src/meshlabplugins/filter_mutualinfoxml/solver.cpp            | 4 ++--
 src/meshlabplugins/filter_mutualinfoxml/solver.h              | 2 +-
 16 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/fgt/filter_decompose/filter_decompose.pro b/src/fgt/filter_decompose/filter_decompose.pro
index 96f87ef18..7c1db45c4 100644
--- a/src/fgt/filter_decompose/filter_decompose.pro
+++ b/src/fgt/filter_decompose/filter_decompose.pro
@@ -11,7 +11,7 @@ SOURCES       += \
 ../../external/maxflow-v2.21.src/adjacency_list/graph.cpp \
 ../../../../vcglib/wrap/ply/plylib.cpp \
     filter_decomposer.cpp
-
+INCLUDEPATH *= ../../external/maxflow-v2.21.src/
 TARGET        = filter_decomposer
 
 
diff --git a/src/fgt/filter_decompose/graph_builder.h b/src/fgt/filter_decompose/graph_builder.h
index 3f8e66f65..f0b54b8f2 100644
--- a/src/fgt/filter_decompose/graph_builder.h
+++ b/src/fgt/filter_decompose/graph_builder.h
@@ -1,4 +1,4 @@
-#include "../../external/maxflow-v2.21.src/adjacency_list/graph.h"
+#include "adjacency_list/graph.h"
 #include <stdlib.h>
 
 #ifndef GRAPHBUILDER_H
diff --git a/src/meshlabplugins/edit_align/edit_align.pro b/src/meshlabplugins/edit_align/edit_align.pro
index f1009822f..ba6bfee29 100644
--- a/src/meshlabplugins/edit_align/edit_align.pro
+++ b/src/meshlabplugins/edit_align/edit_align.pro
@@ -39,7 +39,7 @@ CONFIG(system_glew) {
     linux: LIBS += -lGLEW
 }
                 
-INCLUDEPATH += ../../external
+INCLUDEPATH += ../../external/newuoa/include
 
 FORMS 	  += alignDialog.ui
 TARGET       = edit_align
diff --git a/src/meshlabplugins/edit_align/point_matching_scale.cpp b/src/meshlabplugins/edit_align/point_matching_scale.cpp
index 698431ed4..0689cde74 100644
--- a/src/meshlabplugins/edit_align/point_matching_scale.cpp
+++ b/src/meshlabplugins/edit_align/point_matching_scale.cpp
@@ -1,5 +1,5 @@
 #include "point_matching_scale.h"
-#include <newuoa/include/newuoa.h>
+#include <newuoa.h>
 
 #include <vcg/space/point3.h>
 #include <vcg/space/box3.h>
diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
index 89cf7d939..d3bbd1c61 100644
--- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
+++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.pro
@@ -25,6 +25,8 @@ RESOURCES     = edit_mutualcorrs.qrc
 
 FORMS         = edit_mutualcorrsDialog.ui
 
+INCLUDEPATH *= ../../external/levmar-2.3 ../../external/newuoa/include
+
 win32-msvc:  LIBS += ../../external/lib/win32-msvc/levmar.lib
 win32-g++:LIBS += -L../../external -llevmar
 linux-g++:LIBS += -llevmar
diff --git a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
index 484d6dbf7..67f144d97 100644
--- a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
+++ b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 
 struct LevmarCorrelation {
diff --git a/src/meshlabplugins/edit_mutualcorrs/solver.cpp b/src/meshlabplugins/edit_mutualcorrs/solver.cpp
index 57b7863f8..0c0ac0779 100644
--- a/src/meshlabplugins/edit_mutualcorrs/solver.cpp
+++ b/src/meshlabplugins/edit_mutualcorrs/solver.cpp
@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include "edit_mutualcorrs.h"
 #include <vcg/math/shot.h>
-#include "../../external/newuoa/include/newuoa.h"
+#include "newuoa.h"
 
 
 #include "solver.h"
@@ -426,7 +426,7 @@ int Solver::levmar(AlignSet *_align, MutualInfo *_mutual, Shot &shot) {
 
 double Solver::calculateError2( Shot &shot){
     //E' una pezza, andrebbe meglio pensato. Va a beccare direttamente le strutture dati PointCorrespondence di base.
-    //align già è sicuramente settato perchè lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
+    //align gi� � sicuramente settato perch� lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
     std::vector<Correspondence> correspList = align->correspList;
     double error = 0;
    
diff --git a/src/meshlabplugins/edit_mutualcorrs/solver.h b/src/meshlabplugins/edit_mutualcorrs/solver.h
index 05e99c5e4..c9e1f5256 100644
--- a/src/meshlabplugins/edit_mutualcorrs/solver.h
+++ b/src/meshlabplugins/edit_mutualcorrs/solver.h
@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro b/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro
index 036652a4d..9b0dd6201 100644
--- a/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro
+++ b/src/meshlabplugins/filter_mutualglobal/filter_mutualglobal.pro
@@ -20,3 +20,4 @@ SOURCES       += filter_mutualglobal.cpp \
 		
 TARGET        = filter_mutualglobal
 
+INCLUDEPATH *= ../../external/levmar-2.3 ../../external/newuoa/include
diff --git a/src/meshlabplugins/filter_mutualglobal/levmarmethods.h b/src/meshlabplugins/filter_mutualglobal/levmarmethods.h
index 484d6dbf7..67f144d97 100644
--- a/src/meshlabplugins/filter_mutualglobal/levmarmethods.h
+++ b/src/meshlabplugins/filter_mutualglobal/levmarmethods.h
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 
 struct LevmarCorrelation {
diff --git a/src/meshlabplugins/filter_mutualglobal/solver.cpp b/src/meshlabplugins/filter_mutualglobal/solver.cpp
index dbb984556..27ed41cea 100644
--- a/src/meshlabplugins/filter_mutualglobal/solver.cpp
+++ b/src/meshlabplugins/filter_mutualglobal/solver.cpp
@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include "filter_mutualglobal.h"
 #include <vcg/math/shot.h>
-#include "../../external/newuoa/include/newuoa.h"
+#include "newuoa.h"
 
 
 #include "solver.h"
@@ -677,7 +677,7 @@ double Solver::calculateError(std::list<Correlation> *corrs, Shot &shot){
 
 double Solver::calculateError2( Shot &shot){
 	//E' una pezza, andrebbe meglio pensato. Va a beccare direttamente le strutture dati PointCorrespondence di base.
-	//align già è sicuramente settato perchè lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
+	//align gi� � sicuramente settato perch� lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
 	QList<PointCorrespondence*> *correspList = align->correspList;
 	double error = 0;
 	int count=0;
diff --git a/src/meshlabplugins/filter_mutualglobal/solver.h b/src/meshlabplugins/filter_mutualglobal/solver.h
index c45992b2f..06239bb6b 100644
--- a/src/meshlabplugins/filter_mutualglobal/solver.h
+++ b/src/meshlabplugins/filter_mutualglobal/solver.h
@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro b/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
index c634d379c..c01362a2d 100644
--- a/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
+++ b/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
@@ -20,4 +20,6 @@ SOURCES       += filter_mutualinfo.cpp \
 		
 TARGET        = filter_mutualinfo
 
+INCLUDEPATH *= ../../external/levmar-2.3 ../../external/newuoa/include
+
 include (../../shared_post.pri)
diff --git a/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h b/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
index 484d6dbf7..67f144d97 100644
--- a/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
+++ b/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 
 #include <list>
 
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 
 struct LevmarCorrelation {
diff --git a/src/meshlabplugins/filter_mutualinfoxml/solver.cpp b/src/meshlabplugins/filter_mutualinfoxml/solver.cpp
index bf4da7aa4..07d2293e9 100644
--- a/src/meshlabplugins/filter_mutualinfoxml/solver.cpp
+++ b/src/meshlabplugins/filter_mutualinfoxml/solver.cpp
@@ -2,7 +2,7 @@
 #include <QTextStream>
 #include "filter_mutualinfo.h"
 #include <vcg/math/shot.h>
-#include "../../external/newuoa/include/newuoa.h"
+#include "newuoa.h"
 
 
 #include "solver.h"
@@ -574,7 +574,7 @@ double Solver::calculateError(std::list<Correlation> *corrs, Shot &shot){
 
 double Solver::calculateError2( Shot &shot){
     //E' una pezza, andrebbe meglio pensato. Va a beccare direttamente le strutture dati PointCorrespondence di base.
-    //align già è sicuramente settato perchè lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
+    //align gi� � sicuramente settato perch� lo chiami da optimize (poi dovrai distinguere le due cose, p.e. fare un optimize2)
     QList<PointCorrespondence*> *correspList = align->correspList;
     double error = 0;
     int count=0;
diff --git a/src/meshlabplugins/filter_mutualinfoxml/solver.h b/src/meshlabplugins/filter_mutualinfoxml/solver.h
index c45992b2f..06239bb6b 100644
--- a/src/meshlabplugins/filter_mutualinfoxml/solver.h
+++ b/src/meshlabplugins/filter_mutualinfoxml/solver.h
@@ -5,7 +5,7 @@
 #include "alignset.h"
 
 #include "parameters.h"
-#include "../../external/levmar-2.3/lm.h"
+#include "lm.h"
 
 #include <iostream>
 #include <fstream>