X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fabstractitemview.cpp;h=4fca7881b1a43f0aa0dc899ea261301dc4ef4f87;hp=ac084a29db69635f5061cc8c596e1c041763cec8;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=1cb02004ee5973b89368bd84f234d4652794690d diff --git a/src/uisupport/abstractitemview.cpp b/src/uisupport/abstractitemview.cpp index ac084a29..4fca7881 100644 --- a/src/uisupport/abstractitemview.cpp +++ b/src/uisupport/abstractitemview.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,37 +20,29 @@ #include "abstractitemview.h" -AbstractItemView::AbstractItemView(QWidget *parent) - : QWidget(parent), - _model(0), - _selectionModel(0) -{ -} +AbstractItemView::AbstractItemView(QWidget* parent) + : QWidget(parent) + , _model(nullptr) + , _selectionModel(nullptr) +{} - -void AbstractItemView::setModel(QAbstractItemModel *model) +void AbstractItemView::setModel(QAbstractItemModel* model) { if (_model) { - disconnect(_model, 0, this, 0); + disconnect(_model, nullptr, this, nullptr); } _model = model; - connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), - this, SLOT(dataChanged(QModelIndex, QModelIndex))); - connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), - this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int))); - connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), - this, SLOT(rowsInserted(QModelIndex, int, int))); + connect(model, &QAbstractItemModel::dataChanged, this, &AbstractItemView::dataChanged); + connect(model, &QAbstractItemModel::rowsAboutToBeRemoved, this, &AbstractItemView::rowsAboutToBeRemoved); + connect(model, &QAbstractItemModel::rowsInserted, this, &AbstractItemView::rowsInserted); } - -void AbstractItemView::setSelectionModel(QItemSelectionModel *selectionModel) +void AbstractItemView::setSelectionModel(QItemSelectionModel* selectionModel) { if (_selectionModel) { - disconnect(_selectionModel, 0, this, 0); + disconnect(_selectionModel, nullptr, this, nullptr); } _selectionModel = selectionModel; - connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), - this, SLOT(currentChanged(QModelIndex, QModelIndex))); - connect(selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), - this, SLOT(selectionChanged(QItemSelection, QItemSelection))); + connect(selectionModel, &QItemSelectionModel::currentChanged, this, &AbstractItemView::currentChanged); + connect(selectionModel, &QItemSelectionModel::selectionChanged, this, &AbstractItemView::selectionChanged); }