diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-09-18 13:18:30 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-09-18 14:41:32 +0000 |
commit | 6225d33c282fc56d1c7b634bdeef04bccf6a914a (patch) | |
tree | a975cea0e29c1a7dc7aa7369015aad1426a5ad60 /src/plugins/valgrind | |
parent | 2a70bc1d0983b9c26c3db513e37410bcabc73d90 (diff) |
Fix build issues with Qt6
Change from QStringRef to QStringView at various places.
Task-number: QTCREATORBUG-24098
Change-Id: Ia7a634fa26464fbb2962724d5f0e188cecc68801
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/valgrind')
-rw-r--r-- | src/plugins/valgrind/callgrind/callgrindparsedata.cpp | 4 | ||||
-rw-r--r-- | src/plugins/valgrind/callgrind/callgrindparser.cpp | 2 | ||||
-rw-r--r-- | src/plugins/valgrind/xmlprotocol/parser.cpp | 22 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp index 186df0676b0..55398ce79ae 100644 --- a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp @@ -182,9 +182,9 @@ QString ParseData::prettyStringForEvent(const QString &event) type = ParseData::Private::tr("Instruction"); else if (event.at(0) == 'D') type = ParseData::Private::tr("Cache"); - else if (event.leftRef(2) == "Bc") + else if (event.left(2) == "Bc") type = ParseData::Private::tr("Conditional branches"); - else if (event.leftRef(2) == "Bi") + else if (event.left(2) == "Bi") type = ParseData::Private::tr("Indirect branches"); QStringList prettyString; diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp index 60e604f9b9d..f481ff2dd94 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp @@ -321,7 +321,7 @@ void Parser::Private::parseHeader(QIODevice *device) } else if (line.startsWith("summary: ")) { QString values = getValue(line, 9); uint i = 0; - foreach (const QStringRef &value, values.splitRef(' ', Qt::SkipEmptyParts)) + foreach (const QString &value, values.split(' ', Qt::SkipEmptyParts)) data->setTotalCost(i++, value.toULongLong()); } else if (!line.trimmed().isEmpty()) { // handle line and exit parseHeader diff --git a/src/plugins/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp index 81208327c03..e4059112470 100644 --- a/src/plugins/valgrind/xmlprotocol/parser.cpp +++ b/src/plugins/valgrind/xmlprotocol/parser.cpp @@ -303,7 +303,7 @@ XWhat Parser::Private::parseXWhat() blockingReadNext(); if (reader.isEndElement()) break; - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "text") what.text = blockingReadElementText(); else if (name == "leakedbytes") @@ -325,7 +325,7 @@ XauxWhat Parser::Private::parseXauxWhat() blockingReadNext(); if (reader.isEndElement()) break; - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "text") what.text = blockingReadElementText(); else if (name == "file") @@ -433,7 +433,7 @@ void Parser::Private::parseError() break; if (reader.isStartElement()) lastAuxWhat++; - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "unique") { e.setUnique(parseHex(blockingReadElementText(), "unique")); } else if (name == "tid") { @@ -504,7 +504,7 @@ Frame Parser::Private::parseFrame() if (reader.isEndElement()) break; if (reader.isStartElement()) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "ip") frame.setInstructionPointer(parseHex(blockingReadElementText(), "error/frame/ip")); else if (name == "obj") @@ -534,7 +534,7 @@ void Parser::Private::parseAnnounceThread() if (reader.isEndElement()) break; if (reader.isStartElement()) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "hthreadid") at.setHelgrindThreadId(parseInt64(blockingReadElementText(), "announcethread/hthreadid")); else if (name == "stack") @@ -562,7 +562,7 @@ void Parser::Private::parseErrorCounts() if (reader.isEndElement()) break; if (reader.isStartElement()) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "unique") unique = parseHex(blockingReadElementText(), "errorcounts/pair/unique"); else if (name == "count") @@ -595,7 +595,7 @@ void Parser::Private::parseSuppressionCounts() if (reader.isEndElement()) break; if (reader.isStartElement()) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "name") pairName = blockingReadElementText(); else if (name == "count") @@ -621,7 +621,7 @@ void Parser::Private::parseStatus() if (reader.isEndElement()) break; if (reader.isStartElement()) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "state") s.setState(parseState(blockingReadElementText())); else if (name == "time") @@ -659,7 +659,7 @@ SuppressionFrame Parser::Private::parseSuppressionFrame() if (reader.isEndElement()) break; if (reader.isStartElement()) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "obj") frame.setObject(blockingReadElementText()); else if (name == "fun") @@ -681,7 +681,7 @@ Suppression Parser::Private::parseSuppression() if (reader.isEndElement()) break; if (reader.isStartElement()) { - const QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "sname") supp.setName(blockingReadElementText()); else if (name == "skind") @@ -707,7 +707,7 @@ void Parser::Private::parse(QIODevice *device) try { while (notAtEnd()) { blockingReadNext(); - QStringRef name = reader.name(); + const auto name = reader.name(); if (name == "error") parseError(); else if (name == "announcethread") |