soc-2008-mxcurioni: towards Freestyle compilation, removing Qt's QString and QImage dependencies. Up to this commit, the following directories compile well (and without any warning): system, image, geometry, graph, winged_edge, view_map, stroke.

Modified code is commented by //soc and unused variables by //soc unused

7 files changed, 7 insertions, 7 deletions

diff --git a/config/darwin-config.py b/config/darwin-config.py
index 9ceb1d1644b..115123f9984 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -168,7 +168,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 # WITH_BF_OPENEXR = 'true'
 # BF_OPENEXR = '${LCGDIR}/openexr'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 3c8a48d12bc..f59dcf266ee 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -94,7 +94,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 886b9f93f3f..603f6a1a880 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -14,7 +14,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 ###########################
 
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index ad4891a0098..9a4c0d6f34e 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -88,7 +88,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index 6581ad2b692..cccc380f60c 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -90,7 +90,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index b0a3c3ae18d..9757c0264b5 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -105,7 +105,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 849b153378f..8e7d6c56c13 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -116,7 +116,7 @@ BF_SWIG_LIB = 'extern_swig'
 BF_LIB3DS = '${BF_FREESTYLE}/lib3ds'
 BF_LIB3DS_LIB = 'extern_lib3ds'
 BF_LIB3DS_LIBPATH = '${BF_LIB3DS}/lib3ds/.libs'
-BF_LIB3DS_INC = '${BF_LIB3DS}/lib3ds'
+BF_LIB3DS_INC = '${BF_LIB3DS}'
 
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr