projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Prefer default member init over ctor init
[quassel.git]
/
src
/
client
/
selectionmodelsynchronizer.cpp
diff --git
a/src/client/selectionmodelsynchronizer.cpp
b/src/client/selectionmodelsynchronizer.cpp
index
14c57c0
..
717ef4e
100644
(file)
--- a/
src/client/selectionmodelsynchronizer.cpp
+++ b/
src/client/selectionmodelsynchronizer.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-28,9
+28,7
@@
SelectionModelSynchronizer::SelectionModelSynchronizer(QAbstractItemModel *parent)
: QObject(parent),
_model(parent),
SelectionModelSynchronizer::SelectionModelSynchronizer(QAbstractItemModel *parent)
: QObject(parent),
_model(parent),
- _selectionModel(parent),
- _changeCurrentEnabled(true),
- _changeSelectionEnabled(true)
+ _selectionModel(parent)
{
connect(&_selectionModel, SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
this, SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
{
connect(&_selectionModel, SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
this, SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
@@
-45,8
+43,8
@@
bool SelectionModelSynchronizer::checkBaseModel(QItemSelectionModel *selectionMo
return false;
const QAbstractItemModel *baseModel = selectionModel->model();
return false;
const QAbstractItemModel *baseModel = selectionModel->model();
- const QAbstractProxyModel *proxyModel =
0
;
- while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
0
) {
+ const QAbstractProxyModel *proxyModel =
nullptr
;
+ while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
nullptr
) {
baseModel = proxyModel->sourceModel();
if (baseModel == model())
break;
baseModel = proxyModel->sourceModel();
if (baseModel == model())
break;
@@
-81,8
+79,8
@@
void SelectionModelSynchronizer::synchronizeSelectionModel(QItemSelectionModel *
void SelectionModelSynchronizer::removeSelectionModel(QItemSelectionModel *model)
{
void SelectionModelSynchronizer::removeSelectionModel(QItemSelectionModel *model)
{
- disconnect(model,
0, this, 0
);
- disconnect(this,
0, model, 0
);
+ disconnect(model,
nullptr, this, nullptr
);
+ disconnect(this,
nullptr, model, nullptr
);
selectionModelDestroyed(model);
}
selectionModelDestroyed(model);
}
@@
-156,8
+154,8
@@
QModelIndex SelectionModelSynchronizer::mapFromSource(const QModelIndex &sourceI
// make a list of all involved proxies, wie have to traverse backwards
QList<const QAbstractProxyModel *> proxyModels;
const QAbstractItemModel *baseModel = selectionModel->model();
// make a list of all involved proxies, wie have to traverse backwards
QList<const QAbstractProxyModel *> proxyModels;
const QAbstractItemModel *baseModel = selectionModel->model();
- const QAbstractProxyModel *proxyModel =
0
;
- while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
0
) {
+ const QAbstractProxyModel *proxyModel =
nullptr
;
+ while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
nullptr
) {
if (baseModel == model())
break;
proxyModels << proxyModel;
if (baseModel == model())
break;
proxyModels << proxyModel;
@@
-182,8
+180,8
@@
QItemSelection SelectionModelSynchronizer::mapSelectionFromSource(const QItemSel
// make a list of all involved proxies, wie have to traverse backwards
QList<const QAbstractProxyModel *> proxyModels;
const QAbstractItemModel *baseModel = selectionModel->model();
// make a list of all involved proxies, wie have to traverse backwards
QList<const QAbstractProxyModel *> proxyModels;
const QAbstractItemModel *baseModel = selectionModel->model();
- const QAbstractProxyModel *proxyModel =
0
;
- while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
0
) {
+ const QAbstractProxyModel *proxyModel =
nullptr
;
+ while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
nullptr
) {
if (baseModel == model())
break;
proxyModels << proxyModel;
if (baseModel == model())
break;
proxyModels << proxyModel;
@@
-204,8
+202,8
@@
QModelIndex SelectionModelSynchronizer::mapToSource(const QModelIndex &index, QI
QModelIndex sourceIndex = index;
const QAbstractItemModel *baseModel = selectionModel->model();
QModelIndex sourceIndex = index;
const QAbstractItemModel *baseModel = selectionModel->model();
- const QAbstractProxyModel *proxyModel =
0
;
- while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
0
) {
+ const QAbstractProxyModel *proxyModel =
nullptr
;
+ while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
nullptr
) {
sourceIndex = proxyModel->mapToSource(sourceIndex);
baseModel = proxyModel->sourceModel();
if (baseModel == model())
sourceIndex = proxyModel->mapToSource(sourceIndex);
baseModel = proxyModel->sourceModel();
if (baseModel == model())
@@
-221,8
+219,8
@@
QItemSelection SelectionModelSynchronizer::mapSelectionToSource(const QItemSelec
QItemSelection sourceSelection = selection;
const QAbstractItemModel *baseModel = selectionModel->model();
QItemSelection sourceSelection = selection;
const QAbstractItemModel *baseModel = selectionModel->model();
- const QAbstractProxyModel *proxyModel =
0
;
- while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
0
) {
+ const QAbstractProxyModel *proxyModel =
nullptr
;
+ while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) !=
nullptr
) {
sourceSelection = proxyModel->mapSelectionToSource(sourceSelection);
baseModel = proxyModel->sourceModel();
if (baseModel == model())
sourceSelection = proxyModel->mapSelectionToSource(sourceSelection);
baseModel = proxyModel->sourceModel();
if (baseModel == model())