From dcec1420ea9d7e90bbd7f37be15d8e61eaf35d23 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 6 Jan 2017 22:02:50 +0300 Subject: Use QString::asprintf(), QStringBuilder, and the multi-arg overload of QString::arg() ... instead of sequential .arg(const QString &) callings. It saves memory allocations and prevents unexpected results if replacing strings contain place markers. Found with clazy's qstring-arg check. Change-Id: I3912275a6e11c6fb7559ff5623f2e8cde9b7f07a Reviewed-by: Anton Kudryavtsev Reviewed-by: Thiago Macieira --- src/corelib/plugin/qlibrary_unix.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/corelib/plugin/qlibrary_unix.cpp') diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index 9db0b7ff39..bb7874071e 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -252,7 +252,7 @@ bool QLibraryPrivate::load_sys() #endif #endif // QT_NO_DYNAMIC_LIBRARY if (!pHnd) { - errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName).arg(qdlerror()); + errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror()); } if (pHnd) { qualifiedFileName = attempt; @@ -273,10 +273,10 @@ bool QLibraryPrivate::unload_sys() char *error = dlerror(); // QtDeclarative auto test "qqmlenginecleanup" for instance if (!qstrcmp(error, "Shared objects still referenced")) // On QNX that's only "informative" return true; - errorString = QLibrary::tr("Cannot unload library %1: %2").arg(fileName) - .arg(QLatin1String(error)); + errorString = QLibrary::tr("Cannot unload library %1: %2").arg(fileName, + QLatin1String(error)); # else - errorString = QLibrary::tr("Cannot unload library %1: %2").arg(fileName).arg(qdlerror()); + errorString = QLibrary::tr("Cannot unload library %1: %2").arg(fileName, qdlerror()); # endif return false; } @@ -312,7 +312,7 @@ QFunctionPointer QLibraryPrivate::resolve_sys(const char* symbol) #endif if (!address) { errorString = QLibrary::tr("Cannot resolve symbol \"%1\" in %2: %3").arg( - QString::fromLatin1(symbol)).arg(fileName).arg(qdlerror()); + QString::fromLatin1(symbol), fileName, qdlerror()); } else { errorString.clear(); } -- cgit v1.2.3