From 612393889a2819f8e4268cc8bfbab517b6c013cb Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Thu, 7 Feb 2019 12:29:36 +0100
Subject: [PATCH] CppEditor: Fix some clazy level0 warnings

Use leftRef() instead [-Wclazy-qstring-ref]
Use multi-arg instead [-Wclazy-qstring-arg]

Change-Id: I4aa67e0d518060cdec4f96cb7a03a9a499f28f27
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 .../cppdocumentationcommenthelper.cpp         |  2 +-
 src/plugins/cppeditor/cppquickfixes.cpp       | 44 +++++++++----------
 .../cppeditor/resourcepreviewhoverhandler.cpp |  3 +-
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp b/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
index 0fb67c9b220..65c3dc9769b 100644
--- a/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
+++ b/src/plugins/cppeditor/cppdocumentationcommenthelper.cpp
@@ -173,7 +173,7 @@ bool handleDoxygenCppStyleContinuation(QTextCursor &cursor)
         return false;
 
     QString newLine(QLatin1Char('\n'));
-    newLine.append(text.left(offset)); // indent correctly
+    newLine.append(text.leftRef(offset)); // indent correctly
     newLine.append(commentMarker);
     newLine.append(QLatin1Char(' '));
 
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index eeba204dbaf..840274792f6 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -3101,13 +3101,13 @@ public:
 
         const QString declarationGetterTypeAndNameString = oo.prettyType(getterType, m_getterName);
         const QString declarationGetter = QString::fromLatin1("%1%2()%3;\n")
-                .arg(isStatic ? QLatin1String("static ") : QString())
-            .arg(declarationGetterTypeAndNameString)
-            .arg(isStatic ? QString() : QLatin1String(" const"));
+                                              .arg(isStatic ? QLatin1String("static ") : QString(),
+                                                   declarationGetterTypeAndNameString,
+                                                   isStatic ? QString() : QLatin1String(" const"));
         const QString declarationSetter = QString::fromLatin1("%1void %2(%3);\n")
-            .arg(isStatic ? QLatin1String("static ") : QString())
-            .arg(m_setterName)
-            .arg(paramString);
+                                              .arg(isStatic ? QLatin1String("static ") : QString(),
+                                                   m_setterName,
+                                                   paramString);
 
         if (generateGetter())
             declaration += declarationGetter;
@@ -3118,22 +3118,22 @@ public:
         // Construct implementation strings
         const QString implementationGetterTypeAndNameString = oo.prettyType(
             getterType, QString::fromLatin1("%1::%2").arg(classString, m_getterName));
-        const QString implementationGetter = QString::fromLatin1(
-                    "%1()%2\n"
-                    "{\n"
-                    "return %3;\n"
-                    "}")
-                .arg(implementationGetterTypeAndNameString)
-                .arg(isStatic ? QString() : QLatin1String(" const"))
-                .arg(m_variableString);
-        const QString implementationSetter = QString::fromLatin1(
-                    "void %1::%2(%3)\n"
-                    "{\n"
-                    "%4 = %5;\n"
-                    "}")
-                .arg(classString).arg(m_setterName)
-                .arg(paramString).arg(m_variableString)
-                .arg(paramName);
+        const QString implementationGetter = QString::fromLatin1("%1()%2\n"
+                                                                 "{\n"
+                                                                 "return %3;\n"
+                                                                 "}")
+                                                 .arg(implementationGetterTypeAndNameString,
+                                                      isStatic ? QString() : QLatin1String(" const"),
+                                                      m_variableString);
+        const QString implementationSetter = QString::fromLatin1("void %1::%2(%3)\n"
+                                                                 "{\n"
+                                                                 "%4 = %5;\n"
+                                                                 "}")
+                                                 .arg(classString,
+                                                      m_setterName,
+                                                      paramString,
+                                                      m_variableString,
+                                                      paramName);
 
         QString implementation;
         if (generateGetter())
diff --git a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp
index a454361d302..72fb74f0876 100644
--- a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp
+++ b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp
@@ -204,8 +204,7 @@ QString ResourcePreviewHoverHandler::makeTooltip() const
         ret += QString("<img src=\"file:///%1\" /><br/>").arg(m_resPath);
 
     ret += QString("<a href=\"file:///%1\">%2</a>")
-            .arg(m_resPath)
-            .arg(QDir::toNativeSeparators(m_resPath));
+               .arg(m_resPath, QDir::toNativeSeparators(m_resPath));
     return ret;
 }