From 0b69bdbf0bcb98f5b5e600ec4125196db593fa1d Mon Sep 17 00:00:00 2001
From: Emmanuel Lepage Vallee <emmanuel.lepage@savoirfairelinux.com>
Date: Fri, 11 Jul 2014 22:22:21 +0200
Subject: [PATCH] dbus: Drop support for older (3 years +) Qt versions
The Trolltech namespace is deprecated since 2008,
the digia and nokia namespaces replaced them in
2008-2011 then it was moved to the Qt project itself
The trolltech namespace was kept to avoid the 3
successive renames from 2008-2011. It would have
caused issues for some LTS distributions. It is no
longer an issue.
Refs #50191
Change-Id: Ic1457ea00b6decbfc875aa671af97effd1be09d3
---
.../src/client/dbus/callmanager-introspec.xml | 6 +-
.../dbus/configurationmanager-introspec.xml | 56 +++++++++----------
.../client/dbus/presencemanager-introspec.xml | 8 +--
.../client/dbus/videomanager-introspec.xml | 14 ++---
4 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/daemon/src/client/dbus/callmanager-introspec.xml b/daemon/src/client/dbus/callmanager-introspec.xml
index 41896bcc99..1b86646403 100644
--- a/daemon/src/client/dbus/callmanager-introspec.xml
+++ b/daemon/src/client/dbus/callmanager-introspec.xml
@@ -248,7 +248,7 @@
The conference ID
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="infos" direction="out">
<tp:docstring>
A map containing the ID of the conferences
@@ -377,7 +377,7 @@
The call ID.
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="infos" direction="out" tp:type="String_String_Map">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>A map containing the call details: </p>
@@ -776,7 +776,7 @@
<p>Signal sent adter a RTCP report has been received and computed.</p>
</tp:docstring>
<arg type="s" name="callID" />
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringInt"/>
<arg type="a{si}" name="report" direction="out" tp:type="String_Integer_Map">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>A map containing RTCP stats: </p>
diff --git a/daemon/src/client/dbus/configurationmanager-introspec.xml b/daemon/src/client/dbus/configurationmanager-introspec.xml
index bb83525048..8cc1c5dcd6 100644
--- a/daemon/src/client/dbus/configurationmanager-introspec.xml
+++ b/daemon/src/client/dbus/configurationmanager-introspec.xml
@@ -7,7 +7,7 @@
</tp:docstring>
<method name="getAccountTemplate" tp:name-for-bindings="getAccountTemplate">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
</arg>
</method>
@@ -21,7 +21,7 @@
The account ID
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
<tp:docstring>
The available keys / parameters are:
@@ -77,7 +77,7 @@
<tp:rationale>Account settings are written to the configuration file when sflphone properly quits.</tp:rationale>
<tp:rationale>After calling this method, the core will emit the signal <tp:member-ref>accountsChanged</tp:member-ref> with the updated data. The client must subscribe to this signal and use it to update its internal data structure.</tp:rationale>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/>
<arg type="s" name="accountID" direction="in">
</arg>
<arg type="a{ss}" name="details" direction="in" tp:type="String_String_Map">
@@ -87,7 +87,7 @@
<method name="setCredentials" tp:name-for-bindings="setCredentials">
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="in" tp:type="String_String_Map">
</arg>
</method>
@@ -96,7 +96,7 @@
<tp:docstring>
Get configuration settings of the IP2IP_PROFILE. They are sligthly different from account settings since no VoIP accounts are involved.
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
<tp:docstring>
Available parameters are:
@@ -131,7 +131,7 @@
<method name="getCredentials" tp:name-for-bindings="getCredentials">
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="out">
</arg>
</method>
@@ -142,7 +142,7 @@
<tp:rationale>If no details are specified, the default parameters are used.</tp:rationale>
<tp:rationale>The core tries to register the account as soon it is created.</tp:rationale>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="in" tp:type="String_String_Map">
<tp:docstring>
The new account settings
@@ -182,7 +182,7 @@
<tp:docstring>
Get a list of all created accounts, as stored by the core.
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
<tp:docstring>
A list of account IDs
@@ -350,7 +350,7 @@
<!-- Codecs-related methods -->
<method name="getAudioCodecList" tp:name-for-bindings="getAudioCodecList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorInt"/>
<arg type="ai" name="list" direction="out">
</arg>
</method>
@@ -358,13 +358,13 @@
<method name="getAudioCodecDetails" tp:name-for-bindings="getAudioCodecDetails">
<arg type="i" name="payload" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="details" direction="out">
</arg>
</method>
<method name="getActiveAudioCodecList" tp:name-for-bindings="getActiveAudioCodecList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorInt"/>
<arg type="s" name="accountID" direction="in">
</arg>
<arg type="ai" name="list" direction="out">
@@ -372,7 +372,7 @@
</method>
<method name="setActiveAudioCodecList" tp:name-for-bindings="setActiveAudioCodecList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="VectorString"/>
<arg type="as" name="list" direction="in">
</arg>
<arg type="s" name="accountID" direction="in">
@@ -382,7 +382,7 @@
<!-- Audio devices methods -->
<method name="getAudioPluginList" tp:name-for-bindings="getAudioPluginList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
@@ -393,7 +393,7 @@
</method>
<method name="getAudioOutputDeviceList" tp:name-for-bindings="getAudioOutputDeviceList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
@@ -414,14 +414,14 @@
</method>
<method name="getAudioInputDeviceList" tp:name-for-bindings="getAudioInputDeviceList">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getCurrentAudioDevicesIndex" tp:name-for-bindings="getCurrentAudioDevicesIndex">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
@@ -447,7 +447,7 @@
<method name="getRingtoneList" tp:name-for-bindings="getRingtoneList">
<tp:added version="1.1.1"/>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<tp:docstring>
Get a map [Path,Filename] of available ringtone. Note, set the ringtone with the complete path
</tp:docstring>
@@ -496,19 +496,19 @@
<!-- Hook configuration -->
<method name="getHookSettings" tp:name-for-bindings="getHookSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="settings" direction="out">
</arg>
</method>
<method name="setHookSettings" tp:name-for-bindings="setHookSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="settings" direction="in">
</arg>
</method>
<method name="getHistory" tp:name-for-bindings="getHistory">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<!-- Return a List of type Dict<string, string> >...a List of Dicts -->
<arg type="aa{ss}" name="entries" direction="out"/>
</method>
@@ -569,25 +569,25 @@
<!-- TLS Methods -->
<method name="getSupportedTlsMethod" tp:name-for-bindings="getSupportedTlsMethod">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getTlsSettingsDefault" tp:name-for-bindings="getTlsSettingsDefault">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out">
</arg>
</method>
<method name="getTlsSettings" tp:name-for-bindings="getTlsSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="out">
</arg>
</method>
<method name="setTlsSettings" tp:name-for-bindings="setTlsSettings">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="in">
</arg>
</method>
@@ -600,25 +600,25 @@
</method>
<method name="getAllIpInterface" tp:name-for-bindings="getAllIpInterface">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getAllIpInterfaceByName" tp:name-for-bindings="getAllIpInterfaceByName">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getShortcuts" tp:name-for-bindings="getShortcuts">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="shortcutsMap" direction="out">
</arg>
</method>
<method name="setShortcuts" tp:name-for-bindings="setShortcuts">
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="shortcutsMap" direction="in">
</arg>
</method>
diff --git a/daemon/src/client/dbus/presencemanager-introspec.xml b/daemon/src/client/dbus/presencemanager-introspec.xml
index 2e714d002b..77b1527a43 100644
--- a/daemon/src/client/dbus/presencemanager-introspec.xml
+++ b/daemon/src/client/dbus/presencemanager-introspec.xml
@@ -65,12 +65,12 @@
New clients connecting to existing daemon need to be aware of active
subscriptions.
</tp:rationale>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorMapStringString">
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="VectorMapStringString">
While there is more status than "Online" or "Offline", only those
</annotation>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="out" tp:type="String_String_Map">
<tp:docstring>
List of hashes map with the following key-value pairs:
@@ -85,13 +85,13 @@
<tp:rationale>Calling "subscribeClient" in a loop is too slow</tp:rationale>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="VectorString"/>
<arg type="as" name="uriList" direction="in">
<tp:docstring>
A list of SIP URIs
</tp:docstring>
</arg>
- <!--TODO<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <!--TODO<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="invalidUris" direction="out">
<tp:docstring>
List of invalid URIs. An URI must be a valid SIP URI. Clients should purge
diff --git a/daemon/src/client/dbus/videomanager-introspec.xml b/daemon/src/client/dbus/videomanager-introspec.xml
index 654538d745..b7773f8379 100644
--- a/daemon/src/client/dbus/videomanager-introspec.xml
+++ b/daemon/src/client/dbus/videomanager-introspec.xml
@@ -5,14 +5,14 @@
<method name="getDeviceList" tp:name-for-bindings="getDeviceList">
<tp:docstring>Returns a list of the detected v4l2 devices</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorString"/>
<arg type="as" name="list" direction="out">
</arg>
</method>
<method name="getCapabilities" tp:name-for-bindings="getCapabilities">
<tp:docstring>Returns a map of map of array of strings, containing the capabilities (channel, size, rate) of a device</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringMapStringVectorString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringMapStringVectorString"/>
<arg type="s" name="name" direction="in">
</arg>
<arg type="a{sa{sas}}" name="cap" direction="out">
@@ -21,7 +21,7 @@
<method name="getSettings" tp:name-for-bindings="getSettings">
<tp:docstring>Returns a map of settings for the given device name</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="s" name="device" direction="in">
</arg>
<arg type="a{ss}" name="map" direction="out">
@@ -32,7 +32,7 @@
<tp:docstring>Set the preferred settings for a given device name</tp:docstring>
<arg type="s" name="name" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="MapStringString"/>
<arg type="a{ss}" name="settings" direction="in">
</arg>
</method>
@@ -53,7 +53,7 @@
<tp:docstring>Gets the hashtable describing all the codecs and their parameters for a given account</tp:docstring>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="details" direction="out">
</arg>
</method>
@@ -62,7 +62,7 @@
<tp:docstring>Sets a vector of hashtables describing codecs and their parameters for a given account, one hashtable per codec</tp:docstring>
<arg type="s" name="accountID" direction="in">
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
<arg type="aa{ss}" name="details" direction="in">
</arg>
</method>
@@ -92,7 +92,7 @@
</method>
<method name="hasCameraStarted" tp:name-for-bindings="hasCameraStarted">
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="Bool"/>
+ <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="Bool"/>
<arg type="b" name="started" direction="out">
<tp:docstring>Returns true if the camera has already started, false otherwise</tp:docstring>
</arg>
--
GitLab