From b6ca1f1c848676442ff2b782107645fb9a71d721 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 6 Aug 2015 13:36:38 +0200 Subject: [PATCH] GIT_SILENT astyle-kdelibs reformatting --- autotests/kextracolumnsproxymodeltest.cpp | 3 ++- src/kextracolumnsproxymodel.cpp | 11 +++++------ src/krearrangecolumnsproxymodel.cpp | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autotests/kextracolumnsproxymodeltest.cpp b/autotests/kextracolumnsproxymodeltest.cpp index c77fbe4..1ac7856 100644 --- a/autotests/kextracolumnsproxymodeltest.cpp +++ b/autotests/kextracolumnsproxymodeltest.cpp @@ -76,7 +76,8 @@ private: } return KExtraColumnsProxyModel::setExtraColumnData(parent, row, extraColumn, data, role); } - void changeExtraColumnData() { + void changeExtraColumnData() + { m_extraColumnData = '<'; extraColumnDataChanged(QModelIndex(), 0, 0, QVector() << Qt::EditRole); } diff --git a/src/kextracolumnsproxymodel.cpp b/src/kextracolumnsproxymodel.cpp index 5dfec99..eec7ae9 100644 --- a/src/kextracolumnsproxymodel.cpp +++ b/src/kextracolumnsproxymodel.cpp @@ -71,7 +71,7 @@ bool KExtraColumnsProxyModel::setExtraColumnData(const QModelIndex &parent, int return false; } -void KExtraColumnsProxyModel::extraColumnDataChanged(const QModelIndex &parent, int row, int extraColumn, const QVector & roles) +void KExtraColumnsProxyModel::extraColumnDataChanged(const QModelIndex &parent, int row, int extraColumn, const QVector &roles) { const QModelIndex idx = index(row, proxyColumnForExtraColumn(extraColumn), parent); emit dataChanged(idx, idx, roles); @@ -81,9 +81,9 @@ void KExtraColumnsProxyModel::setSourceModel(QAbstractItemModel *model) { if (sourceModel()) { disconnect(sourceModel(), SIGNAL(layoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint)), - this, SLOT(_ec_sourceLayoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint))); + this, SLOT(_ec_sourceLayoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint))); disconnect(sourceModel(), SIGNAL(layoutChanged(QList,QAbstractItemModel::LayoutChangeHint)), - this, SLOT(_ec_sourceLayoutChanged(QList,QAbstractItemModel::LayoutChangeHint))); + this, SLOT(_ec_sourceLayoutChanged(QList,QAbstractItemModel::LayoutChangeHint))); } QIdentityProxyModel::setSourceModel(model); @@ -92,9 +92,9 @@ void KExtraColumnsProxyModel::setSourceModel(QAbstractItemModel *model) // The handling of persistent model indexes assumes mapToSource can be called for any index // This breaks for the extra column, so we'll have to do it ourselves disconnect(model, SIGNAL(layoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint)), - this, SLOT(_q_sourceLayoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint))); + this, SLOT(_q_sourceLayoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint))); disconnect(model, SIGNAL(layoutChanged(QList,QAbstractItemModel::LayoutChangeHint)), - this, SLOT(_q_sourceLayoutChanged(QList,QAbstractItemModel::LayoutChangeHint))); + this, SLOT(_q_sourceLayoutChanged(QList,QAbstractItemModel::LayoutChangeHint))); connect(model, SIGNAL(layoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint)), this, SLOT(_ec_sourceLayoutAboutToBeChanged(QList,QAbstractItemModel::LayoutChangeHint))); connect(model, SIGNAL(layoutChanged(QList,QAbstractItemModel::LayoutChangeHint)), @@ -125,7 +125,6 @@ QModelIndex KExtraColumnsProxyModel::sibling(int row, int column, const QModelIn QItemSelection KExtraColumnsProxyModel::mapSelectionToSource(const QItemSelection &selection) const { - Q_D(const KExtraColumnsProxyModel); QItemSelection sourceSelection; if (!sourceModel()) { diff --git a/src/krearrangecolumnsproxymodel.cpp b/src/krearrangecolumnsproxymodel.cpp index bd1b49b..72e4f14 100644 --- a/src/krearrangecolumnsproxymodel.cpp +++ b/src/krearrangecolumnsproxymodel.cpp @@ -28,7 +28,7 @@ public: KRearrangeColumnsProxyModel::KRearrangeColumnsProxyModel(QObject *parent) : QIdentityProxyModel(parent), - d_ptr(new KRearrangeColumnsProxyModelPrivate) + d_ptr(new KRearrangeColumnsProxyModelPrivate) { }