cosmetics

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26629 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 8bb33f9258c8fb23f7f06c380023337d1448d45a..37f8b704b28a19a66521b954066524cb6cd3c5d9 100644 (file)
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -34,7 +34,14 @@ using namespace std;
 namespace lyx {
 namespace frontend {
 
-TocTypeModel::TocTypeModel(QObject * parent): QStandardItemModel(parent)
+///////////////////////////////////////////////////////////////////////////////
+//
+// TocModels
+//
+///////////////////////////////////////////////////////////////////////////////
+
+TocTypeModel::TocTypeModel(QObject * parent)
+       : QStandardItemModel(parent)
 {
 }
 
@@ -127,8 +134,6 @@ void TocModel::reset(Toc const & toc)
        }
 
        model_->blockSignals(true);
-       int current_row;
-       QModelIndex top_level_item;
        model_->insertColumns(0, 1);
        maxdepth_ = 0;
        mindepth_ = INT_MAX;
@@ -138,9 +143,9 @@ void TocModel::reset(Toc const & toc)
                TocItem const & item = (*toc_)[index];
                maxdepth_ = max(maxdepth_, item.depth());
                mindepth_ = min(mindepth_, item.depth());
-               current_row = model_->rowCount();
+               int current_row = model_->rowCount();
                model_->insertRows(current_row, 1);
-               top_level_item = model_->index(current_row, 0);
+               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);
 
@@ -200,10 +205,13 @@ int TocModel::modelDepth() const
 
 
 ///////////////////////////////////////////////////////////////////////////////
-// TocModels implementation.
+//
+// TocModels
+//
 ///////////////////////////////////////////////////////////////////////////////
 
-TocModels::TocModels(): bv_(0)
+TocModels::TocModels()
+       : bv_(0)
 {
        names_ = new TocTypeModel(this);
        names_sorted_ = new QSortFilterProxyModel(this);

diff --git a/src/frontends/qt4/TocModel.h b/src/frontends/qt4/TocModel.h
index d5e7ea830d08e070a36ba69c9bfbfc8979fefce9..f4ac2a28c6791b2be4af3d62917840ae42d2d985 100644 (file)
--- a/src/frontends/qt4/TocModel.h
+++ b/src/frontends/qt4/TocModel.h
@@ -15,10 +15,9 @@
 #include "qt_helpers.h"
 
 #include <QHash>
-#include <QList>
-#include <QSortFilterProxyModel>
 #include <QStandardItemModel>
-#include <QStringList>
+
+class QSortFilterProxyModel;
 
 namespace lyx {
 
@@ -34,7 +33,7 @@ class TocTypeModel : public QStandardItemModel
 {
 public:
        ///
-       TocTypeModel(QObject * parent = 0);
+       TocTypeModel(QObject * parent);
        ///
        void reset();
 };
@@ -44,7 +43,7 @@ class TocModel
 {
 public:
        ///
-       TocModel(QObject * parent = 0);
+       TocModel(QObject * parent);
        ///
        void reset(Toc const & toc);
        ///
@@ -76,16 +75,15 @@ private:
        ///
        bool is_sorted_;
        ///
-       QList<QModelIndex> toc_indexes_;
-       ///
        Toc const * toc_;
        ///
        int maxdepth_;
+       ///
        int mindepth_;
 };
 
 
-class TocModels: public QObject
+class TocModels : public QObject
 {
        Q_OBJECT
 public: