Change to use preffered calling of Boost.Function

[lyx.git] / src / toc.C

diff --git a/src/toc.C b/src/toc.C
index 0338f3f98ac3608f92e70c1e0f17d82b80ddd18b..d18c4b03877cfab695d2478de9f033fb1ed19ad5 100644 (file)
--- a/src/toc.C
+++ b/src/toc.C
@@ -16,9 +16,9 @@
 #include "buffer.h"
 #include "bufferparams.h"
 #include "funcrequest.h"
-#include "iterators.h"
 #include "LyXAction.h"
 #include "paragraph.h"
+#include "pariterator.h"
 
 #include "frontends/LyXView.h"
 
@@ -30,6 +30,7 @@
 using std::vector;
 using std::max;
 using std::ostream;
+using std::string;
 
 namespace lyx {
 namespace toc {
@@ -47,10 +48,9 @@ void TocItem::goTo(LyXView & lv_) const
 }
 
 
-int TocItem::action() const
+FuncRequest TocItem::action() const
 {
-       return lyxaction.getPseudoAction(LFUN_GOTO_PARAGRAPH,
-                                        tostr(id_));
+       return FuncRequest(LFUN_GOTO_PARAGRAPH, tostr(id_));
 }
 
 
@@ -69,14 +69,13 @@ TocList const getTocList(Buffer const & buf)
        TocList toclist;
 
        BufferParams const & bufparams = buf.params();
-       LyXTextClass const & textclass = bufparams.getLyXTextClass();
 
        ParConstIterator pit = buf.par_iterator_begin();
        ParConstIterator end = buf.par_iterator_end();
        for (; pit != end; ++pit) {
 
                int const toclevel = pit->layout()->toclevel;
-               if (toclevel > 0 &&  toclevel <= bufparams.tocdepth) {
+               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);
@@ -88,14 +87,11 @@ TocList const getTocList(Buffer const & buf)
                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);
+                               static_cast<InsetFloat*>(it->inset)
+                                       ->addToToc(toclist, buf);
                        } else if (it->inset->lyxCode() == InsetOld::WRAP_CODE) {
-                               InsetWrap * il =
-                                       static_cast<InsetWrap*>(it->inset);
-
-                               il->addToToc(toclist, buf);
+                               static_cast<InsetWrap*>(it->inset)
+                                       ->addToToc(toclist, buf);
                        }
                }
        }