From 34f7b71e7f52fe9a8368ed3ec182d3a1a0d48225 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 11 Feb 2019 19:23:19 +0300 Subject: unused xml api items removed --- src/mir_app/src/mir_app.def | 27 ------ src/mir_app/src/mir_app64.def | 27 ------ src/mir_app/src/xmlApi.cpp | 186 ------------------------------------------ 3 files changed, 240 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 82d6345ebf..8c720db6db 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -130,18 +130,8 @@ xmlAddAttr @143 xmlAddAttrInt @144 xmlAddChild @145 xmlAddChild2 @146 -xmlAddChildEx @147 -xmlAddChildEx2 @148 -xmlAddClear @149 -xmlAddText @150 xmlCopyNode @151 xmlCreateNode @152 -xmlDeepCopy @153 -xmlDeleteAttrByIndex @154 -xmlDeleteAttrByName @155 -xmlDeleteClear @156 -xmlDeleteNodeContent @157 -xmlDeleteText @158 xmlDestroyNode @159 xmlFree @160 xmlGetAttr @161 @@ -153,34 +143,17 @@ xmlGetChildByAttrValue @166 xmlGetChildByPath @167 xmlGetChildCount @168 xmlGetClear @169 -xmlGetClearCount @170 -xmlGetElement @171 -xmlGetElementCount @172 xmlGetFirstChild @173 xmlGetName @174 -xmlGetNextChild @175 xmlGetNextNode @176 xmlGetNthChild @177 xmlGetParent @178 xmlGetText @179 -xmlGetTextByIndex @180 -xmlGetTextCount @181 -xmlIsDeclaration @182 xmlParseFile @183 xmlParseString @184 -xmlPositionOfChildByIndex @185 -xmlPositionOfChildByName @186 -xmlPositionOfChildByNode @187 -xmlPositionOfClear @188 -xmlPositionOfText @189 -xmlSetAttrByIndex @190 -xmlSetAttrByName @191 -xmlSetClear @192 xmlSetText @193 -xmlSetTextByIndex @194 xmlToFile @195 xmlToString @196 -xmlToStringWithFormatting @197 KillModuleMenus @198 Utils_ReplaceVars @199 Utils_ReplaceVarsW @200 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index f17e4dc692..30593c184e 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -130,18 +130,8 @@ xmlAddAttr @143 xmlAddAttrInt @144 xmlAddChild @145 xmlAddChild2 @146 -xmlAddChildEx @147 -xmlAddChildEx2 @148 -xmlAddClear @149 -xmlAddText @150 xmlCopyNode @151 xmlCreateNode @152 -xmlDeepCopy @153 -xmlDeleteAttrByIndex @154 -xmlDeleteAttrByName @155 -xmlDeleteClear @156 -xmlDeleteNodeContent @157 -xmlDeleteText @158 xmlDestroyNode @159 xmlFree @160 xmlGetAttr @161 @@ -153,34 +143,17 @@ xmlGetChildByAttrValue @166 xmlGetChildByPath @167 xmlGetChildCount @168 xmlGetClear @169 -xmlGetClearCount @170 -xmlGetElement @171 -xmlGetElementCount @172 xmlGetFirstChild @173 xmlGetName @174 -xmlGetNextChild @175 xmlGetNextNode @176 xmlGetNthChild @177 xmlGetParent @178 xmlGetText @179 -xmlGetTextByIndex @180 -xmlGetTextCount @181 -xmlIsDeclaration @182 xmlParseFile @183 xmlParseString @184 -xmlPositionOfChildByIndex @185 -xmlPositionOfChildByName @186 -xmlPositionOfChildByNode @187 -xmlPositionOfClear @188 -xmlPositionOfText @189 -xmlSetAttrByIndex @190 -xmlSetAttrByName @191 -xmlSetClear @192 xmlSetText @193 -xmlSetTextByIndex @194 xmlToFile @195 xmlToString @196 -xmlToStringWithFormatting @197 KillModuleMenus @198 Utils_ReplaceVars @199 Utils_ReplaceVarsW @200 diff --git a/src/mir_app/src/xmlApi.cpp b/src/mir_app/src/xmlApi.cpp index 9243dce6d7..3545529df1 100644 --- a/src/mir_app/src/xmlApi.cpp +++ b/src/mir_app/src/xmlApi.cpp @@ -124,11 +124,6 @@ MIR_APP_DLL(HXML) xmlGetNthChild(HXML _n, LPCTSTR name, int i) return XMLNode(_n).getChildNode(name, i); } -MIR_APP_DLL(HXML) xmlGetNextChild(HXML _n, LPCTSTR name, int* i) -{ - return XMLNode(_n).getChildNode(name, i); -} - MIR_APP_DLL(HXML) xmlGetNextNode(HXML _n) { return XMLNode(_n).getNextNode(); @@ -192,37 +187,6 @@ MIR_APP_DLL(void) xmlFree(void* p) free(p); } -//) xml API v2 methods -MIR_APP_DLL(int) xmlGetTextCount(HXML _n) -{ - return XMLNode(_n).nText(); -} - -MIR_APP_DLL(LPCTSTR) xmlGetTextByIndex(HXML _n, int i) -{ - return XMLNode(_n).getText(i); -} - -MIR_APP_DLL(void) xmlSetTextByIndex(HXML _n, int i, LPCTSTR value) -{ - XMLNode(_n).updateText(value, i); -} - -MIR_APP_DLL(void) xmlAddText(HXML _n, LPCTSTR value, XML_ELEMENT_POS pos) -{ - XMLNode(_n).addText(value, (XMLElementPosition)pos); -} - -MIR_APP_DLL(LPTSTR) xmlToStringWithFormatting(HXML _n, int* datalen) -{ - return XMLNode(_n).createXMLString(1, datalen); -} - -MIR_APP_DLL(int) xmlGetClearCount(HXML _n) -{ - return XMLNode(_n).nClear(); -} - MIR_APP_DLL(LPCTSTR) xmlGetClear(HXML _n, int i, LPCTSTR *openTag, LPCTSTR *closeTag) { XMLClear c = XMLNode(_n).getClear(i); @@ -232,153 +196,3 @@ MIR_APP_DLL(LPCTSTR) xmlGetClear(HXML _n, int i, LPCTSTR *openTag, LPCTSTR *clos *closeTag = c.lpszCloseTag; return c.lpszValue; } - -MIR_APP_DLL(void) xmlAddClear(HXML _n, LPCTSTR lpszValue, LPCTSTR openTag, LPCTSTR closeTag, XML_ELEMENT_POS pos) -{ - XMLNode(_n).addClear(lpszValue, openTag, closeTag, (XMLElementPosition)pos); -} - -MIR_APP_DLL(void) xmlSetClear(HXML _n, int i, LPCTSTR lpszValue) -{ - XMLNode(_n).updateClear(lpszValue, i); -} - -MIR_APP_DLL(int) xmlGetElement(HXML _n, XML_ELEMENT_POS pos, XML_ELEMENT_TYPE *type, HXML *child, LPCTSTR *value, LPCTSTR *name, LPCTSTR *openTag, LPCTSTR *closeTag) -{ - // reset all values - if (child) - *child = nullptr; - if (value) - *value = nullptr; - if (name) - *name = nullptr; - if (openTag) - *openTag = nullptr; - if (closeTag) - *closeTag = nullptr; - - if (!type || pos >= XMLNode(_n).nElement()) - return false; - - XMLNodeContents c(XMLNode(_n).enumContents((XMLElementPosition)pos)); - switch (c.etype) { - case eNodeChild: - *type = XML_ELEM_TYPE_CHILD; - if (child) - *child = c.child; - break; - - case eNodeAttribute: - *type = XML_ELEM_TYPE_ATTRIBUTE; - if (name) - *name = c.attrib.lpszName; - if (value) - *value = c.attrib.lpszValue; - break; - - case eNodeText: - *type = XML_ELEM_TYPE_TEXT; - if (value) - *value = c.text; - break; - - case eNodeClear: - *type = XML_ELEM_TYPE_CLEAR; - if (value) - *value = c.clear.lpszValue; - if (openTag) - *openTag = c.clear.lpszOpenTag; - if (closeTag) - *closeTag = c.clear.lpszCloseTag; - break; - - case eNodeNULL: - return false; - } - return true; -} - -MIR_APP_DLL(int) xmlGetElementCount(HXML _n) -{ - return XMLNode(_n).nElement(); -} - -MIR_APP_DLL(char) xmlIsDeclaration(HXML _n) -{ - return XMLNode(_n).isDeclaration(); -} - -MIR_APP_DLL(HXML) xmlDeepCopy(HXML _n) -{ - return XMLNode(_n).deepCopy().detach(); -} - -MIR_APP_DLL(HXML) xmlAddChildEx(HXML _n, LPCTSTR name, char isDeclaration, XML_ELEMENT_POS pos) -{ - return XMLNode(_n).addChild(name, isDeclaration, (XMLElementPosition)pos); -} - -MIR_APP_DLL(void) xmlAddChildEx2(HXML _n, HXML parent, XML_ELEMENT_POS pos) -{ - XMLNode(_n).addChild(parent, (XMLElementPosition)pos); -} - -MIR_APP_DLL(void) xmlSetAttrByIndex(HXML _n, int i, LPCTSTR value) -{ - XMLNode(_n).updateAttribute(value, nullptr, i); -} - -MIR_APP_DLL(void) xmlSetAttrByName(HXML _n, LPCTSTR name, LPCTSTR value) -{ - XMLNode(_n).updateAttribute(value, nullptr, name); -} - -MIR_APP_DLL(void) xmlDeleteNodeContent(HXML _n) -{ - XMLNode(_n).deleteNodeContent(); -} - -MIR_APP_DLL(void) xmlDeleteAttrByIndex(HXML _n, int i) -{ - XMLNode(_n).deleteAttribute(i); -} - -MIR_APP_DLL(void) xmlDeleteAttrByName(HXML _n, LPCTSTR name) -{ - XMLNode(_n).deleteAttribute(name); -} - -MIR_APP_DLL(void) xmlDeleteText(HXML _n, int i) -{ - XMLNode(_n).deleteText(i); -} - -MIR_APP_DLL(void) xmlDeleteClear(HXML _n, int i) -{ - XMLNode(_n).deleteClear(i); -} - -MIR_APP_DLL(XML_ELEMENT_POS) xmlPositionOfText(HXML _n, int i) -{ - return (XML_ELEMENT_POS)XMLNode(_n).positionOfText(i); -} - -MIR_APP_DLL(XML_ELEMENT_POS) xmlPositionOfClear(HXML _n, int i) -{ - return (XML_ELEMENT_POS)XMLNode(_n).positionOfClear(i); -} - -MIR_APP_DLL(XML_ELEMENT_POS) xmlPositionOfChildByIndex(HXML _n, int i) -{ - return (XML_ELEMENT_POS)XMLNode(_n).positionOfChildNode(i); -} - -MIR_APP_DLL(XML_ELEMENT_POS) xmlPositionOfChildByNode(HXML _n, HXML child) -{ - return (XML_ELEMENT_POS)XMLNode(_n).positionOfChildNode(child); -} - -MIR_APP_DLL(XML_ELEMENT_POS) xmlPositionOfChildByName(HXML _n, LPCTSTR name, int i) -{ - return (XML_ELEMENT_POS)XMLNode(_n).positionOfChildNode(name, i); -} -- cgit v1.2.3