summaryrefslogtreecommitdiffstats
path: root/examples/network/loopback
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-18 09:54:31 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-18 15:47:49 +0200
commit87274e272d2a854563066489e20d019b4e6320de (patch)
treed01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/network/loopback
parent08e24858607d1b1483fb1faa54effa957501cfbb (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/loopback')
-rw-r--r--examples/network/loopback/dialog.cpp35
-rw-r--r--examples/network/loopback/dialog.h5
-rw-r--r--examples/network/loopback/loopback.pro6
-rw-r--r--examples/network/loopback/main.cpp4
4 files changed, 0 insertions, 50 deletions
diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp
index f9a51268b7..34fc999dcc 100644
--- a/examples/network/loopback/dialog.cpp
+++ b/examples/network/loopback/dialog.cpp
@@ -43,11 +43,7 @@
#include "dialog.h"
-#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN)
static const int TotalBytes = 50 * 1024 * 1024;
-#else
-static const int TotalBytes = 5 * 1024 * 1024;
-#endif
static const int PayloadSize = 64 * 1024; // 64 KB
Dialog::Dialog(QWidget *parent)
@@ -58,22 +54,6 @@ Dialog::Dialog(QWidget *parent)
serverProgressBar = new QProgressBar;
serverStatusLabel = new QLabel(tr("Server ready"));
-#ifdef Q_OS_SYMBIAN
- QMenu *menu = new QMenu(this);
-
- QAction *optionsAction = new QAction(tr("Options"), this);
- optionsAction->setSoftKeyRole(QAction::PositiveSoftKey);
- optionsAction->setMenu(menu);
- addAction(optionsAction);
-
- startAction = menu->addAction(tr("Start"), this, SLOT(start()));
-
- quitAction = new QAction(tr("Exit"), this);
- quitAction->setSoftKeyRole(QAction::NegativeSoftKey);
- addAction(quitAction);
-
- connect(quitAction, SIGNAL(triggered()), this, SLOT(close()));
-#else
startButton = new QPushButton(tr("&Start"));
quitButton = new QPushButton(tr("&Quit"));
@@ -83,7 +63,6 @@ Dialog::Dialog(QWidget *parent)
connect(startButton, SIGNAL(clicked()), this, SLOT(start()));
connect(quitButton, SIGNAL(clicked()), this, SLOT(close()));
-#endif
connect(&tcpServer, SIGNAL(newConnection()),
this, SLOT(acceptConnection()));
connect(&tcpClient, SIGNAL(connected()), this, SLOT(startTransfer()));
@@ -99,9 +78,7 @@ Dialog::Dialog(QWidget *parent)
mainLayout->addWidget(serverStatusLabel);
mainLayout->addStretch(1);
mainLayout->addSpacing(10);
-#ifndef Q_OS_SYMBIAN
mainLayout->addWidget(buttonBox);
-#endif
setLayout(mainLayout);
setWindowTitle(tr("Loopback"));
@@ -109,11 +86,7 @@ Dialog::Dialog(QWidget *parent)
void Dialog::start()
{
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(false);
-#else
startButton->setEnabled(false);
-#endif
#ifndef QT_NO_CURSOR
QApplication::setOverrideCursor(Qt::WaitCursor);
@@ -169,11 +142,7 @@ void Dialog::updateServerProgress()
if (bytesReceived == TotalBytes) {
tcpServerConnection->close();
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(true);
-#else
startButton->setEnabled(true);
-#endif
#ifndef QT_NO_CURSOR
QApplication::restoreOverrideCursor();
#endif
@@ -210,11 +179,7 @@ void Dialog::displayError(QAbstractSocket::SocketError socketError)
serverProgressBar->reset();
clientStatusLabel->setText(tr("Client ready"));
serverStatusLabel->setText(tr("Server ready"));
-#ifdef Q_OS_SYMBIAN
- startAction->setVisible(true);
-#else
startButton->setEnabled(true);
-#endif
#ifndef QT_NO_CURSOR
QApplication::restoreOverrideCursor();
#endif
diff --git a/examples/network/loopback/dialog.h b/examples/network/loopback/dialog.h
index b48c090d3f..8261b2279a 100644
--- a/examples/network/loopback/dialog.h
+++ b/examples/network/loopback/dialog.h
@@ -76,14 +76,9 @@ private:
QLabel *clientStatusLabel;
QLabel *serverStatusLabel;
-#ifdef Q_OS_SYMBIAN
- QAction *startAction;
- QAction *quitAction;
-#else
QPushButton *startButton;
QPushButton *quitButton;
QDialogButtonBox *buttonBox;
-#endif
QTcpServer tcpServer;
QTcpSocket tcpClient;
diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro
index c96868fb40..760a366d54 100644
--- a/examples/network/loopback/loopback.pro
+++ b/examples/network/loopback/loopback.pro
@@ -10,9 +10,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/loopback
INSTALLS += target sources
-
-symbian: {
- CONFIG += qt_example
- TARGET.CAPABILITY = NetworkServices
-}
-maemo5: CONFIG += qt_example
diff --git a/examples/network/loopback/main.cpp b/examples/network/loopback/main.cpp
index 7f26fd4357..03ac9ad84c 100644
--- a/examples/network/loopback/main.cpp
+++ b/examples/network/loopback/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
Dialog dialog;
-#ifdef Q_OS_SYMBIAN
- dialog.showMaximized();
-#else
dialog.show();
-#endif
return app.exec();
}