From 25d95829b47380148f22fd2abc72a810e06b5730 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <doxygen@gmail.com>
Date: Sat, 25 Apr 2020 12:33:02 +0200
Subject: moved separate doxygen tag to tagfile attribute

---
 src/doxygen.cpp   | 8 +++-----
 src/tagreader.cpp | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 47b5cea..559e745 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10363,14 +10363,12 @@ static void writeTagFile()
   }
   FTextStream tagFile(&tag);
   tagFile << "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>" << endl;
-  tagFile << "<tagfile>" << endl;
-  tagFile << "  <doxygen";
-  tagFile << "  version=\"" << getDoxygenVersion() << "\"";
+  tagFile << "<tagfile doxygen_version=\"" << getDoxygenVersion() << "\"";
   if (strlen(getGitVersion())>0)
   {
-    tagFile << "  gitid=\"" << getGitVersion() << "\"";
+    tagFile << " doxygen_gitid=\"" << getGitVersion() << "\"";
   }
-  tagFile << "></doxygen>" << endl;
+  tagFile << ">" << endl;
 
   // for each file
   for (const auto &fn : *Doxygen::inputNameLinkedMap)
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 6e3c6d4..12010e8 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -860,7 +860,6 @@ class TagFileParser : public QXmlDefaultHandler
       m_startElementHandlers.insert("tagfile",     new StartElementHandler(this,&TagFileParser::startIgnoreElement));
       m_startElementHandlers.insert("templarg",    new StartElementHandler(this,&TagFileParser::startStringValue));
       m_startElementHandlers.insert("type",        new StartElementHandler(this,&TagFileParser::startStringValue));
-      m_startElementHandlers.insert("doxygen",     new StartElementHandler(this,&TagFileParser::startIgnoreElement));
 
       m_endElementHandlers.insert("compound",    new EndElementHandler(this,&TagFileParser::endCompound));
       m_endElementHandlers.insert("member",      new EndElementHandler(this,&TagFileParser::endMember));
@@ -885,7 +884,6 @@ class TagFileParser : public QXmlDefaultHandler
       m_endElementHandlers.insert("tagfile",     new EndElementHandler(this,&TagFileParser::endIgnoreElement));
       m_endElementHandlers.insert("templarg",    new EndElementHandler(this,&TagFileParser::endTemplateArg));
       m_endElementHandlers.insert("type",        new EndElementHandler(this,&TagFileParser::endType));
-      m_endElementHandlers.insert("doxygen",     new EndElementHandler(this,&TagFileParser::endIgnoreElement));
 
       return TRUE;
     }
-- 
cgit v0.12