Make layout parser use the new XML parser

1 files changed, 31 insertions, 30 deletions

diff --git a/src/layout.h b/src/layout.h
index b1facf5..68d5c6e 100644
--- a/src/layout.h
+++ b/src/layout.h
@@ -1,13 +1,13 @@
 /******************************************************************************
  *
- * 
+ *
  *
  *
  * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -19,6 +19,7 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
+#include <memory>
 #include <qlist.h>
 #include "types.h"
 
@@ -30,14 +31,14 @@ class QTextStream;
 struct LayoutDocEntry
 {
   virtual ~LayoutDocEntry() {}
-  enum Kind { 
+  enum Kind {
               // Generic items for all pages
               MemberGroups,
               MemberDeclStart, MemberDeclEnd, MemberDecl,
               MemberDefStart, MemberDefEnd, MemberDef,
               BriefDesc, DetailedDesc,
               AuthorSection,
-              
+
               // Class specific items
               ClassIncludes, ClassInlineClasses,
               ClassInheritanceGraph, ClassNestedClasses,
@@ -51,7 +52,7 @@ struct LayoutDocEntry
 
               // File specific items
               FileClasses, FileInterfaces, FileStructs, FileExceptions, FileConstantGroups, FileNamespaces,
-              FileIncludes, FileIncludeGraph, 
+              FileIncludes, FileIncludeGraph,
               FileIncludedByGraph, FileSourceLink,
               FileInlineClasses,
 
@@ -90,7 +91,7 @@ private:
 struct LayoutDocEntryMemberDecl: public LayoutDocEntry
 {
   LayoutDocEntryMemberDecl(MemberListType tp,
-                           const QCString &tl,const QCString &ss) 
+                           const QCString &tl,const QCString &ss)
     : type(tp), m_title(tl), m_subscript(ss) {}
 
   Kind kind() const { return MemberDecl; }
@@ -105,7 +106,7 @@ private:
 /** @brief Represents of a member definition list with configurable title. */
 struct LayoutDocEntryMemberDef: public LayoutDocEntry
 {
-  LayoutDocEntryMemberDef(MemberListType tp,const QCString &tl) 
+  LayoutDocEntryMemberDef(MemberListType tp,const QCString &tl)
     : type(tp), m_title(tl) {}
 
   Kind kind() const { return MemberDef; }
@@ -116,44 +117,44 @@ private:
 };
 
 /** @brief Base class for the layout of a navigation item at the top of the HTML pages. */
-struct LayoutNavEntry 
+struct LayoutNavEntry
 {
   public:
-    enum Kind { 
-      None = -1, 
-      MainPage, 
+    enum Kind {
+      None = -1,
+      MainPage,
       Pages,
-      Modules, 
-      Namespaces, 
+      Modules,
+      Namespaces,
       NamespaceList,
       NamespaceMembers,
       Classes,
-      ClassList, 
-      ClassIndex, 
-      ClassHierarchy, 
+      ClassList,
+      ClassIndex,
+      ClassHierarchy,
       ClassMembers,
       Interfaces,
-      InterfaceList, 
-      InterfaceIndex, 
-      InterfaceHierarchy, 
+      InterfaceList,
+      InterfaceIndex,
+      InterfaceHierarchy,
       Structs,
-      StructList, 
-      StructIndex, 
+      StructList,
+      StructIndex,
       Exceptions,
-      ExceptionList, 
-      ExceptionIndex, 
-      ExceptionHierarchy, 
-      Files, 
+      ExceptionList,
+      ExceptionIndex,
+      ExceptionHierarchy,
+      Files,
       FileList,
       FileGlobals,
       Examples,
       User,
       UserGroup
     };
-    LayoutNavEntry(LayoutNavEntry *parent,Kind k,bool vs,const QCString &bf, 
-                   const QCString &tl,const QCString &intro,bool prepend=FALSE) 
+    LayoutNavEntry(LayoutNavEntry *parent,Kind k,bool vs,const QCString &bf,
+                   const QCString &tl,const QCString &intro,bool prepend=FALSE)
       : m_parent(parent), m_kind(k), m_visible(vs), m_baseFile(bf), m_title(tl), m_intro(intro)
-    { m_children.setAutoDelete(TRUE); 
+    { m_children.setAutoDelete(TRUE);
       if (parent) { if (prepend) parent->prependChild(this); else parent->addChild(this); }
     }
     LayoutNavEntry *parent() const   { return m_parent; }
@@ -208,7 +209,7 @@ class LayoutDocManager
     void clear(LayoutPart p);
     LayoutDocManager();
     ~LayoutDocManager();
-    Private *d;
+    std::unique_ptr<Private> d;
     friend class LayoutParser;
 };