From 061b4afed568f279759c6da3b3ecd543d25941d2 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Tue, 24 Jul 2018 14:49:03 +0200 Subject: Rename profile1_p to profilemanager1_p The new QBluetoothSocketPrivateBluezDBus implementation requires the ProfileManger1 and Profile1 interface spec. The old profile1_p header really is the profilemanager1_p header. Task-number: QTBUG-68550 Change-Id: I8ffdb5f7969a2e93b2a167b178b32ff4b5f264c5 Reviewed-by: Timur Pocheptsov --- src/bluetooth/bluez/bluez.pri | 4 +-- src/bluetooth/bluez/generate | 2 +- src/bluetooth/bluez/profile1.cpp | 26 -------------- src/bluetooth/bluez/profile1_p.h | 61 --------------------------------- src/bluetooth/bluez/profilemanager1.cpp | 26 ++++++++++++++ src/bluetooth/bluez/profilemanager1_p.h | 61 +++++++++++++++++++++++++++++++++ 6 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 src/bluetooth/bluez/profile1.cpp delete mode 100644 src/bluetooth/bluez/profile1_p.h create mode 100644 src/bluetooth/bluez/profilemanager1.cpp create mode 100644 src/bluetooth/bluez/profilemanager1_p.h (limited to 'src/bluetooth/bluez') diff --git a/src/bluetooth/bluez/bluez.pri b/src/bluetooth/bluez/bluez.pri index a8ca8e22..e2c320e1 100644 --- a/src/bluetooth/bluez/bluez.pri +++ b/src/bluetooth/bluez/bluez.pri @@ -13,7 +13,7 @@ HEADERS += bluez/manager_p.h \ bluez/properties_p.h \ bluez/adapter1_bluez5_p.h \ bluez/device1_bluez5_p.h \ - bluez/profile1_p.h \ + bluez/profilemanager1_p.h \ bluez/obex_client1_bluez5_p.h \ bluez/obex_objectpush1_bluez5_p.h \ bluez/obex_transfer1_bluez5_p.h \ @@ -40,7 +40,7 @@ SOURCES += bluez/manager.cpp \ bluez/adapter1_bluez5.cpp \ bluez/device1_bluez5.cpp \ bluez/bluez5_helper.cpp \ - bluez/profile1.cpp \ + bluez/profilemanager1.cpp \ bluez/obex_client1_bluez5.cpp \ bluez/obex_objectpush1_bluez5.cpp \ bluez/obex_transfer1_bluez5.cpp \ diff --git a/src/bluetooth/bluez/generate b/src/bluetooth/bluez/generate index 5c401ffe..b2c4bd9e 100755 --- a/src/bluetooth/bluez/generate +++ b/src/bluetooth/bluez/generate @@ -14,7 +14,7 @@ qdbusxml2cpp -a obex_agent_p.h:obex_agent.cpp org.openobex.agent.xml org.openobe #Bluez 5 qdbusxml2cpp -p adapter1_bluez5_p.h:adapter1_bluez5.cpp org.bluez.Adapter1.xml qdbusxml2cpp -i bluez5_helper_p.h -p device1_bluez5_p.h:device1_bluez5.cpp org.bluez.Device1.xml -qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml +qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml qdbusxml2cpp -i bluez5_helper_p.h -p objectmanager_p.h:objectmanager.cpp org.freedesktop.dbus.objectmanager.xml qdbusxml2cpp -p properties_p.h:properties.cpp org.freedesktop.dbus.properties.xml qdbusxml2cpp -p obex_client1_bluez5_p.h:obex_client1_bluez5_p.h org.bluez.Client1.xml diff --git a/src/bluetooth/bluez/profile1.cpp b/src/bluetooth/bluez/profile1.cpp deleted file mode 100644 index 26d42c7c..00000000 --- a/src/bluetooth/bluez/profile1.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml - * - * 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. - */ - -#include "profile1_p.h" - -/* - * Implementation of interface class OrgBluezProfileManager1Interface - */ - -OrgBluezProfileManager1Interface::OrgBluezProfileManager1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) - : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) -{ -} - -OrgBluezProfileManager1Interface::~OrgBluezProfileManager1Interface() -{ -} - diff --git a/src/bluetooth/bluez/profile1_p.h b/src/bluetooth/bluez/profile1_p.h deleted file mode 100644 index e61fb2a9..00000000 --- a/src/bluetooth/bluez/profile1_p.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This file was generated by qdbusxml2cpp version 0.8 - * Command line was: qdbusxml2cpp -p profile1_p.h:profile1.cpp org.bluez.ProfileManager1.xml - * - * 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_P_H -#define PROFILE1_P_H - -#include -#include -#include -#include -#include -#include -#include -#include - -/* - * Proxy class for interface org.bluez.ProfileManager1 - */ -class OrgBluezProfileManager1Interface: public QDBusAbstractInterface -{ - Q_OBJECT -public: - static inline const char *staticInterfaceName() - { return "org.bluez.ProfileManager1"; } - -public: - OrgBluezProfileManager1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); - - ~OrgBluezProfileManager1Interface(); - -public Q_SLOTS: // METHODS - inline QDBusPendingReply<> RegisterProfile(const QDBusObjectPath &profile, const QString &UUID, const QVariantMap &options) - { - QList argumentList; - argumentList << QVariant::fromValue(profile) << QVariant::fromValue(UUID) << QVariant::fromValue(options); - return asyncCallWithArgumentList(QStringLiteral("RegisterProfile"), argumentList); - } - - inline QDBusPendingReply<> UnregisterProfile(const QDBusObjectPath &profile) - { - QList argumentList; - argumentList << QVariant::fromValue(profile); - return asyncCallWithArgumentList(QStringLiteral("UnregisterProfile"), argumentList); - } - -Q_SIGNALS: // SIGNALS -}; - -namespace org { - namespace bluez { - typedef ::OrgBluezProfileManager1Interface ProfileManager1; - } -} -#endif diff --git a/src/bluetooth/bluez/profilemanager1.cpp b/src/bluetooth/bluez/profilemanager1.cpp new file mode 100644 index 00000000..fe685c63 --- /dev/null +++ b/src/bluetooth/bluez/profilemanager1.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml + * + * 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. + */ + +#include "profilemanager1_p.h" + +/* + * Implementation of interface class OrgBluezProfileManager1Interface + */ + +OrgBluezProfileManager1Interface::OrgBluezProfileManager1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) + : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) +{ +} + +OrgBluezProfileManager1Interface::~OrgBluezProfileManager1Interface() +{ +} + diff --git a/src/bluetooth/bluez/profilemanager1_p.h b/src/bluetooth/bluez/profilemanager1_p.h new file mode 100644 index 00000000..5530783b --- /dev/null +++ b/src/bluetooth/bluez/profilemanager1_p.h @@ -0,0 +1,61 @@ +/* + * This file was generated by qdbusxml2cpp version 0.8 + * Command line was: qdbusxml2cpp -p profilemanager1_p.h:profilemanager1.cpp org.bluez.ProfileManager1.xml + * + * 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 PROFILEMANAGER1_P_H +#define PROFILEMANAGER1_P_H + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Proxy class for interface org.bluez.ProfileManager1 + */ +class OrgBluezProfileManager1Interface: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticInterfaceName() + { return "org.bluez.ProfileManager1"; } + +public: + OrgBluezProfileManager1Interface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = nullptr); + + ~OrgBluezProfileManager1Interface(); + +public Q_SLOTS: // METHODS + inline QDBusPendingReply<> RegisterProfile(const QDBusObjectPath &profile, const QString &UUID, const QVariantMap &options) + { + QList argumentList; + argumentList << QVariant::fromValue(profile) << QVariant::fromValue(UUID) << QVariant::fromValue(options); + return asyncCallWithArgumentList(QStringLiteral("RegisterProfile"), argumentList); + } + + inline QDBusPendingReply<> UnregisterProfile(const QDBusObjectPath &profile) + { + QList argumentList; + argumentList << QVariant::fromValue(profile); + return asyncCallWithArgumentList(QStringLiteral("UnregisterProfile"), argumentList); + } + +Q_SIGNALS: // SIGNALS +}; + +namespace org { + namespace bluez { + typedef ::OrgBluezProfileManager1Interface ProfileManager1; + } +} +#endif -- cgit v1.2.3