Andre's s/getTextClass/textClass/ cleanup.

[lyx.git] / src / TocBackend.cpp

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index daa95283d307312b13d1de5cfb8b55ded5353fae..4c5bdb00f363610aa42a7e845bbdd00b3582d9d1 100644 (file)
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -40,9 +40,8 @@ namespace lyx {
 //
 ///////////////////////////////////////////////////////////////////////////
 
-TocItem::TocItem(ParConstIterator const & par_it, int d,
-               docstring const & s)
-               : par_it_(par_it), depth_(d), str_(s)
+TocItem::TocItem(ParConstIterator const & par_it, int d, docstring const & s)
+       : par_it_(par_it), depth_(d), str_(s)
 {
 }
 
@@ -83,7 +82,7 @@ FuncRequest TocItem::action() const
 //
 ///////////////////////////////////////////////////////////////////////////
 
-Toc const & TocBackend::toc(std::string const & type) const
+Toc const & TocBackend::toc(string const & type) const
 {
        // Is the type already supported?
        TocList::const_iterator it = tocs_.find(type);
@@ -93,6 +92,12 @@ Toc const & TocBackend::toc(std::string const & type) const
 }
 
 
+Toc & TocBackend::toc(string const & type)
+{
+       return tocs_[type];
+}
+
+
 void TocBackend::updateItem(ParConstIterator const & par_it)
 {
        if (toc("tableofcontents").empty()) {
@@ -103,7 +108,7 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
        }
 
        BufferParams const & bufparams = buffer_->params();
-       const int min_toclevel = bufparams.getTextClass().min_toclevel();
+       const int min_toclevel = bufparams.textClass().min_toclevel();
 
        TocIterator toc_item = item("tableofcontents", par_it);
 
@@ -120,8 +125,8 @@ void TocBackend::updateItem(ParConstIterator const & par_it)
                                break;
                        Paragraph const & par =
                                *static_cast<InsetOptArg&>(inset).paragraphs().begin();
-                       if (!toc_item->par_it_->getLabelstring().empty())
-                               tocstring = toc_item->par_it_->getLabelstring() + ' ';
+                       if (!toc_item->par_it_->labelString().empty())
+                               tocstring = toc_item->par_it_->labelString() + ' ';
                        tocstring += par.asString(*buffer_, false);
                        break;
                }
@@ -142,7 +147,7 @@ void TocBackend::update()
        tocs_.clear();
 
        BufferParams const & bufparams = buffer_->params();
-       const int min_toclevel = bufparams.getTextClass().min_toclevel();
+       const int min_toclevel = bufparams.textClass().min_toclevel();
 
        Toc & toc = tocs_["tableofcontents"];
        ParConstIterator pit = buffer_->par_iterator_begin();
@@ -158,15 +163,15 @@ void TocBackend::update()
                InsetList::const_iterator end = pit->insetList().end();
                for (; it != end; ++it) {
                        Inset & inset = *it->inset;
-                       inset.addToToc(tocs_, *buffer_, pit);
+                       inset.addToToc(*buffer_, pit);
                        switch (inset.lyxCode()) {
                        case OPTARG_CODE: {
                                if (!tocstring.empty())
                                        break;
                                Paragraph const & par =
                                        *static_cast<InsetOptArg&>(inset).paragraphs().begin();
-                               if (!pit->getLabelstring().empty())
-                                       tocstring = pit->getLabelstring() + ' ';
+                               if (!pit->labelString().empty())
+                                       tocstring = pit->labelString() + ' ';
                                tocstring += par.asString(*buffer_, false);
                                break;
                        }
@@ -189,7 +194,7 @@ void TocBackend::update()
 }
 
 
-TocIterator const TocBackend::item(std::string const & type,
+TocIterator TocBackend::item(string const & type,
                ParConstIterator const & par_it) const
 {
        TocList::const_iterator toclist_it = tocs_.find(type);
@@ -205,12 +210,11 @@ TocIterator const TocBackend::item(std::string const & type,
        --it;
 
        ParConstIterator par_it_text = par_it;
-       if (par_it_text.inMathed())
-               // It would be better to do
-               //   par_it_text.backwardInset();
-               // but this method does not exist.
+       if (par_it_text.inMathed()) {
+               // We are only interested in text so remove the math CursorSlice.
                while (par_it_text.inMathed())
-                       par_it_text.backwardPos();
+                       par_it_text.pop_back();
+       }
 
        for (; it != last; --it) {
                // We verify that we don't compare contents of two