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

5 files changed, 8 insertions, 5 deletions

diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index 2369caf4566..1ab37246469 100755
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -117,6 +117,7 @@ public:
 # else
     inline incoming_edge_iterator() : iterator<input_iterator_tag, WOEdge*,ptrdiff_t>() {}
 # endif
+	virtual ~incoming_edge_iterator() {}; //soc
 
   protected:
     friend class WVertex;
@@ -197,6 +198,7 @@ public:
 # else
     inline face_iterator() : iterator<input_iterator_tag, WFace*,ptrdiff_t>() {}
 # endif
+	virtual ~face_iterator() {}; //soc
 
   protected:
     friend class WVertex;
@@ -308,6 +310,7 @@ public:
     _pOwner = NULL;
     userdata = NULL;
   }
+  virtual ~WOEdge() {}; //soc
 
   /*! copy constructor */
   WOEdge(WOEdge& iBrother);
diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
index cf3734b488e..55fa418d4f5 100755
--- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
@@ -19,7 +19,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "WSEdge.h"
+#include "WEdge.h"
 #include "WSFillGrid.h"
 
 void WSFillGrid::fillGrid() {
diff --git a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
index 976fdca8e46..2ea5bc6c621 100755
--- a/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
@@ -31,8 +31,8 @@
 #ifndef  WS_FILL_GRID_H
 # define WS_FILL_GRID_H
 
-# include "Grid.h" 
-# include "Polygon.h"
+# include "../geometry/Grid.h" 
+# include "../geometry/Polygon.h"
 # include "WEdge.h"
 
 class LIB_WINGED_EDGE_EXPORT WSFillGrid
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index beacb1a9ca9..66204ba5e99 100755
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -208,7 +208,7 @@ public:
   WXSmoothEdge * _pSmoothEdge;
   WXNature _Nature;
 
-  //tmp values
+  //oldtmp values
   unsigned _nPosDotP; // count the number of positive dot products for vertices.
                       // if this number is != 0 and !=_DotP.size() -> it is a silhouette fac
 
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index 98e7c269248..e611c1106f2 100755
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -64,7 +64,7 @@ void WingedEdgeBuilder::visitNodeTransformAfter(NodeTransform&) {
 void WingedEdgeBuilder::buildWShape(WShape& shape, IndexedFaceSet& ifs) {
   unsigned	vsize = ifs.vsize();
   unsigned	nsize = ifs.nsize();
-  unsigned	tsize = ifs.tsize();
+  //soc unused - unsigned	tsize = ifs.tsize();
 
   const real*	vertices = ifs.vertices();
   const real*	normals = ifs.normals();