projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use raw string literals instead of escaped strings
[quassel.git]
/
src
/
uisupport
/
flatproxymodel.cpp
diff --git
a/src/uisupport/flatproxymodel.cpp
b/src/uisupport/flatproxymodel.cpp
index
aef7b1b
..
d722c18
100644
(file)
--- a/
src/uisupport/flatproxymodel.cpp
+++ b/
src/uisupport/flatproxymodel.cpp
@@
-24,8
+24,7
@@
#include <QDebug>
FlatProxyModel::FlatProxyModel(QObject *parent)
#include <QDebug>
FlatProxyModel::FlatProxyModel(QObject *parent)
- : QAbstractProxyModel(parent),
- _rootSourceItem(nullptr)
+ : QAbstractProxyModel(parent)
{
}
{
}
@@
-33,7
+32,7
@@
FlatProxyModel::FlatProxyModel(QObject *parent)
QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const
{
if (!sourceIndex.isValid())
QModelIndex FlatProxyModel::mapFromSource(const QModelIndex &sourceIndex) const
{
if (!sourceIndex.isValid())
- return
QModelIndex()
;
+ return
{}
;
SourceItem *sourceItem = sourceToInternal(sourceIndex);
Q_ASSERT(sourceItem);
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())
QModelIndex FlatProxyModel::mapToSource(const QModelIndex &proxyIndex) const
{
if (!proxyIndex.isValid())
- return
QModelIndex()
;
+ return
{}
;
Q_ASSERT(proxyIndex.model() == this);
Q_ASSERT(_rootSourceItem);
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);
qWarning() << "FlatProxyModel::mapToSource(): couldn't find source index for" << proxyIndex;
Q_ASSERT(false);
- return
QModelIndex()
; // make compilers happy :)
+ return
{}
; // make compilers happy :)
}
}
@@
-180,7
+179,7
@@
QItemSelection FlatProxyModel::mapSelectionToSource(const QItemSelection &proxyS
SourceItem *topLeftItem = nullptr;
SourceItem *bottomRightItem = nullptr;
SourceItem *topLeftItem = nullptr;
SourceItem *bottomRightItem = nullptr;
-
SourceItem
*currentItem = static_cast<SourceItem *>(range.topLeft().internalPointer());
+
auto
*currentItem = static_cast<SourceItem *>(range.topLeft().internalPointer());
int row = range.topLeft().row();
int left = range.topLeft().column();
int right = range.bottomRight().column();
int row = range.topLeft().row();
int left = range.topLeft().column();
int right = range.bottomRight().column();
@@
-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;
{
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";
}
if (!_rootSourceItem) {
qWarning() << "FlatProxyModel::index() while model has no root Item";
- return
QModelIndex()
;
+ return
{}
;
}
SourceItem *item = _rootSourceItem;
}
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;
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
{
Q_UNUSED(index)
// this is a flat model
- return
QModelIndex()
;
+ return
{}
;
}
}
@@
-683,9
+682,7
@@
void FlatProxyModel::checkChildCount(const QModelIndex &index, const SourceItem
// SourceItem
// ========================================
FlatProxyModel::SourceItem::SourceItem(int row, SourceItem *parent)
// SourceItem
// ========================================
FlatProxyModel::SourceItem::SourceItem(int row, SourceItem *parent)
- : _parent(parent),
- _pos(-1),
- _next(nullptr)
+ : _parent(parent)
{
if (parent) {
parent->_childs.insert(row, this);
{
if (parent) {
parent->_childs.insert(row, this);