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

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

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 8f923d89f49e107b460fa611fb82832bfafacd0c..1b66b932e0c8711d2beaac2336fc7c4039d65578 100644 (file)
--- a/src/frontends/qt4/TocModel.cpp
+++ b/src/frontends/qt4/TocModel.cpp
@@ -1,5 +1,5 @@
 /**
- * \file QTocDialog.C
+ * \file TocModel.cpp
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -13,53 +13,35 @@
 
 #include "TocModel.h"
 
-#include "debug.h"
+#include "support/debug.h"
 
-#include <vector>
-#include <string>
+#include "support/assert.h"
+#include <climits>
 
-using std::endl;
-using std::pair;
-using std::map;
-using std::vector;
-using std::string;
-using std::make_pair;
-using std::max;
-using std::min;
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-
-TocModel::TocModel(Toc const & toc)
-{
-       populate(toc);
-}
+typedef std::pair<QModelIndex, TocIterator> TocPair;
 
 
-TocModel const & TocModel::operator=(Toc const & toc)
-{
-       populate(toc);
-       return *this;
-}
-
-
-TocIterator const TocModel::tocIterator(QModelIndex const & index) const
+TocIterator TocModel::tocIterator(QModelIndex const & index) const
 {
        TocMap::const_iterator map_it = toc_map_.find(index);
-       BOOST_ASSERT(map_it != toc_map_.end()); 
+       LASSERT(map_it != toc_map_.end(), /**/);
        return map_it->second;
 }
 
 
-QModelIndex const TocModel::modelIndex(TocIterator const & it) const
+QModelIndex TocModel::modelIndex(TocIterator const & it) const
 {
        ModelMap::const_iterator map_it = model_map_.find(it);
-       //BOOST_ASSERT(it != model_map_.end());
+       //LASSERT(it != model_map_.end(), /**/);
 
        if (map_it == model_map_.end())
                return QModelIndex();
-       
+
        return map_it->second;
 }
 
@@ -91,48 +73,41 @@ void TocModel::populate(Toc const & toc)
        mindepth_ = INT_MAX;
 
        while (iter != end) {
+               maxdepth_ = max(maxdepth_, iter->depth());
+               mindepth_ = min(mindepth_, iter->depth());
+               current_row = rowCount();
+               insertRows(current_row, 1);
+               top_level_item = QStandardItemModel::index(current_row, 0);
+               //setData(top_level_item, toqstr(iter->str()));
+               setData(top_level_item, toqstr(iter->str()), Qt::DisplayRole);
 
-               if (iter->isValid()) {
-
-                       maxdepth_ = max(maxdepth_, iter->depth());
-                       mindepth_ = min(mindepth_, iter->depth());
-                       current_row = rowCount();
-                       insertRows(current_row, 1);
-                       top_level_item = QStandardItemModel::index(current_row, 0);
-                       //setData(top_level_item, toqstr(iter->str()));
-                       setData(top_level_item, toqstr(iter->str()), Qt::DisplayRole);
+               // This looks like a gcc bug, in principle this should work:
+               //toc_map_[top_level_item] = iter;
+               // but it crashes with gcc-4.1 and 4.0.2
+               toc_map_.insert( TocPair(top_level_item, iter) );
+               model_map_[iter] = top_level_item;
 
-                       // This looks like a gcc bug, in principle this should work:
-                       //toc_map_[top_level_item] = iter;
-                       // but it crashes with gcc-4.1 and 4.0.2
-                       toc_map_.insert( TocPair(top_level_item, iter) );
-                       model_map_[iter] = top_level_item;
+               LYXERR(Debug::GUI, "Toc: at depth " << iter->depth()
+                       << ", added item " << to_utf8(iter->str()));
 
-                       LYXERR(Debug::GUI)
-                               << "Toc: at depth " << iter->depth()
-                               << ", added item " << to_utf8(iter->str())
-                               << endl;
-
-                       populate(iter, end, top_level_item);
-               }
+               populate(iter, end, top_level_item);
 
                if (iter == end)
                        break;
 
                ++iter;
        }
-       
+
        setHeaderData(0, Qt::Horizontal, QVariant("title"), Qt::DisplayRole);
 //     emit headerDataChanged();
 }
 
 
-void TocModel::populate(TocIterator & iter,
-                                               TocIterator const & end,
-                                               QModelIndex const & parent)
+void TocModel::populate(TocIterator & iter, TocIterator const & end,
+       QModelIndex const & parent)
 {
        int curdepth = iter->depth() + 1;
-       
+
        int current_row;
        QModelIndex child_item;
 
@@ -148,7 +123,7 @@ void TocModel::populate(TocIterator & iter,
                        --iter;
                        return;
                }
-               
+
                maxdepth_ = max(maxdepth_, iter->depth());
                mindepth_ = min(mindepth_, iter->depth());
                current_row = rowCount(parent);
@@ -167,7 +142,7 @@ void TocModel::populate(TocIterator & iter,
 }
 
 
-int TocModel::modelDepth()
+int TocModel::modelDepth() const
 {
        return maxdepth_ - mindepth_;
 }