From 205f68f8ad866857ccac58799fa1ab932ee06773 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 15 Jan 2015 14:00:19 +0100 Subject: Fix assorted MSVC warnings in tests. tst_collections.cpp tst_collections.cpp(3138) : warning C4305: 'argument' : truncation from 'size_t' to 'bool' tst_collections.cpp(3190) : see reference to function template instantiation 'void testContainerTypedefs>(Container)' being compiled with[Container=QVector] (repeated) tst_qringbuffer.cpp(297) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data tst_qringbuffer.cpp(300) : warning C4309: '=' : truncation of constant value tst_qringbuffer.cpp(306) : warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data tst_qrawfont.cpp(947) : warning C4309: 'argument' : truncation of constant value tst_qsslsocket_onDemandCertificates_member.cpp(217) : warning C4189: 'rootCertLoadingAllowed' : local variable is initialized but not referenced Change-Id: I6143d4ad121088a0d5bdd6dd2637eb3641a26096 Reviewed-by: Kai Koehne --- tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp | 2 +- tests/manual/qnetworkreply/main.cpp | 2 ++ tests/manual/windowflags/controllerwindow.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/manual') diff --git a/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp b/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp index 0694003e0a..0d1014a6ff 100644 --- a/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp +++ b/tests/manual/qnetworkaccessmanager/qget/downloadmanager.cpp @@ -130,7 +130,7 @@ void DownloadManager::proxyAuthenticationRequired(const QNetworkProxy &, QAuthen } #ifndef QT_NO_SSL -void DownloadManager::sslErrors(QNetworkReply *reply, const QList &errors) +void DownloadManager::sslErrors(QNetworkReply *, const QList &errors) { qDebug() << "sslErrors"; foreach (const QSslError &error, errors) { diff --git a/tests/manual/qnetworkreply/main.cpp b/tests/manual/qnetworkreply/main.cpp index 9d199c3755..f91309502b 100644 --- a/tests/manual/qnetworkreply/main.cpp +++ b/tests/manual/qnetworkreply/main.cpp @@ -180,6 +180,8 @@ void tst_qnetworkreply::setSslConfiguration() QCOMPARE(rootCertLoadingAllowed, true); #elif defined(Q_OS_MAC) QCOMPARE(rootCertLoadingAllowed, false); +#else + Q_UNUSED(rootCertLoadingAllowed) #endif // other platforms: undecided (Windows: depends on the version) if (works) { QCOMPARE(reply->error(), QNetworkReply::NoError); diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp index 5c06a9a646..2981bb9bf1 100644 --- a/tests/manual/windowflags/controllerwindow.cpp +++ b/tests/manual/windowflags/controllerwindow.cpp @@ -102,7 +102,7 @@ ControllerWindow::ControllerWindow() : previewWidget(0) updatePreview(); } -bool ControllerWindow::eventFilter(QObject *o, QEvent *e) +bool ControllerWindow::eventFilter(QObject *, QEvent *e) { if (e->type() == QEvent::WindowStateChange) updateStateControl(); -- cgit v1.2.3