From 8186a9d371b2a31122643f75c65cef4e438ac97b Mon Sep 17 00:00:00 2001
From: Jonathan Beck
Date: Thu, 15 Oct 2009 19:28:30 +0200
Subject: Fix various mistakes in C++ bindings.

---
 include/plist/Array.h   | 6 +++---
 include/plist/Boolean.h | 1 +
 include/plist/Data.h    | 1 +
 include/plist/Date.h    | 1 +
 include/plist/Integer.h | 1 +
 include/plist/Node.h    | 2 +-
 include/plist/Real.h    | 1 +
 include/plist/String.h  | 1 +
 8 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'include')

diff --git a/include/plist/Array.h b/include/plist/Array.h
index 8f8d992..f990928 100644
--- a/include/plist/Array.h
+++ b/include/plist/Array.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
  */
 
-#ifndef STRING_H
-#define STRING_H
+#ifndef ARRAY_H
+#define ARRAY_H
 
 #include <plist/Structure.h>
 #include <vector>
@@ -49,4 +49,4 @@ class Array : public Structure
 
 };
 
-#endif // STRING_H
+#endif // ARRAY_H
diff --git a/include/plist/Boolean.h b/include/plist/Boolean.h
index 89761ca..01b5b85 100644
--- a/include/plist/Boolean.h
+++ b/include/plist/Boolean.h
@@ -31,6 +31,7 @@ class Boolean : public Node
 {
     public :
 	Boolean();
+	Boolean(plist_t node);
 	Boolean(bool b);
 	virtual ~Boolean();
 
diff --git a/include/plist/Data.h b/include/plist/Data.h
index f7e5cd2..92bda0a 100644
--- a/include/plist/Data.h
+++ b/include/plist/Data.h
@@ -32,6 +32,7 @@ class Data : public Node
 {
     public :
 	Data();
+	Data(plist_t node);
 	Data(std::vector<char>& buff);
 	virtual ~Data();
 
diff --git a/include/plist/Date.h b/include/plist/Date.h
index df185db..78d8601 100644
--- a/include/plist/Date.h
+++ b/include/plist/Date.h
@@ -31,6 +31,7 @@ class Date : public Node
 {
     public :
 	Date();
+	Date(plist_t node);
 	Date(uint64_t i);
 	virtual ~Date();
 
diff --git a/include/plist/Integer.h b/include/plist/Integer.h
index 8f1ecdb..823e3a0 100644
--- a/include/plist/Integer.h
+++ b/include/plist/Integer.h
@@ -31,6 +31,7 @@ class Integer : public Node
 {
     public :
 	Integer();
+	Integer(plist_t node);
 	Integer(uint64_t i);
 	virtual ~Integer();
 
diff --git a/include/plist/Node.h b/include/plist/Node.h
index 0f6100e..3be900a 100644
--- a/include/plist/Node.h
+++ b/include/plist/Node.h
@@ -31,7 +31,6 @@ class Node
 {
     public :
 	virtual ~Node();
-	Node(plist_t node);
 	Node(Node& node);
 	Node& operator=(const Node& node);
 	
@@ -40,6 +39,7 @@ class Node
 	
     protected:
 	Node();
+	Node(plist_t node);
 	Node(plist_type type);
 	plist_t _node;
 };
diff --git a/include/plist/Real.h b/include/plist/Real.h
index 272f431..8d898c7 100644
--- a/include/plist/Real.h
+++ b/include/plist/Real.h
@@ -31,6 +31,7 @@ class Real : public Node
 {
     public :
 	Real();
+	Real(plist_t node);
 	Real(double d);
 	virtual ~Real();
 
diff --git a/include/plist/String.h b/include/plist/String.h
index 14becac..5314065 100644
--- a/include/plist/String.h
+++ b/include/plist/String.h
@@ -32,6 +32,7 @@ class String : public Node
 {
     public :
 	String();
+	String(plist_t node);
 	String(std::string& s);
 	virtual ~String();
 
-- 
cgit v1.1-32-gdbae