- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 5131554009fc9def9bd0684a5fb57964d8487acd..603912ab55343b142dda1381799b8edd38116356 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -12,24 +12,25 @@
 #include <config.h>
 
 #include "toc.h"
+
 #include "buffer.h"
+#include "bufferparams.h"
 #include "funcrequest.h"
 #include "LyXAction.h"
 #include "paragraph.h"
-#include "debug.h"
-#include "iterators.h"
+#include "pariterator.h"
+
+#include "frontends/LyXView.h"
 
 #include "insets/insetfloat.h"
 #include "insets/insetwrap.h"
 
-#include "support/tostr.h"
-
-#include "frontends/LyXView.h"
+#include "support/convert.h"
 
 using std::vector;
 using std::max;
-using std::endl;
 using std::ostream;
+using std::string;
 
 namespace lyx {
 namespace toc {
@@ -42,15 +43,14 @@ string const TocItem::asString() const
 
 void TocItem::goTo(LyXView & lv_) const
 {
-       string const tmp = tostr(id_);
+       string const tmp = convert<string>(id_);
        lv_.dispatch(FuncRequest(LFUN_GOTO_PARAGRAPH, tmp));
 }
 
 
-int TocItem::action() const
+FuncRequest TocItem::action() const
 {
-       return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
-                                        tostr(id_));
+       return FuncRequest(LFUN_GOTO_PARAGRAPH, convert<string>(id_));
 }
 
 
@@ -68,22 +68,16 @@ TocList const getTocList(Buffer const & buf)
 {
        TocList toclist;
 
-       LyXTextClass const & textclass = buf.params.getLyXTextClass();
+       BufferParams const & bufparams = buf.params();
 
        ParConstIterator pit = buf.par_iterator_begin();
        ParConstIterator end = buf.par_iterator_end();
        for (; pit != end; ++pit) {
-#ifdef WITH_WARNINGS
-#warning bogus type (Lgb)
-#endif
-               char const labeltype = pit->layout()->labeltype;
-
-               if (labeltype >= LABEL_COUNTER_CHAPTER
-                   && 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(pit->id(), depth,
-                                          pit->asString(buf, true));
+
+               int const toclevel = pit->layout()->toclevel;
+               if (toclevel > 0 && toclevel <= bufparams.tocdepth) {
+                       // insert this into the table of contents
+                       TocItem const item(pit->id(), toclevel - 1, pit->asString(buf, true));
                        toclist["TOC"].push_back(item);
                }
 
@@ -92,15 +86,12 @@ TocList const getTocList(Buffer const & buf)
                InsetList::const_iterator it = pit->insetlist.begin();
                InsetList::const_iterator end = pit->insetlist.end();
                for (; it != end; ++it) {
-                       if (it->inset->lyxCode() == InsetOld::FLOAT_CODE) {
-                               InsetFloat * il =
-                                       static_cast<InsetFloat*>(it->inset);
-                               il->addToToc(toclist, buf);
-                       } else if (it->inset->lyxCode() == InsetOld::WRAP_CODE) {
-                               InsetWrap * il =
-                                       static_cast<InsetWrap*>(it->inset);
-
-                               il->addToToc(toclist, buf);
+                       if (it->inset->lyxCode() == InsetBase::FLOAT_CODE) {
+                               static_cast<InsetFloat*>(it->inset)
+                                       ->addToToc(toclist, buf);
+                       } else if (it->inset->lyxCode() == InsetBase::WRAP_CODE) {
+                               static_cast<InsetWrap*>(it->inset)
+                                       ->addToToc(toclist, buf);
                        }
                }
        }