From 562848f64767667b3fe81bd2a74d64d63f17ba07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Tue, 3 Aug 2021 21:05:54 +0200
Subject: [PATCH] Fix warning about format string not being string literal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I54e80b15b7a492acd4ffdb50a28f00511f72355c
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/plugins/cpptools/cpptoolstestcase.cpp     | 21 +++++++------------
 .../tst_languageserverprotocol.cpp            |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/plugins/cpptools/cpptoolstestcase.cpp b/src/plugins/cpptools/cpptoolstestcase.cpp
index 858f4811d4a..24e1373f4fa 100644
--- a/src/plugins/cpptools/cpptoolstestcase.cpp
+++ b/src/plugins/cpptools/cpptoolstestcase.cpp
@@ -64,8 +64,7 @@ static bool snapshotContains(const CPlusPlus::Snapshot &snapshot, const QSet<QSt
 {
     foreach (const QString &filePath, filePaths) {
         if (!snapshot.contains(filePath)) {
-            const QString warning = QLatin1String("Missing file in snapshot: ") + filePath;
-            qWarning(qPrintable(warning));
+            qWarning() << "Missing file in snapshot:" << qPrintable(filePath);
             return false;
         }
     }
@@ -247,8 +246,7 @@ bool TestCase::writeFile(const QString &filePath, const QByteArray &contents)
 {
     Utils::FileSaver saver(Utils::FilePath::fromString(filePath));
     if (!saver.write(contents) || !saver.finalize()) {
-        const QString warning = QLatin1String("Failed to write file to disk: ") + filePath;
-        qWarning(qPrintable(warning));
+        qWarning() << "Failed to write file to disk:" << qPrintable(filePath);
         return false;
     }
     return true;
@@ -363,7 +361,7 @@ TemporaryCopiedDir::TemporaryCopiedDir(const QString &sourceDirPath)
 
     QString errorMessage;
     if (!copyRecursively(sourceDirPath, path(), &errorMessage)) {
-        qWarning(qPrintable(errorMessage));
+        qWarning() << qPrintable(errorMessage);
         m_isValid = false;
     }
 }
@@ -377,11 +375,8 @@ FileWriterAndRemover::FileWriterAndRemover(const QString &filePath, const QByteA
     : m_filePath(filePath)
 {
     if (QFileInfo::exists(filePath)) {
-        const QString warning = QString::fromLatin1(
-            "Will not overwrite existing file: \"%1\"."
-            " If this file is left over due to a(n) abort/crash, please remove manually.")
-                .arg(m_filePath);
-        qWarning(qPrintable(warning));
+        qWarning().nospace() << "Will not overwrite existing file: " << m_filePath << "."
+            << " If this file is left over due to a(n) abort/crash, please remove manually.";
         m_writtenSuccessfully = false;
     } else {
         m_writtenSuccessfully = TestCase::writeFile(filePath, contents);
@@ -390,10 +385,8 @@ FileWriterAndRemover::FileWriterAndRemover(const QString &filePath, const QByteA
 
 FileWriterAndRemover::~FileWriterAndRemover()
 {
-    if (m_writtenSuccessfully && !QFile::remove(m_filePath)) {
-        const QString warning = QLatin1String("Failed to remove file from disk: ") + m_filePath;
-        qWarning(qPrintable(warning));
-    }
+    if (m_writtenSuccessfully && !QFile::remove(m_filePath))
+        qWarning() << "Failed to remove file from disk:" << qPrintable(m_filePath);
 }
 
 VerifyCleanCppModelManager::VerifyCleanCppModelManager()
diff --git a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp
index ed34207159e..db994a3c5bf 100644
--- a/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp
+++ b/tests/auto/languageserverprotocol/tst_languageserverprotocol.cpp
@@ -308,7 +308,7 @@ void tst_LanguageServerProtocol::baseMessageParse()
     BaseMessage::parse(&buffer, parseError, partial);
 
     if (!parseError.isEmpty() && !error) // show message if there is an error message we do not expect
-        qWarning(parseError.toLatin1());
+        qWarning() << qPrintable(parseError);
     QCOMPARE(!parseError.isEmpty(), error);
     QCOMPARE(partial.content, content);
     QCOMPARE(partial.isValid(), valid);