diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-11-24 08:43:30 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-12-01 07:27:13 +0000 |
commit | 1f1f3a2b889d9192fdb4b53428309ef720cec8ca (patch) | |
tree | 2931f4503b348c0908d5bbce04f6c465bde0a4db /src | |
parent | 155f954d9941e9eee14d86ee7bc30411aea60dee (diff) |
Fix -Wclazy-qstring-arg in Windows code
plugin\qlibrary_win.cpp(119,55): warning: Use multi-arg instead [-Wclazy-qstring-arg]
plugin\qlibrary_win.cpp(155,55): warning: Use multi-arg instead [-Wclazy-qstring-arg]
plugin\qlibrary_win.cpp(168,55): warning: Use multi-arg instead [-Wclazy-qstring-arg]
socket\qlocalserver_win.cpp(228,61): warning: Use multi-arg instead [-Wclazy-qstring-arg]
Change-Id: I0feadd3a5cce5ac2ba09630a38b867981d48a391
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/plugin/qlibrary_win.cpp | 7 | ||||
-rw-r--r-- | src/network/socket/qlocalserver_win.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp index a4d3f67c27..9368e53b3f 100644 --- a/src/corelib/plugin/qlibrary_win.cpp +++ b/src/corelib/plugin/qlibrary_win.cpp @@ -116,7 +116,7 @@ bool QLibraryPrivate::load_sys() #endif if (!pHnd) { errorString = QLibrary::tr("Cannot load library %1: %2").arg( - QDir::toNativeSeparators(fileName)).arg(qt_error_string()); + QDir::toNativeSeparators(fileName), qt_error_string()); } else { // Query the actual name of the library that was loaded errorString.clear(); @@ -152,7 +152,7 @@ bool QLibraryPrivate::unload_sys() { if (!FreeLibrary(pHnd)) { errorString = QLibrary::tr("Cannot unload library %1: %2").arg( - QDir::toNativeSeparators(fileName)).arg(qt_error_string()); + QDir::toNativeSeparators(fileName), qt_error_string()); return false; } errorString.clear(); @@ -164,8 +164,7 @@ QFunctionPointer QLibraryPrivate::resolve_sys(const char* symbol) FARPROC address = GetProcAddress(pHnd, symbol); if (!address) { errorString = QLibrary::tr("Cannot resolve symbol \"%1\" in %2: %3").arg( - QString::fromLatin1(symbol)).arg( - QDir::toNativeSeparators(fileName)).arg(qt_error_string()); + QString::fromLatin1(symbol), QDir::toNativeSeparators(fileName), qt_error_string()); } else { errorString.clear(); } diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp index 8cb3449343..ced923ced1 100644 --- a/src/network/socket/qlocalserver_win.cpp +++ b/src/network/socket/qlocalserver_win.cpp @@ -225,7 +225,7 @@ bool QLocalServerPrivate::addListener() void QLocalServerPrivate::setError(const QString &function) { int windowsError = GetLastError(); - errorString = QString::fromLatin1("%1: %2").arg(function).arg(qt_error_string(windowsError)); + errorString = QString::fromLatin1("%1: %2").arg(function, qt_error_string(windowsError)); error = QAbstractSocket::UnknownSocketError; } |