From 933cbb044e6e8f62e88fc04f5ac6cfb4c6aea094 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 24 Dec 2011 10:14:53 -0500 Subject: [PATCH] Apply astyle-kdelibs Over the years, the coding style is all over the place. Use 'git diff -w --ignore-all-space' to see non-whitespace changes. --- src/CopyInputDialog.cpp | 61 ++++++++++++++++++----------------------- src/CopyInputDialog.h | 18 ++++++++---- 2 files changed, 38 insertions(+), 41 deletions(-) diff --git a/src/CopyInputDialog.cpp b/src/CopyInputDialog.cpp index cd557b7d7..3392dfb52 100644 --- a/src/CopyInputDialog.cpp +++ b/src/CopyInputDialog.cpp @@ -30,18 +30,18 @@ using namespace Konsole; CopyInputDialog::CopyInputDialog(QWidget* parent) -: KDialog(parent) + : KDialog(parent) { setCaption(i18n("Copy Input")); - setButtons( KDialog::Ok | KDialog::Cancel ); + setButtons(KDialog::Ok | KDialog::Cancel); setWindowModality(Qt::WindowModal); _ui = new Ui::CopyInputDialog(); _ui->setupUi(mainWidget()); - connect(_ui->selectAllButton,SIGNAL(clicked()),this,SLOT(selectAll())); - connect(_ui->deselectAllButton,SIGNAL(clicked()),this,SLOT(deselectAll())); + connect(_ui->selectAllButton, SIGNAL(clicked()), this, SLOT(selectAll())); + connect(_ui->deselectAllButton, SIGNAL(clicked()), this, SLOT(deselectAll())); _ui->filterEdit->setClearButtonShown(true); _ui->filterEdit->setFocus(); @@ -56,11 +56,11 @@ CopyInputDialog::CopyInputDialog(QWidget* parent) filterProxyModel->setSourceModel(_model); filterProxyModel->setFilterKeyColumn(-1); - connect(_ui->filterEdit,SIGNAL(textChanged(QString)), + connect(_ui->filterEdit, SIGNAL(textChanged(QString)), filterProxyModel, SLOT(setFilterFixedString(QString))); _ui->sessionList->setModel(filterProxyModel); - _ui->sessionList->setColumnHidden(0,true); // Hide number column + _ui->sessionList->setColumnHidden(0, true); // Hide number column _ui->sessionList->header()->hide(); } @@ -84,9 +84,9 @@ QSet CopyInputDialog::chosenSessions() const void CopyInputDialog::setMasterSession(Session* session) { if (_masterSession) - _model->setCheckable(_masterSession,true); + _model->setCheckable(_masterSession, true); - _model->setCheckable(session,false); + _model->setCheckable(session, false); QSet checked = _model->checkedSessions(); checked.insert(session); _model->setCheckedSessions(checked); @@ -100,29 +100,26 @@ void CopyInputDialog::setSelectionChecked(bool checked) QModelIndexList selected = _ui->sessionList->selectionModel()->selectedIndexes(); - if (selected.count() > 1) - { - foreach(const QModelIndex& index, selected) - setRowChecked(index.row(),checked); - } - else - { - for (int i=0;i 1) { + foreach(const QModelIndex & index, selected) + setRowChecked(index.row(), checked); + } else { + for (int i = 0; i < rows; i++) + setRowChecked(i, checked); } } void CopyInputDialog::setRowChecked(int row, bool checked) { QAbstractItemModel* model = _ui->sessionList->model(); - QModelIndex index = model->index(row,_model->checkColumn()); + QModelIndex index = model->index(row, _model->checkColumn()); if (checked) - model->setData(index,(int)Qt::Checked,Qt::CheckStateRole); + model->setData(index, (int)Qt::Checked, Qt::CheckStateRole); else - model->setData(index,(int)Qt::Unchecked,Qt::CheckStateRole); + model->setData(index, (int)Qt::Unchecked, Qt::CheckStateRole); } CheckableSessionModel::CheckableSessionModel(QObject* parent) -: SessionListModel(parent) -, _checkColumn(0) + : SessionListModel(parent) + , _checkColumn(0) { } void CheckableSessionModel::setCheckColumn(int column) @@ -141,24 +138,20 @@ Qt::ItemFlags CheckableSessionModel::flags(const QModelIndex& index) const } QVariant CheckableSessionModel::data(const QModelIndex& index, int role) const { - if (role == Qt::CheckStateRole && index.column() == _checkColumn) - { + if (role == Qt::CheckStateRole && index.column() == _checkColumn) { Session* session = (Session*)index.internalPointer(); if (_checkedSessions.contains(session)) return QVariant::fromValue((int)Qt::Checked); else return QVariant::fromValue((int)Qt::Unchecked); - } - else - { - return SessionListModel::data(index,role); + } else { + return SessionListModel::data(index, role); } } bool CheckableSessionModel::setData(const QModelIndex& index, const QVariant& value, int role) { - if (role == Qt::CheckStateRole && index.column() == _checkColumn) - { + if (role == Qt::CheckStateRole && index.column() == _checkColumn) { Session* session = (Session*)index.internalPointer(); if (_fixedSessions.contains(session)) @@ -169,12 +162,10 @@ bool CheckableSessionModel::setData(const QModelIndex& index, const QVariant& va else _checkedSessions.remove(session); - emit dataChanged(index,index); + emit dataChanged(index, index); return true; - } - else - { - return SessionListModel::setData(index,value,role); + } else { + return SessionListModel::setData(index, value, role); } } void CheckableSessionModel::setCheckedSessions(const QSet sessions) diff --git a/src/CopyInputDialog.h b/src/CopyInputDialog.h index 0c33882bc..6dd64a222 100644 --- a/src/CopyInputDialog.h +++ b/src/CopyInputDialog.h @@ -32,7 +32,7 @@ namespace Ui { - class CopyInputDialog; +class CopyInputDialog; } namespace Konsole @@ -47,7 +47,7 @@ class CheckableSessionModel; */ class CopyInputDialog : public KDialog { -Q_OBJECT + Q_OBJECT public: CopyInputDialog(QWidget* parent = 0); @@ -67,8 +67,12 @@ public: QSet chosenSessions() const; private slots: - void selectAll() { setSelectionChecked(true); }; - void deselectAll() { setSelectionChecked(false); }; + void selectAll() { + setSelectionChecked(true); + }; + void deselectAll() { + setSelectionChecked(false); + }; private: // Checks or unchecks selected sessions. If there are no @@ -88,7 +92,7 @@ private: */ class CheckableSessionModel : public SessionListModel { -Q_OBJECT + Q_OBJECT public: CheckableSessionModel(QObject* parent); @@ -122,7 +126,9 @@ private: }; inline int CheckableSessionModel::checkColumn() const -{ return _checkColumn; } +{ + return _checkColumn; +} }