From dee87d4e80d2758a8ffc1e7cca80eb6f11bbecf6 Mon Sep 17 00:00:00 2001
From: Kavindra Devi Palaraja <kavindra.palaraja@nokia.com>
Date: Wed, 22 Jul 2009 15:48:20 +0200
Subject: [PATCH] Doc - Modified Part 6 to use ui->
Reviewed-By: TrustMe
---
.../addressbook-sdk/part6/addressbook.cpp | 175 +++++++-----------
.../addressbook-sdk/part6/addressbook.h | 19 +-
.../addressbook-sdk/part6/finddialog.cpp | 21 +--
.../addressbook-sdk/part6/finddialog.h | 5 +-
4 files changed, 77 insertions(+), 143 deletions(-)
diff --git a/doc/examples/addressbook-sdk/part6/addressbook.cpp b/doc/examples/addressbook-sdk/part6/addressbook.cpp
index 5748fe377ab..6d8a15bc24d 100644
--- a/doc/examples/addressbook-sdk/part6/addressbook.cpp
+++ b/doc/examples/addressbook-sdk/part6/addressbook.cpp
@@ -6,69 +6,30 @@ AddressBook::AddressBook(QWidget *parent)
{
ui->setupUi(this);
- nameLine = new QLineEdit;
- nameLine = ui->nameLine;
- nameLine->setReadOnly(true);
-
- addressText = new QTextEdit;
- addressText = ui->addressText;
- addressText->setReadOnly(true);
-
- addButton = new QPushButton;
- addButton = ui->addButton;
-
- submitButton = new QPushButton;
- submitButton = ui->submitButton;
- submitButton->hide();
-
- cancelButton = new QPushButton;
- cancelButton = ui->cancelButton;
- cancelButton->hide();
-
- nextButton = new QPushButton;
- nextButton = ui->nextButton;
- nextButton->setEnabled(false);
-
- previousButton = new QPushButton;
- previousButton = ui->previousButton;
- previousButton->setEnabled(false);
-
- editButton = new QPushButton;
- editButton = ui->editButton;
- editButton->setEnabled(false);
-
- removeButton = new QPushButton;
- removeButton = ui->removeButton;
- removeButton->setEnabled(false);
-
- findButton = new QPushButton;
- findButton = ui->findButton;
-
- dialog = new FindDialog;
-
-//! [private members]
- loadButton = new QPushButton;
- loadButton = ui->loadButton;
-
- saveButton = new QPushButton;
- saveButton = ui->saveButton;
-//! [private members]
-
- connect(addButton, SIGNAL(clicked()), this,
+ ui->nameLine->setReadOnly(true);
+ ui->addressText->setReadOnly(true);
+ ui->submitButton->hide();
+ ui->cancelButton->hide();
+ ui->nextButton->setEnabled(false);
+ ui->previousButton->setEnabled(false);
+ ui->editButton->setEnabled(false);
+ ui->removeButton->setEnabled(false);
+
+ connect(ui->addButton, SIGNAL(clicked()), this,
SLOT(addContact()));
- connect(submitButton, SIGNAL(clicked()), this,
+ connect(ui->submitButton, SIGNAL(clicked()), this,
SLOT(submitContact()));
- connect(cancelButton, SIGNAL(clicked()), this,
+ connect(ui->cancelButton, SIGNAL(clicked()), this,
SLOT(cancel()));
- connect(nextButton, SIGNAL(clicked()), this,
+ connect(ui->nextButton, SIGNAL(clicked()), this,
SLOT(next()));
- connect(previousButton, SIGNAL(clicked()), this,
+ connect(ui->previousButton, SIGNAL(clicked()), this,
SLOT(previous()));
- connect(editButton, SIGNAL(clicked()), this,
+ connect(ui->editButton, SIGNAL(clicked()), this,
SLOT(editContact()));
- connect(removeButton, SIGNAL(clicked()), this,
+ connect(ui->removeButton, SIGNAL(clicked()), this,
SLOT(removeContact()));
- connect(findButton, SIGNAL(clicked()), this,
+ connect(ui->findButton, SIGNAL(clicked()), this,
SLOT(findContact()));
setWindowTitle(tr("Simple Address Book"));
@@ -81,23 +42,25 @@ AddressBook::~AddressBook()
void AddressBook::addContact()
{
- oldName = nameLine->text();
- oldAddress = addressText->toPlainText();
+ oldName = ui->nameLine->text();
+ oldAddress = ui->addressText->toPlainText();
- nameLine->clear();
- addressText->clear();
+ ui->nameLine->clear();
+ ui->addressText->clear();
updateInterface(AddingMode);
}
void AddressBook::submitContact()
{
- QString name = nameLine->text();
- QString address = addressText->toPlainText();
+ QString name = ui->nameLine->text();
+ QString address = ui->addressText->toPlainText();
if (name == "" || address == "") {
QMessageBox::information(this, tr("Empty Field"),
tr("Please enter a name and address."));
+ updateInterface(NavigationMode);
+ return;
}
if (currentMode == AddingMode) {
@@ -134,15 +97,15 @@ void AddressBook::submitContact()
void AddressBook::cancel()
{
- nameLine->setText(oldName);
- nameLine->setReadOnly(true);
+ ui->nameLine->setText(oldName);
+ ui->nameLine->setReadOnly(true);
updateInterface(NavigationMode);
}
void AddressBook::next()
{
- QString name = nameLine->text();
+ QString name = ui->nameLine->text();
QMap<QString, QString>::iterator i = contacts.find(name);
if (i != contacts.end())
@@ -150,18 +113,18 @@ void AddressBook::next()
if (i == contacts.end())
i = contacts.begin();
- nameLine->setText(i.key());
- addressText->setText(i.value());
+ ui->nameLine->setText(i.key());
+ ui->addressText->setText(i.value());
}
void AddressBook::previous()
{
- QString name = nameLine->text();
+ QString name = ui->nameLine->text();
QMap<QString, QString>::iterator i = contacts.find(name);
if (i == contacts.end()) {
- nameLine->clear();
- addressText->clear();
+ ui->nameLine->clear();
+ ui->addressText->clear();
return;
}
@@ -169,22 +132,22 @@ void AddressBook::previous()
i = contacts.end();
i--;
- nameLine->setText(i.key());
- addressText->setText(i.value());
+ ui->nameLine->setText(i.key());
+ ui->addressText->setText(i.value());
}
void AddressBook::editContact()
{
- oldName = nameLine->text();
- oldAddress = addressText->toPlainText();
+ oldName = ui->nameLine->text();
+ oldAddress = ui->addressText->toPlainText();
updateInterface(EditingMode);
}
void AddressBook::removeContact()
{
- QString name = nameLine->text();
- QString address = addressText->toPlainText();
+ QString name = ui->nameLine->text();
+ QString address = ui->addressText->toPlainText();
if (contacts.contains(name)) {
int button = QMessageBox::question(this,
@@ -213,55 +176,55 @@ void AddressBook::updateInterface(Mode mode)
case AddingMode:
case EditingMode:
- nameLine->setReadOnly(false);
- nameLine->setFocus(Qt::OtherFocusReason);
- addressText->setReadOnly(false);
+ ui->nameLine->setReadOnly(false);
+ ui->nameLine->setFocus(Qt::OtherFocusReason);
+ ui->addressText->setReadOnly(false);
- addButton->setEnabled(false);
- editButton->setEnabled(false);
- removeButton->setEnabled(false);
+ ui->addButton->setEnabled(false);
+ ui->editButton->setEnabled(false);
+ ui->removeButton->setEnabled(false);
- nextButton->setEnabled(false);
- previousButton->setEnabled(false);
+ ui->nextButton->setEnabled(false);
+ ui->previousButton->setEnabled(false);
- submitButton->show();
- cancelButton->show();
+ ui->submitButton->show();
+ ui->cancelButton->show();
break;
case NavigationMode:
if (contacts.isEmpty()) {
- nameLine->clear();
- addressText->clear();
+ ui->nameLine->clear();
+ ui->addressText->clear();
}
- nameLine->setReadOnly(true);
- addressText->setReadOnly(true);
- addButton->setEnabled(true);
+ ui->nameLine->setReadOnly(true);
+ ui->addressText->setReadOnly(true);
+ ui->addButton->setEnabled(true);
int number = contacts.size();
- editButton->setEnabled(number >= 1);
- removeButton->setEnabled(number >= 1);
- findButton->setEnabled(number > 2);
- nextButton->setEnabled(number > 1);
- previousButton->setEnabled(number >1);
-
- submitButton->hide();
- cancelButton->hide();
+ ui->editButton->setEnabled(number >= 1);
+ ui->removeButton->setEnabled(number >= 1);
+ ui->findButton->setEnabled(number > 2);
+ ui->nextButton->setEnabled(number > 1);
+ ui->previousButton->setEnabled(number >1);
+
+ ui->submitButton->hide();
+ ui->cancelButton->hide();
break;
}
}
void AddressBook::findContact()
{
- dialog->show();
+ FindDialog dialog;
- if (dialog->exec() == QDialog::Accepted) {
- QString contactName = dialog->getFindText();
+ if (dialog.exec() == QDialog::Accepted) {
+ QString contactName = dialog.findText();
if (contacts.contains(contactName)) {
- nameLine->setText(contactName);
- addressText->setText(contacts.value(contactName));
+ ui->nameLine->setText(contactName);
+ ui->addressText->setText(contacts.value(contactName));
} else {
QMessageBox::information(this, tr("Contact Not Found"),
tr("Sorry, \"%1\" is not in your address book.").arg(contactName));
@@ -333,8 +296,8 @@ void AddressBook::loadFromFile()
tr("The file you are attempting to open contains no contacts."));
} else {
QMap<QString, QString>::iterator i = contacts.begin();
- nameLine->setText(i.key());
- addressText->setText(i.value());
+ ui->nameLine->setText(i.key());
+ ui->addressText->setText(i.value());
}
}
diff --git a/doc/examples/addressbook-sdk/part6/addressbook.h b/doc/examples/addressbook-sdk/part6/addressbook.h
index 3ed6231a5d6..2dd06cb9aea 100644
--- a/doc/examples/addressbook-sdk/part6/addressbook.h
+++ b/doc/examples/addressbook-sdk/part6/addressbook.h
@@ -2,10 +2,8 @@
#define ADDRESSBOOK_H
#include <QtGui/QWidget>
-#include <QtGui/QPushButton>
-#include <QtGui/QLineEdit>
-#include <QtGui/QTextEdit>
#include <QtGui/QMessageBox>
+#include <QtCore/QMap>
#include "finddialog.h"
namespace Ui
@@ -38,22 +36,7 @@ public slots:
private:
Ui::AddressBook *ui;
-
void updateInterface(Mode mode);
- QPushButton *addButton;
- QPushButton *submitButton;
- QPushButton *cancelButton;
- QPushButton *editButton;
- QPushButton *removeButton;
- QPushButton *nextButton;
- QPushButton *previousButton;
- QPushButton *findButton;
-//! [private members]
- QPushButton *loadButton;
- QPushButton *saveButton;
-//! [private members]
- QLineEdit *nameLine;
- QTextEdit *addressText;
QMap<QString, QString> contacts;
QString oldName;
diff --git a/doc/examples/addressbook-sdk/part6/finddialog.cpp b/doc/examples/addressbook-sdk/part6/finddialog.cpp
index 478ab9e9cd8..0ddbb29a150 100644
--- a/doc/examples/addressbook-sdk/part6/finddialog.cpp
+++ b/doc/examples/addressbook-sdk/part6/finddialog.cpp
@@ -7,15 +7,8 @@ FindDialog::FindDialog(QWidget *parent) :
m_ui(new Ui::FindDialog)
{
m_ui->setupUi(this);
- lineEdit = new QLineEdit;
- lineEdit = m_ui->lineEdit;
- findButton = new QPushButton;
- findButton = m_ui->findButton;
-
- findText = "";
-
- connect(findButton, SIGNAL(clicked()), this, SLOT(findClicked()));
+ connect(m_ui->findButton, SIGNAL(clicked()), this, SLOT(findClicked()));
setWindowTitle(tr("Find a Contact"));
}
@@ -27,20 +20,18 @@ FindDialog::~FindDialog()
void FindDialog::findClicked()
{
- QString text = lineEdit->text();
+ QString text = m_ui->lineEdit->text();
if (text.isEmpty()) {
QMessageBox::information(this, tr("Empty Field"),
tr("Please enter a name."));
- return;
+ reject();
} else {
- findText = text;
- lineEdit->clear();
- hide();
+ accept();
}
}
-QString FindDialog::getFindText()
+QString FindDialog::findText()
{
- return findText;
+ return m_ui->lineEdit->text();
}
diff --git a/doc/examples/addressbook-sdk/part6/finddialog.h b/doc/examples/addressbook-sdk/part6/finddialog.h
index 95bdaea5061..1166102537c 100644
--- a/doc/examples/addressbook-sdk/part6/finddialog.h
+++ b/doc/examples/addressbook-sdk/part6/finddialog.h
@@ -14,16 +14,13 @@ class FindDialog : public QDialog {
public:
FindDialog(QWidget *parent = 0);
~FindDialog();
- QString getFindText();
+ QString findText();
public slots:
void findClicked();
private:
Ui::FindDialog *m_ui;
- QPushButton *findButton;
- QLineEdit *lineEdit;
- QString findText;
};
#endif // FINDDIALOG_H
--
GitLab