X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fflatproxymodel.cpp;h=844f6e1b5cb674991272e690353e209ee372a023;hp=bd6dcd087f77c0d105c97bfc5baeb433952d41d9;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=d82f98b8cf9c7c83f3aab1d7f010ccf8bdd2c003 diff --git a/src/uisupport/flatproxymodel.cpp b/src/uisupport/flatproxymodel.cpp index bd6dcd08..844f6e1b 100644 --- a/src/uisupport/flatproxymodel.cpp +++ b/src/uisupport/flatproxymodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -24,8 +24,7 @@ #include FlatProxyModel::FlatProxyModel(QObject *parent) - : QAbstractProxyModel(parent), - _rootSourceItem(0) + : QAbstractProxyModel(parent) { } @@ -33,7 +32,7 @@ FlatProxyModel::FlatProxyModel(QObject *parent) QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const { if (!sourceIndex.isValid()) - return QModelIndex(); + return {}; SourceItem *sourceItem = sourceToInternal(sourceIndex); Q_ASSERT(sourceItem); @@ -44,7 +43,7 @@ QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const QModelIndex FlatProxyModel::mapToSource(const QModelIndex &proxyIndex) const { if (!proxyIndex.isValid()) - return QModelIndex(); + return {}; Q_ASSERT(proxyIndex.model() == this); Q_ASSERT(_rootSourceItem); @@ -64,7 +63,7 @@ QModelIndex FlatProxyModel::mapToSource(const QModelIndex &proxyIndex) const qWarning() << "FlatProxyModel::mapToSource(): couldn't find source index for" << proxyIndex; Q_ASSERT(false); - return QModelIndex(); // make compilers happy :) + return {}; // make compilers happy :) } @@ -96,7 +95,7 @@ QItemSelection FlatProxyModel::mapSelectionFromSource(const QItemSelection &sour QModelIndex currentParent = currentRange.topLeft().parent(); Q_ASSERT(currentParent == currentRange.bottomRight().parent()); - SourceItem *parentItem = 0; + SourceItem *parentItem = nullptr; if (!itemLookup.contains(currentParent)) { parentItem = sourceToInternal(currentParent); itemLookup[currentParent] = parentItem; @@ -178,9 +177,9 @@ QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS for (int i = 0; i < proxySelection.count(); i++) { const QItemSelectionRange &range = proxySelection[i]; - SourceItem *topLeftItem = 0; - SourceItem *bottomRightItem = 0; - SourceItem *currentItem = static_cast(range.topLeft().internalPointer()); + SourceItem *topLeftItem = nullptr; + SourceItem *bottomRightItem = nullptr; + auto *currentItem = static_cast(range.topLeft().internalPointer()); int row = range.topLeft().row(); int left = range.topLeft().column(); int right = range.bottomRight().column(); @@ -195,8 +194,8 @@ QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS else { Q_ASSERT(topLeftItem && bottomRightItem); sourceSelection << QItemSelectionRange(mapToSource(createIndex(topLeftItem->pos(), left, topLeftItem)), mapToSource(createIndex(bottomRightItem->pos(), right, bottomRightItem))); - topLeftItem = 0; - bottomRightItem = 0; + topLeftItem = nullptr; + bottomRightItem = nullptr; } // update loop vars @@ -216,7 +215,7 @@ QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS void FlatProxyModel::setSourceModel(QAbstractItemModel *sourceModel) { if (QAbstractProxyModel::sourceModel()) { - disconnect(QAbstractProxyModel::sourceModel(), 0, this, 0); + disconnect(QAbstractProxyModel::sourceModel(), nullptr, this, nullptr); } QAbstractProxyModel::setSourceModel(sourceModel); @@ -227,36 +226,36 @@ void FlatProxyModel::setSourceModel(QAbstractItemModel *sourceModel) emit layoutChanged(); if (sourceModel) { - connect(sourceModel, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)), - this, SLOT(on_columnsAboutToBeInserted(const QModelIndex &, int, int))); - connect(sourceModel, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)), - this, SLOT(on_columnsAboutToBeRemoved(const QModelIndex &, int, int))); - connect(sourceModel, SIGNAL(columnsInserted(const QModelIndex &, int, int)), - this, SLOT(on_columnsInserted(const QModelIndex &, int, int))); - connect(sourceModel, SIGNAL(columnsRemoved(const QModelIndex &, int, int)), - this, SLOT(on_columnsRemoved(const QModelIndex &, int, int))); - - connect(sourceModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), - this, SLOT(on_dataChanged(const QModelIndex &, const QModelIndex &))); + connect(sourceModel, &QAbstractItemModel::columnsAboutToBeInserted, + this, &FlatProxyModel::on_columnsAboutToBeInserted); + connect(sourceModel, &QAbstractItemModel::columnsAboutToBeRemoved, + this, &FlatProxyModel::on_columnsAboutToBeRemoved); + connect(sourceModel, &QAbstractItemModel::columnsInserted, + this, &FlatProxyModel::on_columnsInserted); + connect(sourceModel, &QAbstractItemModel::columnsRemoved, + this, &FlatProxyModel::on_columnsRemoved); + + connect(sourceModel, &QAbstractItemModel::dataChanged, + this, &FlatProxyModel::on_dataChanged); // on_headerDataChanged(Qt::Orientation orientation, int first, int last) - connect(sourceModel, SIGNAL(layoutAboutToBeChanged()), - this, SLOT(on_layoutAboutToBeChanged())); - connect(sourceModel, SIGNAL(layoutChanged()), - this, SLOT(on_layoutChanged())); + connect(sourceModel, &QAbstractItemModel::layoutAboutToBeChanged, + this, &FlatProxyModel::on_layoutAboutToBeChanged); + connect(sourceModel, &QAbstractItemModel::layoutChanged, + this, &FlatProxyModel::on_layoutChanged); - connect(sourceModel, SIGNAL(modelAboutToBeReset()), - this, SLOT(on_modelAboutToBeReset())); + connect(sourceModel, &QAbstractItemModel::modelAboutToBeReset, + this, &FlatProxyModel::on_modelAboutToBeReset); // void on_modelReset() - connect(sourceModel, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)), - this, SLOT(on_rowsAboutToBeInserted(const QModelIndex &, int, int))); - connect(sourceModel, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)), - this, SLOT(on_rowsAboutToBeRemoved(const QModelIndex &, int, int))); - connect(sourceModel, SIGNAL(rowsInserted(const QModelIndex &, int, int)), - this, SLOT(on_rowsInserted(const QModelIndex &, int, int))); - connect(sourceModel, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), - this, SLOT(on_rowsRemoved(const QModelIndex &, int, int))); + connect(sourceModel, &QAbstractItemModel::rowsAboutToBeInserted, + this, &FlatProxyModel::on_rowsAboutToBeInserted); + connect(sourceModel, &QAbstractItemModel::rowsAboutToBeRemoved, + this, &FlatProxyModel::on_rowsAboutToBeRemoved); + connect(sourceModel, &QAbstractItemModel::rowsInserted, + this, &FlatProxyModel::on_rowsInserted); + connect(sourceModel, &QAbstractItemModel::rowsRemoved, + this, &FlatProxyModel::on_rowsRemoved); } } @@ -271,7 +270,7 @@ void FlatProxyModel::insertSubTree(const QModelIndex &source_idx, bool emitInser SourceItem *lastItem = insertSubTreeHelper(newSubTree, newSubTree, source_idx); Q_ASSERT(lastItem); - Q_ASSERT(lastItem->next() == 0); + Q_ASSERT(lastItem->next() == nullptr); if (emitInsert) beginInsertRows(QModelIndex(), newSubTree->pos(), lastItem->pos()); @@ -310,7 +309,7 @@ void FlatProxyModel::insertSubTree(const QModelIndex &source_idx, bool emitInser FlatProxyModel::SourceItem *FlatProxyModel::insertSubTreeHelper(SourceItem *parentItem, SourceItem *lastItem_, const QModelIndex &source_idx) { SourceItem *lastItem = lastItem_; - SourceItem *newItem = 0; + SourceItem *newItem = nullptr; for (int row = 0; row < sourceModel()->rowCount(source_idx); row++) { newItem = new SourceItem(row, parentItem); newItem->setPos(lastItem->pos() + 1); @@ -368,12 +367,12 @@ QModelIndex FlatProxyModel::index(int row, int column, const QModelIndex &parent { if (parent.isValid()) { qWarning() << "FlatProxyModel::index() called with valid parent:" << parent; - return QModelIndex(); + return {}; } if (!_rootSourceItem) { qWarning() << "FlatProxyModel::index() while model has no root Item"; - return QModelIndex(); + return {}; } SourceItem *item = _rootSourceItem; @@ -381,7 +380,7 @@ QModelIndex FlatProxyModel::index(int row, int column, const QModelIndex &parent item = item->findChild(row); if (!item) { qWarning() << "FlatProxyModel::index() no such row:" << row; - return QModelIndex(); + return {}; } } @@ -394,7 +393,7 @@ QModelIndex FlatProxyModel::parent(const QModelIndex &index) const { Q_UNUSED(index) // this is a flat model - return QModelIndex(); + return {}; } @@ -525,7 +524,7 @@ void FlatProxyModel::on_rowsAboutToBeInserted(const QModelIndex &parent, int sta SourceItem *nextItem = prevItem->next(); - SourceItem *newItem = 0; + SourceItem *newItem = nullptr; int newPos = prevItem->pos() + 1; for (int row = start; row <= end; row++) { newItem = new SourceItem(row, sourceItem); @@ -683,9 +682,7 @@ void FlatProxyModel::checkChildCount(const QModelIndex &index, const SourceItem // SourceItem // ======================================== FlatProxyModel::SourceItem::SourceItem(int row, SourceItem *parent) - : _parent(parent), - _pos(-1), - _next(0) + : _parent(parent) { if (parent) { parent->_childs.insert(row, this);