zlib stuff

[lyx.git] / src / toc.h

diff --git a/src/toc.h b/src/toc.h
index e7f8e7daa9420d357351f90a2826f141589209db..7ee44a0a88274b0b2410504b8479ee70451c630f 100644 (file)
--- a/src/toc.h
+++ b/src/toc.h
@@ -30,22 +30,22 @@ class Paragraph;
 
 /** Nice functions and objects to handle TOCs
  */
-namespace toc
-{
+namespace lyx {
+namespace toc {
 
 ///
 struct TocItem {
-       TocItem(Paragraph const * 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 const * par;
-       ///
+       /// Paragraph ID containing this item
+       int id_;
+       /// nesting depth
        int depth;
        ///
        string str;
@@ -69,24 +69,22 @@ void asciiTocList(string const &, Buffer const *, std::ostream &);
     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.
 }
 
 
 } // namespace toc
+} // namespace lyx
 
 #endif // CONTROLTOC_H