From 8c6a809fafa6befff7e2b1adc3df2bdb47042dd1 Mon Sep 17 00:00:00 2001 From: Jonathan Beck Date: Wed, 11 Nov 2009 00:18:14 +0100 Subject: Move some methods and drop Utils class in C++ binding. --- include/CMakeLists.txt | 1 - include/plist/Node.h | 2 ++ include/plist/Structure.h | 3 +++ include/plist/Utils.h | 43 ------------------------------------------- include/plist/plist++.h | 1 - 5 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 include/plist/Utils.h (limited to 'include') diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 00dbbda..ea77d45 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -11,7 +11,6 @@ SET( libplist_HDR ${CMAKE_CURRENT_SOURCE_DIR}/plist/Real.h ${CMAKE_CURRENT_SOURCE_DIR}/plist/String.h ${CMAKE_CURRENT_SOURCE_DIR}/plist/Structure.h - ${CMAKE_CURRENT_SOURCE_DIR}/plist/Utils.h ) INSTALL( FILES ${libplist_HDR} 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& 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 -#include - -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& 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 -- cgit v1.1-32-gdbae