Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

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

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index 0246ad3328b806507aaa0d89fddd3b0e624a5fd9..46985c2fcfa584d4701d37755ea0a27e065b5815 100644 (file)
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -213,8 +213,8 @@ void TocWidget::updateView()
 
 void TocWidget::updateGui(int selected_type)
 {
-       vector<docstring> const & type_names = form_.typeNames();
-       if (type_names.empty()) {
+       QStringList const & type_names = form_.typeNames();
+       if (type_names.isEmpty()) {
                enableControls(false);
                typeCO->clear();
                tocTV->setModel(new QStandardItemModel);
@@ -225,10 +225,8 @@ void TocWidget::updateGui(int selected_type)
        QString const current_text = typeCO->currentText();
        typeCO->blockSignals(true);
        typeCO->clear();
-       for (size_t i = 0; i != type_names.size(); ++i) {
-               QString item = toqstr(type_names[i]);
-               typeCO->addItem(item);
-       }
+       for (int i = 0; i != type_names.size(); ++i)
+               typeCO->addItem(type_names[i]);
        if (selected_type != -1)
                typeCO->setCurrentIndex(selected_type);
        else {
@@ -243,7 +241,7 @@ void TocWidget::updateGui(int selected_type)
 
        // setTocModel produce QTreeView reset and setting depth again
        // is needed. That must be done after all Qt updates are processed.
-       QTimer::singleShot(1, this, SLOT(setTreeDepth()));
+       QTimer::singleShot(0, this, SLOT(setTreeDepth()));
 }