From 6d564efb42ba51ff8e3d6512aa8edb964b6f2306 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 17 May 2013 22:14:30 -0500 Subject: [PATCH] Add ability to obtain error messages from async calls --- tools/dbusxml2qt3/classgen.cpp | 3 +++ tools/dbusxml2qt3/methodgen.cpp | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/dbusxml2qt3/classgen.cpp b/tools/dbusxml2qt3/classgen.cpp index 040a969..12051c0 100644 --- a/tools/dbusxml2qt3/classgen.cpp +++ b/tools/dbusxml2qt3/classgen.cpp @@ -243,6 +243,8 @@ static void writeHeaderIncludes(const Class& classData, Class::Role role, break; } + includes["tqdbus"].insertString(""); + if (!includes["TQt"].isEmpty()) writeIncludes("TQt", includes["TQt"].keys(), stream); @@ -663,6 +665,7 @@ static void writeSignalDeclarations(const Class& classData, Class::Role role, case Class::Proxy: stream << "signals:" << endl; + stream << " void AsyncErrorResponseDetected(int asyncCallId, const TQT_DBusError error);" << endl << endl; prefix = " void "; break; diff --git a/tools/dbusxml2qt3/methodgen.cpp b/tools/dbusxml2qt3/methodgen.cpp index 7e0b633..cf7929c 100644 --- a/tools/dbusxml2qt3/methodgen.cpp +++ b/tools/dbusxml2qt3/methodgen.cpp @@ -1576,7 +1576,11 @@ void MethodGenerator::writeProxyAsyncReplyHandler(const Class& classData, // FIXME tricking writeVariables and writeSignalEmit into writing // the reply emit code by manipulating arguments and name - stream << " int _asyncCallId = asyncCallId;" << endl; + stream << " int _asyncCallId = asyncCallId;" << endl << endl; + + stream << " if (message.type() == TQT_DBusMessage::ErrorMessage) {" << endl; + stream << " emit AsyncErrorResponseDetected(_asyncCallId, message.error());" << endl; + stream << " }" << endl << endl; Method signal = *it; signal.arguments.pop_front();