On Linux show in crash message box the backtrace

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

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 870b9242da5816b546cf59060e0ef5c8d653f3bc..cd1189b49b473371c2e2b6ce53ee76147dfe8c18 100644 (file)
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -19,12 +19,15 @@
 #include "DocIterator.h"
 #include "FuncRequest.h"
 #include "LyX.h"
+#include "qt_helpers.h"
 #include "TocBackend.h"
 
 #include "support/debug.h"
 #include "support/lassert.h"
 
 #include <QSortFilterProxyModel>
+#include <QStandardItemModel>
+
 
 #include <climits>
 
@@ -44,7 +47,11 @@ public:
        ///
        void reset()
        {
+#if (QT_VERSION < 0x050000)
                QStandardItemModel::reset();
+#else
+               QStandardItemModel::endResetModel();
+#endif
        }
        ///
        void beginResetModel()
@@ -76,9 +83,7 @@ TocModel::TocModel(QObject * parent)
        sorted_model_(new QSortFilterProxyModel(parent)),
        is_sorted_(false), maxdepth_(0), mindepth_(0)
 {
-#if QT_VERSION >= 0x040300
        sorted_model_->setSortLocaleAware(true);
-#endif
        sorted_model_->setSourceModel(model_);
 }
 
@@ -148,6 +153,7 @@ void TocModel::updateItem(DocIterator const & dit)
        QModelIndex index = modelIndex(dit);
        TocItem const & toc_item = tocItem(index);
        model_->setData(index, toqstr(toc_item.str()), Qt::DisplayRole);
+       model_->setData(index, toqstr(toc_item.tooltip()), Qt::ToolTipRole);
 }
 
 
@@ -177,6 +183,7 @@ void TocModel::reset(Toc const & toc)
                QModelIndex top_level_item = model_->index(current_row, 0);
                model_->setData(top_level_item, toqstr(item.str()), Qt::DisplayRole);
                model_->setData(top_level_item, index, Qt::UserRole);
+               model_->setData(top_level_item, toqstr(item.tooltip()), Qt::ToolTipRole);
 
                LYXERR(Debug::GUI, "Toc: at depth " << item.depth()
                        << ", added item " << item.str());
@@ -187,11 +194,11 @@ void TocModel::reset(Toc const & toc)
        }
 
        model_->setHeaderData(0, Qt::Horizontal, QVariant("title"), Qt::DisplayRole);
+       sorted_model_->setSourceModel(model_);
        if (is_sorted_)
                sorted_model_->sort(0);
        model_->blockSignals(false);
        model_->endResetModel();
-//     emit headerDataChanged();
 }
 
 
@@ -218,6 +225,7 @@ void TocModel::populate(unsigned int & index, QModelIndex const & parent)
                child_item = model_->index(current_row, 0, parent);
                model_->setData(child_item, toqstr(item.str()), Qt::DisplayRole);
                model_->setData(child_item, index, Qt::UserRole);
+               model_->setData(child_item, toqstr(item.tooltip()), Qt::ToolTipRole);
                populate(index, child_item);
                if (index >= end)
                        break;
@@ -243,11 +251,9 @@ TocModels::TocModels()
        : bv_(0)
 {
        names_ = new TocTypeModel(this);
-       names_sorted_ = new QSortFilterProxyModel(this);
+       names_sorted_ = new TocModelSortProxyModel(this);
        names_sorted_->setSourceModel(names_);
-#if QT_VERSION >= 0x040300
        names_sorted_->setSortLocaleAware(true);
-#endif
        names_sorted_->sort(0);
 }
 
@@ -327,13 +333,6 @@ TocItem const TocModels::currentItem(QString const & type,
 }
  
 
-void TocModels::updateBackend() const
-{
-       bv_->buffer().masterBuffer()->tocBackend().update();
-       bv_->buffer().structureChanged();
-}
-
-
 void TocModels::updateItem(QString const & type, DocIterator const & dit)
 {
        models_[type]->updateItem(dit);