Use <cstdint> instead of <boost/cstdint.hpp>

[lyx.git] / src / frontends / qt4 / TocModel.cpp

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 96711e617394fe56e10305ae3c68bc02cfb327c5..51365311aa9eba703bfeda79a7243a7e114f8db2 100644 (file)
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -248,7 +248,6 @@ int TocModel::modelDepth() const
 ///////////////////////////////////////////////////////////////////////////////
 
 TocModels::TocModels()
-       : bv_(0)
 {
        names_ = new TocTypeModel(this);
        names_sorted_ = new TocModelSortProxyModel(this);
@@ -272,7 +271,7 @@ void TocModels::clear()
 int TocModels::depth(QString const & type)
 {
        const_iterator it = models_.find(type);
-       if (!bv_ || it == models_.end())
+       if (it == models_.end())
                return 0;
        return it.value()->modelDepth();
 }
@@ -280,8 +279,6 @@ int TocModels::depth(QString const & type)
 
 QAbstractItemModel * TocModels::model(QString const & type)
 {
-       if (!bv_)
-               return 0;
        iterator it = models_.find(type);
        if (it != models_.end())
                return it.value()->model();
@@ -296,26 +293,27 @@ QAbstractItemModel * TocModels::nameModel()
 }
 
 
-QModelIndex TocModels::currentIndex(QString const & type) const
+QModelIndex TocModels::currentIndex(QString const & type,
+                                    DocIterator const & dit) const
 {
        const_iterator it = models_.find(type);
-       if (!bv_ || it == models_.end())
+       if (it == models_.end())
                return QModelIndex();
-       return it.value()->modelIndex(bv_->cursor());
+       return it.value()->modelIndex(dit);
 }
 
 
-void TocModels::goTo(QString const & type, QModelIndex const & index) const
+FuncRequest TocModels::goTo(QString const & type, QModelIndex const & index) const
 {
        const_iterator it = models_.find(type);
        if (it == models_.end() || !index.isValid()) {
                LYXERR(Debug::GUI, "TocModels::goTo(): QModelIndex is invalid!");
-               return;
+               return FuncRequest(LFUN_NOACTION);
        }
-       LASSERT(index.model() == it.value()->model(), return);
+       LASSERT(index.model() == it.value()->model(), return FuncRequest(LFUN_NOACTION));
        TocItem const item = it.value()->tocItem(index);
        LYXERR(Debug::GUI, "TocModels::goTo " << item.asString());
-       dispatch(item.action());
+       return item.action();
 }
 
 
@@ -341,9 +339,8 @@ void TocModels::updateItem(QString const & type, DocIterator const & dit)
 
 void TocModels::reset(BufferView const * bv)
 {
-       bv_ = bv;
        clear();
-       if (!bv_) {
+       if (!bv) {
                iterator end = models_.end();
                for (iterator it = models_.begin(); it != end;  ++it)
                        it.value()->reset();
@@ -354,20 +351,19 @@ void TocModels::reset(BufferView const * bv)
        names_->blockSignals(true);
        names_->beginResetModel();
        names_->insertColumns(0, 1);
-       TocList const & tocs = bv_->buffer().masterBuffer()->tocBackend().tocs();
-       TocList::const_iterator it = tocs.begin();
-       TocList::const_iterator toc_end = tocs.end();
-       for (; it != toc_end; ++it) {
-               QString const type = toqstr(it->first);
+       // In the outliner, add Tocs from the master document
+       TocBackend const & backend = bv->buffer().masterBuffer()->tocBackend();
+       for (pair<string, shared_ptr<Toc>> const & toc : backend.tocs()) {
+               QString const type = toqstr(toc.first);
 
                // First, fill in the toc models.
                iterator mod_it = models_.find(type);
                if (mod_it == models_.end())
                        mod_it = models_.insert(type, new TocModel(this));
-               mod_it.value()->reset(it->second);
+               mod_it.value()->reset(toc.second);
 
                // Fill in the names_ model.
-               QString const gui_name = guiName(it->first, bv->buffer().params());
+               QString const gui_name = toqstr(backend.outlinerName(toc.first));
                int const current_row = names_->rowCount();
                names_->insertRows(current_row, 1);
                QModelIndex const index = names_->index(current_row, 0);