More 'standard conformant blurb' nonsense.

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 685108a81bab1028e89f3188ce915fdb39c61d45..e8d303412fd903503daa1ec9770a7c26e0b14bdd 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -15,26 +15,27 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "support/lstrings.h"
 #include "toc.h"
 #include "buffer.h"
-#include "frontends/LyXView.h"
 #include "LyXAction.h"
 #include "paragraph.h"
-#include "insets/insetfloat.h"
 #include "debug.h"
+#include "iterators.h"
+
+#include "insets/insetfloat.h"
+#include "insets/insetwrap.h"
+
+#include "support/tostr.h"
+
+#include "frontends/LyXView.h"
 
 using std::vector;
 using std::max;
 using std::endl;
 using std::ostream;
 
-namespace toc
-{
+namespace lyx {
+namespace toc {
 
 string const TocItem::asString() const
 {
@@ -44,7 +45,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));
 }
 
@@ -52,7 +53,7 @@ void TocItem::goTo(LyXView & lv_) const
 int TocItem::action() const
 {
        return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
-                                        tostr(par->id()));
+                                        tostr(id_));
 }
 
 
@@ -71,38 +72,42 @@ TocList const getTocList(Buffer const * buf)
        TocList toclist;
        if (!buf)
                return toclist;
-       Paragraph * par = &*(buf->paragraphs.begin());
 
        LyXTextClass const & textclass = buf->params.getLyXTextClass();
 
-       while (par) {
+       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 = par->layout()->labeltype;
+               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(par, depth,
-                                          par->asString(buf, true));
+                       TocItem const item(pit->id(), depth,
+                                          pit->asString(buf, true));
                        toclist["TOC"].push_back(item);
                }
 
                // For each paragraph, traverse its insets and look for
-               // FLOAT_CODE
-               InsetList::iterator it = par->insetlist.begin();
-               InsetList::iterator end = par->insetlist.end();
+               // FLOAT_CODE or WRAP_CODE
+               InsetList::const_iterator it = pit->insetlist.begin();
+               InsetList::const_iterator end = pit->insetlist.end();
                for (; it != end; ++it) {
-                       if (it.getInset()->lyxCode() == Inset::FLOAT_CODE) {
+                       if (it->inset->lyxCode() == InsetOld::FLOAT_CODE) {
                                InsetFloat * il =
-                                       static_cast<InsetFloat*>(it.getInset());
+                                       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);
                        }
                }
-
-               par = par->next();
        }
        return toclist;
 }
@@ -139,3 +144,4 @@ void asciiTocList(string const & type, Buffer const * buffer, ostream & os)
 
 
 } // namespace toc
+} // namespace lyx