1 files changed, 154 insertions, 1 deletions

diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 4aae657..fb09013 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -81,6 +81,155 @@ class DitaXmlGenerator : public PageGenerator
         LastSinceType
     };
 
+    enum DitaTag {
+        DT_NONE,
+        DT_alt,
+        DT_apiDesc,
+        DT_APIMap,
+        DT_apiName,
+        DT_b,
+        DT_body,
+        DT_bodydiv,
+        DT_codeblock,
+        DT_comment,
+        DT_cxxAPIMap,
+        DT_cxxClass,
+        DT_cxxClassAbstract,
+        DT_cxxClassAccessSpecifier,
+        DT_cxxClassAPIItemLocation,
+        DT_cxxClassBaseClass,
+        DT_cxxClassDeclarationFile,
+        DT_cxxClassDeclarationFileLine,
+        DT_cxxClassDefinition,
+        DT_cxxClassDerivation,
+        DT_cxxClassDerivationAccessSpecifier,
+        DT_cxxClassDerivations,
+        DT_cxxClassDetail,
+        DT_cxxClassNested,
+        DT_cxxClassNestedClass,
+        DT_cxxClassNestedDetail,
+        DT_cxxDefine,
+        DT_cxxDefineAccessSpecifier,
+        DT_cxxDefineAPIItemLocation,
+        DT_cxxDefineDeclarationFile,
+        DT_cxxDefineDeclarationFileLine,
+        DT_cxxDefineDefinition,
+        DT_cxxDefineDetail,
+        DT_cxxDefineNameLookup,
+        DT_cxxDefineParameter,
+        DT_cxxDefineParameterDeclarationName,
+        DT_cxxDefineParameters,
+        DT_cxxDefinePrototype,
+        DT_cxxDefineReimplemented,
+        DT_cxxEnumeration,
+        DT_cxxEnumerationAccessSpecifier,
+        DT_cxxEnumerationAPIItemLocation,
+        DT_cxxEnumerationDeclarationFile,
+        DT_cxxEnumerationDeclarationFileLine,
+        DT_cxxEnumerationDefinition,
+        DT_cxxEnumerationDefinitionFile,
+        DT_cxxEnumerationDefinitionFileLineStart,
+        DT_cxxEnumerationDefinitionFileLineEnd,
+        DT_cxxEnumerationDetail,
+        DT_cxxEnumerationNameLookup,
+        DT_cxxEnumerationPrototype,
+        DT_cxxEnumerationScopedName,
+        DT_cxxEnumerator,
+        DT_cxxEnumeratorInitialiser,
+        DT_cxxEnumeratorNameLookup,
+        DT_cxxEnumeratorPrototype,
+        DT_cxxEnumerators,
+        DT_cxxEnumeratorScopedName,
+        DT_cxxFunction,
+        DT_cxxFunctionAccessSpecifier,
+        DT_cxxFunctionAPIItemLocation,
+        DT_cxxFunctionConst,
+        DT_cxxFunctionConstructor,
+        DT_cxxFunctionDeclarationFile,
+        DT_cxxFunctionDeclarationFileLine,
+        DT_cxxFunctionDeclaredType,
+        DT_cxxFunctionDefinition,
+        DT_cxxFunctionDestructor,
+        DT_cxxFunctionDetail,
+        DT_cxxFunctionNameLookup,
+        DT_cxxFunctionParameter,
+        DT_cxxFunctionParameterDeclarationName,
+        DT_cxxFunctionParameterDeclaredType,
+        DT_cxxFunctionParameterDefaultValue,
+        DT_cxxFunctionParameters,
+        DT_cxxFunctionPrototype,
+        DT_cxxFunctionPureVirtual,
+        DT_cxxFunctionReimplemented,
+        DT_cxxFunctionScopedName,
+        DT_cxxFunctionStorageClassSpecifierStatic,
+        DT_cxxFunctionVirtual,
+        DT_cxxTypedef,
+        DT_cxxTypedefAccessSpecifier,
+        DT_cxxTypedefAPIItemLocation,
+        DT_cxxTypedefDeclarationFile,
+        DT_cxxTypedefDeclarationFileLine,
+        DT_cxxTypedefDefinition,
+        DT_cxxTypedefDetail,
+        DT_cxxTypedefNameLookup,
+        DT_cxxTypedefScopedName,
+    	DT_cxxVariable,
+    	DT_cxxVariableAccessSpecifier,
+    	DT_cxxVariableAPIItemLocation,
+        DT_cxxVariableDeclarationFile,
+        DT_cxxVariableDeclarationFileLine,
+    	DT_cxxVariableDeclaredType,
+    	DT_cxxVariableDefinition,
+    	DT_cxxVariableDetail,
+    	DT_cxxVariableNameLookup,
+    	DT_cxxVariablePrototype,
+    	DT_cxxVariableReimplemented,
+    	DT_cxxVariableScopedName,
+    	DT_cxxVariableStorageClassSpecifierStatic,
+        DT_dd,
+        DT_dl,
+        DT_dlentry,
+        DT_dt,
+        DT_entry,
+        DT_fig,
+        DT_i,
+        DT_image,
+        DT_keyword,
+        DT_li,
+        DT_link,
+        DT_linktext,
+        DT_lq,
+        DT_ol,
+        DT_p,
+        DT_parameter,
+        DT_ph,
+        DT_pre,
+        DT_relatedLinks,
+        DT_row,
+        DT_section,
+        DT_sectiondiv,
+        DT_shortdesc,
+        DT_simpletable,
+        DT_stentry,
+        DT_sthead,
+        DT_strow,
+        DT_sub,
+        DT_sup,
+        DT_table,
+        DT_tbody,
+        DT_tgroup,
+        DT_thead,
+        DT_title,
+        DT_tm,
+        DT_topic,
+        DT_topicmeta,
+        DT_topicref,
+        DT_tt,
+        DT_ul,
+        DT_u,
+        DT_xref,
+        DT_LAST
+    };
+
  public:
     DitaXmlGenerator();
     ~DitaXmlGenerator();
@@ -260,6 +409,9 @@ class DitaXmlGenerator : public PageGenerator
                                   const QString& title);
     void addLink(const QString& href, const QStringRef& text);
     void writeDitaMap();
+    void writeStartTag(DitaTag t);
+    void writeEndTag(DitaTag t=DT_NONE);
+    DitaTag currentTag();
 
  private:
     QMap<QString, QString> refMap;
@@ -316,8 +468,9 @@ class DitaXmlGenerator : public PageGenerator
     static bool inSection;
     static bool inDetailedDescription;
     static bool inLegaleseText;
-
+    static QString ditaTags[];
     QStack<QXmlStreamWriter*> xmlWriterStack;
+    QStack<DitaTag> tagStack;
 };
 
 #define DITAXMLGENERATOR_ADDRESS           "address"