yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make the qtwaylandscanner fork build against Qt6

Browse source
This commit is contained in:
Volker Krause 2022-03-06 11:52:48 +01:00
parent 124c78cb4b
commit 09624c5a9b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/wayland/tools/qtwaylandscanner.cpp
View file

@ -223,7 +223,7 @@ Scanner::WaylandEvent Scanner::readEvent(QXmlStreamReader &xml, bool request)
.arguments = {}, .arguments = {},
}; };
while (xml.readNextStartElement()) { while (xml.readNextStartElement()) {
if (xml.name() == "arg") { if (xml.name() == QLatin1String("arg")) {
WaylandArgument argument = { WaylandArgument argument = {
.name = byteArrayValue(xml, "name"), .name = byteArrayValue(xml, "name"),
.type = byteArrayValue(xml, "type"), .type = byteArrayValue(xml, "type"),
@ -247,7 +247,7 @@ Scanner::WaylandEnum Scanner::readEnum(QXmlStreamReader &xml)
}; };
while (xml.readNextStartElement()) { while (xml.readNextStartElement()) {
if (xml.name() == "entry") { if (xml.name() == QLatin1String("entry")) {
WaylandEnumEntry entry = { WaylandEnumEntry entry = {
.name = byteArrayValue(xml, "name"), .name = byteArrayValue(xml, "name"),
.value = byteArrayValue(xml, "value"), .value = byteArrayValue(xml, "value"),
@ -273,11 +273,11 @@ Scanner::WaylandInterface Scanner::readInterface(QXmlStreamReader &xml)
}; };
while (xml.readNextStartElement()) { while (xml.readNextStartElement()) {
if (xml.name() == "event") if (xml.name() == QLatin1String("event"))
interface.events.push_back(readEvent(xml, false)); interface.events.push_back(readEvent(xml, false));
else if (xml.name() == "request") else if (xml.name() == QLatin1String("request"))
interface.requests.push_back(readEvent(xml, true)); interface.requests.push_back(readEvent(xml, true));
else if (xml.name() == "enum") else if (xml.name() == QLatin1String("enum"))
interface.enums.push_back(readEnum(xml)); interface.enums.push_back(readEnum(xml));
else else
xml.skipCurrentElement(); xml.skipCurrentElement();
@ -438,7 +438,7 @@ bool Scanner::process()
if (!m_xml->readNextStartElement()) if (!m_xml->readNextStartElement())
return false; return false;
if (m_xml->name() != "protocol") { if (m_xml->name() != QLatin1String("protocol")) {
m_xml->raiseError(QStringLiteral("The file is not a wayland protocol file.")); m_xml->raiseError(QStringLiteral("The file is not a wayland protocol file."));
return false; return false;
} }
@ -458,7 +458,7 @@ bool Scanner::process()
std::vector<WaylandInterface> interfaces; std::vector<WaylandInterface> interfaces;
while (m_xml->readNextStartElement()) { while (m_xml->readNextStartElement()) {
if (m_xml->name() == "interface") if (m_xml->name() == QLatin1String("interface"))
interfaces.push_back(readInterface(*m_xml)); interfaces.push_back(readInterface(*m_xml));
else else
m_xml->skipCurrentElement(); m_xml->skipCurrentElement();