namespace grfx -> lyx::graphics

[lyx.git] / src / toc.h

diff --git a/src/toc.h b/src/toc.h
index 78ec77afa964da65921d5836a9e479e1e673cf45..956101d13296eac2b93c766631830193a83623f7 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -16,9 +16,7 @@
 #ifndef TOC_H
 #define TOC_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
+#include <config.h>
 
 #include "support/LOstream.h"
 #include "LString.h"
@@ -32,22 +30,22 @@ class Paragraph;
 
 /** Nice functions and objects to handle TOCs
  */
-namespace toc 
+namespace toc
 {
 
 ///
 struct TocItem {
-       TocItem(Paragraph * p, int d, string const & s)
-               : par(p), depth(d), str(s) {}
+       TocItem(int par_id, int d, string const & s)
+               : id_(par_id), depth(d), str(s) {}
        ///
        string const asString() const;
        /// set cursor in LyXView to this TocItem
        void goTo(LyXView & lv_) const;
        /// the action corresponding to the goTo above
        int action() const;
-       ///
-       Paragraph * par;
-       ///
+       /// Paragraph ID containing this item
+       int id_;
+       /// nesting depth
        int depth;
        ///
        string str;
@@ -65,27 +63,24 @@ TocList const getTocList(Buffer const *);
 std::vector<string> const getTypes(Buffer const *);
 
 ///
-void asciiTocList(string const &, Buffer const *, ostream &);
-       
+void asciiTocList(string const &, Buffer const *, std::ostream &);
+
 /** Given the cmdName of the TOC param, returns the type used
     by ControlToc::getContents() */
 string const getType(string const & cmdName);
 
-///
 inline
 bool operator==(TocItem const & a, TocItem const & b)
 {
-       return a.par == b.par && a.str == b.str;
+       return a.id_ == b.id_ && a.str == b.str;
        // No need to compare depth.
 }
 
 
-///
 inline
 bool operator!=(TocItem const & a, TocItem const & b)
 {
        return !(a == b);
-       // No need to compare depth.
 }