Merge remote-tracking branch 'gerrit/dev' into btlebtle

Change-Id: Id7698ec157a4e06296bcc27d48aaa8325dd3c23a

1 files changed, 11 insertions, 11 deletions

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));
         }