diff options
| author | George Hazan <ghazan@miranda.im> | 2019-02-12 16:15:41 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-02-12 16:15:41 +0300 |
| commit | 7fce8a7217dd38316debcf2104fc8909c840a053 (patch) | |
| tree | 28a4066bde1f0851652aa8dd0105433d72ffc499 /include/m_xml.h | |
| parent | 34f7b71e7f52fe9a8368ed3ec182d3a1a0d48225 (diff) | |
tinyxml2 added to mir_core to replace the old xml parser
Diffstat (limited to 'include/m_xml.h')
| -rw-r--r-- | include/m_xml.h | 52 |
1 files changed, 15 insertions, 37 deletions
diff --git a/include/m_xml.h b/include/m_xml.h index 3319cfba27..a35997c7f4 100644 --- a/include/m_xml.h +++ b/include/m_xml.h @@ -28,43 +28,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <tchar.h>
#include <m_core.h>
+/////////////////////////////////////////////////////////////////////////////////////////
+// new API to replace the old one
+
+#ifdef MIR_CORE_EXPORTS
+#define TINYXML2_EXPORT 1
+#else
+#define TINYXML2_IMPORT 1
+#endif
+
+#include "../src/mir_core/src/tinyxml2.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// old API to be removed once
+
DECLARE_HANDLE(HXML);
-typedef int XML_ELEMENT_POS; // XML_ELEMENT_POS is not interchangeable with simple indexes
-
-enum XML_ELEMENT_TYPE
-{
- XML_ELEM_TYPE_CHILD = 0,
- XML_ELEM_TYPE_ATTRIBUTE = 1,
- XML_ELEM_TYPE_TEXT = 2,
- XML_ELEM_TYPE_CLEAR = 3,
-};
-
-/// Enumeration for XML parse errors.
-enum XMLError
-{
- eXMLErrorNone = 0,
- eXMLErrorMissingEndTag,
- eXMLErrorNoXMLTagFound,
- eXMLErrorEmpty,
- eXMLErrorMissingTagName,
- eXMLErrorMissingEndTagName,
- eXMLErrorUnmatchedEndTag,
- eXMLErrorUnmatchedEndClearTag,
- eXMLErrorUnexpectedToken,
- eXMLErrorNoElements,
- eXMLErrorFileNotFound,
- eXMLErrorFirstTagNotFound,
- eXMLErrorUnknownCharacterEntity,
- eXMLErrorCharacterCodeAbove255,
- eXMLErrorCharConversionError,
- eXMLErrorCannotOpenWriteFile,
- eXMLErrorCannotWriteFile,
-
- eXMLErrorBase64DataSizeIsNotMultipleOf4,
- eXMLErrorBase64DecodeIllegalCharacter,
- eXMLErrorBase64DecodeTruncatedData,
- eXMLErrorBase64DecodeBufferTooSmall
-};
EXTERN_C MIR_APP_DLL(HXML) xmlCreateNode(LPCTSTR name, LPCTSTR text, char isDeclaration);
EXTERN_C MIR_APP_DLL(void) xmlDestroyNode(HXML node);
@@ -100,6 +78,6 @@ EXTERN_C MIR_APP_DLL(void) xmlFree(void*); EXTERN_C MIR_APP_DLL(LPCTSTR) xmlGetClear(HXML, int i, LPCTSTR *openTag, LPCTSTR *closeTag);
EXTERN_C MIR_APP_DLL(HXML) xmlParseFile(LPCTSTR filename, int *datalen, LPCTSTR tag);
-EXTERN_C MIR_APP_DLL(XMLError) xmlToFile(HXML node, LPCTSTR filename, int withformattiing);
+EXTERN_C MIR_APP_DLL(int) xmlToFile(HXML node, LPCTSTR filename, int withformattiing);
#endif // M_XML_H__
|