diff --git a/gb.xml/src/CDocument.cpp b/gb.xml/src/CDocument.cpp index 1f6fdb4e7..1a8e34776 100644 --- a/gb.xml/src/CDocument.cpp +++ b/gb.xml/src/CDocument.cpp @@ -213,8 +213,8 @@ GB_DESC CDocumentDesc[] = { GB_DECLARE("XmlDocument", sizeof(CDocument)), - GB_METHOD("_new", "", CDocument_new, "[(FileName)s]"), - GB_METHOD("_free", "", CDocument_free, ""), + GB_METHOD("_new", NULL, CDocument_new, "[(FileName)s]"), + GB_METHOD("_free", NULL, CDocument_free, NULL), GB_METHOD("CreateElement", "XmlElement", CDocument_createElement, "(TagName)s"), GB_PROPERTY("Root", "XmlElement", CDocument_root), @@ -225,13 +225,13 @@ GB_DESC CDocumentDesc[] = GB_PROPERTY("Content", "s", CDocument_content), - GB_METHOD("FromString", "", CDocument_fromString, "(Data)s"), - GB_METHOD("HtmlFromString", "", CDocument_fromString, "(Data)s"), + GB_METHOD("FromString", NULL, CDocument_fromString, "(Data)s"), + GB_METHOD("HtmlFromString", NULL, CDocument_fromString, "(Data)s"), GB_METHOD("ToString", "s", CDocument_tostring, "[(Indent)b]"), - GB_METHOD("Open", "", CDocument_open, "(FileName)s"), - GB_METHOD("Save", "", CDocument_save, "(FileName)s[(Indent)b]"), - GB_METHOD("Write", "", CDocument_save, "(FileName)s[(Indent)b]"), + GB_METHOD("Open", NULL, CDocument_open, "(FileName)s"), + GB_METHOD("Save", NULL, CDocument_save, "(FileName)s[(Indent)b]"), + GB_METHOD("Write", NULL, CDocument_save, "(FileName)s[(Indent)b]"), GB_END_DECLARE diff --git a/gb.xml/src/CElement.cpp b/gb.xml/src/CElement.cpp index 9e6c3384e..8dc3a248e 100644 --- a/gb.xml/src/CElement.cpp +++ b/gb.xml/src/CElement.cpp @@ -324,23 +324,23 @@ GB_DESC CElementDesc[] = { GB_DECLARE("XmlElement", sizeof(CNode)), GB_INHERITS("XmlNode"), - GB_METHOD("_new", "", CElement_new, "[(TagName)s]"), + GB_METHOD("_new", NULL, CElement_new, "[(TagName)s]"), - GB_METHOD("AppendChild", "", CElement_appendChild, "(NewChild)XmlNode"), - GB_METHOD("AppendChildren", "", CElement_appendChildren, "(NewChildren)XmlNode[]"), - GB_METHOD("PrependChild", "", CElement_prependChild, "(NewChild)XmlNode"), - GB_METHOD("InsertAfter", "", CElement_insertAfter, "(Child)XmlNode;(NewChild)XmlNode"), - GB_METHOD("InsertBefore", "", CElement_insertBefore, "(Child)XmlNode;(NewChild)XmlNode"), - GB_METHOD("RemoveChild", "", CElement_removeChild, "(OldChild)XmlNode"), - GB_METHOD("ReplaceChild", "", CElement_replaceChild, "(OldChild)XmlNode;(NewChild)XmlNode"), - GB_METHOD("ClearChildren", "", CElement_clearChildren, ""), + GB_METHOD("AppendChild", NULL, CElement_appendChild, "(NewChild)XmlNode"), + GB_METHOD("AppendChildren", NULL, CElement_appendChildren, "(NewChildren)XmlNode[]"), + GB_METHOD("PrependChild", NULL, CElement_prependChild, "(NewChild)XmlNode"), + GB_METHOD("InsertAfter", NULL, CElement_insertAfter, "(Child)XmlNode;(NewChild)XmlNode"), + GB_METHOD("InsertBefore", NULL, CElement_insertBefore, "(Child)XmlNode;(NewChild)XmlNode"), + GB_METHOD("RemoveChild", NULL, CElement_removeChild, "(OldChild)XmlNode"), + GB_METHOD("ReplaceChild", NULL, CElement_replaceChild, "(OldChild)XmlNode;(NewChild)XmlNode"), + GB_METHOD("ClearChildren", NULL, CElement_clearChildren, ""), - GB_METHOD("AppendText", "", CElement_appendText, "(Data)s"), - GB_METHOD("AppendFromText", "", CElement_appendFromText, "(Data)s(Arguments)."), + GB_METHOD("AppendText", NULL, CElement_appendText, "(Data)s"), + GB_METHOD("AppendFromText", NULL, CElement_appendFromText, "(Data)s(Arguments)."), GB_METHOD("GetAttribute", "s", CElement_getAttribute, "(Name)s[(Mode)i]"), - GB_METHOD("RemoveAttribute", "", CElement_removeAttribute, "(Name)s"), - GB_METHOD("SetAttribute", "", CElement_setAttribute, "(Name)s(Value)s"), + GB_METHOD("RemoveAttribute", NULL, CElement_removeAttribute, "(Name)s"), + GB_METHOD("SetAttribute", NULL, CElement_setAttribute, "(Name)s(Value)s"), GB_METHOD("IsAttributeSet", "b", CElement_isAttributeSet, "(Name)s"), @@ -371,18 +371,18 @@ GB_DESC CElementDesc[] = GB_DESC CElementDesc[] = { GB_DECLARE("XmlElement", sizeof(CElement)), GB_INHERITS("XmlNode"), - GB_METHOD("_new", "", CElement_new, "[(TagName)s]"), - GB_METHOD("_free", "", CElement_free, ""), - GB_METHOD("AppendChild", "", CElement_AppendChild, "(NewChild)XmlNode"), - GB_METHOD("AppendChildren", "", CElement_AppendChildren, "(NewChildren)XmlNode[]"), - GB_METHOD("PrependChild", "", CElement_prependChild, "(NewChild)XmlNode"), - GB_METHOD("InsertAfter", "", CElement_insertAfter, "(Child)XmlNode;(NewChild)XmlNode"), - GB_METHOD("InsertBefore", "", CElement_insertBefore, "(Child)XmlNode;(NewChild)XmlNode"), - GB_METHOD("AppendText", "", CElement_AppendText, "(NewText)s"), - GB_METHOD("AppendFromText", "", CElement_appendFromText, "(Data)s"), - GB_METHOD("RemoveChild", "", CElement_removeChild, "(OldChild)XmlNode"), - GB_METHOD("ReplaceChild", "", CElement_replaceChild, "(OldChild)XmlNode;(NewChild)XmlNode"), - GB_METHOD("NewElement", "", CElement_newElement, "(Name)s[(Value)s]"), + GB_METHOD("_new", NULL, CElement_new, "[(TagName)s]"), + GB_METHOD("_free", NULL, CElement_free, ""), + GB_METHOD("AppendChild", NULL, CElement_AppendChild, "(NewChild)XmlNode"), + GB_METHOD("AppendChildren", NULL, CElement_AppendChildren, "(NewChildren)XmlNode[]"), + GB_METHOD("PrependChild", NULL, CElement_prependChild, "(NewChild)XmlNode"), + GB_METHOD("InsertAfter", NULL, CElement_insertAfter, "(Child)XmlNode;(NewChild)XmlNode"), + GB_METHOD("InsertBefore", NULL, CElement_insertBefore, "(Child)XmlNode;(NewChild)XmlNode"), + GB_METHOD("AppendText", NULL, CElement_AppendText, "(NewText)s"), + GB_METHOD("AppendFromText", NULL, CElement_appendFromText, "(Data)s"), + GB_METHOD("RemoveChild", NULL, CElement_removeChild, "(OldChild)XmlNode"), + GB_METHOD("ReplaceChild", NULL, CElement_replaceChild, "(OldChild)XmlNode;(NewChild)XmlNode"), + GB_METHOD("NewElement", NULL, CElement_newElement, "(Name)s[(Value)s]"), GB_PROPERTY("TagName", "s", CElement_tagName), @@ -390,8 +390,8 @@ GB_DESC CElementDesc[] = GB_PROPERTY_READ("NextSibling", "XmlElement", CElement_nextSibling), GB_METHOD("GetAttribute", "s", CElement_getAttribute, "(Name)s"), - GB_METHOD("SetAttribute", "", CElement_setAttribute, "(Name)s(Value)s"), - GB_METHOD("NewAttribute", "", CElement_setAttribute, "(Name)s(Value)s"), + GB_METHOD("SetAttribute", NULL, CElement_setAttribute, "(Name)s(Value)s"), + GB_METHOD("NewAttribute", NULL, CElement_setAttribute, "(Name)s(Value)s"), GB_METHOD("IsAttributeSet", "b", CElement_isAttributeSet, "(Name)s"), GB_PROPERTY_READ("ChildNodes", "XmlNode[]", CElement_childNodes), diff --git a/gb.xml/src/CExplorer.cpp b/gb.xml/src/CExplorer.cpp index cf0be41ab..dc1da9ba9 100644 --- a/gb.xml/src/CExplorer.cpp +++ b/gb.xml/src/CExplorer.cpp @@ -139,16 +139,16 @@ GB_DESC CExplorerDesc[] = { GB_DECLARE("XmlExplorer", sizeof(CExplorer)), - GB_METHOD("_new", "", CExplorer_new, "[(Document)XmlDocument]"), - GB_METHOD("_free", "", CExplorer_free, ""), - GB_METHOD("Load", "", CExplorer_load, "(Document)XmlDocument"), + GB_METHOD("_new", NULL, CExplorer_new, "[(Document)XmlDocument]"), + GB_METHOD("_free", NULL, CExplorer_free, ""), + GB_METHOD("Load", NULL, CExplorer_load, "(Document)XmlDocument"), GB_PROPERTY("Document", "XMLDocument", CExplorer_document), GB_PROPERTY_SELF("ReadFlags", ".XmlExplorerReadFlags"), GB_PROPERTY_READ("Node", "XmlNode", CExplorer_Node), GB_PROPERTY_READ("Eof", "b", CExplorer_eof), GB_PROPERTY_READ("State", "i", CExplorer_state), GB_METHOD("Read", "i", CExplorer_Read, ""), - GB_METHOD("Open", "", CExplorer_open, "(Path)s"), + GB_METHOD("Open", NULL, CExplorer_open, "(Path)s"), GB_END_DECLARE }; diff --git a/gb.xml/src/CNode.cpp b/gb.xml/src/CNode.cpp index 2585b6d03..d9730ca80 100644 --- a/gb.xml/src/CNode.cpp +++ b/gb.xml/src/CNode.cpp @@ -395,8 +395,8 @@ GB_DESC CNodeDesc[] = { GB_DECLARE("XmlNode", sizeof(CNode)), GB_NOT_CREATABLE(), - GB_METHOD("_new", "", CNode_new, ""), - GB_METHOD("_free", "", CNode_free, ""), + GB_METHOD("_new", NULL, CNode_new, ""), + GB_METHOD("_free", NULL, CNode_free, ""), GB_CONSTANT("ElementNode", "i", NODE_ELEMENT), GB_CONSTANT("TextNode", "i", NODE_TEXT), @@ -422,7 +422,7 @@ GB_DESC CNodeDesc[] = GB_METHOD("ToString", "s", CNode_tostring, "[(Indent)b]"), GB_METHOD("GetUserData", "v", CNode_getUserData, "(Key)s"), - GB_METHOD("SetUserData", "", CNode_setUserData, "(Key)s(Value)v"), + GB_METHOD("SetUserData", NULL, CNode_setUserData, "(Key)s(Value)v"), GB_PROPERTY("TextContent", "s", CNode_textContent), GB_PROPERTY("Value", "s", CNode_textContent), GB_PROPERTY("Name", "s", CNode_name), @@ -430,8 +430,8 @@ GB_DESC CNodeDesc[] = GB_STATIC_METHOD("Serialize", "s", CNode_escapeContent, "(Data)s"), GB_STATIC_METHOD("Deserialize", "s", CNode_unEscapeContent, "(Data)s"), - GB_METHOD("NewElement", "", CNode_newElement, "(Name)s[(Value)s]"), - GB_METHOD("NewAttribute", "", CNode_setAttribute, "(Name)s(Value)s"), + GB_METHOD("NewElement", NULL, CNode_newElement, "(Name)s[(Value)s]"), + GB_METHOD("NewAttribute", NULL, CNode_setAttribute, "(Name)s(Value)s"), GB_PROPERTY_SELF("Attributes", ".XmlElementAttributes"), GB_END_DECLARE diff --git a/gb.xml/src/CReader.cpp b/gb.xml/src/CReader.cpp index 034ac5a21..e83f92505 100644 --- a/gb.xml/src/CReader.cpp +++ b/gb.xml/src/CReader.cpp @@ -420,8 +420,8 @@ GB_DESC CReaderDesc[] = { GB_DECLARE("_XmlReader", sizeof(CReader)), - GB_METHOD("_new", "", CReader_new, ""), - GB_METHOD("_free", "", CReader_free, ""), + GB_METHOD("_new", NULL, CReader_new, ""), + GB_METHOD("_free", NULL, CReader_free, ""), GB_METHOD("_ReadChar", "i", CReader_ReadChar, "(Char)s"), GB_METHOD("_Close", "i", CReader_Close, ""), diff --git a/gb.xml/src/CTextNode.cpp b/gb.xml/src/CTextNode.cpp index 8eadf4e19..9c94d9f65 100644 --- a/gb.xml/src/CTextNode.cpp +++ b/gb.xml/src/CTextNode.cpp @@ -73,7 +73,7 @@ GB_DESC CTextNodeDesc[] = { GB_DECLARE("XmlTextNode", sizeof(CNode)), GB_INHERITS("XmlNode"), - GB_METHOD("_new", "", CTextNode_new, "[(Content)s]"), + GB_METHOD("_new", NULL, CTextNode_new, "[(Content)s]"), GB_END_DECLARE }; diff --git a/gb.xml/src/html/CHTMLDocument.cpp b/gb.xml/src/html/CHTMLDocument.cpp index 2f9aed63d..c4b0d8fb9 100644 --- a/gb.xml/src/html/CHTMLDocument.cpp +++ b/gb.xml/src/html/CHTMLDocument.cpp @@ -188,9 +188,9 @@ GB_DESC CDocumentStyleSheetsDesc[] = { GB_DECLARE(".HtmlDocumentStyleSheets", 0), GB_VIRTUAL_CLASS(), - GB_METHOD("Add", "", CDocumentStyleSheets_add, "(Source)s[(Media)s]"), - GB_METHOD("AddIfIE", "", CDocumentStyleSheets_addIfIE, "(Source)s[(Condition)s(Media)s]"), - GB_METHOD("AddIfNotIE", "", CDocumentStyleSheets_addIfNotIE, "(Source)s[(Media)s]"), + GB_METHOD("Add", NULL, CDocumentStyleSheets_add, "(Source)s[(Media)s]"), + GB_METHOD("AddIfIE", NULL, CDocumentStyleSheets_addIfIE, "(Source)s[(Condition)s(Media)s]"), + GB_METHOD("AddIfNotIE", NULL, CDocumentStyleSheets_addIfNotIE, "(Source)s[(Media)s]"), GB_END_DECLARE }; @@ -199,9 +199,9 @@ GB_DESC CDocumentScriptsDesc[] = { GB_DECLARE(".HtmlDocumentScripts", 0), GB_VIRTUAL_CLASS(), - GB_METHOD("Add", "", CDocumentScripts_add, "(Source)s"), - GB_METHOD("AddIfIE", "", CDocumentScripts_addIfIE, "(Source)s[(Condition)s]"), - GB_METHOD("AddIfNotIE", "", CDocumentScripts_addIfNotIE, "(Source)s"), + GB_METHOD("Add", NULL, CDocumentScripts_add, "(Source)s"), + GB_METHOD("AddIfIE", NULL, CDocumentScripts_addIfIE, "(Source)s[(Condition)s]"), + GB_METHOD("AddIfNotIE", NULL, CDocumentScripts_addIfNotIE, "(Source)s"), GB_END_DECLARE }; @@ -210,8 +210,8 @@ GB_DESC CDocumentDesc[] = { GB_DECLARE("HtmlDocument", sizeof(CDocument)), GB_INHERITS("XmlDocument"), - GB_METHOD("_new", "", CDocument_new, ""), - GB_METHOD("_free", "", CDocument_free, ""), + GB_METHOD("_new", NULL, CDocument_new, ""), + GB_METHOD("_free", NULL, CDocument_free, ""), GB_PROPERTY("Html5", "b", CDocument_Html5), @@ -222,8 +222,8 @@ GB_DESC CDocumentDesc[] = GB_PROPERTY_READ("Head", "XmlElement", CDocument_head), GB_PROPERTY_READ("Body", "XmlElement", CDocument_body), - //GB_METHOD("FromString", "", CDocument_fromString, "(Data)s"), - //GB_METHOD("HtmlFromString", "", CDocument_fromString, "(Data)s"), + //GB_METHOD("FromString", NULL, CDocument_fromString, "(Data)s"), + //GB_METHOD("HtmlFromString", NULL, CDocument_fromString, "(Data)s"), GB_PROPERTY_SELF("StyleSheets", ".HtmlDocumentStyleSheets"), GB_PROPERTY_SELF("Scripts", ".HtmlDocumentScripts"), diff --git a/gb.xml/src/html/html.pro b/gb.xml/src/html/html.pro deleted file mode 100644 index 730e1c923..000000000 --- a/gb.xml/src/html/html.pro +++ /dev/null @@ -1,29 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Apr 4 21:47:56 2012 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . /usr/include/c++/4.6.1 - -# Input -HEADERS += \ - gb.xml.html.h \ - cssfilter.h \ - htmlserializer.h \ - CHTMLDocument.h \ - CHTMLElement.h \ - htmlmain.h \ - htmlparser.h \ - htmldocument.h \ - htmlelement.h -SOURCES += \ - cssfilter.cpp \ - CHTMLDocument.cpp \ - CHTMLElement.cpp \ - htmldocument.cpp \ - htmlelement.cpp \ - htmlserializer.cpp \ - htmlmain.cpp \ - htmlparser.cpp diff --git a/gb.xml/src/src.pro b/gb.xml/src/src.pro deleted file mode 100644 index fb36133fb..000000000 --- a/gb.xml/src/src.pro +++ /dev/null @@ -1,44 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) lun. juil. 4 20:53:59 2011 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . testhtml -INCLUDEPATH += . /usr/include/c++/4.6.1 - -# Input -HEADERS += document.h \ - element.h \ - main.h \ - node.h \ - textnode.h \ - CDocument.h \ - CNode.h \ - CElement.h \ - CTextNode.h \ - CReader.h \ - reader.h \ - explorer.h \ - CExplorer.h \ - utils.h \ - parser.h \ - serializer.h \ - gb.xml.h \ - gbinterface.h -SOURCES += document.cpp \ - element.cpp \ - main.cpp \ - node.cpp \ - textnode.cpp \ - CDocument.cpp \ - CNode.cpp \ - CElement.cpp \ - CTextNode.cpp \ - CReader.cpp \ - reader.cpp \ - explorer.cpp \ - CExplorer.cpp \ - utils.cpp \ - parser.cpp \ - serializer.cpp