feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

cppeditor: remove misleading Qt4/Qt5 label in WrapStringLiteral

Browse Source 
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 <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Frank Meerkoetter
2018-09-17 21:04:57 +02:00
parent 8f65486dfc
commit 17fdb595a0
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -1084,12 +1084,6 @@ static QByteArray charToStringEscapeSequences(const QByteArray &content)
return QByteArray(); 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) static QString msgQtStringLiteralDescription(const QString &replacement)
{ {
return QApplication::translate("CppTools::QuickFix", "Enclose in %1(...)").arg(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; actions = EncloseInQLatin1StringAction | objectiveCActions;
result << new WrapStringLiteralOp(interface, priority, actions, result << new WrapStringLiteralOp(interface, priority, actions,
msgQtStringLiteralDescription(stringLiteralReplacement(actions), 4), literal); msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
actions = EncloseInQStringLiteralAction | objectiveCActions; actions = EncloseInQStringLiteralAction | objectiveCActions;
result << new WrapStringLiteralOp(interface, priority, actions, result << new WrapStringLiteralOp(interface, priority, actions,
msgQtStringLiteralDescription(stringLiteralReplacement(actions), 5), literal); msgQtStringLiteralDescription(stringLiteralReplacement(actions)), literal);
} }
} }