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

Core: Do not use QStringRef

Browse Source 
It is gone in Qt6.
QXmlStreamReader changed return values from QStringRef to QStringView,
so use auto there.

Task-number: QTCREATORBUG-24098
Change-Id: I806f01c20574721bfaa4b100747ef0bba75874a0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-07 12:26:59 +02:00
parent 7721d5c29a
commit e223e2480a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/actionmanager/commandsfile.cpp
View File

@@ -101,7 +101,7 @@ QMap<QString, QList<QKeySequence>> CommandsFile::importCommands() const
while (!r.atEnd()) { while (!r.atEnd()) {
switch (r.readNext()) { switch (r.readNext()) {
case QXmlStreamReader::StartElement: { case QXmlStreamReader::StartElement: {
const QStringRef name = r.name(); const auto name = r.name();
if (name == ctx.shortCutElement) { if (name == ctx.shortCutElement) {
currentId = r.attributes().value(ctx.idAttribute).toString(); currentId = r.attributes().value(ctx.idAttribute).toString();
if (!result.contains(currentId)) if (!result.contains(currentId))

6
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -825,14 +825,14 @@ QString DocumentManager::getSaveFileName(const QString &title, const QString &pa
const QRegularExpressionMatch match = matchIt.next(); const QRegularExpressionMatch match = matchIt.next();
QString caption = match.captured(1); QString caption = match.captured(1);
caption.remove(QLatin1Char('*')); caption.remove(QLatin1Char('*'));
const QVector<QStringRef> suffixes = caption.splitRef(QLatin1Char(' ')); const QStringList suffixes = caption.split(QLatin1Char(' '));
for (const QStringRef &suffix : suffixes) for (const QString &suffix : suffixes)
if (fileName.endsWith(suffix)) { if (fileName.endsWith(suffix)) {
suffixOk = true; suffixOk = true;
break; break;
} }
if (!suffixOk && !suffixes.isEmpty()) if (!suffixOk && !suffixes.isEmpty())
fileName.append(suffixes.at(0).toString()); fileName.append(suffixes.at(0));
} }
} }
if (QFile::exists(fileName)) { if (QFile::exists(fileName)) {

4
src/plugins/coreplugin/externaltool.cpp
View File

@@ -351,7 +351,7 @@ static void localizedText(const QStringList &locales, QXmlStreamReader *reader,
static bool parseOutputAttribute(const QString &attribute, QXmlStreamReader *reader, ExternalTool::OutputHandling *value) static bool parseOutputAttribute(const QString &attribute, QXmlStreamReader *reader, ExternalTool::OutputHandling *value)
{ {
const QStringRef output = reader->attributes().value(attribute); const auto output = reader->attributes().value(attribute);
if (output == kOutputShowInPane) { if (output == kOutputShowInPane) {
*value = ExternalTool::ShowInPane; *value = ExternalTool::ShowInPane;
} else if (output == kOutputReplaceSelection) { } else if (output == kOutputReplaceSelection) {
@@ -405,7 +405,7 @@ ExternalTool * ExternalTool::createFromXml(const QByteArray &xml, QString *error
break; break;
} }
if (reader.attributes().hasAttribute(kModifiesDocument)) { if (reader.attributes().hasAttribute(kModifiesDocument)) {
const QStringRef value = reader.attributes().value(kModifiesDocument); const auto value = reader.attributes().value(kModifiesDocument);
if (value == kYes || value == kTrue) { if (value == kYes || value == kTrue) {
tool->m_modifiesCurrentDocument = true; tool->m_modifiesCurrentDocument = true;
} else if (value == kNo || value == kFalse) { } else if (value == kNo || value == kFalse) {