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/part7 | |
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/part7')
-rw-r--r-- | examples/widgets/tutorials/addressbook/part7/addressbook.cpp | 24 | ||||
-rw-r--r-- | examples/widgets/tutorials/addressbook/part7/addressbook.h | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/examples/widgets/tutorials/addressbook/part7/addressbook.cpp b/examples/widgets/tutorials/addressbook/part7/addressbook.cpp index 6ad7630e8d..2060d97d2f 100644 --- a/examples/widgets/tutorials/addressbook/part7/addressbook.cpp +++ b/examples/widgets/tutorials/addressbook/part7/addressbook.cpp @@ -93,7 +93,7 @@ AddressBook::AddressBook(QWidget *parent) connect(loadButton, SIGNAL(clicked()), this, SLOT(loadFromFile())); connect(saveButton, SIGNAL(clicked()), this, SLOT(saveToFile())); connect(exportButton, SIGNAL(clicked()), this, SLOT(exportAsVCard())); - + QVBoxLayout *buttonLayout1 = new QVBoxLayout; buttonLayout1->addWidget(addButton); buttonLayout1->addWidget(editButton); @@ -153,7 +153,7 @@ void AddressBook::submitContact() } if (currentMode == AddingMode) { - + if (!contacts.contains(name)) { contacts.insert(name, address); QMessageBox::information(this, tr("Add Successful"), @@ -163,7 +163,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"), @@ -204,7 +204,7 @@ void AddressBook::removeContact() QMessageBox::Yes | QMessageBox::No); if (button == QMessageBox::Yes) { - + previous(); contacts.remove(name); @@ -298,7 +298,7 @@ void AddressBook::updateInterface(Mode mode) break; case NavigationMode: - + if (contacts.isEmpty()) { nameLine->clear(); addressText->clear(); @@ -331,7 +331,7 @@ void AddressBook::saveToFile() QString fileName = QFileDialog::getSaveFileName(this, tr("Save Address Book"), "", tr("Address Book (*.abk);;All Files (*)")); - + if (fileName.isEmpty()) return; else { @@ -404,14 +404,14 @@ void AddressBook::exportAsVCard() QString fileName = QFileDialog::getSaveFileName(this, tr("Export Contact"), "", tr("vCard Files (*.vcf);;All Files (*)")); - + if (fileName.isEmpty()) return; QFile file(fileName); //! [export function part1] - -//! [export function part2] + +//! [export function part2] if (!file.open(QIODevice::WriteOnly)) { QMessageBox::information(this, tr("Unable to open file"), file.errorString()); @@ -425,12 +425,12 @@ void AddressBook::exportAsVCard() out << "BEGIN:VCARD" << "\n"; out << "VERSION:2.1" << "\n"; out << "N:" << lastName << ";" << firstName << "\n"; - - if (!nameList.isEmpty()) + + if (!nameList.isEmpty()) out << "FN:" << nameList.join(' ') << "\n"; else out << "FN:" << firstName << "\n"; -//! [export function part3] +//! [export function part3] //! [export function part4] address.replace(";", "\\;", Qt::CaseInsensitive); diff --git a/examples/widgets/tutorials/addressbook/part7/addressbook.h b/examples/widgets/tutorials/addressbook/part7/addressbook.h index a34cf24a23..d672c7a85b 100644 --- a/examples/widgets/tutorials/addressbook/part7/addressbook.h +++ b/examples/widgets/tutorials/addressbook/part7/addressbook.h @@ -74,7 +74,7 @@ public slots: void loadFromFile(); //! [exportAsVCard() declaration] void exportAsVCard(); -//! [exportAsVCard() declaration] +//! [exportAsVCard() declaration] private: void updateInterface(Mode mode); @@ -89,9 +89,9 @@ private: QPushButton *previousButton; QPushButton *loadButton; QPushButton *saveButton; -//! [exportButton declaration] +//! [exportButton declaration] QPushButton *exportButton; -//! [exportButton declaration] +//! [exportButton declaration] QLineEdit *nameLine; QTextEdit *addressText; |