enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / qt4 / QToc.C

diff --git a/src/frontends/qt4/QToc.C b/src/frontends/qt4/QToc.C
index cb3ae3e7f8426d1796f0408e8bbaa9800fc53516..4d3b332cedace6f2f6652206e7b942d5937084b7 100644 (file)
--- a/src/frontends/qt4/QToc.C
+++ b/src/frontends/qt4/QToc.C
@@ -31,6 +31,7 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
+
 QToc::QToc(Dialog & parent)
        : ControlToc(parent)
 {
@@ -76,17 +77,13 @@ QStandardItemModel * QToc::setTocModel(int type)
 QModelIndex const QToc::getCurrentIndex()
 {
        vector<string> const & types = getTypes();
-       toc::TocItem const item = getCurrentTocItem(types[type_]);
-       if (item.id_ == -1) {
-               lyxerr[Debug::GUI]
-                       << "QToc::getCurrentIndex(): TocItem is invalid!" << endl;
+       TocIterator const it = getCurrentTocItem(types[type_]);
+       if (!it->isValid()) {
+               lyxerr[Debug::GUI] << "QToc::getCurrentIndex(): TocItem is invalid!" << endl;
                return QModelIndex();
        }
 
-       string toc_str = item.str;
-       toc_str.erase(0, toc_str.find(' ') + 1);
-
-       return toc_models_[type_]->index(toc_str);
+       return toc_models_[type_]->modelIndex(it);
 }
 
 
@@ -98,12 +95,14 @@ void QToc::goTo(QModelIndex const & index)
                        << endl;
                return;
        }
+
+       TocIterator const it = toc_models_[type_]->tocIterator(index);
        
        lyxerr[Debug::GUI]
-               << "QToc::goTo " << toc_models_[type_]->item(index).str
+               << "QToc::goTo " << it->str()
                << endl;
 
-       ControlToc::goTo(toc_models_[type_]->item(index));
+       it->goTo(kernel().lyxview());
 }
 
 
@@ -139,28 +138,9 @@ void QToc::update()
 
 void QToc::updateToc(int type)
 {
-       vector<string> const & choice = getTypes();
-
-       toc_models_[type] = new TocModel(getContents(choice[type]));
+       toc_models_[type] = new TocModel(getContents(getTypes()[type]));
 }
 
 
-void QToc::move(toc::OutlineOp const operation, QModelIndex & index)
-{
-       int toc_id = toc_models_[type_]->item(index).id_;
-       string toc_str = toc_models_[type_]->item(index).str;
-       toc_str.erase(0, toc_str.find(' ') + 1);
-
-       outline(operation);
-       updateToc(type_);
-
-       lyxerr[Debug::GUI]
-               << "Toc id " << toc_id
-               << "  Toc str " << toc_str
-               << endl;
-
-       index = toc_models_[type_]->index(toc_str);
-}
-
 } // namespace frontend
 } // namespace lyx