Complete the removal of the Bluez's DBus Characteristic API

It never worked and was not used. In the future there might be a new
GATT DBUS API offered by Bluez.

Change-Id: If4c05d37e330ff3cdcda3ef3458938e2bce30725
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>

4 files changed, 0 insertions, 168 deletions

diff --git a/src/bluetooth/bluez/bluez.pri b/src/bluetooth/bluez/bluez.pri
index e1cdb58a..851949d2 100644
--- a/src/bluetooth/bluez/bluez.pri
+++ b/src/bluetooth/bluez/bluez.pri
@@ -21,7 +21,6 @@ HEADERS += bluez/manager_p.h \
            bluez/obex_agent_p.h \
            bluez/obex_transfer_p.h \
            bluez/obex_manager_p.h \
-           bluez/characteristic_p.h \
            bluez/bluez5_helper_p.h \
            bluez/objectmanager_p.h \
            bluez/properties_p.h \
@@ -43,7 +42,6 @@ SOURCES += bluez/manager.cpp \
            bluez/obex_agent.cpp \
            bluez/obex_transfer.cpp \
            bluez/obex_manager.cpp \
-           bluez/characteristic.cpp \
            bluez/objectmanager.cpp \
            bluez/properties.cpp \
            bluez/adapter1_bluez5.cpp \
diff --git a/src/bluetooth/bluez/characteristic.cpp b/src/bluetooth/bluez/characteristic.cpp
deleted file mode 100644
index ed4b8485..00000000
--- a/src/bluetooth/bluez/characteristic.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtBluetooth module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "characteristic_p.h"
-
-/*
- * Implementation of interface class OrgBluezCharacteristicInterface
- */
-
-OrgBluezCharacteristicInterface::OrgBluezCharacteristicInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent)
-    : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent)
-{
-}
-
-OrgBluezCharacteristicInterface::~OrgBluezCharacteristicInterface()
-{
-}
diff --git a/src/bluetooth/bluez/characteristic_p.h b/src/bluetooth/bluez/characteristic_p.h
deleted file mode 100644
index ef510ab2..00000000
--- a/src/bluetooth/bluez/characteristic_p.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2013 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtBluetooth module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CHARACTERISTIC_P_H
-#define CHARACTERISTIC_P_H
-
-#endif // CHARACTERISTIC_P_H
-
-#include <QtCore/QObject>
-#include <QtCore/QByteArray>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
-#include <QtDBus/QtDBus>
-
-/*
- * Proxy class for interface org.bluez.Device
- */
-class OrgBluezCharacteristicInterface: public QDBusAbstractInterface
-{
-    Q_OBJECT
-public:
-    static inline const char *staticInterfaceName()
-    { return "org.bluez.Characteristic"; }
-
-public:
-    OrgBluezCharacteristicInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-    ~OrgBluezCharacteristicInterface();
-
-public Q_SLOTS:
-    inline QDBusPendingReply<QVariantMap> GetProperties()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("GetProperties"), argumentList);
-    }
-
-    inline QDBusPendingReply<> SetProperty(const QString &in0, const QDBusVariant &in1)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0) << qVariantFromValue(in1);
-        return asyncCallWithArgumentList(QLatin1String("SetProperty"), argumentList);
-    }
-    inline QDBusPendingReply<QList<QDBusObjectPath> > DiscoverCharacteristics()
-    {
-        QList<QVariant> argumentList;
-        return asyncCallWithArgumentList(QLatin1String("DiscoverCharacteristics"), argumentList);
-    }
-
-    inline QDBusPendingReply<> RegisterCharacteristicsWatcher(const QDBusObjectPath &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("RegisterCharacteristicsWatcher"), argumentList);
-    }
-
-    inline QDBusPendingReply<> UnregisterCharacteristicsWatcher(const QDBusObjectPath &in0)
-    {
-        QList<QVariant> argumentList;
-        argumentList << qVariantFromValue(in0);
-        return asyncCallWithArgumentList(QLatin1String("UnregisterCharacteristicsWatcher"), argumentList);
-    }
-
-Q_SIGNALS:
-    void PropertyChanged(const QString &in0, const QDBusVariant &in1);
-};
-
-namespace org {
-  namespace bluez {
-    typedef ::OrgBluezCharacteristicInterface Characteristic;
-  }
-}
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
index c27a59ee..1d7a6327 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_bluez.cpp
@@ -46,7 +46,6 @@
 #include "bluez/manager_p.h"
 #include "bluez/adapter_p.h"
 #include "bluez/device_p.h"
-#include "bluez/characteristic_p.h"
 #include "bluez/bluez5_helper_p.h"
 #include "bluez/objectmanager_p.h"
 #include "bluez/adapter1_bluez5_p.h"