Amend f441590c

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

diff --git a/src/frontends/qt4/TocModel.h b/src/frontends/qt4/TocModel.h
index 6385a586b5c61ea170bad2ead3d25394d71d1d3e..4d4d442719bb86d8fef5c7e7141e5fbd48cdfc67 100644 (file)
--- a/src/frontends/qt4/TocModel.h
+++ b/src/frontends/qt4/TocModel.h
@@ -12,12 +12,10 @@
 #ifndef TOCMODEL_H
 #define TOCMODEL_H
 
-#include "qt_helpers.h"
+#include "support/shared_ptr.h"
 
 #include <QHash>
-#include <QStandardItemModel>
-
-class QSortFilterProxyModel;
+#include <QSortFilterProxyModel>
 
 namespace lyx {
 
@@ -29,30 +27,26 @@ class TocItem;
 
 namespace frontend {
 
-/// A QStandardItemModel that gives access to the reset method.
-/// This is needed in order to fix http://bugzilla.lyx.org/show_bug.cgi?id=3740
-class TocTypeModel : public QStandardItemModel
-{
-public:
-       ///
-       TocTypeModel(QObject * parent);
-       ///
-       void reset();
-};
+class TocTypeModel;
 
 /// A class that adapt the TocBackend of a Buffer into standard Qt models for
 /// GUI visualisation.
 /// There is one TocModel per list in the TocBackend.
 class TocModel
 {
+       /// noncopyable
+       TocModel(TocModel const &);
+       void operator=(TocModel const &);
 public:
        ///
        TocModel(QObject * parent);
        ///
-       void reset(Toc const & toc);
+       void reset(shared_ptr<Toc const>);
        ///
        void reset();
        ///
+       void updateItem(DocIterator const & dit);
+       ///
        void clear();
        ///
        QAbstractItemModel * model();
@@ -79,7 +73,7 @@ private:
        ///
        bool is_sorted_;
        ///
-       Toc const * toc_;
+       shared_ptr<Toc const> toc_;
        ///
        int maxdepth_;
        ///
@@ -87,6 +81,30 @@ private:
 };
 
 
+/// A filter to sort the models alphabetically but with
+/// the table of contents on top.
+class TocModelSortProxyModel : public QSortFilterProxyModel
+{
+public:
+       TocModelSortProxyModel(QObject * w) 
+               : QSortFilterProxyModel(w)
+       {}
+
+       bool lessThan (const QModelIndex & left, const QModelIndex & right) const
+       {
+               if (left.model()->data(left, Qt::UserRole).toString()
+                         == QString("tableofcontents"))
+                       return true;
+               else if (right.model()->data(right, Qt::UserRole).toString()
+                         == QString("tableofcontents"))
+                       return false;
+               else
+                       return QSortFilterProxyModel::lessThan(left, right);
+       }
+};
+
+
+
 /// A container for the different TocModels.
 class TocModels : public QObject
 {
@@ -109,11 +127,14 @@ public:
        ///
        void init(Buffer const & buffer);
        ///
-       void updateBackend() const;
+       void updateItem(QString const & type, DocIterator const & dit);
        ///
        void sort(QString const & type, bool sort_it);
        ///
        bool isSorted(QString const & type) const;
+       /// the item that is currently selected
+       TocItem const currentItem(QString const & type,
+               QModelIndex const & index) const;
 
 Q_SIGNALS:
        /// Signal that the internal toc_models_ has been reset.
@@ -131,7 +152,7 @@ private:
        ///
        TocTypeModel * names_;
        ///
-       QSortFilterProxyModel * names_sorted_;
+       TocModelSortProxyModel * names_sorted_;
 };
 
 } // namespace frontend