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

Utils: Fix build with Qt6

Browse Source 
Do not use QStringRef related API, replace with QStringView where
appropriate.

Adapt to removal of QAbstractItemView::viewOptions().

Task-number: QTCREATORBUG-24098
Change-Id: I5a7a9821984583222083733f91b46df39c21d592
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2020-09-07 10:08:59 +02:00
parent 3dd224c466
commit 7e8c3e91a1
10 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/utils/persistentsettings.cpp
View File

@@ -188,13 +188,13 @@ private:
enum Element { QtCreatorElement, DataElement, VariableElement,
SimpleValueElement, ListValueElement, MapValueElement, UnknownElement };
Element element(const QStringRef &r) const;
Element element(const QStringView &r) const;
static inline bool isValueElement(Element e)
{ return e == SimpleValueElement || e == ListValueElement || e == MapValueElement; }
QVariant readSimpleValue(QXmlStreamReader &r, const QXmlStreamAttributes &attributes) const;
bool handleStartElement(QXmlStreamReader &r);
bool handleEndElement(const QStringRef &name);
bool handleEndElement(const QStringView &name);
static QString formatWarning(const QXmlStreamReader &r, const QString &message);
@@ -233,7 +233,7 @@ QVariantMap ParseContext::parse(QFile &file)
bool ParseContext::handleStartElement(QXmlStreamReader &r)
{
const QStringRef name = r.name();
const QStringView name = r.name();
const Element e = element(name);
if (e == VariableElement) {
m_currentVariableName = r.readElementText();
@@ -268,7 +268,7 @@ bool ParseContext::handleStartElement(QXmlStreamReader &r)
return false;
}
bool ParseContext::handleEndElement(const QStringRef &name)
bool ParseContext::handleEndElement(const QStringView &name)
{
const Element e = element(name);
if (ParseContext::isValueElement(e)) {
@@ -297,7 +297,7 @@ QString ParseContext::formatWarning(const QXmlStreamReader &r, const QString &me
return result;
}
ParseContext::Element ParseContext::element(const QStringRef &r) const
ParseContext::Element ParseContext::element(const QStringView &r) const
{
if (r == valueElement)
return SimpleValueElement;
@@ -317,7 +317,7 @@ ParseContext::Element ParseContext::element(const QStringRef &r) const
QVariant ParseContext::readSimpleValue(QXmlStreamReader &r, const QXmlStreamAttributes &attributes) const
{
// Simple value
const QStringRef type = attributes.value(typeAttribute);
const QStringView type = attributes.value(typeAttribute);
const QString text = r.readElementText();
if (type == QLatin1String("QChar")) { // Workaround: QTBUG-12345
QTC_ASSERT(text.size() == 1, return QVariant());