diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/network/blockingfortuneclient/blockingclient.cpp | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/network/blockingfortuneclient/blockingclient.cpp')
-rw-r--r-- | examples/network/blockingfortuneclient/blockingclient.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/examples/network/blockingfortuneclient/blockingclient.cpp b/examples/network/blockingfortuneclient/blockingclient.cpp index 0491433d56..8867e25678 100644 --- a/examples/network/blockingfortuneclient/blockingclient.cpp +++ b/examples/network/blockingfortuneclient/blockingclient.cpp @@ -68,10 +68,6 @@ BlockingClient::BlockingClient(QWidget *parent) portLineEdit = new QLineEdit; portLineEdit->setValidator(new QIntValidator(1, 65535, this)); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - Qt::InputMethodHint hints = Qt::ImhDigitsOnly; - portLineEdit->setInputMethodHints(hints); -#endif hostLabel->setBuddy(hostLineEdit); portLabel->setBuddy(portLineEdit); @@ -80,23 +76,6 @@ BlockingClient::BlockingClient(QWidget *parent) "Fortune Server example as well.")); statusLabel->setWordWrap(true); -#ifdef Q_OS_SYMBIAN - QMenu *menu = new QMenu(this); - fortuneAction = menu->addAction(tr("Get Fortune")); - fortuneAction->setVisible(false); - - QAction *optionsAction = new QAction(tr("Options"), this); - optionsAction->setMenu(menu); - optionsAction->setSoftKeyRole(QAction::PositiveSoftKey); - addAction(optionsAction); - - exitAction = new QAction(tr("Exit"), this); - exitAction->setSoftKeyRole(QAction::NegativeSoftKey); - addAction(exitAction); - - connect(fortuneAction, SIGNAL(triggered()), this, SLOT(requestNewFortune())); - connect(exitAction, SIGNAL(triggered()), this, SLOT(close())); -#else getFortuneButton = new QPushButton(tr("Get Fortune")); getFortuneButton->setDefault(true); getFortuneButton->setEnabled(false); @@ -109,7 +88,6 @@ BlockingClient::BlockingClient(QWidget *parent) connect(getFortuneButton, SIGNAL(clicked()), this, SLOT(requestNewFortune())); connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); -#endif connect(hostLineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableGetFortuneButton())); @@ -129,9 +107,7 @@ BlockingClient::BlockingClient(QWidget *parent) mainLayout->addWidget(portLabel, 1, 0); mainLayout->addWidget(portLineEdit, 1, 1); mainLayout->addWidget(statusLabel, 2, 0, 1, 2); -#ifndef Q_OS_SYMBIAN mainLayout->addWidget(buttonBox, 3, 0, 1, 2); -#endif setLayout(mainLayout); setWindowTitle(tr("Blocking Fortune Client")); @@ -141,11 +117,7 @@ BlockingClient::BlockingClient(QWidget *parent) //! [2] void BlockingClient::requestNewFortune() { -#ifdef Q_OS_SYMBIAN - fortuneAction->setVisible(false); -#else getFortuneButton->setEnabled(false); -#endif thread.requestNewFortune(hostLineEdit->text(), portLineEdit->text().toInt()); } @@ -163,11 +135,7 @@ void BlockingClient::showFortune(const QString &nextFortune) //! [4] currentFortune = nextFortune; statusLabel->setText(currentFortune); -#ifdef Q_OS_SYMBIAN - fortuneAction->setVisible(true); -#else getFortuneButton->setEnabled(true); -#endif } //! [4] @@ -192,19 +160,11 @@ void BlockingClient::displayError(int socketError, const QString &message) .arg(message)); } -#ifdef Q_OS_SYMBIAN - fortuneAction->setVisible(true); -#else getFortuneButton->setEnabled(true); -#endif } void BlockingClient::enableGetFortuneButton() { bool enable(!hostLineEdit->text().isEmpty() && !portLineEdit->text().isEmpty()); -#ifdef Q_OS_SYMBIAN - fortuneAction->setVisible(enable); -#else getFortuneButton->setEnabled(enable); -#endif } |