Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
09624c5a
Commit
09624c5a
authored
Mar 06, 2022
by
Volker Krause
Browse files
Make the qtwaylandscanner fork build against Qt6
parent
124c78cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/wayland/tools/qtwaylandscanner.cpp
View file @
09624c5a
...
...
@@ -223,7 +223,7 @@ Scanner::WaylandEvent Scanner::readEvent(QXmlStreamReader &xml, bool request)
.
arguments
=
{},
};
while
(
xml
.
readNextStartElement
())
{
if
(
xml
.
name
()
==
"arg"
)
{
if
(
xml
.
name
()
==
QLatin1String
(
"arg"
)
)
{
WaylandArgument
argument
=
{
.
name
=
byteArrayValue
(
xml
,
"name"
),
.
type
=
byteArrayValue
(
xml
,
"type"
),
...
...
@@ -247,7 +247,7 @@ Scanner::WaylandEnum Scanner::readEnum(QXmlStreamReader &xml)
};
while
(
xml
.
readNextStartElement
())
{
if
(
xml
.
name
()
==
"entry"
)
{
if
(
xml
.
name
()
==
QLatin1String
(
"entry"
)
)
{
WaylandEnumEntry
entry
=
{
.
name
=
byteArrayValue
(
xml
,
"name"
),
.
value
=
byteArrayValue
(
xml
,
"value"
),
...
...
@@ -273,11 +273,11 @@ Scanner::WaylandInterface Scanner::readInterface(QXmlStreamReader &xml)
};
while
(
xml
.
readNextStartElement
())
{
if
(
xml
.
name
()
==
"event"
)
if
(
xml
.
name
()
==
QLatin1String
(
"event"
)
)
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
));
else
if
(
xml
.
name
()
==
"enum"
)
else
if
(
xml
.
name
()
==
QLatin1String
(
"enum"
)
)
interface
.
enums
.
push_back
(
readEnum
(
xml
));
else
xml
.
skipCurrentElement
();
...
...
@@ -438,7 +438,7 @@ bool Scanner::process()
if
(
!
m_xml
->
readNextStartElement
())
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."
));
return
false
;
}
...
...
@@ -458,7 +458,7 @@ bool Scanner::process()
std
::
vector
<
WaylandInterface
>
interfaces
;
while
(
m_xml
->
readNextStartElement
())
{
if
(
m_xml
->
name
()
==
"interface"
)
if
(
m_xml
->
name
()
==
QLatin1String
(
"interface"
)
)
interfaces
.
push_back
(
readInterface
(
*
m_xml
));
else
m_xml
->
skipCurrentElement
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment