Run a general update of all dbus interface classes

Mostly this permits the codebase to catchup with changes introduced by
the qdbusxml2cpp tool.

Change-Id: Ib16b70523b222c6babb3735f91b578e10c7542f3
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

32 files changed, 190 insertions, 186 deletions

diff --git a/src/bluetooth/bluez/adapter.cpp b/src/bluetooth/bluez/adapter.cpp
index 10b46f3b..eaea76f8 100644
--- a/src/bluetooth/bluez/adapter.cpp
+++ b/src/bluetooth/bluez/adapter.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p adapter_p.h:adapter.cpp org.bluez.all.xml org.bluez.Adapter
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/adapter_p.h b/src/bluetooth/bluez/adapter_p.h
index d9b6a0c7..236fe7e4 100644
--- a/src/bluetooth/bluez/adapter_p.h
+++ b/src/bluetooth/bluez/adapter_p.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p adapter_p.h:adapter.cpp org.bluez.all.xml org.bluez.Adapter
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef ADAPTER_P_H_1273205927
-#define ADAPTER_P_H_1273205927
+#ifndef ADAPTER_P_H
+#define ADAPTER_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.bluez.Adapter"; }
 
 public:
-    OrgBluezAdapterInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezAdapterInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezAdapterInterface();
 
@@ -39,106 +39,106 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> CancelDeviceCreation(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("CancelDeviceCreation"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("CancelDeviceCreation"), argumentList);
     }
 
     inline QDBusPendingReply<QDBusObjectPath> CreateDevice(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("CreateDevice"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("CreateDevice"), argumentList);
     }
 
     inline QDBusPendingReply<QDBusObjectPath> CreatePairedDevice(const QString &in0, const QDBusObjectPath &in1, const QString &in2)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1) << qVariantFromValue(in2);
-        return asyncCallWithArgumentList(QLatin1String("CreatePairedDevice"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2);
+        return asyncCallWithArgumentList(QStringLiteral("CreatePairedDevice"), argumentList);
     }
 
     inline QDBusPendingReply<QDBusObjectPath> FindDevice(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("FindDevice"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("FindDevice"), argumentList);
     }
 
     inline QDBusPendingReply<QVariantMap> GetProperties()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("GetProperties"), argumentList);
     }
 
     inline QDBusPendingReply<QList<QDBusObjectPath> > ListDevices()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("ListDevices"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("ListDevices"), argumentList);
     }
 
     inline QDBusPendingReply<> RegisterAgent(const QDBusObjectPath &in0, const QString &in1)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("RegisterAgent"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
+        return asyncCallWithArgumentList(QStringLiteral("RegisterAgent"), argumentList);
     }
 
     inline QDBusPendingReply<> ReleaseMode()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("ReleaseMode"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("ReleaseMode"), argumentList);
     }
 
     inline QDBusPendingReply<> ReleaseSession()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("ReleaseSession"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("ReleaseSession"), argumentList);
     }
 
     inline QDBusPendingReply<> RemoveDevice(const QDBusObjectPath &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("RemoveDevice"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("RemoveDevice"), argumentList);
     }
 
     inline QDBusPendingReply<> RequestMode(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("RequestMode"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("RequestMode"), argumentList);
     }
 
     inline QDBusPendingReply<> RequestSession()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("RequestSession"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("RequestSession"), argumentList);
     }
 
     inline QDBusPendingReply<> SetProperty(const QString &in0, const QDBusVariant &in1)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("SetProperty"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
+        return asyncCallWithArgumentList(QStringLiteral("SetProperty"), argumentList);
     }
 
     inline QDBusPendingReply<> StartDiscovery()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("StartDiscovery"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("StartDiscovery"), argumentList);
     }
 
     inline QDBusPendingReply<> StopDiscovery()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("StopDiscovery"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("StopDiscovery"), argumentList);
     }
 
     inline QDBusPendingReply<> UnregisterAgent(const QDBusObjectPath &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("UnregisterAgent"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("UnregisterAgent"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/agent.cpp b/src/bluetooth/bluez/agent.cpp
index 89840531..6fa80176 100644
--- a/src/bluetooth/bluez/agent.cpp
+++ b/src/bluetooth/bluez/agent.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c OrgBluezAgentAdaptor -a agent_p.h:agent.cpp org.bluez.Agent.xml org.bluez.Agent
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
diff --git a/src/bluetooth/bluez/agent_p.h b/src/bluetooth/bluez/agent_p.h
index 8329089f..32efa62e 100644
--- a/src/bluetooth/bluez/agent_p.h
+++ b/src/bluetooth/bluez/agent_p.h
@@ -1,20 +1,19 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -c OrgBluezAgentAdaptor -a agent_p.h:agent.cpp org.bluez.Agent.xml org.bluez.Agent
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
  * before re-generating it.
  */
 
-#ifndef AGENT_P_H_1291941396
-#define AGENT_P_H_1291941396
+#ifndef AGENT_P_H
+#define AGENT_P_H
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
-
 QT_BEGIN_NAMESPACE
 class QByteArray;
 template<class T> class QList;
diff --git a/src/bluetooth/bluez/device.cpp b/src/bluetooth/bluez/device.cpp
index 5dc814dc..14b91ad0 100644
--- a/src/bluetooth/bluez/device.cpp
+++ b/src/bluetooth/bluez/device.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -i servicemap_p.h -p device_p.h:device.cpp org.bluez.Device.xml org.bluez.Device
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/device1_bluez5.cpp b/src/bluetooth/bluez/device1_bluez5.cpp
index 491a365d..cd6453ad 100644
--- a/src/bluetooth/bluez/device1_bluez5.cpp
+++ b/src/bluetooth/bluez/device1_bluez5.cpp
@@ -1,5 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
  *
  * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
diff --git a/src/bluetooth/bluez/device1_bluez5_p.h b/src/bluetooth/bluez/device1_bluez5_p.h
index 4feb5318..b9523a56 100644
--- a/src/bluetooth/bluez/device1_bluez5_p.h
+++ b/src/bluetooth/bluez/device1_bluez5_p.h
@@ -1,5 +1,6 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml
  *
  * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
diff --git a/src/bluetooth/bluez/device_p.h b/src/bluetooth/bluez/device_p.h
index 417db3d9..2e1e39ad 100644
--- a/src/bluetooth/bluez/device_p.h
+++ b/src/bluetooth/bluez/device_p.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -i servicemap_p.h -p device_p.h:device.cpp org.bluez.Device.xml org.bluez.Device
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef DEVICE_P_H_1273205927
-#define DEVICE_P_H_1273205927
+#ifndef DEVICE_P_H
+#define DEVICE_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -32,7 +32,7 @@ public:
     { return "org.bluez.Device"; }
 
 public:
-    OrgBluezDeviceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezDeviceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezDeviceInterface();
 
@@ -40,53 +40,53 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> CancelDiscovery()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("CancelDiscovery"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("CancelDiscovery"), argumentList);
     }
 
     inline QDBusPendingReply<QDBusObjectPath> CreateNode(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("CreateNode"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("CreateNode"), argumentList);
     }
 
     inline QDBusPendingReply<> Disconnect()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Disconnect"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Disconnect"), argumentList);
     }
 
     inline QDBusPendingReply<ServiceMap> DiscoverServices(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("DiscoverServices"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("DiscoverServices"), argumentList);
     }
 
     inline QDBusPendingReply<QVariantMap> GetProperties()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("GetProperties"), argumentList);
     }
 
     inline QDBusPendingReply<QList<QDBusObjectPath> > ListNodes()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("ListNodes"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("ListNodes"), argumentList);
     }
 
     inline QDBusPendingReply<> RemoveNode(const QDBusObjectPath &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("RemoveNode"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("RemoveNode"), argumentList);
     }
 
     inline QDBusPendingReply<> SetProperty(const QString &in0, const QDBusVariant &in1)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("SetProperty"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
+        return asyncCallWithArgumentList(QStringLiteral("SetProperty"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/manager.cpp b/src/bluetooth/bluez/manager.cpp
index b5d6590d..8ca6fb42 100644
--- a/src/bluetooth/bluez/manager.cpp
+++ b/src/bluetooth/bluez/manager.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p manager_p.h:manager.cpp org.bluez.Manager.xml org.bluez.Manager
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/manager_p.h b/src/bluetooth/bluez/manager_p.h
index edb1c73b..a969e067 100644
--- a/src/bluetooth/bluez/manager_p.h
+++ b/src/bluetooth/bluez/manager_p.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p manager_p.h:manager.cpp org.bluez.Manager.xml org.bluez.Manager
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef MANAGER_P_H_1273205927
-#define MANAGER_P_H_1273205927
+#ifndef MANAGER_P_H
+#define MANAGER_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.bluez.Manager"; }
 
 public:
-    OrgBluezManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezManagerInterface();
 
@@ -39,20 +39,20 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<QDBusObjectPath> DefaultAdapter()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("DefaultAdapter"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("DefaultAdapter"), argumentList);
     }
 
     inline QDBusPendingReply<QDBusObjectPath> FindAdapter(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("FindAdapter"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("FindAdapter"), argumentList);
     }
 
     inline QDBusPendingReply<QList<QDBusObjectPath> > ListAdapters()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("ListAdapters"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("ListAdapters"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/obex_agent.cpp b/src/bluetooth/bluez/obex_agent.cpp
index c5252898..5bc05f87 100644
--- a/src/bluetooth/bluez/obex_agent.cpp
+++ b/src/bluetooth/bluez/obex_agent.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -a obex_agent_p.h:obex_agent.cpp org.openobex.agent.xml
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -a obex_agent_p.h:obex_agent.cpp org.openobex.agent.xml org.openobex.Agent
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
diff --git a/src/bluetooth/bluez/obex_agent_p.h b/src/bluetooth/bluez/obex_agent_p.h
index 8af38d86..242b2598 100644
--- a/src/bluetooth/bluez/obex_agent_p.h
+++ b/src/bluetooth/bluez/obex_agent_p.h
@@ -1,20 +1,19 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
- * Command line was: qdbusxml2cpp -a obex_agent_p.h:obex_agent.cpp org.openobex.agent.xml
+ * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -a obex_agent_p.h:obex_agent.cpp org.openobex.agent.xml org.openobex.Agent
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
  * before re-generating it.
  */
 
-#ifndef OBEX_AGENT_P_H_1291359033
-#define OBEX_AGENT_P_H_1291359033
+#ifndef OBEX_AGENT_P_H
+#define OBEX_AGENT_P_H
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
-
 QT_BEGIN_NAMESPACE
 class QByteArray;
 template<class T> class QList;
diff --git a/src/bluetooth/bluez/obex_client.cpp b/src/bluetooth/bluez/obex_client.cpp
index 07730d42..bef9155a 100644
--- a/src/bluetooth/bluez/obex_client.cpp
+++ b/src/bluetooth/bluez/obex_client.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p obex_client_p.h:obex_client.cpp org.openobex.client.xml org.openobex.Client
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/obex_client1_bluez5_p.h b/src/bluetooth/bluez/obex_client1_bluez5_p.h
index 5133faea..ccd5b0d6 100644
--- a/src/bluetooth/bluez/obex_client1_bluez5_p.h
+++ b/src/bluetooth/bluez/obex_client1_bluez5_p.h
@@ -1,15 +1,15 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp org.bluez.Client1.xml -p asd
+ * Command line was: qdbusxml2cpp -p obex_client1_bluez5_p.h:obex_client1_bluez5_p.h org.bluez.Client1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef ASD_H_1399976174
-#define ASD_H_1399976174
+#ifndef OBEX_CLIENT1_BLUEZ5_P_H
+#define OBEX_CLIENT1_BLUEZ5_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.bluez.obex.Client1"; }
 
 public:
-    OrgBluezObexClient1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezObexClient1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezObexClient1Interface();
 
@@ -40,14 +40,14 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(destination) << QVariant::fromValue(args);
-        return asyncCallWithArgumentList(QLatin1String("CreateSession"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("CreateSession"), argumentList);
     }
 
     inline QDBusPendingReply<> RemoveSession(const QDBusObjectPath &session)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(session);
-        return asyncCallWithArgumentList(QLatin1String("RemoveSession"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("RemoveSession"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/obex_client_p.h b/src/bluetooth/bluez/obex_client_p.h
index b2dd0f61..13b638b6 100644
--- a/src/bluetooth/bluez/obex_client_p.h
+++ b/src/bluetooth/bluez/obex_client_p.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p obex_client_p.h:obex_client.cpp org.openobex.client.xml org.openobex.Client
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef OBEX_CLIENT_P_H_1291349694
-#define OBEX_CLIENT_P_H_1291349694
+#ifndef OBEX_CLIENT_P_H
+#define OBEX_CLIENT_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.openobex.Client"; }
 
 public:
-    OrgOpenobexClientInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgOpenobexClientInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgOpenobexClientInterface();
 
@@ -39,36 +39,36 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<QDBusObjectPath> CreateSession(const QVariantMap &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("CreateSession"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("CreateSession"), argumentList);
     }
 
     inline QDBusPendingReply<> ExchangeBusinessCards(const QVariantMap &in0, const QString &in1, const QString &in2)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1) << qVariantFromValue(in2);
-        return asyncCallWithArgumentList(QLatin1String("ExchangeBusinessCards"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2);
+        return asyncCallWithArgumentList(QStringLiteral("ExchangeBusinessCards"), argumentList);
     }
 
     inline QDBusPendingReply<QString> GetCapabilities(const QVariantMap &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("GetCapabilities"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("GetCapabilities"), argumentList);
     }
 
     inline QDBusPendingReply<> PullBusinessCard(const QVariantMap &in0, const QString &in1)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("PullBusinessCard"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
+        return asyncCallWithArgumentList(QStringLiteral("PullBusinessCard"), argumentList);
     }
 
     inline QDBusPendingReply<> SendFiles(const QVariantMap &in0, const QStringList &in1, const QDBusObjectPath &in2)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1) << qVariantFromValue(in2);
-        return asyncCallWithArgumentList(QLatin1String("SendFiles"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1) << QVariant::fromValue(in2);
+        return asyncCallWithArgumentList(QStringLiteral("SendFiles"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/obex_manager.cpp b/src/bluetooth/bluez/obex_manager.cpp
index 0eb5d1c8..cc6e0ecb 100644
--- a/src/bluetooth/bluez/obex_manager.cpp
+++ b/src/bluetooth/bluez/obex_manager.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p obex_manager_p.h:obex_manager.cpp org.openobex.all.xml org.openobex.Manager
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/obex_manager_p.h b/src/bluetooth/bluez/obex_manager_p.h
index a6e4d189..822954ab 100644
--- a/src/bluetooth/bluez/obex_manager_p.h
+++ b/src/bluetooth/bluez/obex_manager_p.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p obex_manager_p.h:obex_manager.cpp org.openobex.all.xml org.openobex.Manager
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef OBEX_MANAGER_P_H_1291186314
-#define OBEX_MANAGER_P_H_1291186314
+#ifndef OBEX_MANAGER_P_H
+#define OBEX_MANAGER_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.openobex.Manager"; }
 
 public:
-    OrgOpenobexManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgOpenobexManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgOpenobexManagerInterface();
 
@@ -39,15 +39,15 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> RegisterAgent(const QDBusObjectPath &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("RegisterAgent"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("RegisterAgent"), argumentList);
     }
 
     inline QDBusPendingReply<> UnregisterAgent(const QDBusObjectPath &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("UnregisterAgent"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("UnregisterAgent"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/obex_objectpush1_bluez5.cpp b/src/bluetooth/bluez/obex_objectpush1_bluez5.cpp
index 6edb27a8..59b94e80 100644
--- a/src/bluetooth/bluez/obex_objectpush1_bluez5.cpp
+++ b/src/bluetooth/bluez/obex_objectpush1_bluez5.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp org.bluez.obex.ObjectPush1.xml -p obex_objectpush1_bluez5
+ * Command line was: qdbusxml2cpp -p obex_objectpush1_bluez5_p.h:obex_objectpush1_bluez5.cpp org.bluez.obex.ObjectPush1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/obex_objectpush1_bluez5_p.h b/src/bluetooth/bluez/obex_objectpush1_bluez5_p.h
index ba5f090d..5fa1703b 100644
--- a/src/bluetooth/bluez/obex_objectpush1_bluez5_p.h
+++ b/src/bluetooth/bluez/obex_objectpush1_bluez5_p.h
@@ -1,15 +1,15 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp org.bluez.obex.ObjectPush1.xml -p obex_objectpush1_bluez5
+ * Command line was: qdbusxml2cpp -p obex_objectpush1_bluez5_p.h:obex_objectpush1_bluez5.cpp org.bluez.obex.ObjectPush1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef OBEX_OBJECTPUSH1_BLUEZ5_H_1399989318
-#define OBEX_OBJECTPUSH1_BLUEZ5_H_1399989318
+#ifndef OBEX_OBJECTPUSH1_BLUEZ5_P_H
+#define OBEX_OBJECTPUSH1_BLUEZ5_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.bluez.obex.ObjectPush1"; }
 
 public:
-    OrgBluezObexObjectPush1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezObexObjectPush1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezObexObjectPush1Interface();
 
@@ -40,13 +40,13 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(clientfile) << QVariant::fromValue(targetfile);
-        return asyncCallWithArgumentList(QLatin1String("ExchangeBusinessCards"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("ExchangeBusinessCards"), argumentList);
     }
     inline QDBusReply<QDBusObjectPath> ExchangeBusinessCards(const QString &clientfile, const QString &targetfile, QVariantMap &properties)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(clientfile) << QVariant::fromValue(targetfile);
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("ExchangeBusinessCards"), argumentList);
+        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("ExchangeBusinessCards"), argumentList);
         if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
             properties = qdbus_cast<QVariantMap>(reply.arguments().at(1));
         }
@@ -57,13 +57,13 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(targetfile);
-        return asyncCallWithArgumentList(QLatin1String("PullBusinessCard"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("PullBusinessCard"), argumentList);
     }
     inline QDBusReply<QDBusObjectPath> PullBusinessCard(const QString &targetfile, QVariantMap &properties)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(targetfile);
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("PullBusinessCard"), argumentList);
+        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("PullBusinessCard"), argumentList);
         if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
             properties = qdbus_cast<QVariantMap>(reply.arguments().at(1));
         }
@@ -74,13 +74,13 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(sourcefile);
-        return asyncCallWithArgumentList(QLatin1String("SendFile"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("SendFile"), argumentList);
     }
     inline QDBusReply<QDBusObjectPath> SendFile(const QString &sourcefile, QVariantMap &properties)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(sourcefile);
-        QDBusMessage reply = callWithArgumentList(QDBus::Block, QLatin1String("SendFile"), argumentList);
+        QDBusMessage reply = callWithArgumentList(QDBus::Block, QStringLiteral("SendFile"), argumentList);
         if (reply.type() == QDBusMessage::ReplyMessage && reply.arguments().count() == 2) {
             properties = qdbus_cast<QVariantMap>(reply.arguments().at(1));
         }
diff --git a/src/bluetooth/bluez/obex_transfer.cpp b/src/bluetooth/bluez/obex_transfer.cpp
index 49e1f7c9..be27362f 100644
--- a/src/bluetooth/bluez/obex_transfer.cpp
+++ b/src/bluetooth/bluez/obex_transfer.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p obex_transfer_p.h:obex_transfer.cpp org.openobex.transfer.xml org.openobex.Transfer
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/obex_transfer1_bluez5_p.h b/src/bluetooth/bluez/obex_transfer1_bluez5_p.h
index 2307f2ae..ccde588e 100644
--- a/src/bluetooth/bluez/obex_transfer1_bluez5_p.h
+++ b/src/bluetooth/bluez/obex_transfer1_bluez5_p.h
@@ -1,15 +1,15 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp org.bluez.obex.Transfer1.xml -p obex_transfer1_bluez5
+ * Command line was: qdbusxml2cpp -p obex_transfer1_bluez5_p.h:obex_transfer1_bluez5_p.h org.bluez.obex.Transfer1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef OBEX_TRANSFER1_BLUEZ5_H_1400058158
-#define OBEX_TRANSFER1_BLUEZ5_H_1400058158
+#ifndef OBEX_TRANSFER1_BLUEZ5_P_H
+#define OBEX_TRANSFER1_BLUEZ5_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.bluez.obex.Transfer1"; }
 
 public:
-    OrgBluezObexTransfer1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezObexTransfer1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezObexTransfer1Interface();
 
@@ -63,19 +63,19 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> Cancel()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Cancel"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Cancel"), argumentList);
     }
 
     inline QDBusPendingReply<> Resume()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Resume"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Resume"), argumentList);
     }
 
     inline QDBusPendingReply<> Suspend()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Suspend"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Suspend"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/obex_transfer_p.h b/src/bluetooth/bluez/obex_transfer_p.h
index 81b9eb22..b8fa0a5d 100644
--- a/src/bluetooth/bluez/obex_transfer_p.h
+++ b/src/bluetooth/bluez/obex_transfer_p.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p obex_transfer_p.h:obex_transfer.cpp org.openobex.transfer.xml org.openobex.Transfer
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef OBEX_TRANSFER_P_H_1291853849
-#define OBEX_TRANSFER_P_H_1291853849
+#ifndef OBEX_TRANSFER_P_H
+#define OBEX_TRANSFER_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.openobex.Transfer"; }
 
 public:
-    OrgOpenobexTransferInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgOpenobexTransferInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgOpenobexTransferInterface();
 
@@ -39,13 +39,13 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<> Cancel()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("Cancel"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Cancel"), argumentList);
     }
 
     inline QDBusPendingReply<QVariantMap> GetProperties()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("GetProperties"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/objectmanager.cpp b/src/bluetooth/bluez/objectmanager.cpp
index a8e8fdba..4484ea27 100644
--- a/src/bluetooth/bluez/objectmanager.cpp
+++ b/src/bluetooth/bluez/objectmanager.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p objectmanager -v -i bluez5_helper.h org.freedesktop.dbus.objectmanager.xml
+ * Command line was: qdbusxml2cpp -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/objectmanager_p.h b/src/bluetooth/bluez/objectmanager_p.h
index 74f5ab43..7aa2f35b 100644
--- a/src/bluetooth/bluez/objectmanager_p.h
+++ b/src/bluetooth/bluez/objectmanager_p.h
@@ -1,15 +1,15 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p objectmanager -v -i bluez5_helper.h org.freedesktop.dbus.objectmanager.xml
+ * Command line was: qdbusxml2cpp -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef OBJECTMANAGER_H_1396883000
-#define OBJECTMANAGER_H_1396883000
+#ifndef OBJECTMANAGER_P_H
+#define OBJECTMANAGER_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -33,7 +33,7 @@ public:
     { return "org.freedesktop.DBus.ObjectManager"; }
 
 public:
-    OrgFreedesktopDBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgFreedesktopDBusObjectManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgFreedesktopDBusObjectManagerInterface();
 
@@ -41,7 +41,7 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<ManagedObjectList> GetManagedObjects()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetManagedObjects"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("GetManagedObjects"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/org.bluez.GattCharacteristic1.xml b/src/bluetooth/bluez/org.bluez.GattCharacteristic1.xml
index 598e01e9..f62014cf 100644
--- a/src/bluetooth/bluez/org.bluez.GattCharacteristic1.xml
+++ b/src/bluetooth/bluez/org.bluez.GattCharacteristic1.xml
@@ -3,11 +3,13 @@
     <interface name="org.bluez.GattCharacteristic1">
         <method name="ReadValue">
             <arg name="options" type="a{sv}" direction="in"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
             <arg name="value" type="ay" direction="out"/>
         </method>
         <method name="WriteValue">
             <arg name="value" type="ay" direction="in"/>
             <arg name="options" type="a{sv}" direction="in"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
         </method>
         <method name="StartNotify"></method>
         <method name="StopNotify"></method>
diff --git a/src/bluetooth/bluez/org.bluez.GattDescriptor1.xml b/src/bluetooth/bluez/org.bluez.GattDescriptor1.xml
index ceb6f0af..fc7ebce0 100644
--- a/src/bluetooth/bluez/org.bluez.GattDescriptor1.xml
+++ b/src/bluetooth/bluez/org.bluez.GattDescriptor1.xml
@@ -3,11 +3,13 @@
     <interface name="org.bluez.GattDescriptor1">
         <method name="ReadValue">
             <arg name="options" type="a{sv}" direction="in"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
             <arg name="value" type="ay" direction="out"/>
         </method>
         <method name="WriteValue">
             <arg name="value" type="ay" direction="in"/>
             <arg name="options" type="a{sv}" direction="in"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/>
         </method>
         <property name="UUID" type="s" access="read"></property>
         <property name="Characteristic" type="o" access="read"></property>
diff --git a/src/bluetooth/bluez/profile1.cpp b/src/bluetooth/bluez/profile1.cpp
index c289c89b..26d42c7c 100644
--- a/src/bluetooth/bluez/profile1.cpp
+++ b/src/bluetooth/bluez/profile1.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profile1 org.bluez.ProfileManager1.xml
+ * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/profile1_p.h b/src/bluetooth/bluez/profile1_p.h
index a08f10e0..e61fb2a9 100644
--- a/src/bluetooth/bluez/profile1_p.h
+++ b/src/bluetooth/bluez/profile1_p.h
@@ -1,15 +1,15 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p profile1 org.bluez.ProfileManager1.xml
+ * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef PROFILE1_H_1400142085
-#define PROFILE1_H_1400142085
+#ifndef PROFILE1_P_H
+#define PROFILE1_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.bluez.ProfileManager1"; }
 
 public:
-    OrgBluezProfileManager1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezProfileManager1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezProfileManager1Interface();
 
@@ -40,14 +40,14 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(profile) << QVariant::fromValue(UUID) << QVariant::fromValue(options);
-        return asyncCallWithArgumentList(QLatin1String("RegisterProfile"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("RegisterProfile"), argumentList);
     }
 
     inline QDBusPendingReply<> UnregisterProfile(const QDBusObjectPath &profile)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(profile);
-        return asyncCallWithArgumentList(QLatin1String("UnregisterProfile"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("UnregisterProfile"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/properties.cpp b/src/bluetooth/bluez/properties.cpp
index 4ddbc30c..1c10bfdc 100644
--- a/src/bluetooth/bluez/properties.cpp
+++ b/src/bluetooth/bluez/properties.cpp
@@ -1,8 +1,8 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p properties -v org.freedesktop.dbus.properties.xml
+ * Command line was: qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/properties_p.h b/src/bluetooth/bluez/properties_p.h
index daadfefc..16a43e80 100644
--- a/src/bluetooth/bluez/properties_p.h
+++ b/src/bluetooth/bluez/properties_p.h
@@ -1,15 +1,15 @@
 /*
  * This file was generated by qdbusxml2cpp version 0.8
- * Command line was: qdbusxml2cpp -p properties -v org.freedesktop.dbus.properties.xml
+ * Command line was: qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml
  *
- * qdbusxml2cpp is Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef PROPERTIES_H_1396952220
-#define PROPERTIES_H_1396952220
+#ifndef PROPERTIES_P_H
+#define PROPERTIES_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.freedesktop.DBus.Properties"; }
 
 public:
-    OrgFreedesktopDBusPropertiesInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgFreedesktopDBusPropertiesInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgFreedesktopDBusPropertiesInterface();
 
@@ -40,21 +40,21 @@ public Q_SLOTS: // METHODS
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name);
-        return asyncCallWithArgumentList(QLatin1String("Get"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Get"), argumentList);
     }
 
     inline QDBusPendingReply<QVariantMap> GetAll(const QString &interface)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(interface);
-        return asyncCallWithArgumentList(QLatin1String("GetAll"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("GetAll"), argumentList);
     }
 
     inline QDBusPendingReply<> Set(const QString &interface, const QString &name, const QDBusVariant &value)
     {
         QList<QVariant> argumentList;
         argumentList << QVariant::fromValue(interface) << QVariant::fromValue(name) << QVariant::fromValue(value);
-        return asyncCallWithArgumentList(QLatin1String("Set"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("Set"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS
diff --git a/src/bluetooth/bluez/service.cpp b/src/bluetooth/bluez/service.cpp
index 2004bea7..d2b15fc2 100644
--- a/src/bluetooth/bluez/service.cpp
+++ b/src/bluetooth/bluez/service.cpp
@@ -1,8 +1,8 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p service_p.h:service.cpp org.bluez.all.xml org.bluez.Service
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments
diff --git a/src/bluetooth/bluez/service_p.h b/src/bluetooth/bluez/service_p.h
index e8c5e1f4..573265a8 100644
--- a/src/bluetooth/bluez/service_p.h
+++ b/src/bluetooth/bluez/service_p.h
@@ -1,15 +1,15 @@
 /*
- * This file was generated by qdbusxml2cpp version 0.7
+ * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -p service_p.h:service.cpp org.bluez.all.xml org.bluez.Service
  *
- * Copyright (C) 2015 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2017 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.
  */
 
-#ifndef SERVICE_P_H_1277421939
-#define SERVICE_P_H_1277421939
+#ifndef SERVICE_P_H
+#define SERVICE_P_H
 
 #include <QtCore/QObject>
 #include <QtCore/QByteArray>
@@ -31,7 +31,7 @@ public:
     { return "org.bluez.Service"; }
 
 public:
-    OrgBluezServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
+    OrgBluezServiceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr);
 
     ~OrgBluezServiceInterface();
 
@@ -39,35 +39,35 @@ public Q_SLOTS: // METHODS
     inline QDBusPendingReply<uint> AddRecord(const QString &in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("AddRecord"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("AddRecord"), argumentList);
     }
 
     inline QDBusPendingReply<> CancelAuthorization()
     {
         QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("CancelAuthorization"), argumentList);
+        return asyncCallWithArgumentList(QStringLiteral("CancelAuthorization"), argumentList);
     }
 
     inline QDBusPendingReply<> RemoveRecord(uint in0)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("RemoveRecord"), argumentList);
+        argumentList << QVariant::fromValue(in0);
+        return asyncCallWithArgumentList(QStringLiteral("RemoveRecord"), argumentList);
     }
 
     inline QDBusPendingReply<> RequestAuthorization(const QString &in0, uint in1)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("RequestAuthorization"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
+        return asyncCallWithArgumentList(QStringLiteral("RequestAuthorization"), argumentList);
     }
 
     inline QDBusPendingReply<> UpdateRecord(uint in0, const QString &in1)
     {
         QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("UpdateRecord"), argumentList);
+        argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1);
+        return asyncCallWithArgumentList(QStringLiteral("UpdateRecord"), argumentList);
     }
 
 Q_SIGNALS: // SIGNALS