Revert "Use the newer org.qtproject.QtDBus annotation for DBus interfaces"
This reverts commit 740cd49cbd.
Going back to Qt4 compatible annotations,
as requested by with Rohan offline.
This commit is contained in:
Patrick Ohly
parent
4daf9aa005
commit
adde54c510
3 changed files with 21 additions and 20 deletions
|
|
@ -102,7 +102,7 @@
|
|||
"URL" - the URL for an HTTP POST.
|
||||
</doc:summary>
|
||||
</doc:doc>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMap"/>
|
||||
</arg>
|
||||
|
||||
<arg type="b" name="final">
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
"system" - some plain text information about system libraries,
|
||||
"backends" - available backend libraries
|
||||
</doc:summary></doc:doc>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMap"/>
|
||||
</arg>
|
||||
</method>
|
||||
|
||||
|
|
@ -342,7 +342,7 @@
|
|||
server (or template) configuration
|
||||
</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
|
||||
</method>
|
||||
|
||||
<method name="CheckPresence">
|
||||
|
|
@ -411,7 +411,7 @@
|
|||
its pair-value won't be included in the dictionary.
|
||||
</doc:description></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
|
||||
</method>
|
||||
|
||||
<method name="GetDatabases">
|
||||
|
|
@ -444,7 +444,7 @@
|
|||
</doc:description>
|
||||
</doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
|
||||
</method>
|
||||
|
||||
<method name="CheckSource">
|
||||
|
|
@ -585,7 +585,7 @@
|
|||
version of the transport entity.
|
||||
</doc:summary>
|
||||
</doc:doc>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QStringMap"/>
|
||||
</arg>
|
||||
<arg type="b" name="must_authenticate" direction="in">
|
||||
<doc:doc>
|
||||
|
|
@ -824,7 +824,7 @@
|
|||
</doc:summary>
|
||||
</doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In5" value="QStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In5" value="QStringMap"/>
|
||||
</signal>
|
||||
|
||||
<method name="InfoResponse">
|
||||
|
|
@ -853,7 +853,7 @@
|
|||
</doc:summary>
|
||||
</doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMap"/>
|
||||
</method>
|
||||
|
||||
<signal name="LogOutput">
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
<doc:doc><doc:summary>server configuration</doc:summary></doc:doc>
|
||||
<doc:doc><doc:description>See Server.GetConfig() for dictionary description.</doc:description></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
|
||||
</method>
|
||||
|
||||
<method name="SetConfig">
|
||||
|
|
@ -104,7 +104,7 @@
|
|||
<doc:doc><doc:summary>server configuration</doc:summary></doc:doc>
|
||||
<doc:doc><doc:description>See Server.GetConfig() for dictionary description.</doc:description></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
|
||||
</method>
|
||||
|
||||
<method name="GetNamedConfig">
|
||||
|
|
@ -115,8 +115,9 @@
|
|||
<arg type="s" name="name" direction="in">
|
||||
<doc:doc><doc:summary>configuration name</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<arg type="b" name="template" direction="in"/>
|
||||
<arg type="a{sa{ss}}" name="configuration" direction="out"/>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringMultiMap"/>
|
||||
</method>
|
||||
|
||||
<method name="SetNamedConfig">
|
||||
|
|
@ -129,7 +130,7 @@
|
|||
<doc:doc><doc:summary>temporary changes of the configuration are currently only supported for the configuration chosen when creating the session</doc:summary></doc:doc>
|
||||
</arg>
|
||||
<arg type="a{sa{ss}}" name="configuration" direction="in"/>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QStringMultiMap"/>
|
||||
</method>
|
||||
|
||||
<method name="GetReports">
|
||||
|
|
@ -144,7 +145,7 @@
|
|||
<doc:doc><doc:summary>synchronization reports</doc:summary></doc:doc>
|
||||
<doc:doc><doc:description>See Server.GetReports() for array description.</doc:description></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfStringMap"/>
|
||||
</method>
|
||||
|
||||
|
||||
|
|
@ -176,7 +177,7 @@
|
|||
</doc:description>
|
||||
</doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QArrayOfDatabases"/>
|
||||
</method>
|
||||
|
||||
<method name="CheckSource">
|
||||
|
|
@ -230,7 +231,7 @@
|
|||
<doc:doc><doc:summary>synchronization source modes</doc:summary></doc:doc>
|
||||
<doc:doc><doc:description>Source modes to override the 'mode' variable for specific sources. The dictionary key is source name, value is synchronization mode. Valid synchronization modes are all synchronization modes used in syncevolution server configuration files and the empty string.</doc:description></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QStringMap"/>
|
||||
</method>
|
||||
|
||||
<method name="Abort">
|
||||
|
|
@ -317,7 +318,7 @@
|
|||
<doc:doc><doc:summary>Synchronization source status dictionary</doc:summary></doc:doc>
|
||||
<doc:doc><doc:description>Dictionary key is source name. The value structs contain synchronization mode, source status and error code. Valid values for status are the same as for status parameter above. "done" represents a synced source when the whole sync is not done yet.</doc:description></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out2" value="QSyncStatusMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out2" value="QSyncStatusMap"/>
|
||||
</method>
|
||||
|
||||
<method name="GetProgress">
|
||||
|
|
@ -329,7 +330,7 @@
|
|||
<doc:doc><doc:summary>Synchronization source progress dictionary</doc:summary></doc:doc>
|
||||
<doc:doc><doc:description>Dictionary key is source name. The value structs contain phase (can be one of "", "preparing", "sending", "receiving"), prepare count, prepare total, send count, send total, receive count and receive total. -1 is used for unknown. Normally only the 'counts' increase but there are cases where the total will increase as well.</doc:description></doc:doc>
|
||||
</arg>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QSyncProgressMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.Out1" value="QSyncProgressMap"/>
|
||||
</method>
|
||||
|
||||
<method name="Execute">
|
||||
|
|
@ -344,7 +345,7 @@
|
|||
</arg>
|
||||
<arg type="a{ss}" name="vars" direction="in">
|
||||
<doc:doc><doc:summary>Environment variables in clients</doc:summary></doc:doc>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QStringMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QStringMap"/>
|
||||
</arg>
|
||||
</method>
|
||||
|
||||
|
|
@ -353,14 +354,14 @@
|
|||
<arg type="s" name="status"/>
|
||||
<arg type="u" name="error"/>
|
||||
<arg type="a{s(ssu)}" name="sources"/>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="QSyncStatusMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="QSyncStatusMap"/>
|
||||
</signal>
|
||||
|
||||
<signal name="ProgressChanged">
|
||||
<doc:doc><doc:description>Synchronization progress change. See GetProgress() for argument descriptions.</doc:description></doc:doc>
|
||||
<arg type="i" name="progress"/>
|
||||
<arg type="a{s(siiiiii)}" name="sources"/>
|
||||
<annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSyncProgressMap"/>
|
||||
<annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSyncProgressMap"/>
|
||||
</signal>
|
||||
|
||||
</interface>
|
||||
|
|
|
|||
Loading…
Reference in a new issue