Dictionary.h   Dictionary.h 
skipping to change at line 49 skipping to change at line 49
virtual ~Dictionary(); virtual ~Dictionary();
Node* Clone(); Node* Clone();
typedef std::map<std::string,Node*>::iterator iterator; typedef std::map<std::string,Node*>::iterator iterator;
Node* operator[](const std::string& key); Node* operator[](const std::string& key);
iterator Begin(); iterator Begin();
iterator End(); iterator End();
iterator Find(const std::string& key); iterator Find(const std::string& key);
iterator Insert(const std::string& key, Node* node); iterator Set(const std::string& key, Node* node);
DEPRECATED("use Set() instead") iterator Insert(const std::string& key,
Node* node);
void Remove(Node* node); void Remove(Node* node);
void Remove(const std::string& key); void Remove(const std::string& key);
std::string GetNodeKey(Node* key); std::string GetNodeKey(Node* key);
private : private :
std::map<std::string,Node*> _map; std::map<std::string,Node*> _map;
}; };
}; };
 End of changes. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added


 plist.h   plist.h 
skipping to change at line 47 skipping to change at line 47
typedef unsigned __int8 uint8_t; typedef unsigned __int8 uint8_t;
typedef unsigned __int16 uint16_t; typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t; typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t; typedef unsigned __int64 uint64_t;
#ifdef plist_EXPORTS #ifdef plist_EXPORTS
#define PLIST_API __declspec( dllexport ) #define PLIST_API __declspec( dllexport )
#else #else
#define PLIST_API __declspec( dllimport ) #define PLIST_API __declspec( dllimport )
#endif #endif
#define DEPRECATED(x) __declspec(deprecated(x))
#else #else
#include <stdint.h> #include <stdint.h>
#define PLIST_API #define PLIST_API
#ifdef __GNUC__
#define DEPRECATED(x) __attribute__((deprecated(x)))
#elif defined(_MSC_VER)
#else
#define DEPRECATED(x)
#pragma message("WARNING: You need to implement DEPRECATED for this compile
r")
#endif
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include <stdarg.h> #include <stdarg.h>
/** /**
* \mainpage libplist : A library to handle Apple Property Lists * \mainpage libplist : A library to handle Apple Property Lists
* \defgroup PublicAPI Public libplist API * \defgroup PublicAPI Public libplist API
*/ */
/*@{*/ /*@{*/
skipping to change at line 310 skipping to change at line 318
* Get the nth item in a #PLIST_DICT node. * Get the nth item in a #PLIST_DICT node.
* *
* @param node the node of type #PLIST_DICT * @param node the node of type #PLIST_DICT
* @param key the identifier of the item to get. * @param key the identifier of the item to get.
* @return the item or NULL if node is not of type #PLIST_DICT * @return the item or NULL if node is not of type #PLIST_DICT
*/ */
PLIST_API plist_t plist_dict_get_item(plist_t node, const char* key); PLIST_API plist_t plist_dict_get_item(plist_t node, const char* key);
/** /**
* Set item identified by key in a #PLIST_DICT node. * Set item identified by key in a #PLIST_DICT node.
* The previous item at index n will be freed using #plist_free * The previous item identified by key will be freed using #plist_free.
* If there is no item for the given key a new item will be inserted.
* *
* @param node the node of type #PLIST_DICT * @param node the node of type #PLIST_DICT
* @param item the new item associated to key * @param item the new item associated to key
* @param key the identifier of the item to get. Assert if identifier i s not present. * @param key the identifier of the item to set.
*/ */
PLIST_API void plist_dict_set_item(plist_t node, const char* key, plist _t item); PLIST_API void plist_dict_set_item(plist_t node, const char* key, plist _t item);
/** /**
* Insert a new item at position n in a #PLIST_DICT node. * Insert a new item into a #PLIST_DICT node.
*
* @deprecated Deprecated. Use plist_dict_set_item instead.
* *
* @param node the node of type #PLIST_DICT * @param node the node of type #PLIST_DICT
* @param item the new item to insert * @param item the new item to insert
* @param key The identifier of the item to insert. Assert if identifie r already present. * @param key The identifier of the item to insert.
*/ */
PLIST_API void plist_dict_insert_item(plist_t node, const char* key, pl ist_t item); DEPRECATED("use plist_dict_set_item instead") PLIST_API void plist_dict _insert_item(plist_t node, const char* key, plist_t item);
/** /**
* Remove an existing position in a #PLIST_DICT node. * Remove an existing position in a #PLIST_DICT node.
* Removed position will be freed using #plist_free * Removed position will be freed using #plist_free
* *
* @param node the node of type #PLIST_DICT * @param node the node of type #PLIST_DICT
* @param key The identifier of the item to remove. Assert if identifie r is not present. * @param key The identifier of the item to remove. Assert if identifie r is not present.
*/ */
PLIST_API void plist_dict_remove_item(plist_t node, const char* key); PLIST_API void plist_dict_remove_item(plist_t node, const char* key);
/**
* Merge a dictionary into another. This will add all key/value pairs
* from the source dictionary to the target dictionary, overwriting
* any existing key/value pairs that are already present in target.
*
* @param target pointer to an existing node of type #PLIST_DICT
* @param source node of type #PLIST_DICT that should be merged into ta
rget
*/
PLIST_API void plist_dict_merge(plist_t *target, plist_t source);
/******************************************** /********************************************
* * * *
* Getters * * Getters *
* * * *
********************************************/ ********************************************/
/** /**
* Get the parent of a node * Get the parent of a node
* *
* @param node the parent (NULL if node is root) * @param node the parent (NULL if node is root)
 End of changes. 8 change blocks. 
5 lines changed or deleted 28 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/