Further cleanup of InsetFlex, InsetCollapsable and InsetLayout:

[lyx.git] / src / TocBackend.h

diff --git a/src/TocBackend.h b/src/TocBackend.h
index ca69b09237331f495de21956e670b995f0e3d3c0..30ed9de75fd84e8ca93224c89d40e7b49d25ce86 100644 (file)
--- a/src/TocBackend.h
+++ b/src/TocBackend.h
@@ -22,7 +22,7 @@
 
 #include "ParIterator.h"
 
-#include "support/docstream.h"
+#include "support/strfwd.h"
 
 
 namespace lyx {
@@ -38,19 +38,19 @@ class TocItem
        friend class TocBackend;
 
 public:
+       /// Default constructor for STL containers.
+       TocItem() {}
        ///
-       TocItem(ParConstIterator const & par_it = ParConstIterator(),
-               int d = -1,
-               docstring const & s = docstring()
+       TocItem(ParConstIterator const & par_it,
+               int depth,
+               docstring const & s
                );
        ///
        ~TocItem() {}
        ///
-       bool const isValid() const;
+       int id() const;
        ///
-       int const id() const;
-       ///
-       int const depth() const;
+       int depth() const;
        ///
        docstring const & str() const;
        ///
@@ -58,7 +58,7 @@ public:
 
        /// the action corresponding to the goTo above
        FuncRequest action() const;
-       
+
 protected:
        /// Current position of item.
        ParConstIterator par_it_;
@@ -74,11 +74,10 @@ protected:
 ///
 typedef std::vector<TocItem> Toc;
 typedef Toc::const_iterator TocIterator;
+
 /// The ToC list.
 /// A class and no typedef because we want to forward declare it.
-class TocList : public std::map<std::string, Toc>
-{
-};
+class TocList : public std::map<std::string, Toc> {};
 
 
 ///
@@ -114,7 +113,7 @@ public:
        void writePlaintextTocList(std::string const & type, odocstream & os) const;
 
 private:
-       /// 
+       ///
        TocList tocs_;
        ///
        Buffer const * buffer_;