From 87274e272d2a854563066489e20d019b4e6320de Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 18 Oct 2011 09:54:31 +0200 Subject: 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 Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81 Reviewed-by: Friedemann Kleint Reviewed-by: Casper van Donderen --- .../blockingfortuneclient/blockingclient.cpp | 40 ---------------------- .../network/blockingfortuneclient/blockingclient.h | 5 --- .../blockingfortuneclient.pro | 8 ----- examples/network/blockingfortuneclient/main.cpp | 4 --- 4 files changed, 57 deletions(-) (limited to 'examples/network/blockingfortuneclient') 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 } diff --git a/examples/network/blockingfortuneclient/blockingclient.h b/examples/network/blockingfortuneclient/blockingclient.h index 83ff93b228..99b97f13c5 100644 --- a/examples/network/blockingfortuneclient/blockingclient.h +++ b/examples/network/blockingfortuneclient/blockingclient.h @@ -73,14 +73,9 @@ private: QLineEdit *hostLineEdit; QLineEdit *portLineEdit; QLabel *statusLabel; -#ifdef Q_OS_SYMBIAN - QAction *fortuneAction; - QAction *exitAction; -#else QPushButton *getFortuneButton; QPushButton *quitButton; QDialogButtonBox *buttonBox; -#endif FortuneThread thread; QString currentFortune; diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro index 3fe6f7c7ab..c8689b39fb 100644 --- a/examples/network/blockingfortuneclient/blockingfortuneclient.pro +++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro @@ -13,11 +13,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pr sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/blockingfortuneclient INSTALLS += target sources -symbian: { - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices -} -maemo5: CONFIG += qt_example - -symbian: warning(This example might not fully work on Symbian platform) -maemo5: warning(This example might not fully work on Maemo platform) diff --git a/examples/network/blockingfortuneclient/main.cpp b/examples/network/blockingfortuneclient/main.cpp index 97ce59fdb3..b67464089b 100644 --- a/examples/network/blockingfortuneclient/main.cpp +++ b/examples/network/blockingfortuneclient/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); BlockingClient client; -#ifdef Q_OS_SYMBIAN - client.showMaximized(); -#else client.show(); -#endif return app.exec(); } -- cgit v1.2.3