From 5b984faebca64b0542e0221efdee188af22df4bc Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Thu, 22 Jul 2010 13:29:02 +0200 Subject: Fix Rhys' qmake warnings --- examples/network/torrent/torrent.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/network') diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro index 7665455e81..44716fdefb 100644 --- a/examples/network/torrent/torrent.pro +++ b/examples/network/torrent/torrent.pro @@ -5,7 +5,7 @@ HEADERS += addtorrentdialog.h \ metainfo.h \ peerwireclient.h \ ratecontroller.h \ - filemanager.h \ + filemanager.h \ torrentclient.h \ torrentserver.h \ trackerclient.h -- cgit v1.2.3 From 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe Mon Sep 17 00:00:00 2001 From: Jerome Pasion Date: Thu, 29 Jul 2010 14:59:55 +0200 Subject: Fixed spelling mistakes in documented functions, classes, etc. Part of QTBUG-11938 and QTBUG-10801 --- examples/network/download/main.cpp | 2 +- examples/network/http/httpwindow.cpp | 2 +- examples/network/torrent/torrentclient.cpp | 22 +++++++++++----------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'examples/network') diff --git a/examples/network/download/main.cpp b/examples/network/download/main.cpp index c322a448b9..0fb913746e 100644 --- a/examples/network/download/main.cpp +++ b/examples/network/download/main.cpp @@ -150,7 +150,7 @@ void DownloadManager::downloadFinished(QNetworkReply *reply) } else { QString filename = saveFileName(url); if (saveToDisk(filename, reply)) - printf("Download of %s succeded (saved to %s)\n", + printf("Download of %s succeeded (saved to %s)\n", url.toEncoded().constData(), qPrintable(filename)); } diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index b1ea98ca7d..ea485463a3 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -206,7 +206,7 @@ void HttpWindow::httpFinished() void HttpWindow::httpReadyRead() { - // this slot gets called everytime the QNetworkReply has new data. + // this slot gets called every time the QNetworkReply has new data. // We read all of its new data and write it into the file. // That way we use less RAM than when reading it at the finished() // signal of the QNetworkReply diff --git a/examples/network/torrent/torrentclient.cpp b/examples/network/torrent/torrentclient.cpp index 5e25b9a3f9..b7607a6ffa 100644 --- a/examples/network/torrent/torrentclient.cpp +++ b/examples/network/torrent/torrentclient.cpp @@ -1243,8 +1243,8 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client) // depending on the state we're in. int pieceIndex = 0; if (d->state == WarmingUp || (qrand() & 4) == 0) { - int *occurrances = new int[d->pieceCount]; - memset(occurrances, 0, d->pieceCount * sizeof(int)); + int *occurrences = new int[d->pieceCount]; + memset(occurrences, 0, d->pieceCount * sizeof(int)); // Count how many of each piece are available. foreach (PeerWireClient *peer, d->connections) { @@ -1252,38 +1252,38 @@ void TorrentClient::schedulePieceForClient(PeerWireClient *client) int peerPiecesSize = peerPieces.size(); for (int i = 0; i < peerPiecesSize; ++i) { if (peerPieces.testBit(i)) - ++occurrances[i]; + ++occurrences[i]; } } // Find the rarest or most common pieces. - int numOccurrances = d->state == WarmingUp ? 0 : 99999; + int numOccurrences = d->state == WarmingUp ? 0 : 99999; QList piecesReadyForDownload; for (int i = 0; i < d->pieceCount; ++i) { if (d->state == WarmingUp) { // Add common pieces - if (occurrances[i] >= numOccurrances + if (occurrences[i] >= numOccurrences && incompletePiecesAvailableToClient.testBit(i)) { - if (occurrances[i] > numOccurrances) + if (occurrences[i] > numOccurrences) piecesReadyForDownload.clear(); piecesReadyForDownload.append(i); - numOccurrances = occurrances[i]; + numOccurrences = occurrences[i]; } } else { // Add rare pieces - if (occurrances[i] <= numOccurrances + if (occurrences[i] <= numOccurrences && incompletePiecesAvailableToClient.testBit(i)) { - if (occurrances[i] < numOccurrances) + if (occurrences[i] < numOccurrences) piecesReadyForDownload.clear(); piecesReadyForDownload.append(i); - numOccurrances = occurrances[i]; + numOccurrences = occurrences[i]; } } } // Select one piece randomly pieceIndex = piecesReadyForDownload.at(qrand() % piecesReadyForDownload.size()); - delete [] occurrances; + delete [] occurrences; } else { // Make up a list of available piece indices, and pick // a random one. -- cgit v1.2.3 From 597a842d66dc04181bfd063863216acbb11ce3bc Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Fri, 30 Jul 2010 08:17:21 +1000 Subject: Fix crash on Desktop platforms. Missing check for null networkSession. Task-number: QTBUG-12501 --- examples/network/fortuneserver/server.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'examples/network') diff --git a/examples/network/fortuneserver/server.cpp b/examples/network/fortuneserver/server.cpp index b931b966d3..4dca38cbf5 100644 --- a/examples/network/fortuneserver/server.cpp +++ b/examples/network/fortuneserver/server.cpp @@ -107,17 +107,19 @@ Server::Server(QWidget *parent) void Server::sessionOpened() { // Save the used configuration - QNetworkConfiguration config = networkSession->configuration(); - QString id; - if (config.type() == QNetworkConfiguration::UserChoice) - id = networkSession->sessionProperty(QLatin1String("UserChoiceConfiguration")).toString(); - else - id = config.identifier(); - - QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); - settings.beginGroup(QLatin1String("QtNetwork")); - settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); - settings.endGroup(); + if (networkSession) { + QNetworkConfiguration config = networkSession->configuration(); + QString id; + if (config.type() == QNetworkConfiguration::UserChoice) + id = networkSession->sessionProperty(QLatin1String("UserChoiceConfiguration")).toString(); + else + id = config.identifier(); + + QSettings settings(QSettings::UserScope, QLatin1String("Trolltech")); + settings.beginGroup(QLatin1String("QtNetwork")); + settings.setValue(QLatin1String("DefaultNetworkConfiguration"), id); + settings.endGroup(); + } //! [0] //! [1] tcpServer = new QTcpServer(this); -- cgit v1.2.3 From 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 29 Jul 2010 16:35:30 +1000 Subject: Rename QNetworkConfiguration::bearerName() function. bearerName() -> bearerTypeName(). bearerName() is deprecated and converted into an inline function which calls bearerTypeName(). This is required to keep existing code source compatible between Qt Mobility 1.0.x and Qt 4.7. Task-number: QTBUG-12378 Reviewed-by: Alex --- examples/network/bearercloud/cloud.cpp | 22 +++++++++++----------- examples/network/bearermonitor/sessionwidget.cpp | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'examples/network') diff --git a/examples/network/bearercloud/cloud.cpp b/examples/network/bearercloud/cloud.cpp index 980efbf527..f45ae0dfc5 100644 --- a/examples/network/bearercloud/cloud.cpp +++ b/examples/network/bearercloud/cloud.cpp @@ -261,9 +261,9 @@ void Cloud::stateChanged(QNetworkSession::State state) tooltip += tr("
Id: %1").arg(configuration.identifier()); #endif - const QString bearerName = configuration.bearerName(); - if (!bearerName.isEmpty()) - tooltip += tr("
Bearer: %1").arg(bearerName); + const QString bearerTypeName = configuration.bearerTypeName(); + if (!bearerTypeName.isEmpty()) + tooltip += tr("
Bearer: %1").arg(bearerTypeName); QString s = tr("
State: %1 (%2)"); switch (state) { @@ -313,17 +313,17 @@ void Cloud::stateChanged(QNetworkSession::State state) //! [1] void Cloud::newConfigurationActivated() { - const QString bearerName = configuration.bearerName(); - if (!svgCache.contains(bearerName)) { - if (bearerName == QLatin1String("WLAN")) - svgCache.insert(bearerName, new QSvgRenderer(QLatin1String(":wlan.svg"))); - else if (bearerName == QLatin1String("Ethernet")) - svgCache.insert(bearerName, new QSvgRenderer(QLatin1String(":lan.svg"))); + const QString bearerTypeName = configuration.bearerTypeName(); + if (!svgCache.contains(bearerTypeName)) { + if (bearerTypeName == QLatin1String("WLAN")) + svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":wlan.svg"))); + else if (bearerTypeName == QLatin1String("Ethernet")) + svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":lan.svg"))); else - svgCache.insert(bearerName, new QSvgRenderer(QLatin1String(":unknown.svg"))); + svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":unknown.svg"))); } - icon->setSharedRenderer(svgCache[bearerName]); + icon->setSharedRenderer(svgCache[bearerTypeName]); if (configuration.name().isEmpty()) { text->setPlainText(tr("HIDDEN NETWORK")); diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp index 8b5693aaa0..ecc2a9367f 100644 --- a/examples/network/bearermonitor/sessionwidget.cpp +++ b/examples/network/bearermonitor/sessionwidget.cpp @@ -111,11 +111,11 @@ void SessionWidget::updateSession() killTimer(statsTimer); if (session->configuration().type() == QNetworkConfiguration::InternetAccessPoint) - bearer->setText(session->configuration().bearerName()); + bearer->setText(session->configuration().bearerTypeName()); else { QNetworkConfigurationManager mgr; QNetworkConfiguration c = mgr.configurationFromIdentifier(session->sessionProperty("ActiveConfiguration").toString()); - bearer->setText(c.bearerName()); + bearer->setText(c.bearerTypeName()); } #ifndef QT_NO_NETWORKINTERFACE -- cgit v1.2.3 From d12f39e50e4144f3272424bb0bff18c857105654 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Thu, 29 Jul 2010 16:39:05 +1000 Subject: Use an enum to return the bearer type of a network configuration. Task-number: QTBUG-12378 Reviewed-by: Alex --- examples/network/bearercloud/cloud.cpp | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'examples/network') diff --git a/examples/network/bearercloud/cloud.cpp b/examples/network/bearercloud/cloud.cpp index f45ae0dfc5..8deaab3cd0 100644 --- a/examples/network/bearercloud/cloud.cpp +++ b/examples/network/bearercloud/cloud.cpp @@ -53,7 +53,7 @@ #include -static QMap svgCache; +static QMap svgCache; //! [0] Cloud::Cloud(const QNetworkConfiguration &config, QGraphicsItem *parent) @@ -313,17 +313,25 @@ void Cloud::stateChanged(QNetworkSession::State state) //! [1] void Cloud::newConfigurationActivated() { - const QString bearerTypeName = configuration.bearerTypeName(); - if (!svgCache.contains(bearerTypeName)) { - if (bearerTypeName == QLatin1String("WLAN")) - svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":wlan.svg"))); - else if (bearerTypeName == QLatin1String("Ethernet")) - svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":lan.svg"))); - else - svgCache.insert(bearerTypeName, new QSvgRenderer(QLatin1String(":unknown.svg"))); + QNetworkConfiguration::BearerType bearerType = configuration.bearerType(); + if (!svgCache.contains(bearerType)) { + QSvgRenderer *renderer = 0; + switch (bearerType) { + case QNetworkConfiguration::BearerWLAN: + renderer = new QSvgRenderer(QLatin1String(":wlan.svg")); + break; + case QNetworkConfiguration::BearerEthernet: + renderer = new QSvgRenderer(QLatin1String(":lan.svg")); + break; + default: + renderer = new QSvgRenderer(QLatin1String(":unknown.svg")); + } + + if (renderer) + svgCache.insert(bearerType, renderer); } - icon->setSharedRenderer(svgCache[bearerTypeName]); + icon->setSharedRenderer(svgCache[bearerType]); if (configuration.name().isEmpty()) { text->setPlainText(tr("HIDDEN NETWORK")); -- cgit v1.2.3 From 12ad401dbc58df86179645cc747c8fd520c23d82 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 3 Aug 2010 15:39:32 +0300 Subject: Assigned valid UID3 for fortuneserver example Previous UID used by fortuneserver was already assigned for anomaly demo. Task-number: QTBUG-12276 Reviewed-by: TrustMe --- examples/network/fortuneserver/fortuneserver.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/network') diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro index e13f309730..0ef3e97be9 100644 --- a/examples/network/fortuneserver/fortuneserver.pro +++ b/examples/network/fortuneserver/fortuneserver.pro @@ -10,7 +10,7 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver INSTALLS += target sources symbian { - TARGET.UID3 = 0xA000CF71 + TARGET.UID3 = 0xA000E406 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.CAPABILITY = "NetworkServices ReadUserData" TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 -- cgit v1.2.3 From 2234a6f1926d8a7480444b1c6b61610530f6f772 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Wed, 4 Aug 2010 06:00:03 +1000 Subject: new icons for cell and bt networks. --- examples/network/bearercloud/bluetooth.svg | 24 ++++ examples/network/bearercloud/cell.svg | 25 ++++ examples/network/bearercloud/cloud.cpp | 11 ++ examples/network/bearercloud/gprs.svg | 199 ++++++++++++++++++++++++++++ examples/network/bearercloud/icons.qrc | 4 + examples/network/bearercloud/lan.svg | 109 +++++----------- examples/network/bearercloud/umts.svg | 200 +++++++++++++++++++++++++++++ 7 files changed, 496 insertions(+), 76 deletions(-) create mode 100644 examples/network/bearercloud/bluetooth.svg create mode 100644 examples/network/bearercloud/cell.svg create mode 100644 examples/network/bearercloud/gprs.svg mode change 100644 => 100755 examples/network/bearercloud/lan.svg create mode 100644 examples/network/bearercloud/umts.svg (limited to 'examples/network') diff --git a/examples/network/bearercloud/bluetooth.svg b/examples/network/bearercloud/bluetooth.svg new file mode 100644 index 0000000000..7ded90a838 --- /dev/null +++ b/examples/network/bearercloud/bluetooth.svg @@ -0,0 +1,24 @@ + + + + +]> + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/cell.svg b/examples/network/bearercloud/cell.svg new file mode 100644 index 0000000000..d4ca57badb --- /dev/null +++ b/examples/network/bearercloud/cell.svg @@ -0,0 +1,25 @@ + + + + +]> + + + + + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/cloud.cpp b/examples/network/bearercloud/cloud.cpp index 8deaab3cd0..6019d9b4fc 100644 --- a/examples/network/bearercloud/cloud.cpp +++ b/examples/network/bearercloud/cloud.cpp @@ -323,6 +323,17 @@ void Cloud::newConfigurationActivated() case QNetworkConfiguration::BearerEthernet: renderer = new QSvgRenderer(QLatin1String(":lan.svg")); break; + case QNetworkConfiguration::Bearer2G: + renderer = new QSvgRenderer(QLatin1String(":cell.svg")); + break; + case QNetworkConfiguration::BearerBluetooth: + renderer = new QSvgRenderer(QLatin1String(":bluetooth.svg")); + break; + case QNetworkConfiguration::BearerCDMA2000: + case QNetworkConfiguration::BearerWCDMA: + case QNetworkConfiguration::BearerHSPA: + renderer = new QSvgRenderer(QLatin1String(":umts.svg")); + break; default: renderer = new QSvgRenderer(QLatin1String(":unknown.svg")); } diff --git a/examples/network/bearercloud/gprs.svg b/examples/network/bearercloud/gprs.svg new file mode 100644 index 0000000000..4a992c1d36 --- /dev/null +++ b/examples/network/bearercloud/gprs.svg @@ -0,0 +1,199 @@ + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/icons.qrc b/examples/network/bearercloud/icons.qrc index 84a8939db3..7dea1f2c9d 100644 --- a/examples/network/bearercloud/icons.qrc +++ b/examples/network/bearercloud/icons.qrc @@ -3,5 +3,9 @@ wlan.svg lan.svg unknown.svg + bluetooth.svg + cell.svg + gprs.svg + umts.svg diff --git a/examples/network/bearercloud/lan.svg b/examples/network/bearercloud/lan.svg old mode 100644 new mode 100755 index 3cce805197..b8ee999e1e --- a/examples/network/bearercloud/lan.svg +++ b/examples/network/bearercloud/lan.svg @@ -1,76 +1,33 @@ - - - - - - - - - - - image/svg+xml - - - - - - LAN - - + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/umts.svg b/examples/network/bearercloud/umts.svg new file mode 100644 index 0000000000..c1b372e1df --- /dev/null +++ b/examples/network/bearercloud/umts.svg @@ -0,0 +1,200 @@ + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 13670a35a576d6c27bbe27f2e0a97849fd1301ff Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 4 Aug 2010 14:28:39 +0200 Subject: fix line endings --- examples/network/bearercloud/bluetooth.svg | 48 +++++++++++----------- examples/network/bearercloud/cell.svg | 50 +++++++++++----------- examples/network/bearercloud/lan.svg | 66 +++++++++++++++--------------- 3 files changed, 82 insertions(+), 82 deletions(-) (limited to 'examples/network') diff --git a/examples/network/bearercloud/bluetooth.svg b/examples/network/bearercloud/bluetooth.svg index 7ded90a838..32e2fa3691 100644 --- a/examples/network/bearercloud/bluetooth.svg +++ b/examples/network/bearercloud/bluetooth.svg @@ -1,24 +1,24 @@ - - - - -]> - - - - - - - - - - - - - - + + + + +]> + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/cell.svg b/examples/network/bearercloud/cell.svg index d4ca57badb..7519868277 100644 --- a/examples/network/bearercloud/cell.svg +++ b/examples/network/bearercloud/cell.svg @@ -1,25 +1,25 @@ - - - - -]> - - - - - - - - - - - - - - - - - - + + + + +]> + + + + + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/lan.svg b/examples/network/bearercloud/lan.svg index b8ee999e1e..4f7f63d013 100755 --- a/examples/network/bearercloud/lan.svg +++ b/examples/network/bearercloud/lan.svg @@ -1,33 +1,33 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 0d4d065cc9757159c5b6fa817892f5707bc1ecae Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 11 Aug 2010 14:32:51 +1000 Subject: Don't build bearercloud example if Qt was build w/o SVG support Task-number: QTBUG-12791 Reviewed-by: David Laing --- examples/network/network.pro | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'examples/network') diff --git a/examples/network/network.pro b/examples/network/network.pro index 16c40879c7..458561a55c 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -16,9 +16,12 @@ SUBDIRS = \ threadedfortuneserver \ googlesuggest \ torrent \ - bearercloud \ bearermonitor + contains(QT_CONFIG, svg) { + SUBDIRS += bearercloud + } + # no QProcess !vxworks:!qnx:SUBDIRS += network-chat -- cgit v1.2.3