- Fix build with 4.X

Submitted by:	German Tischler <tanis@gaspode.franken.de> (maintainer via privat mail)

10 files changed, 103 insertions, 103 deletions

diff --git a/graphics/libx3dtk/files/patch-MESH_SFVertex.inl b/graphics/libx3dtk/files/patch-MESH_SFVertex.inl
index f671d9b6c8b7..928a7f18e114 100644
--- a/graphics/libx3dtk/files/patch-MESH_SFVertex.inl
+++ b/graphics/libx3dtk/files/patch-MESH_SFVertex.inl
@@ -2,30 +2,30 @@
 --- include/X3DTK/private/MESH_SFVertex.inl	Sat Dec 16 15:55:20 2006
 ***************
 *** 46,58 ****
-  #endif
-  
-  template<class MData, class VData, class EData, class FData, bool RW>
-! SFTemplateVertex<MData, VData, EData, FData, RW>::SFTemplateVertex<MData, VData, EData, FData, RW>(unsigned int i)
-  : BaseSFVertex(i)
-  {
-  }
-  
-  template<class MData, class VData, class EData, class FData, bool RW>
-! SFTemplateVertex<MData, VData, EData, FData, RW>::~SFTemplateVertex<MData, VData, EData, FData, RW>()
-  {
-  }
-  
+  #endif

+  

+  template<class MData, class VData, class EData, class FData, bool RW>

+! SFTemplateVertex<MData, VData, EData, FData, RW>::SFTemplateVertex<MData, VData, EData, FData, RW>(unsigned int i)

+  : BaseSFVertex(i)

+  {

+  }

+  

+  template<class MData, class VData, class EData, class FData, bool RW>

+! SFTemplateVertex<MData, VData, EData, FData, RW>::~SFTemplateVertex<MData, VData, EData, FData, RW>()

+  {

+  }

+  

 --- 46,58 ----
-  #endif
-  
-  template<class MData, class VData, class EData, class FData, bool RW>
-! SFTemplateVertex<MData, VData, EData, FData, RW>::SFTemplateVertex(unsigned int i)
-  : BaseSFVertex(i)
-  {
-  }
-  
-  template<class MData, class VData, class EData, class FData, bool RW>
-! SFTemplateVertex<MData, VData, EData, FData, RW>::~SFTemplateVertex()
-  {
-  }
-  
+  #endif

+  

+  template<class MData, class VData, class EData, class FData, bool RW>

+! SFTemplateVertex<MData, VData, EData, FData, RW>::SFTemplateVertex(unsigned int i)

+  : BaseSFVertex(i)

+  {

+  }

+  

+  template<class MData, class VData, class EData, class FData, bool RW>

+! SFTemplateVertex<MData, VData, EData, FData, RW>::~SFTemplateVertex()

+  {

+  }

+  

diff --git a/graphics/libx3dtk/files/patch-X3DField.h b/graphics/libx3dtk/files/patch-X3DField.h
index 82c0c718ee94..f0cbcd658a76 100644
--- a/graphics/libx3dtk/files/patch-X3DField.h
+++ b/graphics/libx3dtk/files/patch-X3DField.h
@@ -3,20 +3,20 @@
 ***************
 *** 55,60 ****
 --- 55,61 ----
-  class X3DFieldLoader
-  {
-  public:
-+   virtual ~X3DFieldLoader() {}
-    virtual void load(X3DField &field, const SFString &value) = 0;
-  };
-  
+  class X3DFieldLoader

+  {

+  public:

++   virtual ~X3DFieldLoader() {}

+    virtual void load(X3DField &field, const SFString &value) = 0;

+  };

+  

 ***************
 *** 69,74 ****
 --- 70,76 ----
-  class X3DFieldWriter
-  {
-  public:
-+   virtual ~X3DFieldWriter() {}
-    virtual SFString write(const X3DField &field) = 0;
-    virtual void writeToFile(SFString &output, const SFString &name, const X3DField &field, const SFString &init) = 0;
-  };
+  class X3DFieldWriter

+  {

+  public:

++   virtual ~X3DFieldWriter() {}

+    virtual SFString write(const X3DField &field) = 0;

+    virtual void writeToFile(SFString &output, const SFString &name, const X3DField &field, const SFString &init) = 0;

+  };

diff --git a/graphics/libx3dtk/files/patch-X3DMFNodeFunctor.h b/graphics/libx3dtk/files/patch-X3DMFNodeFunctor.h
index 457d0fc54116..68160ed81051 100644
--- a/graphics/libx3dtk/files/patch-X3DMFNodeFunctor.h
+++ b/graphics/libx3dtk/files/patch-X3DMFNodeFunctor.h
@@ -3,10 +3,10 @@
 ***************
 *** 26,31 ****
 --- 26,32 ----
-  class X3DMFNodeFunctor
-  {
-  public:
-+   virtual ~X3DMFNodeFunctor() {}
-    virtual const MFNode &getNodes(X3DAbstractNode const *N) = 0;
-    virtual bool addNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
-    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
+  class X3DMFNodeFunctor

+  {

+  public:

++   virtual ~X3DMFNodeFunctor() {}

+    virtual const MFNode &getNodes(X3DAbstractNode const *N) = 0;

+    virtual bool addNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;

+    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;

diff --git a/graphics/libx3dtk/files/patch-X3DMemberFunctor.h b/graphics/libx3dtk/files/patch-X3DMemberFunctor.h
index ae4c63610e3d..c4de7239d21a 100644
--- a/graphics/libx3dtk/files/patch-X3DMemberFunctor.h
+++ b/graphics/libx3dtk/files/patch-X3DMemberFunctor.h
@@ -3,10 +3,10 @@
 ***************
 *** 28,33 ****
 --- 28,34 ----
-  class X3DMemberFunctor
-  {
-  public:
-+   virtual ~X3DMemberFunctor() {}
-    virtual X3DField getValueOf(X3DAbstractNode const *N) const = 0;
-    virtual void setValueOf(X3DAbstractNode *N, const X3DField &field) = 0;
-  };
+  class X3DMemberFunctor

+  {

+  public:

++   virtual ~X3DMemberFunctor() {}

+    virtual X3DField getValueOf(X3DAbstractNode const *N) const = 0;

+    virtual void setValueOf(X3DAbstractNode *N, const X3DField &field) = 0;

+  };

diff --git a/graphics/libx3dtk/files/patch-X3DNodeCloner.h b/graphics/libx3dtk/files/patch-X3DNodeCloner.h
index a40d210b5bc3..f4f654e0d9af 100644
--- a/graphics/libx3dtk/files/patch-X3DNodeCloner.h
+++ b/graphics/libx3dtk/files/patch-X3DNodeCloner.h
@@ -3,10 +3,10 @@
 ***************
 *** 24,29 ****
 --- 24,30 ----
-  class X3DNodeCloner
-  {
-  public:
-+   virtual ~X3DNodeCloner() {}
-    virtual SFNode create() const = 0;
-  };
-  
+  class X3DNodeCloner

+  {

+  public:

++   virtual ~X3DNodeCloner() {}

+    virtual SFNode create() const = 0;

+  };

+  

diff --git a/graphics/libx3dtk/files/patch-X3DSFNodeFunctor.h b/graphics/libx3dtk/files/patch-X3DSFNodeFunctor.h
index 20df2b8217cb..7c532274ffce 100644
--- a/graphics/libx3dtk/files/patch-X3DSFNodeFunctor.h
+++ b/graphics/libx3dtk/files/patch-X3DSFNodeFunctor.h
@@ -3,10 +3,10 @@
 ***************
 *** 26,31 ****
 --- 26,32 ----
-  class X3DSFNodeFunctor
-  {
-  public:
-+   virtual ~X3DSFNodeFunctor() {}
-    virtual X3DAbstractNode *getNode(X3DAbstractNode const *N) = 0;
-    virtual bool setNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
-    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
+  class X3DSFNodeFunctor

+  {

+  public:

++   virtual ~X3DSFNodeFunctor() {}

+    virtual X3DAbstractNode *getNode(X3DAbstractNode const *N) = 0;

+    virtual bool setNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;

+    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;

diff --git a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DField.h b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DField.h
index e7c00365c730..f9a2c86950d1 100644
--- a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DField.h
+++ b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DField.h
@@ -3,20 +3,20 @@
 ***************
 *** 55,60 ****
 --- 55,61 ----
-  class X3DFieldLoader
-  {
-  public:
-+   virtual ~X3DFieldLoader() {}
-    virtual void load(X3DField &field, const SFString &value) = 0;
-  };
-  
+  class X3DFieldLoader

+  {

+  public:

++   virtual ~X3DFieldLoader() {}

+    virtual void load(X3DField &field, const SFString &value) = 0;

+  };

+  

 ***************
 *** 69,74 ****
 --- 70,76 ----
-  class X3DFieldWriter
-  {
-  public:
-+   virtual ~X3DFieldWriter() {}
-    virtual SFString write(const X3DField &field) = 0;
-    virtual void writeToFile(SFString &output, const SFString &name, const X3DField &field, const SFString &init) = 0;
-  };
+  class X3DFieldWriter

+  {

+  public:

++   virtual ~X3DFieldWriter() {}

+    virtual SFString write(const X3DField &field) = 0;

+    virtual void writeToFile(SFString &output, const SFString &name, const X3DField &field, const SFString &init) = 0;

+  };

diff --git a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMFNodeFunctor.h b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMFNodeFunctor.h
index 0bfc0877c542..8dc9c3657cdc 100644
--- a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMFNodeFunctor.h
+++ b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMFNodeFunctor.h
@@ -3,10 +3,10 @@
 ***************
 *** 26,31 ****
 --- 26,32 ----
-  class X3DMFNodeFunctor
-  {
-  public:
-+   virtual ~X3DMFNodeFunctor() {}
-    virtual const MFNode &getNodes(X3DAbstractNode const *N) = 0;
-    virtual bool addNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
-    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
+  class X3DMFNodeFunctor

+  {

+  public:

++   virtual ~X3DMFNodeFunctor() {}

+    virtual const MFNode &getNodes(X3DAbstractNode const *N) = 0;

+    virtual bool addNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;

+    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;

diff --git a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMemberFunctor.h b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMemberFunctor.h
index 36d61f52cd94..6a8886770b65 100644
--- a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMemberFunctor.h
+++ b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DMemberFunctor.h
@@ -3,10 +3,10 @@
 ***************
 *** 28,33 ****
 --- 28,34 ----
-  class X3DMemberFunctor
-  {
-  public:
-+   virtual ~X3DMemberFunctor() {}
-    virtual X3DField getValueOf(X3DAbstractNode const *N) const = 0;
-    virtual void setValueOf(X3DAbstractNode *N, const X3DField &field) = 0;
-  };
+  class X3DMemberFunctor

+  {

+  public:

++   virtual ~X3DMemberFunctor() {}

+    virtual X3DField getValueOf(X3DAbstractNode const *N) const = 0;

+    virtual void setValueOf(X3DAbstractNode *N, const X3DField &field) = 0;

+  };

diff --git a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DSFNodeFunctor.h b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DSFNodeFunctor.h
index 1fb71d7a50b1..ac506ebf5faf 100644
--- a/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DSFNodeFunctor.h
+++ b/graphics/libx3dtk/files/patch-src-kernel-abstractNode-X3DSFNodeFunctor.h
@@ -3,10 +3,10 @@
 ***************
 *** 26,31 ****
 --- 26,32 ----
-  class X3DSFNodeFunctor
-  {
-  public:
-+   virtual ~X3DSFNodeFunctor() {}
-    virtual X3DAbstractNode *getNode(X3DAbstractNode const *N) = 0;
-    virtual bool setNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
-    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;
+  class X3DSFNodeFunctor

+  {

+  public:

++   virtual ~X3DSFNodeFunctor() {}

+    virtual X3DAbstractNode *getNode(X3DAbstractNode const *N) = 0;

+    virtual bool setNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;

+    virtual bool removeNode(X3DAbstractNode *N, X3DAbstractNode *C) = 0;