diff options
author | Axel Waggershauser <awagger@gmail.com> | 2013-03-15 00:42:15 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-16 20:22:50 +0100 |
commit | b11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch) | |
tree | f81e40ee49f5109b4100048d131d5bb922b448aa /examples/widgets/tutorials/addressbook/part6/addressbook.cpp | |
parent | 72367a94a750355eb748793ce8c365373a332c9c (diff) |
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 <oswald.buddenhagen@digia.com>
Diffstat (limited to 'examples/widgets/tutorials/addressbook/part6/addressbook.cpp')
-rw-r--r-- | examples/widgets/tutorials/addressbook/part6/addressbook.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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 |