Minimal fix needed to give Qt a label dialog again.

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index b52154bc1b66e30eaaf94e2f067e9946b4c9ccd8..2db88e4af9ad6a52c04d9baf2ed63570e18d9a31 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -15,10 +15,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "support/lstrings.h"
 #include "toc.h"
 #include "buffer.h"
@@ -46,7 +42,7 @@ string const TocItem::asString() const
 
 void TocItem::goTo(LyXView & lv_) const
 {
-       string const tmp = tostr(par->id());
+       string const tmp = tostr(id_);
        lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
 }
 
@@ -54,7 +50,7 @@ void TocItem::goTo(LyXView & lv_) const
 int TocItem::action() const
 {
        return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
-                                        tostr(par->id()));
+                                        tostr(id_));
 }
 
 
@@ -76,11 +72,11 @@ TocList const getTocList(Buffer const * buf)
 
        LyXTextClass const & textclass = buf->params.getLyXTextClass();
 
-       ParIterator pit = buf->par_iterator_begin();
-       ParIterator end = buf->par_iterator_end();
+       ParConstIterator pit = buf->par_iterator_begin();
+       ParConstIterator end = buf->par_iterator_end();
        for (; pit != end; ++pit) {
-               Paragraph * par = *pit;
- 
+               Paragraph const * par = *pit;
+
 #ifdef WITH_WARNINGS
 #warning bogus type (Lgb)
 #endif
@@ -90,7 +86,7 @@ TocList const getTocList(Buffer const * buf)
                    && labeltype <= LABEL_COUNTER_CHAPTER + buf->params.tocdepth) {
                                // insert this into the table of contents
                        const int depth = max(0, labeltype - textclass.maxcounter());
-                       TocItem const item(par, depth,
+                       TocItem const item(par->id(), depth,
                                           par->asString(buf, true));
                        toclist["TOC"].push_back(item);
                }