From b11317a64339f5a4bcffc8234ecaf15c7fb416f2 Mon Sep 17 00:00:00 2001 From: Axel Waggershauser Date: Fri, 15 Mar 2013 00:42:15 +0100 Subject: Whitespace cleanup: remove trailing whitespace Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen --- examples/widgets/itemviews/addressbook/adddialog.cpp | 16 ++++++++-------- examples/widgets/itemviews/addressbook/adddialog.h | 2 +- .../widgets/itemviews/addressbook/addresswidget.cpp | 20 ++++++++++---------- .../widgets/itemviews/addressbook/mainwindow.cpp | 6 +++--- .../widgets/itemviews/addressbook/newaddresstab.cpp | 12 ++++++------ .../widgets/itemviews/addressbook/newaddresstab.h | 4 ++-- examples/widgets/itemviews/addressbook/tablemodel.h | 2 +- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'examples/widgets/itemviews/addressbook') diff --git a/examples/widgets/itemviews/addressbook/adddialog.cpp b/examples/widgets/itemviews/addressbook/adddialog.cpp index f68cacc2e5..bb31fd60c4 100644 --- a/examples/widgets/itemviews/addressbook/adddialog.cpp +++ b/examples/widgets/itemviews/addressbook/adddialog.cpp @@ -50,31 +50,31 @@ AddDialog::AddDialog(QWidget *parent) addressLabel = new QLabel("Address"); okButton = new QPushButton("OK"); cancelButton = new QPushButton("Cancel"); - + nameText = new QLineEdit; addressText = new QTextEdit; - + QGridLayout *gLayout = new QGridLayout; gLayout->setColumnStretch(1, 2); gLayout->addWidget(nameLabel, 0, 0); gLayout->addWidget(nameText, 0, 1); - + gLayout->addWidget(addressLabel, 1, 0, Qt::AlignLeft|Qt::AlignTop); gLayout->addWidget(addressText, 1, 1, Qt::AlignLeft); - + QHBoxLayout *buttonLayout = new QHBoxLayout; buttonLayout->addWidget(okButton); buttonLayout->addWidget(cancelButton); - + gLayout->addLayout(buttonLayout, 2, 1, Qt::AlignRight); - + QVBoxLayout *mainLayout = new QVBoxLayout; mainLayout->addLayout(gLayout); setLayout(mainLayout); - + connect(okButton, SIGNAL(clicked()), this, SLOT(accept())); connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject())); - + setWindowTitle(tr("Add a Contact")); } //! [0] diff --git a/examples/widgets/itemviews/addressbook/adddialog.h b/examples/widgets/itemviews/addressbook/adddialog.h index 8412664287..78f56ef744 100644 --- a/examples/widgets/itemviews/addressbook/adddialog.h +++ b/examples/widgets/itemviews/addressbook/adddialog.h @@ -54,7 +54,7 @@ QT_END_NAMESPACE class AddDialog : public QDialog { Q_OBJECT - + public: AddDialog(QWidget *parent = 0); QLineEdit *nameText; diff --git a/examples/widgets/itemviews/addressbook/addresswidget.cpp b/examples/widgets/itemviews/addressbook/addresswidget.cpp index 2c05e0e059..cd6f4a5534 100644 --- a/examples/widgets/itemviews/addressbook/addresswidget.cpp +++ b/examples/widgets/itemviews/addressbook/addresswidget.cpp @@ -52,7 +52,7 @@ AddressWidget::AddressWidget(QWidget *parent) connect(newAddressTab, SIGNAL(sendDetails(QString, QString)), this, SLOT(addEntry(QString, QString))); - addTab(newAddressTab, "Address Book"); + addTab(newAddressTab, "Address Book"); setupTabs(); } @@ -60,13 +60,13 @@ AddressWidget::AddressWidget(QWidget *parent) //! [2] void AddressWidget::addEntry() -{ +{ AddDialog aDialog; if (aDialog.exec()) { QString name = aDialog.nameText->text(); QString address = aDialog.addressText->toPlainText(); - + addEntry(name, address); } } @@ -74,7 +74,7 @@ void AddressWidget::addEntry() //! [3] void AddressWidget::addEntry(QString name, QString address) -{ +{ QList >list = table->getList(); QPair pair(name, address); @@ -110,14 +110,14 @@ void AddressWidget::editEntry() QModelIndex nameIndex = table->index(row, 0, QModelIndex()); QVariant varName = table->data(nameIndex, Qt::DisplayRole); name = varName.toString(); - + QModelIndex addressIndex = table->index(row, 1, QModelIndex()); QVariant varAddr = table->data(addressIndex, Qt::DisplayRole); address = varAddr.toString(); } //! [4a] - -//! [4b] + +//! [4b] AddDialog aDialog; aDialog.setWindowTitle(tr("Edit a Contact")); @@ -141,7 +141,7 @@ void AddressWidget::removeEntry() QTableView *temp = static_cast(currentWidget()); QSortFilterProxyModel *proxy = static_cast(temp->model()); QItemSelectionModel *selectionModel = temp->selectionModel(); - + QModelIndexList indexes = selectionModel->selectedRows(); foreach (QModelIndex index, indexes) { @@ -163,7 +163,7 @@ void AddressWidget::setupTabs() for (int i = 0; i < groups.size(); ++i) { QString str = groups.at(i); - + proxyModel = new QSortFilterProxyModel(this); proxyModel->setSourceModel(table); @@ -181,7 +181,7 @@ void AddressWidget::setupTabs() proxyModel->setFilterRegExp(QRegExp(newStr, Qt::CaseInsensitive)); proxyModel->setFilterKeyColumn(0); proxyModel->sort(0, Qt::AscendingOrder); - + connect(tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SIGNAL(selectionChanged(QItemSelection))); diff --git a/examples/widgets/itemviews/addressbook/mainwindow.cpp b/examples/widgets/itemviews/addressbook/mainwindow.cpp index 8f1ea81763..8e66e9cb49 100644 --- a/examples/widgets/itemviews/addressbook/mainwindow.cpp +++ b/examples/widgets/itemviews/addressbook/mainwindow.cpp @@ -58,7 +58,7 @@ MainWindow::MainWindow() void MainWindow::createMenus() { fileMenu = menuBar()->addMenu(tr("&File")); - + openAct = new QAction(tr("&Open..."), this); fileMenu->addAction(openAct); connect(openAct, SIGNAL(triggered()), this, SLOT(openFile())); @@ -79,7 +79,7 @@ void MainWindow::createMenus() addAct = new QAction(tr("&Add Entry..."), this); toolMenu->addAction(addAct); connect(addAct, SIGNAL(triggered()), addressWidget, SLOT(addEntry())); - + //! [1b] editAct = new QAction(tr("&Edit Entry..."), this); editAct->setEnabled(false); @@ -120,7 +120,7 @@ void MainWindow::saveFile() void MainWindow::updateActions(const QItemSelection &selection) { QModelIndexList indexes = selection.indexes(); - + if (!indexes.isEmpty()) { removeAct->setEnabled(true); editAct->setEnabled(true); diff --git a/examples/widgets/itemviews/addressbook/newaddresstab.cpp b/examples/widgets/itemviews/addressbook/newaddresstab.cpp index b443d9cf96..a8e770cab8 100644 --- a/examples/widgets/itemviews/addressbook/newaddresstab.cpp +++ b/examples/widgets/itemviews/addressbook/newaddresstab.cpp @@ -50,15 +50,15 @@ NewAddressTab::NewAddressTab(QWidget *parent) descriptionLabel = new QLabel(tr("There are currently no contacts in your address book. " "\nClick Add to add new contacts.")); - + addButton = new QPushButton(tr("Add")); - + connect(addButton, SIGNAL(clicked()), this, SLOT(addEntry())); - + mainLayout = new QVBoxLayout; mainLayout->addWidget(descriptionLabel); mainLayout->addWidget(addButton, 0, Qt::AlignCenter); - + setLayout(mainLayout); } //! [0] @@ -67,11 +67,11 @@ NewAddressTab::NewAddressTab(QWidget *parent) void NewAddressTab::addEntry() { AddDialog aDialog; - + if (aDialog.exec()) { QString name = aDialog.nameText->text(); QString address = aDialog.addressText->toPlainText(); - + emit sendDetails(name, address); } } diff --git a/examples/widgets/itemviews/addressbook/newaddresstab.h b/examples/widgets/itemviews/addressbook/newaddresstab.h index 51e75aa366..2db7302e75 100644 --- a/examples/widgets/itemviews/addressbook/newaddresstab.h +++ b/examples/widgets/itemviews/addressbook/newaddresstab.h @@ -53,7 +53,7 @@ QT_END_NAMESPACE class NewAddressTab : public QWidget { Q_OBJECT - + public: NewAddressTab(QWidget *parent = 0); @@ -67,7 +67,7 @@ private: QLabel *descriptionLabel; QPushButton *addButton; QVBoxLayout *mainLayout; - + }; //! [0] diff --git a/examples/widgets/itemviews/addressbook/tablemodel.h b/examples/widgets/itemviews/addressbook/tablemodel.h index 0ef54fae6a..e282defa1b 100644 --- a/examples/widgets/itemviews/addressbook/tablemodel.h +++ b/examples/widgets/itemviews/addressbook/tablemodel.h @@ -49,7 +49,7 @@ class TableModel : public QAbstractTableModel { Q_OBJECT - + public: TableModel(QObject *parent = 0); TableModel(QList > listofPairs, QObject *parent = 0); -- cgit v1.2.3