/// A QStandardItemModel that gives access to the reset methods.
/// This is needed in order to fix http://www.lyx.org/trac/ticket/3740
+// FIXME: Better appropriately subclass QStandardItemModel and implement
+// the toc-specific reset methods there.
class TocTypeModel : public QStandardItemModel
{
public:
///
void reset()
{
-#if (QT_VERSION < 0x050000)
- QStandardItemModel::reset();
-#else
+ QStandardItemModel::beginResetModel();
QStandardItemModel::endResetModel();
-#endif
}
///
void beginResetModel()
- {
- #if QT_VERSION >= 0x040600
- QStandardItemModel::beginResetModel();
- #endif
+ {
+ QStandardItemModel::beginResetModel();
}
///
void endResetModel()
- {
- #if QT_VERSION >= 0x040600
- QStandardItemModel::endResetModel();
- #else
- QStandardItemModel::reset();
- #endif
+ {
+ QStandardItemModel::endResetModel();
}
};
TocModel::TocModel(QObject * parent)
: model_(new TocTypeModel(parent)),
- sorted_model_(new QSortFilterProxyModel(parent)),
- is_sorted_(false), toc_(0), maxdepth_(0), mindepth_(0)
+ sorted_model_(new QSortFilterProxyModel(parent)),
+ is_sorted_(false), toc_(new Toc()),
+ maxdepth_(0), mindepth_(0)
{
sorted_model_->setSortLocaleAware(true);
sorted_model_->setSourceModel(model_);
{
model_->blockSignals(true);
model_->clear();
+ toc_ = make_shared<Toc>();
model_->blockSignals(false);
}
if (toc_->empty())
return QModelIndex();
- unsigned int const toc_index = toc_->item(dit) - toc_->begin();
+ unsigned int const toc_index = TocBackend::findItem(*toc_, dit) -
+ toc_->begin();
QModelIndexList list = model()->match(model()->index(0, 0), Qt::UserRole,
QVariant(toc_index), 1,
}
+void TocModel::setString(TocItem const & item, QModelIndex index)
+{
+ // Use implicit sharing of QStrings
+ QString str = toqstr(item.asString());
+ model_->setData(index, str, Qt::DisplayRole);
+ model_->setData(index, str, Qt::ToolTipRole);
+}
+
+
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);
+ QModelIndex const index = modelIndex(dit);
+ setString(tocItem(index), index);
}
-void TocModel::reset(Toc const & toc)
+void TocModel::reset(shared_ptr<Toc const> toc)
{
- toc_ = &toc;
+ toc_ = toc;
if (toc_->empty()) {
maxdepth_ = 0;
mindepth_ = 0;
int current_row = model_->rowCount();
model_->insertRows(current_row, 1);
QModelIndex top_level_item = model_->index(current_row, 0);
- model_->setData(top_level_item, toqstr(item.str()), Qt::DisplayRole);
+ setString(item, top_level_item);
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());
+ << ", added item " << item.asString());
populate(index, top_level_item);
if (index >= end)
{
int curdepth = (*toc_)[index].depth() + 1;
- int current_row;
QModelIndex child_item;
model_->insertColumns(0, 1, parent);
}
maxdepth_ = max(maxdepth_, item.depth());
mindepth_ = min(mindepth_, item.depth());
- current_row = model_->rowCount(parent);
+ int current_row = model_->rowCount(parent);
model_->insertRows(current_row, 1, parent);
child_item = model_->index(current_row, 0, parent);
- model_->setData(child_item, toqstr(item.str()), Qt::DisplayRole);
+ setString(item, child_item);
model_->setData(child_item, index, Qt::UserRole);
- model_->setData(child_item, toqstr(item.tooltip()), Qt::ToolTipRole);
populate(index, child_item);
if (index >= end)
break;
}
LASSERT(index.model() == it.value()->model(), return);
TocItem const item = it.value()->tocItem(index);
- LYXERR(Debug::GUI, "TocModels::goTo " << item.str());
+ LYXERR(Debug::GUI, "TocModels::goTo " << item.asString());
dispatch(item.action());
}
return TocItem();
}
LASSERT(index.model() == it.value()->model(), return TocItem());
-
+
return it.value()->tocItem(index);
}
-
+
void TocModels::updateItem(QString const & type, DocIterator const & dit)
{