Refactored Qml plugins into modules.

Separated C++ and Qml interfaces. All the UI's from plugins are moved to the settingsui folder.

Change-Id: Id6a6623346b18321357bc42d24121c4d9cdfd098
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>

6 files changed, 0 insertions, 279 deletions

diff --git a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluetoothdevice_p.cpp b/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluetoothdevice_p.cpp
deleted file mode 100644
index ded84f2..0000000
--- a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluetoothdevice_p.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Device Utilities module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "bluetoothdevice_p.h"
-#include "datatypes.h"
-#include "objectmanager_interface.cpp"
-#include "moc_objectmanager_interface.cpp"
-#include "device1_interface.h"
-
-
-BluetoothDevicePrivate::BluetoothDevicePrivate(const QString& address, QObject *parent)
-    :QObject(parent)
-    ,m_address(address)
-{
-
-}
-
-OrgBluezDevice1Interface* BluetoothDevicePrivate::findDevice()
-{
-    OrgFreedesktopDBusObjectManagerInterface manager(QStringLiteral("org.bluez"),
-                                                     QStringLiteral("/"),
-                                                     QDBusConnection::systemBus());
-    QDBusPendingReply<ManagedObjectList> reply = manager.GetManagedObjects();
-    reply.waitForFinished();
-    if (reply.isError()) {
-        qWarning() << "Failed to get objects";
-        return NULL;
-    }
-
-    ManagedObjectList managedObjectList = reply.value();
-    for (ManagedObjectList::const_iterator it = managedObjectList.constBegin(); it != managedObjectList.constEnd(); ++it) {
-        const QDBusObjectPath &path = it.key();
-
-        const InterfaceList &ifaceList = it.value();
-            for (InterfaceList::const_iterator jt = ifaceList.constBegin(); jt != ifaceList.constEnd(); ++jt) {
-            const QString &iface = jt.key();
-            const QVariantMap &ifaceValues = jt.value();
-            if (iface == QStringLiteral("org.bluez.Device1")) {
-                if (ifaceValues["Address"] == m_address) {
-                    OrgBluezDevice1Interface *devIf = new OrgBluezDevice1Interface("org.bluez", path.path(), QDBusConnection::systemBus());
-                    return devIf;
-                }
-            }
-        }
-    }
-    return NULL;
-}
-
-
-void BluetoothDevicePrivate::connectDevice()
-{
-    OrgBluezDevice1Interface *dev = findDevice();
-    if (dev) {
-        dev->Connect();
-        dev->deleteLater();
-    }
-}
-
-void BluetoothDevicePrivate::disconnectDevice()
-{
-    OrgBluezDevice1Interface *dev = findDevice();
-    if (dev) {
-        dev->Disconnect();
-        dev->deleteLater();
-    }
-}
diff --git a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluetoothdevice_p.h b/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluetoothdevice_p.h
deleted file mode 100644
index 0bd9599..0000000
--- a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluetoothdevice_p.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Device Utils module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef BLUETOOTHDEVICE__P_H
-#define BLUETOOTHDEVICE__P_H
-
-#include <QObject>
-#include <bluetooth/bluetooth.h>
-
-class OrgBluezDevice1Interface;
-
-class BluetoothDevicePrivate : public QObject
-{
-public:
-    explicit BluetoothDevicePrivate(const QString& address, QObject *parent=0);
-    void connectDevice();
-    void disconnectDevice();
-
-private:
-    OrgBluezDevice1Interface* findDevice();
-    QString m_address;
-};
-
-#endif // BLUETOOTHDEVICE__P_H
diff --git a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluez.pri b/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluez.pri
deleted file mode 100644
index f20be87..0000000
--- a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/bluez.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2015-11-03T13:52:45
-#
-#-------------------------------------------------
-
-QT       += core dbus
-
-INCLUDEPATH += $${PWD}
-INCLUDEPATH += $${PWD}/bluez
-
-DBUS_INTERFACES = \
-    $${PWD}/objectmanager.xml \
-    $${PWD}/device1.xml \
-
-HEADERS += \
-    $$PWD/bluetoothdevice_p.h \
-    $$PWD/dbusdatatypes.h
-
-SOURCES += \
-    $$PWD/bluetoothdevice_p.cpp
diff --git a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/datatypes.h b/src/qtdevicesettings/bluetoothsettingsplugin/bluez/datatypes.h
deleted file mode 100644
index b794c47..0000000
--- a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/datatypes.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Device Utils module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef DATATYPES_H
-#define DATATYPES_H
-
-#include <QObject>
-#include <QtDBus>
-#include <QMap>
-#include <QVariantMap>
-#include <QtDBus/QDBusObjectPath>
-#include <QtCore/QMetaType>
-
-typedef QMap<QString, QVariantMap> InterfaceList;
-typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList;
-
-Q_DECLARE_METATYPE(InterfaceList)
-Q_DECLARE_METATYPE(ManagedObjectList)
-
-
-#endif // DATATYPES_H
diff --git a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/device1.xml b/src/qtdevicesettings/bluetoothsettingsplugin/bluez/device1.xml
deleted file mode 100644
index 5b16992..0000000
--- a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/device1.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!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="org.bluez.Device1">
-    <method name="Disconnect"></method>
-    <method name="Connect"></method>
-    <method name="ConnectProfile">
-      <arg name="UUID" type="s" direction="in"/>
-    </method>
-    <method name="DisconnectProfile">
-      <arg name="UUID" type="s" direction="in"/>
-    </method>
-    <method name="Pair"></method>
-    <method name="CancelPairing"></method>
-    <property name="Address" type="s" access="read"></property>
-    <property name="Name" type="s" access="read"></property>
-    <property name="Alias" type="s" access="readwrite"></property>
-    <property name="Appearance" type="q" access="read"></property>
-    <property name="Icon" type="s" access="read"></property>
-    <property name="Paired" type="b" access="read"></property>
-    <property name="Trusted" type="b" access="readwrite"></property>
-    <property name="Blocked" type="b" access="readwrite"></property>
-    <property name="LegacyPairing" type="b" access="read"></property>
-    <property name="RSSI" type="n" access="read"></property>
-    <property name="Connected" type="b" access="read"></property>
-    <property name="UUIDs" type="as" access="read"></property>
-    <property name="Modalias" type="s" access="read"></property>
-    <property name="Adapter" type="o" access="read"></property>
-  </interface>
-</node>
-
diff --git a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/objectmanager.xml b/src/qtdevicesettings/bluetoothsettingsplugin/bluez/objectmanager.xml
deleted file mode 100644
index e52d6fe..0000000
--- a/src/qtdevicesettings/bluetoothsettingsplugin/bluez/objectmanager.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.DBus.ObjectManager">
-    <method name="GetManagedObjects">
-      <arg type="a{oa{sa{sv}}}" name="object_paths_interfaces_and_properties" direction="out"/>
-      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="ManagedObjectList"/>
-    </method>
-    <signal name="InterfacesAdded">
-      <arg type="o" name="object_path"/>
-  <arg type="a{sa{sv}}" name="interfaces_and_properties"/>
-  <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="InterfaceList"/>
-    </signal>
-    <signal name="InterfacesRemoved">
-      <arg type="o" name="object_path"/>
-      <arg type="as" name="interfaces"/>
-    </signal>
-  </interface>
-</node>
-