Move some methods and drop Utils class in C++ binding.

4 files changed, 5 insertions, 44 deletions

diff --git a/include/plist/Node.h b/include/plist/Node.h
index 2f9f5b6..1da9ee1 100644
--- a/include/plist/Node.h
+++ b/include/plist/Node.h
@@ -38,6 +38,8 @@ public :
     plist_type GetType();
     plist_t GetPlist();
 
+    static Node* FromPlist(plist_t node, Node* parent = NULL);
+
 protected:
     Node(Node* parent = NULL);
     Node(plist_t node, Node* parent = NULL);
diff --git a/include/plist/Structure.h b/include/plist/Structure.h
index f6e4495..ace8b5c 100644
--- a/include/plist/Structure.h
+++ b/include/plist/Structure.h
@@ -41,6 +41,9 @@ public :
 
     virtual void Remove(Node* node) = 0;
 
+    static Structure* FromXml(const std::string& xml);
+    static Structure* FromBin(const std::vector<char>& bin);
+
 protected:
     Structure(Node* parent = NULL);
     Structure(plist_type type, Node* parent = NULL);
diff --git a/include/plist/Utils.h b/include/plist/Utils.h
deleted file mode 100644
index 52503a0..0000000
--- a/include/plist/Utils.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Utils.h
- * Import functions for C++ binding
- *
- * Copyright (c) 2009 Jonathan Beck All Rights Reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef PLIST__UTILS_H
-#define PLIST__UTILS_H
-
-#include <plist/Structure.h>
-#include <string>
-
-namespace PList
-{
-class Utils
-{
-public:
-    static Node* FromPlist(plist_t node, Node* parent = NULL);
-    static Structure* FromXml(const std::string& xml);
-    static Structure* FromBin(const std::vector<char>& bin);
-
-private:
-    Utils();
-    ~Utils();
-};
-};
-
-#endif // PLIST__UTILS_H
diff --git a/include/plist/plist++.h b/include/plist/plist++.h
index 79181c5..d5eb691 100644
--- a/include/plist/plist++.h
+++ b/include/plist/plist++.h
@@ -33,6 +33,5 @@
 #include "Real.h"
 #include "String.h"
 #include "Structure.h"
-#include "Utils.h"
 
 #endif