From 17fdb595a0d39da7aa64df7871086c73f50ce035 Mon Sep 17 00:00:00 2001 From: Frank Meerkoetter Date: Mon, 17 Sep 2018 21:04:57 +0200 Subject: [PATCH] cppeditor: remove misleading Qt4/Qt5 label in WrapStringLiteral MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QStringLiteral and QLatin1String play a different role and have different properties. QLatin1String isn't strictly Qt4. Qt4 had QLatin1Literal (for which QLatin1String is nowadays a compat alias). Change-Id: Ie2a5f7d9d29ad8db735743a9d9579c4c0828cd45 Reviewed-by: André Hartmann Reviewed-by: Orgad Shaneh Reviewed-by: hjk Reviewed-by: Nikolai Kosjar --- src/plugins/cppeditor/cppquickfixes.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index b4cc33f7966..1b3f79a61fe 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -1084,12 +1084,6 @@ static QByteArray charToStringEscapeSequences(const QByteArray &content) return QByteArray(); } -static QString msgQtStringLiteralDescription(const QString &replacement, int qtVersion) -{ - return QApplication::translate("CppTools::QuickFix", "Enclose in %1(...) (Qt %2)") - .arg(replacement).arg(qtVersion); -} - static QString msgQtStringLiteralDescription(const QString &replacement) { return QApplication::translate("CppTools::QuickFix", "Enclose in %1(...)").arg(replacement); @@ -1291,10 +1285,10 @@ void WrapStringLiteral::match(const CppQuickFixInterface &interface, QuickFixOpe } actions = EncloseInQLatin1StringAction | objectiveCActions; result << new WrapStringLiteralOp(interface, priority, actions, - msgQtStringLiteralDescription(stringLiteralReplacement(actions), 4), literal); + msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal); actions = EncloseInQStringLiteralAction | objectiveCActions; result << new WrapStringLiteralOp(interface, priority, actions, - msgQtStringLiteralDescription(stringLiteralReplacement(actions), 5), literal); + msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal); } }