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 --- .../tutorials/addressbook/part6/addressbook.cpp | 24 +++++++++++----------- .../tutorials/addressbook/part6/addressbook.h | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'examples/widgets/tutorials/addressbook/part6') diff --git a/examples/widgets/tutorials/addressbook/part6/addressbook.cpp b/examples/widgets/tutorials/addressbook/part6/addressbook.cpp index a9bc2cc51c..2ced8e2404 100644 --- a/examples/widgets/tutorials/addressbook/part6/addressbook.cpp +++ b/examples/widgets/tutorials/addressbook/part6/addressbook.cpp @@ -71,9 +71,9 @@ AddressBook::AddressBook(QWidget *parent) previousButton->setEnabled(false); loadButton = new QPushButton(tr("&Load...")); -//! [tooltip 1] +//! [tooltip 1] loadButton->setToolTip(tr("Load contacts from a file")); -//! [tooltip 1] +//! [tooltip 1] saveButton = new QPushButton(tr("&Save...")); //! [tooltip 2] saveButton->setToolTip(tr("Save contacts to a file")); @@ -92,7 +92,7 @@ AddressBook::AddressBook(QWidget *parent) connect(previousButton, SIGNAL(clicked()), this, SLOT(previous())); connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile())); connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile())); - + QVBoxLayout *buttonLayout1 = new QVBoxLayout; buttonLayout1->addWidget(addButton); buttonLayout1->addWidget(editButton); @@ -151,7 +151,7 @@ void AddressBook::submitContact() } if (currentMode == AddingMode) { - + if (!contacts.contains(name)) { contacts.insert(name, address); QMessageBox::information(this, tr("Add Successful"), @@ -161,7 +161,7 @@ void AddressBook::submitContact() tr("Sorry, \"%1\" is already in your address book.").arg(name)); } } else if (currentMode == EditingMode) { - + if (oldName != name) { if (!contacts.contains(name)) { QMessageBox::information(this, tr("Edit Successful"), @@ -202,7 +202,7 @@ void AddressBook::removeContact() QMessageBox::Yes | QMessageBox::No); if (button == QMessageBox::Yes) { - + previous(); contacts.remove(name); @@ -296,7 +296,7 @@ void AddressBook::updateInterface(Mode mode) break; case NavigationMode: - + if (contacts.isEmpty()) { nameLine->clear(); addressText->clear(); @@ -341,12 +341,12 @@ void AddressBook::saveToFile() return; } -//! [saveToFile() function part2] +//! [saveToFile() function part2] //! [saveToFile() function part3] QDataStream out(&file); out.setVersion(QDataStream::Qt_4_5); out << contacts; - } + } } //! [saveToFile() function part3] @@ -362,15 +362,15 @@ void AddressBook::loadFromFile() if (fileName.isEmpty()) return; else { - + QFile file(fileName); - + if (!file.open(QIODevice::ReadOnly)) { QMessageBox::information(this, tr("Unable to open file"), file.errorString()); return; } - + QDataStream in(&file); in.setVersion(QDataStream::Qt_4_5); contacts.clear(); // clear existing contacts diff --git a/examples/widgets/tutorials/addressbook/part6/addressbook.h b/examples/widgets/tutorials/addressbook/part6/addressbook.h index 99dfd1e404..ce2691ccad 100644 --- a/examples/widgets/tutorials/addressbook/part6/addressbook.h +++ b/examples/widgets/tutorials/addressbook/part6/addressbook.h @@ -70,10 +70,10 @@ public slots: void findContact(); void next(); void previous(); -//! [save and load functions declaration] +//! [save and load functions declaration] void saveToFile(); void loadFromFile(); -//! [save and load functions declaration] +//! [save and load functions declaration] private: void updateInterface(Mode mode); @@ -86,10 +86,10 @@ private: QPushButton *cancelButton; QPushButton *nextButton; QPushButton *previousButton; -//! [save and load buttons declaration] +//! [save and load buttons declaration] QPushButton *loadButton; QPushButton *saveButton; -//! [save and load buttons declaration] +//! [save and load buttons declaration] QLineEdit *nameLine; QTextEdit *addressText; -- cgit v1.2.3