diff options
Diffstat (limited to 'examples/network')
-rw-r--r-- | examples/network/bearermonitor/bearermonitor.cpp | 8 | ||||
-rw-r--r-- | examples/network/bearermonitor/bearermonitor.h | 4 | ||||
-rw-r--r-- | examples/network/dnslookup/dnslookup.cpp | 13 | ||||
-rw-r--r-- | examples/network/loopback/dialog.cpp | 4 | ||||
-rw-r--r-- | examples/network/network.pro | 2 | ||||
-rw-r--r-- | examples/network/securesocketclient/main.cpp | 4 | ||||
-rw-r--r-- | examples/network/torrent/peerwireclient.cpp | 2 | ||||
-rw-r--r-- | examples/network/torrent/torrentserver.cpp | 2 |
8 files changed, 25 insertions, 14 deletions
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp index 58421e52b1..4590a91f4f 100644 --- a/examples/network/bearermonitor/bearermonitor.cpp +++ b/examples/network/bearermonitor/bearermonitor.cpp @@ -84,10 +84,10 @@ BearerMonitor::BearerMonitor(QWidget *parent) this, SLOT(configurationChanged(const QNetworkConfiguration))); connect(&manager, SIGNAL(updateCompleted()), this, SLOT(updateConfigurations())); -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) connect(registerButton, SIGNAL(clicked()), this, SLOT(registerNetwork())); connect(unregisterButton, SIGNAL(clicked()), this, SLOT(unregisterNetwork())); -#else +#else // Q_OS_WIN && !Q_OS_WINRT nlaGroup->hide(); #endif @@ -257,7 +257,7 @@ void BearerMonitor::onlineStateChanged(bool isOnline) onlineState->setText(tr("Offline")); } -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) void BearerMonitor::registerNetwork() { QTreeWidgetItem *item = treeWidget->currentItem(); @@ -301,7 +301,7 @@ void BearerMonitor::unregisterNetwork() if (WSASetService(&networkInfo, RNRSERVICE_DELETE, 0) == SOCKET_ERROR) qDebug() << "WSASetService(RNRSERVICE_DELETE) returned" << WSAGetLastError(); } -#endif +#endif // Q_OS_WIN && !Q_OS_WINRT void BearerMonitor::showConfigurationFor(QTreeWidgetItem *item) { diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h index aaa2c18424..307262c2b4 100644 --- a/examples/network/bearermonitor/bearermonitor.h +++ b/examples/network/bearermonitor/bearermonitor.h @@ -66,10 +66,10 @@ private slots: void onlineStateChanged(bool isOnline); -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) void registerNetwork(); void unregisterNetwork(); -#endif +#endif // Q_OS_WIN && !Q_OS_WINRT void showConfigurationFor(QTreeWidgetItem *item); diff --git a/examples/network/dnslookup/dnslookup.cpp b/examples/network/dnslookup/dnslookup.cpp index 77e8abc927..202a5f9580 100644 --- a/examples/network/dnslookup/dnslookup.cpp +++ b/examples/network/dnslookup/dnslookup.cpp @@ -50,7 +50,7 @@ static void usage() { printf("Qt DNS example - performs DNS lookups\n" - "Usage: dnslookup [-t <type>] name\n\n"); + "Usage: dnslookup [-t <type>] [-s nameserver] name\n\n"); } DnsManager::DnsManager() @@ -93,6 +93,17 @@ void DnsManager::execute() return; } } + if (args.size() > 1 && args.first() == "-s") { + args.takeFirst(); + const QString ns = args.takeFirst(); + QHostAddress nameserver(ns); + if (nameserver.isNull() || nameserver.protocol() == QAbstractSocket::UnknownNetworkLayerProtocol) { + printf("Bad nameserver address: %s\n", qPrintable(ns)); + QCoreApplication::instance()->quit(); + return; + } + dns->setNameserver(nameserver); + } if (args.isEmpty()) { usage(); QCoreApplication::instance()->quit(); diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp index a378ccabaa..da5dbce854 100644 --- a/examples/network/loopback/dialog.cpp +++ b/examples/network/loopback/dialog.cpp @@ -99,9 +99,9 @@ void Dialog::start() QMessageBox::StandardButton ret = QMessageBox::critical(this, tr("Loopback"), tr("Unable to start the test: %1.") - .arg(tcpServer.errorString()), + .arg(tcpServer.errorString()), QMessageBox::Retry - | QMessageBox::Cancel); + | QMessageBox::Cancel); if (ret == QMessageBox::Cancel) return; } diff --git a/examples/network/network.pro b/examples/network/network.pro index be4ccdbddf..8ed72315e2 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -23,7 +23,7 @@ qtHaveModule(widgets) { multicastsender # no QProcess - !vxworks:!qnx:SUBDIRS += network-chat + !vxworks:!qnx:!winrt:SUBDIRS += network-chat contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient diff --git a/examples/network/securesocketclient/main.cpp b/examples/network/securesocketclient/main.cpp index de89fafa32..46beaf0d4f 100644 --- a/examples/network/securesocketclient/main.cpp +++ b/examples/network/securesocketclient/main.cpp @@ -50,8 +50,8 @@ int main(int argc, char **argv) QApplication app(argc, argv); if (!QSslSocket::supportsSsl()) { - QMessageBox::information(0, "Secure Socket Client", - "This system does not support OpenSSL."); + QMessageBox::information(0, "Secure Socket Client", + "This system does not support OpenSSL."); return -1; } diff --git a/examples/network/torrent/peerwireclient.cpp b/examples/network/torrent/peerwireclient.cpp index a0be01d363..2b5fe3ada1 100644 --- a/examples/network/torrent/peerwireclient.cpp +++ b/examples/network/torrent/peerwireclient.cpp @@ -215,7 +215,7 @@ void PeerWireClient::sendPieceList(const QBitArray &bitField) // Don't send the bitfield if it's all zeros. if (bitField.count(true) == 0) - return; + return; int bitFieldSize = bitField.size(); int size = (bitFieldSize + 7) / 8; diff --git a/examples/network/torrent/torrentserver.cpp b/examples/network/torrent/torrentserver.cpp index 2196863ca0..0a9d836098 100644 --- a/examples/network/torrent/torrentserver.cpp +++ b/examples/network/torrent/torrentserver.cpp @@ -64,7 +64,7 @@ void TorrentServer::removeClient(TorrentClient *client) void TorrentServer::incomingConnection(qintptr socketDescriptor) { PeerWireClient *client = - new PeerWireClient(ConnectionManager::instance()->clientId(), this); + new PeerWireClient(ConnectionManager::instance()->clientId(), this); if (client->setSocketDescriptor(socketDescriptor)) { if (ConnectionManager::instance()->canAddConnection() && !clients.isEmpty()) { |