From 2c7ab1900642ccb6d1fa5fe5a4123d3fd748ba92 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Sat, 25 Jan 2014 23:36:48 +0100
Subject: [PATCH] New DBus XML files generated

---
 src/blackcore/blackcore.contextnetwork.xml  | 20 ++++++++++++----
 src/blackcore/blackcore.contextsettings.xml |  2 +-
 src/blackcore/blackcore.contextvoice.xml    | 26 +++++++++++++++++++++
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/blackcore/blackcore.contextnetwork.xml b/src/blackcore/blackcore.contextnetwork.xml
index 23b28f64f..4d53d8f5a 100644
--- a/src/blackcore/blackcore.contextnetwork.xml
+++ b/src/blackcore/blackcore.contextnetwork.xml
@@ -28,19 +28,29 @@
     <method name="readAtcBookingsFromSource">
     </method>
     <method name="getAtcStationsOnline">
-      <arg type="(a((ss)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)(si((iii)(iiii)i))(si((iii)(iiii)i))(ssbb)))" direction="out"/>
+      <arg type="(a((ss)(dd(s))(ssss(ss))((dd(s))(dd(s))(dd(s)))(dd(s))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)(si((iii)(iiii)i))(si((iii)(iiii)i))(ssbb)))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStationList"/>
     </method>
     <method name="getAtcStationsBooked">
-      <arg type="(a((ss)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)(si((iii)(iiii)i))(si((iii)(iiii)i))(ssbb)))" direction="out"/>
+      <arg type="(a((ss)(dd(s))(ssss(ss))((dd(s))(dd(s))(dd(s)))(dd(s))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)(si((iii)(iiii)i))(si((iii)(iiii)i))(ssbb)))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStationList"/>
     </method>
     <method name="getAircraftsInRange">
-      <arg type="(a((ss)(ssss)(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s))))" direction="out"/>
+      <arg type="(a((ss)(ssss(ss))(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s))))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAircraftList"/>
     </method>
+    <method name="getUsers">
+      <arg type="(a(ssss(ss)))" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
+    </method>
+    <method name="getUsersForCallsigns">
+      <arg type="(a(ssss(ss)))" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
+      <arg name="callsigns" type="(a(ss))" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CCallsignList"/>
+    </method>
     <method name="getOwnAircraft">
-      <arg type="((ss)(ssss)(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s)))" direction="out"/>
+      <arg type="((ss)(ssss(ss))(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s)))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAircraft"/>
     </method>
     <method name="connectToNetwork">
@@ -57,7 +67,7 @@
     <method name="setOwnAircraft">
       <arg type="(a(sii((iii)(iiii)i)))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
-      <arg name="aircraft" type="((ss)(ssss)(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s)))" direction="in"/>
+      <arg name="aircraft" type="((ss)(ssss(ss))(((dd(s))(dd(s))(dd(s)))(dd(s)i)(dd(s)i)(dd(s))(dd(s))(dd(s))((iii)(iiii)i))(s(dd(s))(dd(s))iiib)(s(dd(s))(dd(s))iiib)(sii)(sssss)(dd(s)))" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CAircraft"/>
     </method>
     <method name="updateOwnPosition">
diff --git a/src/blackcore/blackcore.contextsettings.xml b/src/blackcore/blackcore.contextsettings.xml
index d4cd22ab0..2f45c2cb9 100644
--- a/src/blackcore/blackcore.contextsettings.xml
+++ b/src/blackcore/blackcore.contextsettings.xml
@@ -4,7 +4,7 @@
     <signal name="changedNetworkSettings">
     </signal>
     <method name="getNetworkSettings">
-      <arg type="((sssi(ssss))(a(sssi(ssss))))" direction="out"/>
+      <arg type="((sssi(ssss(ss)))(a(sssi(ssss(ss)))))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Settings::CSettingsNetwork"/>
     </method>
     <method name="value">
diff --git a/src/blackcore/blackcore.contextvoice.xml b/src/blackcore/blackcore.contextvoice.xml
index b99afcd03..9b12ad748 100644
--- a/src/blackcore/blackcore.contextvoice.xml
+++ b/src/blackcore/blackcore.contextvoice.xml
@@ -9,6 +9,16 @@
       <arg type="(a(ssbb))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoomList"/>
     </method>
+    <method name="getCom1VoiceRoom">
+      <arg type="(ssbb)" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoom"/>
+      <arg name="withAudioStatus" type="b" direction="in"/>
+    </method>
+    <method name="getCom2VoiceRoom">
+      <arg type="(ssbb)" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CVoiceRoom"/>
+      <arg name="withAudioStatus" type="b" direction="in"/>
+    </method>
     <method name="setComVoiceRooms">
       <arg name="voiceRoomCom1" type="(ssbb)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Voice::CVoiceRoom"/>
@@ -17,6 +27,22 @@
     </method>
     <method name="leaveAllVoiceRooms">
     </method>
+    <method name="getCom1RoomCallsigns">
+      <arg type="(a(ss))" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CCallsignList"/>
+    </method>
+    <method name="getCom2RoomCallsigns">
+      <arg type="(a(ss))" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CCallsignList"/>
+    </method>
+    <method name="getCom1RoomUsers">
+      <arg type="(a(ssss(ss)))" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
+    </method>
+    <method name="getCom2RoomUsers">
+      <arg type="(a(ssss(ss)))" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Network::CUserList"/>
+    </method>
     <method name="getAudioDevices">
       <arg type="(a(unss))" direction="out"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Voice::CAudioDeviceList"/>