X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftoc.h;h=956101d13296eac2b93c766631830193a83623f7;hb=fe390e9da1538e20eabbc98977d845295f8e563d;hp=5af9e4959f894d29127ec602fca56c60948f4b08;hpb=16668d1632536894964c8ca624b3c90207ebe772;p=lyx.git diff --git a/src/toc.h b/src/toc.h index 5af9e4959f..956101d132 100644 --- a/src/toc.h +++ b/src/toc.h @@ -16,12 +16,8 @@ #ifndef TOC_H #define TOC_H -#ifdef __GNUG__ -#pragma interface -#endif - #include - + #include "support/LOstream.h" #include "LString.h" @@ -34,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; @@ -68,26 +64,23 @@ std::vector const getTypes(Buffer const *); /// 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. }