summaryrefslogtreecommitdiffstats
path: root/src/qtwaylandscanner
diff options
context:
space:
mode:
authorArnaud Vrac <avrac@freebox.fr>2014-09-16 17:36:18 +0200
committerArnaud Vrac <avrac@freebox.fr>2015-05-07 08:44:44 +0000
commit77a7900aaa790f7bb5e0105f38dbd539f04e219f (patch)
treee15a79af500c95d840967307a90800355c8294ab /src/qtwaylandscanner
parentca803d44c8231ff6262221a8d66c1401165f1171 (diff)
Reset wayland object pointer after destroy
This allows calling init() on the wayland object again after destroy() Change-Id: I7856cc8ec676eee7575e15a5d1f81cf1b89537c8 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/qtwaylandscanner')
-rw-r--r--src/qtwaylandscanner/qtwaylandscanner.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp
index a0b4afcfa..784687d26 100644
--- a/src/qtwaylandscanner/qtwaylandscanner.cpp
+++ b/src/qtwaylandscanner/qtwaylandscanner.cpp
@@ -88,6 +88,7 @@ struct WaylandArgument {
struct WaylandEvent {
bool request;
QByteArray name;
+ QByteArray type;
QList<WaylandArgument> arguments;
};
@@ -124,6 +125,7 @@ WaylandEvent readEvent(QXmlStreamReader &xml, bool request)
WaylandEvent event;
event.request = request;
event.name = byteArrayValue(xml, "name");
+ event.type = byteArrayValue(xml, "type");
while (xml.readNextStartElement()) {
if (xml.name() == "arg") {
WaylandArgument argument;
@@ -998,6 +1000,8 @@ void process(QXmlStreamReader &xml, const QByteArray &headerPath, const QByteArr
}
}
printf(");\n");
+ if (e.type == "destructor")
+ printf(" m_%s = 0;\n", interfaceName);
printf(" }\n");
}