summaryrefslogtreecommitdiffstats
path: root/examples/widgets/tutorials/addressbook/part4
diff options
context:
space:
mode:
authorAxel Waggershauser <awagger@gmail.com>2013-03-15 00:42:15 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-16 20:22:50 +0100
commitb11317a64339f5a4bcffc8234ecaf15c7fb416f2 (patch)
treef81e40ee49f5109b4100048d131d5bb922b448aa /examples/widgets/tutorials/addressbook/part4
parent72367a94a750355eb748793ce8c365373a332c9c (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/part4')
-rw-r--r--examples/widgets/tutorials/addressbook/part4/addressbook.cpp24
-rw-r--r--examples/widgets/tutorials/addressbook/part4/addressbook.h8
2 files changed, 16 insertions, 16 deletions
diff --git a/examples/widgets/tutorials/addressbook/part4/addressbook.cpp b/examples/widgets/tutorials/addressbook/part4/addressbook.cpp
index 6b3731b5f6..66764a2815 100644
--- a/examples/widgets/tutorials/addressbook/part4/addressbook.cpp
+++ b/examples/widgets/tutorials/addressbook/part4/addressbook.cpp
@@ -53,17 +53,17 @@ AddressBook::AddressBook(QWidget *parent)
addressText->setReadOnly(true);
addButton = new QPushButton(tr("&Add"));
-//! [edit and remove buttons]
+//! [edit and remove buttons]
editButton = new QPushButton(tr("&Edit"));
editButton->setEnabled(false);
removeButton = new QPushButton(tr("&Remove"));
removeButton->setEnabled(false);
-//! [edit and remove buttons]
+//! [edit and remove buttons]
submitButton = new QPushButton(tr("&Submit"));
submitButton->hide();
cancelButton = new QPushButton(tr("&Cancel"));
cancelButton->hide();
-
+
nextButton = new QPushButton(tr("&Next"));
nextButton->setEnabled(false);
previousButton = new QPushButton(tr("&Previous"));
@@ -71,20 +71,20 @@ AddressBook::AddressBook(QWidget *parent)
connect(addButton, SIGNAL(clicked()), this, SLOT(addContact()));
connect(submitButton, SIGNAL(clicked()), this, SLOT(submitContact()));
-//! [connecting edit and remove]
+//! [connecting edit and remove]
connect(editButton, SIGNAL(clicked()), this, SLOT(editContact()));
connect(removeButton, SIGNAL(clicked()), this, SLOT(removeContact()));
-//! [connecting edit and remove]
+//! [connecting edit and remove]
connect(cancelButton, SIGNAL(clicked()), this, SLOT(cancel()));
connect(nextButton, SIGNAL(clicked()), this, SLOT(next()));
connect(previousButton, SIGNAL(clicked()), this, SLOT(previous()));
QVBoxLayout *buttonLayout1 = new QVBoxLayout;
buttonLayout1->addWidget(addButton);
-//! [adding edit and remove to the layout]
+//! [adding edit and remove to the layout]
buttonLayout1->addWidget(editButton);
buttonLayout1->addWidget(removeButton);
-//! [adding edit and remove to the layout]
+//! [adding edit and remove to the layout]
buttonLayout1->addWidget(submitButton);
buttonLayout1->addWidget(cancelButton);
buttonLayout1->addStretch();
@@ -138,7 +138,7 @@ void AddressBook::submitContact()
}
//! [submitContact() function part1]
if (currentMode == AddingMode) {
-
+
if (!contacts.contains(name)) {
contacts.insert(name, address);
QMessageBox::information(this, tr("Add Successful"),
@@ -150,7 +150,7 @@ void AddressBook::submitContact()
//! [submitContact() function part1]
//! [submitContact() function part2]
} else if (currentMode == EditingMode) {
-
+
if (oldName != name) {
if (!contacts.contains(name)) {
QMessageBox::information(this, tr("Edit Successful"),
@@ -164,7 +164,7 @@ void AddressBook::submitContact()
} else if (oldAddress != address) {
QMessageBox::information(this, tr("Edit Successful"),
tr("\"%1\" has been edited in your address book.").arg(name));
- contacts[name] = address;
+ contacts[name] = address;
}
}
@@ -192,7 +192,7 @@ void AddressBook::removeContact()
QMessageBox::Yes | QMessageBox::No);
if (button == QMessageBox::Yes) {
-
+
previous();
contacts.remove(name);
@@ -243,7 +243,7 @@ void AddressBook::updateInterface(Mode mode)
currentMode = mode;
switch (currentMode) {
-
+
case AddingMode:
case EditingMode:
diff --git a/examples/widgets/tutorials/addressbook/part4/addressbook.h b/examples/widgets/tutorials/addressbook/part4/addressbook.h
index ff8c4f0318..6430ac3413 100644
--- a/examples/widgets/tutorials/addressbook/part4/addressbook.h
+++ b/examples/widgets/tutorials/addressbook/part4/addressbook.h
@@ -77,10 +77,10 @@ private:
void updateInterface(Mode mode);
//! [updateInterface() declaration]
QPushButton *addButton;
-//! [buttons declaration]
+//! [buttons declaration]
QPushButton *editButton;
QPushButton *removeButton;
-//! [buttons declaration]
+//! [buttons declaration]
QPushButton *submitButton;
QPushButton *cancelButton;
QPushButton *nextButton;
@@ -91,9 +91,9 @@ private:
QMap<QString, QString> contacts;
QString oldName;
QString oldAddress;
-//! [mode declaration]
+//! [mode declaration]
Mode currentMode;
-//! [mode declaration]
+//! [mode declaration]
};
#endif