From b38d90a0f1c8ae4bd1bce317f4ebbac56c4e48d4 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 17 Jan 2014 17:11:52 +0100
Subject: [PATCH] New XML files for the sample. Fixed some errors found during
 testing. * applyIf no longer returns number of changed elements * cmd line
 arguments, wrong assignment in main.cpp

---
 .../BlackMiscTest.Datacontext.xml             |  6 ++----
 .../BlackMiscTest.Testservice.xml             | 20 +++++++++----------
 samples/blackmiscdbus/datacontext.h           |  2 +-
 samples/blackmiscdbus/main.cpp                |  4 ++--
 samples/blackmiscdbus/servicetool.cpp         |  3 +--
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/samples/blackmiscdbus/BlackMiscTest.Datacontext.xml b/samples/blackmiscdbus/BlackMiscTest.Datacontext.xml
index 3eeae1bf7..1e8476a45 100644
--- a/samples/blackmiscdbus/BlackMiscTest.Datacontext.xml
+++ b/samples/blackmiscdbus/BlackMiscTest.Datacontext.xml
@@ -1,10 +1,10 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
   <interface name="blackmisctest.datacontext">
-    <property name="qpAtcOnlineList" type="(a((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)))" access="readwrite">
+    <property name="qpAtcOnlineList" 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)))" access="readwrite">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="BlackMisc::Aviation::CAtcStationList"/>
     </property>
-    <property name="qpAtcBookedList" type="(a((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)))" access="readwrite">
+    <property name="qpAtcBookedList" 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)))" access="readwrite">
       <annotation name="org.qtproject.QtDBus.QtTypeName" value="BlackMisc::Aviation::CAtcStationList"/>
     </property>
     <property name="qpFooStrings" type="as" access="read"/>
@@ -19,14 +19,12 @@
       <arg name="baz" type="s" direction="in"/>
     </method>
     <method name="updateBookedControllers">
-      <arg type="i" direction="out"/>
       <arg name="condition" type="(aiavai)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::CValueMap"/>
       <arg name="values" type="(aiavai)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="BlackMisc::CValueMap"/>
     </method>
     <method name="updateOnlineControllers">
-      <arg type="i" direction="out"/>
       <arg name="condition" type="(aiavai)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::CValueMap"/>
       <arg name="values" type="(aiavai)" direction="in"/>
diff --git a/samples/blackmiscdbus/BlackMiscTest.Testservice.xml b/samples/blackmiscdbus/BlackMiscTest.Testservice.xml
index 3ab70f5c0..4ba47fb73 100644
--- a/samples/blackmiscdbus/BlackMiscTest.Testservice.xml
+++ b/samples/blackmiscdbus/BlackMiscTest.Testservice.xml
@@ -22,7 +22,7 @@
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::PhysicalQuantities::CSpeed"/>
     </method>
     <method name="receiveComUnit">
-      <arg name="comUnit" type="(s(dd(s))(dd(s))i)" direction="in"/>
+      <arg name="comUnit" type="(s(dd(s))(dd(s))iiib)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CComSystem"/>
     </method>
     <method name="receiveAltitude">
@@ -66,21 +66,21 @@
       <arg name="lengthsVariantList" type="av" direction="in"/>
     </method>
     <method name="receiveAtcStation">
-      <arg name="station" type="((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i))" direction="in"/>
+      <arg name="station" type="((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="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CAtcStation"/>
     </method>
     <method name="pingAtcStation">
-      <arg type="((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i))" direction="out"/>
+      <arg type="((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"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStation"/>
-      <arg name="station" type="((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i))" direction="in"/>
+      <arg name="station" type="((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="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CAtcStation"/>
     </method>
     <method name="receiveCallsign">
-      <arg name="callsign" type="(s)" direction="in"/>
+      <arg name="callsign" type="(ss)" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CCallsign"/>
     </method>
     <method name="getAtcStationList">
-      <arg type="(a((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)))" direction="out"/>
+      <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"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStationList"/>
       <arg name="number" type="i" direction="in"/>
     </method>
@@ -89,7 +89,7 @@
       <arg name="number" type="i" direction="in"/>
     </method>
     <method name="receiveAtcStationList">
-      <arg name="AtcStationList" type="(a((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)))" direction="in"/>
+      <arg name="AtcStationList" 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="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CAtcStationList"/>
     </method>
     <method name="receiveValueMap">
@@ -97,9 +97,9 @@
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::CValueMap"/>
     </method>
     <method name="pingAtcStationList">
-      <arg type="(a((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)))" direction="out"/>
+      <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"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStationList"/>
-      <arg name="AtcStationList" type="(a((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i)))" direction="in"/>
+      <arg name="AtcStationList" 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="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="BlackMisc::Aviation::CAtcStationList"/>
     </method>
     <method name="getSpeed">
@@ -107,7 +107,7 @@
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::PhysicalQuantities::CSpeed"/>
     </method>
     <method name="getAtcStation">
-      <arg type="((s)(dd(s))(ssss)((dd(s))(dd(s))(dd(s)))(dd(s))b((iii)(iiii)i)((iii)(iiii)i))" direction="out"/>
+      <arg type="((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"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::Aviation::CAtcStation"/>
     </method>
   </interface>
diff --git a/samples/blackmiscdbus/datacontext.h b/samples/blackmiscdbus/datacontext.h
index 4c8f97376..8ab546e6e 100644
--- a/samples/blackmiscdbus/datacontext.h
+++ b/samples/blackmiscdbus/datacontext.h
@@ -82,7 +82,7 @@ namespace BlackMiscTest
         /*!
          * \brief Default constructor
          */
-        CDataContext(QObject *parent = 0) : QObject(parent) {}
+        CDataContext(QObject *parent = nullptr) : QObject(parent) {}
 
         /*!
          * \brief ctor for Qt meta system
diff --git a/samples/blackmiscdbus/main.cpp b/samples/blackmiscdbus/main.cpp
index f03499103..d2c519c61 100644
--- a/samples/blackmiscdbus/main.cpp
+++ b/samples/blackmiscdbus/main.cpp
@@ -49,8 +49,8 @@ int main(int argc, char *argv[])
         useSessionBusForServer = false;
         if (cmdlineArgs.length() > 2)
         {
-            ip = cmdlineArgs.at(1);
-            port = cmdlineArgs.at(2);
+            ip = cmdlineArgs.at(cmdlineArgs.length() - 2);
+            port = cmdlineArgs.at(cmdlineArgs.length() - 1);
         }
     }
     QString addressTcp = QString("tcp:host=%1,port=%2").arg(ip).arg(port);
diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp
index 4bd749808..28934868f 100644
--- a/samples/blackmiscdbus/servicetool.cpp
+++ b/samples/blackmiscdbus/servicetool.cpp
@@ -660,8 +660,7 @@ namespace BlackMiscTest
                 value.addValue(CAtcStation::IndexBookedUntil, QDateTime::currentDateTimeUtc().addDays(2));
                 qDebug() << "  condition" << condition;
                 qDebug() << "  values" << value;
-                qint32 c = dataContextInterface.updateOnlineControllers(condition, value);
-                qDebug() << c << "values changed in online controllers";
+                dataContextInterface.updateOnlineControllers(condition, value);
             }
 
             // display current status