[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:26:40 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=54de8fa
The following commit has been merged in the master branch:
commit 54de8fa2fac664be4069339379c655f6e749bfd7
Author: Albert Vaca <albertvaka at gmail.com>
Date: Wed Jul 24 18:42:33 2013 +0200
Android: Uses Apache Mina to abstract socket management
KDE: Housekeeping
---
daemon/CMakeLists.txt | 16 ++-
daemon/announcers/avahiannouncer.cpp | 109 ---------------------
daemon/announcers/avahiannouncer.h | 59 -----------
daemon/daemon.cpp | 57 +++++------
daemon/daemon.h | 14 +--
daemon/device.cpp | 8 +-
daemon/devicelinks/devicelink.cpp | 5 +-
daemon/devicelinks/devicelink.h | 9 +-
daemon/devicelinks/echodevicelink.cpp | 4 +-
daemon/devicelinks/echodevicelink.h | 7 +-
daemon/devicelinks/tcpdevicelink.cpp | 10 +-
daemon/devicelinks/tcpdevicelink.h | 13 +--
daemon/devicelinks/udpdevicelink.cpp | 59 -----------
daemon/devicelinks/udpdevicelink.h | 55 -----------
.../avahitcplinkprovider.cpp} | 28 +++---
.../avahitcplinkprovider.h} | 16 +--
.../linkprovider.cpp} | 4 +-
.../announcer.h => linkproviders/linkprovider.h} | 23 +++--
.../loopbacklinkprovider.cpp} | 8 +-
.../loopbacklinkprovider.h} | 15 +--
daemon/networkpackage.cpp | 5 +-
.../packageinterfaces/clipboardpackageinterface.h | 4 +-
...ceiver.cpp => notificationpackageinterface.cpp} | 6 +-
...gereceiver.h => notificationpackageinterface.h} | 12 +--
.../{packagereceiver.cpp => packageinterface.cpp} | 4 +-
.../{packagereceiver.h => packageinterface.h} | 12 +--
...receiver.cpp => pausemusicpackageinterface.cpp} | 6 +-
...kagereceiver.h => pausemusicpackageinterface.h} | 8 +-
...ackagereceiver.cpp => pingpackageinterface.cpp} | 7 +-
...ingpackagereceiver.h => pingpackageinterface.h} | 12 +--
kcm/dbusinterfaces.h | 4 +-
kcm/devicesmodel.h | 3 +-
kcm/kcm.h | 3 +-
kcm/kcm.ui | 2 +-
34 files changed, 163 insertions(+), 444 deletions(-)
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index d1de7a1..1bddc53 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -1,19 +1,17 @@
set(kded_kdeconnect_SRCS
- announcers/announcer.cpp
- announcers/fakeannouncer.cpp
- announcers/avahiannouncer.cpp
- announcers/avahitcpannouncer.cpp
+ linkproviders/linkprovider.cpp
+ linkproviders/loopbacklinkprovider.cpp
+ linkproviders/avahitcplinkprovider.cpp
devicelinks/devicelink.cpp
devicelinks/echodevicelink.cpp
- devicelinks/udpdevicelink.cpp
devicelinks/tcpdevicelink.cpp
- packageinterfaces/packagereceiver.cpp
- packageinterfaces/pingpackagereceiver.cpp
- packageinterfaces/notificationpackagereceiver.cpp
- packageinterfaces/pausemusicpackagereceiver.cpp
+ packageinterfaces/packageinterface.cpp
+ packageinterfaces/pingpackageinterface.cpp
+ packageinterfaces/notificationpackageinterface.cpp
+ packageinterfaces/pausemusicpackageinterface.cpp
packageinterfaces/clipboardpackageinterface.cpp
networkpackage.cpp
diff --git a/daemon/announcers/avahiannouncer.cpp b/daemon/announcers/avahiannouncer.cpp
deleted file mode 100644
index 4aa1611..0000000
--- a/daemon/announcers/avahiannouncer.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "avahiannouncer.h"
-
-#include "devicelinks/udpdevicelink.h"
-
-#include <QHostInfo>
-
-AvahiAnnouncer::AvahiAnnouncer()
-{
- QString serviceType = "_kdeconnect._udp";
- quint16 port = 10601;
-
- //http://api.kde.org/4.x-api/kdelibs-apidocs/dnssd/html/index.html
-
- service = new DNSSD::PublicService(QHostInfo::localHostName(), serviceType, port);
-
- mUdpSocket = new QUdpSocket();
- mUdpSocket->bind(port);
-
- connect(mUdpSocket, SIGNAL(readyRead()), this, SLOT(newConnection()));
-
- qDebug() << "Listening to udp messages";
-
-}
-
-void AvahiAnnouncer::newConnection()
-{
-
- qDebug() << "AvahiAnnouncer newConnection";
-
- while (mUdpSocket->hasPendingDatagrams()) {
-
- QByteArray datagram;
- datagram.resize(mUdpSocket->pendingDatagramSize());
- NetAddress client;
- mUdpSocket->readDatagram(datagram.data(), datagram.size(), &(client.ip), &(client.port));
-
- //log.write(datagram);
- qDebug() << "AvahiAnnouncer incomming udp datagram: " << datagram;
-
- NetworkPackage np;
- NetworkPackage::unserialize(datagram,&np);
-
- if (np.type() == "kdeconnect.identity") {
-
- const QString& id = np.get<QString>("deviceId");
- //const QString& name = np.get<QString>("deviceName");
-
- qDebug() << "AvahiAnnouncer creating link to device" << id << "(" << client.ip << "," << client.port << ")";
-
- DeviceLink* dl = new UdpDeviceLink(id, this, client.ip);
- connect(dl,SIGNAL(destroyed(QObject*)),this,SLOT(deviceLinkDestroyed(QObject*)));
-
- emit onNewDeviceLink(np, dl);
-
- NetworkPackage::createIdentityPackage(&np);
- dl->sendPackage(np);
-
- if (links.contains(id)) {
- //Delete old link if we already know it, probably it is down if this happens.
- qDebug() << "Destroying old link";
- delete links[id];
- }
-
- links[id] = dl;
-
- } else {
- qDebug() << "Not an identification package (wuh?)";
- }
- }
-
-}
-
-void AvahiAnnouncer::deviceLinkDestroyed(QObject* deviceLink)
-{
- const QString& id = ((DeviceLink*)deviceLink)->deviceId();
- if (links.contains(id)) links.remove(id);
-}
-
-AvahiAnnouncer::~AvahiAnnouncer()
-{
- delete service;
-}
-
-void AvahiAnnouncer::setDiscoverable(bool b)
-{
- qDebug() << "Avahi announcing";
- if (b) service->publishAsync();
-}
-
diff --git a/daemon/announcers/avahiannouncer.h b/daemon/announcers/avahiannouncer.h
deleted file mode 100644
index c7bfc44..0000000
--- a/daemon/announcers/avahiannouncer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef AVAHIANNOUNCER_H
-#define AVAHIANNOUNCER_H
-
-#include <QObject>
-
-#include <QUdpSocket>
-
-#include <KDE/DNSSD/PublicService>
-
-#include "announcer.h"
-#include "netaddress.h"
-
-class AvahiAnnouncer
- : public Announcer
-{
- Q_OBJECT
-
-public:
- AvahiAnnouncer();
- ~AvahiAnnouncer();
-
- QString name() { return "Avahi"; }
- int priority() { return PRIORITY_HIGH; }
-
- void setDiscoverable(bool b);
-
-private Q_SLOTS:
- void newConnection();
- void deviceLinkDestroyed(QObject*);
-
-private:
- DNSSD::PublicService* service;
- QUdpSocket* mUdpSocket;
-
- QMap<QString, DeviceLink*> links;
-
-};
-
-#endif
diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp
index 8bca738..fcb7c47 100644
--- a/daemon/daemon.cpp
+++ b/daemon/daemon.cpp
@@ -19,15 +19,16 @@
*/
#include "daemon.h"
+
#include "networkpackage.h"
-#include "packageinterfaces/pingpackagereceiver.h"
-#include "packageinterfaces/notificationpackagereceiver.h"
-#include "packageinterfaces/pausemusicpackagereceiver.h"
+
+#include "packageinterfaces/pingpackageinterface.h"
+#include "packageinterfaces/notificationpackageinterface.h"
+#include "packageinterfaces/pausemusicpackageinterface.h"
#include "packageinterfaces/clipboardpackageinterface.h"
-#include "announcers/avahiannouncer.h"
-#include "announcers/avahitcpannouncer.h"
-#include "announcers/fakeannouncer.h"
-#include "devicelinks/echodevicelink.h"
+
+#include "linkproviders/avahitcplinkprovider.h"
+#include "linkproviders/loopbacklinkprovider.h"
#include <QtNetwork/QUdpSocket>
#include <QFile>
@@ -54,23 +55,20 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
}
//Debugging
- qDebug() << "GO GO GO!";
+ qDebug() << "Starting KdeConnect daemon";
config->group("devices").group("paired").group("fake_unreachable").writeEntry("name","Fake device");
- //TODO: Do not hardcode the load of the package receivers
+ //TODO: Do not hardcode the load of the package interfaces
//use: https://techbase.kde.org/Development/Tutorials/Services/Plugins
- packageReceivers.push_back(new PingPackageReceiver());
- packageReceivers.push_back(new NotificationPackageReceiver());
- packageReceivers.push_back(new PauseMusicPackageReceiver());
- packageReceivers.push_back(new ClipboardPackageInterface());
+ mPackageInterfaces.push_back(new PingPackageInterface());
+ mPackageInterfaces.push_back(new NotificationPackageInterface());
+ mPackageInterfaces.push_back(new PauseMusicPackageInterface());
+ mPackageInterfaces.push_back(new ClipboardPackageInterface());
//TODO: Do not hardcode the load of the device locators
//use: https://techbase.kde.org/Development/Tutorials/Services/Plugins
-// announcers.insert(new AvahiAnnouncer());
- announcers.insert(new AvahiTcpAnnouncer());
- //announcers.insert(new LoopbackAnnouncer());
-
- //TODO: Add package emitters
+ mLinkProviders.insert(new AvahiTcpLinkProvider());
+ //mLinkProviders.insert(new LoopbackLinkProvider());
//Read remebered paired devices
const KConfigGroup& known = config->group("devices").group("paired");
@@ -80,8 +78,8 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
const KConfigGroup& data = known.group(id);
const QString& name = data.readEntry<QString>("name",defaultName);
Device* device = new Device(id,name);
- m_devices[id] = device;
- Q_FOREACH (PackageReceiver* pr, packageReceivers) {
+ mDevices[id] = device;
+ Q_FOREACH (PackageInterface* pr, mPackageInterfaces) {
connect(device,SIGNAL(receivedPackage(const Device&, const NetworkPackage&)),
pr,SLOT(receivePackage(const Device&, const NetworkPackage&)));
connect(pr,SIGNAL(sendPackage(const NetworkPackage&)),
@@ -90,7 +88,7 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
}
//Listen to incomming connections
- Q_FOREACH (Announcer* a, announcers) {
+ Q_FOREACH (LinkProvider* a, mLinkProviders) {
connect(a,SIGNAL(onNewDeviceLink(NetworkPackage,DeviceLink*)),
this,SLOT(onNewDeviceLink(NetworkPackage,DeviceLink*)));
}
@@ -102,9 +100,8 @@ Daemon::Daemon(QObject *parent, const QList<QVariant>&)
}
void Daemon::setDiscoveryEnabled(bool b)
{
- qDebug() << "Discovery:" << b;
//Listen to incomming connections
- Q_FOREACH (Announcer* a, announcers) {
+ Q_FOREACH (LinkProvider* a, mLinkProviders) {
a->setDiscoverable(b);
}
@@ -112,7 +109,7 @@ void Daemon::setDiscoveryEnabled(bool b)
QStringList Daemon::devices()
{
- return m_devices.keys();
+ return mDevices.keys();
}
@@ -120,12 +117,12 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
{
const QString& id = identityPackage.get<QString>("deviceId");
- qDebug() << "Device discovered" << id << "via" << dl->announcer()->name();
+ qDebug() << "Device discovered" << id << "via" << dl->provider()->name();
- if (m_devices.contains(id)) {
+ if (mDevices.contains(id)) {
qDebug() << "It is a known device";
- Device* device = m_devices[id];
+ Device* device = mDevices[id];
device->addLink(dl);
KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
@@ -142,8 +139,8 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
const QString& name = identityPackage.get<QString>("deviceName");
Device* device = new Device(id,name,dl);
- m_devices[id] = device;
- Q_FOREACH (PackageReceiver* pr, packageReceivers) {
+ mDevices[id] = device;
+ Q_FOREACH (PackageInterface* pr, mPackageInterfaces) {
connect(device,SIGNAL(receivedPackage(const Device&, const NetworkPackage&)),
pr,SLOT(receivePackage(const Device&, const NetworkPackage&)));
connect(pr,SIGNAL(sendPackage(const NetworkPackage&)),
@@ -156,6 +153,6 @@ void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*
Daemon::~Daemon()
{
- qDebug() << "SAYONARA BABY";
+
}
diff --git a/daemon/daemon.h b/daemon/daemon.h
index 4d14e4d..ab1d4e9 100644
--- a/daemon/daemon.h
+++ b/daemon/daemon.h
@@ -39,9 +39,9 @@
#include <KConfig>
#include "device.h"
-#include "packageinterfaces/packagereceiver.h"
+#include "packageinterfaces/packageinterface.h"
#include "devicelinks/devicelink.h"
-#include "announcers/announcer.h"
+#include "linkproviders/linkprovider.h"
class QUdpSocket;
@@ -75,13 +75,13 @@ private:
//Every known device
- QMap<QString, Device*> m_devices;
+ QMap<QString, Device*> mDevices;
- //Different ways to find devices and connect to them, ordered by priority
- QSet<Announcer*> announcers;
+ //Different ways to find devices and connect to them
+ QSet<LinkProvider*> mLinkProviders;
- //Everybody who wants to be notified about a new package
- QVector<PackageReceiver*> packageReceivers;
+ //The classes that send and receive the packages
+ QVector<PackageInterface*> mPackageInterfaces;
};
diff --git a/daemon/device.cpp b/daemon/device.cpp
index 8efbeab..08241e4 100644
--- a/daemon/device.cpp
+++ b/daemon/device.cpp
@@ -2,7 +2,7 @@
#include <ksharedptr.h>
#include <ksharedconfig.h>
#include "devicelinks/devicelink.h"
-#include "announcers/announcer.h"
+#include "linkproviders/linkprovider.h"
#include <KConfigGroup>
#include <QDebug>
@@ -59,12 +59,12 @@ void Device::setPair(bool b)
static bool lessThan(DeviceLink* p1, DeviceLink* p2)
{
- return p1->announcer()->priority() > p2->announcer()->priority();
+ return p1->provider()->priority() > p2->provider()->priority();
}
void Device::addLink(DeviceLink* link)
{
- qDebug() << "Adding link to " << id() << "via" << link->announcer();
+ qDebug() << "Adding link to " << id() << "via" << link->provider();
connect(link,SIGNAL(destroyed(QObject*)),this,SLOT(linkDestroyed(QObject*)));
@@ -111,7 +111,7 @@ QStringList Device::availableLinks() const
{
QStringList sl;
Q_FOREACH(DeviceLink* dl, m_deviceLinks) {
- sl.append(dl->announcer()->name());
+ sl.append(dl->provider()->name());
}
return sl;
}
diff --git a/daemon/devicelinks/devicelink.cpp b/daemon/devicelinks/devicelink.cpp
index 3eb4b31..c7a9d04 100644
--- a/daemon/devicelinks/devicelink.cpp
+++ b/daemon/devicelinks/devicelink.cpp
@@ -19,11 +19,12 @@
*/
#include "devicelink.h"
+#include "linkproviders/linkprovider.h"
-DeviceLink::DeviceLink(const QString& deviceId, Announcer* parent)
+DeviceLink::DeviceLink(const QString& deviceId, LinkProvider* parent)
: QObject(parent)
, mDeviceId(deviceId)
- , mAnnouncer(parent)
+ , mLinkProvider(parent)
{
//gcc complains if we don't add something to compile on a class with virtual functions
}
\ No newline at end of file
diff --git a/daemon/devicelinks/devicelink.h b/daemon/devicelinks/devicelink.h
index b690caf..f1c0a57 100644
--- a/daemon/devicelinks/devicelink.h
+++ b/daemon/devicelinks/devicelink.h
@@ -24,10 +24,9 @@
#include <QObject>
#include "networkpackage.h"
-#include <announcers/announcer.h>
class Device;
-class Announcer;
+class LinkProvider;
class DeviceLink
: public QObject
@@ -35,10 +34,10 @@ class DeviceLink
Q_OBJECT
public:
- DeviceLink(const QString& deviceId, Announcer* parent);
+ DeviceLink(const QString& deviceId, LinkProvider* parent);
const QString& deviceId() { return mDeviceId; }
- Announcer* announcer() { return mAnnouncer; }
+ LinkProvider* provider() { return mLinkProvider; }
virtual bool sendPackage(const NetworkPackage& np) = 0;
@@ -47,7 +46,7 @@ signals:
private:
QString mDeviceId;
- Announcer* mAnnouncer;
+ LinkProvider* mLinkProvider;
};
diff --git a/daemon/devicelinks/echodevicelink.cpp b/daemon/devicelinks/echodevicelink.cpp
index 174a36a..dba966c 100644
--- a/daemon/devicelinks/echodevicelink.cpp
+++ b/daemon/devicelinks/echodevicelink.cpp
@@ -20,9 +20,9 @@
#include "echodevicelink.h"
-#include "announcers/fakeannouncer.h"
+#include "linkproviders/loopbacklinkprovider.h"
-EchoDeviceLink::EchoDeviceLink(const QString& d, LoopbackAnnouncer* a)
+EchoDeviceLink::EchoDeviceLink(const QString& d, LoopbackLinkProvider* a)
: DeviceLink(d, a)
{
diff --git a/daemon/devicelinks/echodevicelink.h b/daemon/devicelinks/echodevicelink.h
index 26c073f..7e83a18 100644
--- a/daemon/devicelinks/echodevicelink.h
+++ b/daemon/devicelinks/echodevicelink.h
@@ -22,13 +22,14 @@
#define ECHODEVICELINK_H
#include "devicelink.h"
-class LoopbackAnnouncer;
+class LoopbackLinkProvider;
-class EchoDeviceLink : public DeviceLink
+class EchoDeviceLink
+ : public DeviceLink
{
Q_OBJECT
public:
- EchoDeviceLink(const QString& d, LoopbackAnnouncer* a);
+ EchoDeviceLink(const QString& d, LoopbackLinkProvider* a);
bool sendPackage(const NetworkPackage& np) {
emit receivedPackage(np);
diff --git a/daemon/devicelinks/tcpdevicelink.cpp b/daemon/devicelinks/tcpdevicelink.cpp
index c31ecb1..7bfaf38 100644
--- a/daemon/devicelinks/tcpdevicelink.cpp
+++ b/daemon/devicelinks/tcpdevicelink.cpp
@@ -19,9 +19,9 @@
*/
#include "tcpdevicelink.h"
-#include "announcers/avahitcpannouncer.h"
+#include "linkproviders/avahitcplinkprovider.h"
-TcpDeviceLink::TcpDeviceLink(const QString& d, AvahiTcpAnnouncer* a, QTcpSocket* socket)
+TcpDeviceLink::TcpDeviceLink(const QString& d, AvahiTcpLinkProvider* a, QTcpSocket* socket)
: DeviceLink(d, a)
{
mSocket = socket;
@@ -29,6 +29,12 @@ TcpDeviceLink::TcpDeviceLink(const QString& d, AvahiTcpAnnouncer* a, QTcpSocket*
connect(mSocket, SIGNAL(readyRead()), this, SLOT(dataReceived()));
}
+bool TcpDeviceLink::sendPackage(const NetworkPackage& np)
+{
+ int written = mSocket->write(np.serialize());
+ return written != -1;
+}
+
void TcpDeviceLink::dataReceived()
{
qDebug() << "TcpDeviceLink dataReceived";
diff --git a/daemon/devicelinks/tcpdevicelink.h b/daemon/devicelinks/tcpdevicelink.h
index 379b9a0..801dc2d 100644
--- a/daemon/devicelinks/tcpdevicelink.h
+++ b/daemon/devicelinks/tcpdevicelink.h
@@ -27,21 +27,18 @@
#include "devicelink.h"
#include <QTcpSocket>
-#include <QTcpServer>
-class AvahiTcpAnnouncer;
+class AvahiTcpLinkProvider;
-class TcpDeviceLink : public DeviceLink
+class TcpDeviceLink
+ : public DeviceLink
{
Q_OBJECT
public:
- TcpDeviceLink(const QString& d, AvahiTcpAnnouncer* a, QTcpSocket* socket);
+ TcpDeviceLink(const QString& d, AvahiTcpLinkProvider* a, QTcpSocket* socket);
- bool sendPackage(const NetworkPackage& np) {
- mSocket->write(np.serialize());
- return true;
- }
+ bool sendPackage(const NetworkPackage& np);
private Q_SLOTS:
void dataReceived();
diff --git a/daemon/devicelinks/udpdevicelink.cpp b/daemon/devicelinks/udpdevicelink.cpp
deleted file mode 100644
index a352757..0000000
--- a/daemon/devicelinks/udpdevicelink.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "udpdevicelink.h"
-#include "announcers/avahiannouncer.h"
-
-UdpDeviceLink::UdpDeviceLink(const QString& d, AvahiAnnouncer* a, QHostAddress ip)
- : DeviceLink(d, a)
-{
-
- mIp = ip;
-
- mSocket = new QUdpSocket();
- mSocket->bind(mPort);
- connect(mSocket, SIGNAL(readyRead()), this, SLOT(dataReceived()));
-
-}
-
-void UdpDeviceLink::dataReceived()
-{
-
- qDebug() << "UdpDeviceLink dataReceived";
-
- while (mSocket->hasPendingDatagrams()) {
-
- QByteArray datagram;
- datagram.resize(mSocket->pendingDatagramSize());
- QHostAddress sender;
- quint16 senderPort;
- mSocket->readDatagram(datagram.data(), datagram.size(), &sender, &senderPort);
-
- //log.write(datagram);
- qDebug() << datagram;
-
- NetworkPackage np;
- NetworkPackage::unserialize(datagram,&np);
-
- emit receivedPackage(np);
-
- }
-
-}
diff --git a/daemon/devicelinks/udpdevicelink.h b/daemon/devicelinks/udpdevicelink.h
deleted file mode 100644
index 8735249..0000000
--- a/daemon/devicelinks/udpdevicelink.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca <albertvaka at gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License or (at your option) version 3 or any later version
- * accepted by the membership of KDE e.V. (or its successor approved
- * by the membership of KDE e.V.), which shall act as a proxy
- * defined in Section 14 of version 3 of the license.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UDPDEVICELINK_H
-#define UDPDEVICELINK_H
-
-#include <QObject>
-#include <QString>
-
-#include "devicelink.h"
-#include <QUdpSocket>
-
-class AvahiAnnouncer;
-
-class UdpDeviceLink : public DeviceLink
-{
- Q_OBJECT
-
-public:
- UdpDeviceLink(const QString& d, AvahiAnnouncer* a, QHostAddress ip);
-
- bool sendPackage(const NetworkPackage& np) {
- mSocket->writeDatagram(np.serialize(),mIp,mPort+1);
- return true;
- }
-
-private Q_SLOTS:
- void dataReceived();
-
-private:
- QUdpSocket* mSocket;
-
- QHostAddress mIp;
- const quint16 mPort = 10603;
-
-};
-
-#endif // UDPDEVICELINK_H
diff --git a/daemon/announcers/avahitcpannouncer.cpp b/daemon/linkproviders/avahitcplinkprovider.cpp
similarity index 77%
rename from daemon/announcers/avahitcpannouncer.cpp
rename to daemon/linkproviders/avahitcplinkprovider.cpp
index dcb9f45..3b3f5f9 100644
--- a/daemon/announcers/avahitcpannouncer.cpp
+++ b/daemon/linkproviders/avahitcplinkprovider.cpp
@@ -18,14 +18,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "avahitcpannouncer.h"
+#include "avahitcplinkprovider.h"
#include "devicelinks/tcpdevicelink.h"
#include <QHostInfo>
#include <QTcpServer>
-AvahiTcpAnnouncer::AvahiTcpAnnouncer()
+AvahiTcpLinkProvider::AvahiTcpLinkProvider()
{
QString serviceType = "_kdeconnect._tcp";
quint16 port = 10602;
@@ -40,9 +40,9 @@ AvahiTcpAnnouncer::AvahiTcpAnnouncer()
}
-void AvahiTcpAnnouncer::newConnection()
+void AvahiTcpLinkProvider::newConnection()
{
- qDebug() << "AvahiTcpAnnouncer newConnection";
+ qDebug() << "AvahiTcpLinkProvider newConnection";
QTcpSocket* socket = mServer->nextPendingConnection();
socket->setSocketOption(QAbstractSocket::KeepAliveOption, 1);
@@ -51,21 +51,19 @@ void AvahiTcpAnnouncer::newConnection()
NetworkPackage np;
NetworkPackage::createIdentityPackage(&np);
- qDebug() << socket->isWritable();
- qDebug() << socket->isOpen();
int written = socket->write(np.serialize());
qDebug() << np.serialize();
- qDebug() << "AvahiTcpAnnouncer sent tcp package" << written << " bytes written, waiting for reply";
+ qDebug() << "AvahiTcpLinkProvider sent package." << written << " bytes written, waiting for reply";
}
-void AvahiTcpAnnouncer::dataReceived()
+void AvahiTcpLinkProvider::dataReceived()
{
QTcpSocket* socket = (QTcpSocket*) QObject::sender();
QByteArray data = socket->readLine();
- qDebug() << "AvahiTcpAnnouncer received reply:" << data;
+ qDebug() << "AvahiTcpLinkProvider received reply:" << data;
NetworkPackage np;
NetworkPackage::unserialize(data,&np);
@@ -84,32 +82,32 @@ void AvahiTcpAnnouncer::dataReceived()
}
links[id] = dl;
- qDebug() << "AvahiAnnouncer creating link to device" << id << "(" << socket->peerAddress() << ")";
+ qDebug() << "AvahiTcpLinkProvider creating link to device" << id << "(" << socket->peerAddress() << ")";
emit onNewDeviceLink(np, dl);
disconnect(socket,SIGNAL(readyRead()),this,SLOT(dataReceived()));
} else {
- qDebug() << "AvahiTcpAnnouncer/newConnection: Not an identification package (wuh?)";
+ qDebug() << "AvahiTcpLinkProvider/newConnection: Not an identification package (wuh?)";
}
}
-void AvahiTcpAnnouncer::deviceLinkDestroyed(QObject* deviceLink)
+void AvahiTcpLinkProvider::deviceLinkDestroyed(QObject* deviceLink)
{
const QString& id = ((DeviceLink*)deviceLink)->deviceId();
if (links.contains(id)) links.remove(id);
}
-AvahiTcpAnnouncer::~AvahiTcpAnnouncer()
+AvahiTcpLinkProvider::~AvahiTcpLinkProvider()
{
delete service;
}
-void AvahiTcpAnnouncer::setDiscoverable(bool b)
+void AvahiTcpLinkProvider::setDiscoverable(bool b)
{
- qDebug() << "AvahiTcp announcing";
+ qDebug() << "AvahiTcpLinkProvider discoverable:" << b;
if (b) service->publishAsync();
}
diff --git a/daemon/announcers/avahitcpannouncer.h b/daemon/linkproviders/avahitcplinkprovider.h
similarity index 84%
rename from daemon/announcers/avahitcpannouncer.h
rename to daemon/linkproviders/avahitcplinkprovider.h
index 84fdcfc..4c47dad 100644
--- a/daemon/announcers/avahitcpannouncer.h
+++ b/daemon/linkproviders/avahitcplinkprovider.h
@@ -18,28 +18,28 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef AVAHITCPANNOUNCER_H
-#define AVAHITCPANNOUNCER_H
+#ifndef AVAHITCPLINKPROVIDER_H
+#define AVAHITCPLINKPROVIDER_H
#include <QObject>
#include <QTcpServer>
#include <KDE/DNSSD/PublicService>
-#include "announcer.h"
+#include "linkprovider.h"
#include "netaddress.h"
-class AvahiTcpAnnouncer
- : public Announcer
+class AvahiTcpLinkProvider
+ : public LinkProvider
{
Q_OBJECT
public:
- AvahiTcpAnnouncer();
- ~AvahiTcpAnnouncer();
+ AvahiTcpLinkProvider();
+ ~AvahiTcpLinkProvider();
- QString name() { return "AvahiTcpAnnouncer"; }
+ QString name() { return "AvahiTcpLinkProvider"; }
int priority() { return PRIORITY_HIGH + 1; }
void setDiscoverable(bool b);
diff --git a/daemon/announcers/announcer.cpp b/daemon/linkproviders/linkprovider.cpp
similarity index 94%
rename from daemon/announcers/announcer.cpp
rename to daemon/linkproviders/linkprovider.cpp
index fbfd377..7fce173 100644
--- a/daemon/announcers/announcer.cpp
+++ b/daemon/linkproviders/linkprovider.cpp
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "announcer.h"
+#include "linkprovider.h"
-Announcer::Announcer() {
+LinkProvider::LinkProvider() {
//gcc complains if we don't add something to compile on a class with virtual functions
}
\ No newline at end of file
diff --git a/daemon/announcers/announcer.h b/daemon/linkproviders/linkprovider.h
similarity index 77%
rename from daemon/announcers/announcer.h
rename to daemon/linkproviders/linkprovider.h
index d99fd74..3d422d0 100644
--- a/daemon/announcers/announcer.h
+++ b/daemon/linkproviders/linkprovider.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ANNOUNCER_H
-#define ANNOUNCER_H
+#ifndef LINKPROVIDER_H
+#define LINKPROVIDER_H
#include <qvector.h>
#include <QObject>
@@ -29,31 +29,30 @@
class DeviceLink;
-class Announcer : public QObject
+class LinkProvider
+ : public QObject
{
Q_OBJECT
public:
- const int PRIORITY_LOW = 0; //ie: 3g
- const int PRIORITY_MEDIUM = 50; //ie: internet
- const int PRIORITY_HIGH = 100; //ie: lan
+ const int PRIORITY_LOW = 0; //eg: 3g
+ const int PRIORITY_MEDIUM = 50; //eg: internet
+ const int PRIORITY_HIGH = 100; //eg: lan
- Announcer();
- virtual ~Announcer() { }
+ LinkProvider();
+ virtual ~LinkProvider() { }
virtual QString name() = 0;
virtual int priority() = 0;
virtual void setDiscoverable(bool b) = 0;
-signals:
- //NOTE: The announcer will to destroy the DeviceLink when it's no longer accessible,
+Q_SIGNALS:
+ //NOTE: The provider will to destroy the DeviceLink when it's no longer accessible,
// and every user should listen to the destroyed signal to remove its references.
void onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink*);
-signals:
-
};
#endif
diff --git a/daemon/announcers/fakeannouncer.cpp b/daemon/linkproviders/loopbacklinkprovider.cpp
similarity index 87%
rename from daemon/announcers/fakeannouncer.cpp
rename to daemon/linkproviders/loopbacklinkprovider.cpp
index e045620..c286bbb 100644
--- a/daemon/announcers/fakeannouncer.cpp
+++ b/daemon/linkproviders/loopbacklinkprovider.cpp
@@ -18,23 +18,23 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "fakeannouncer.h"
+#include "loopbacklinkprovider.h"
#include "devicelinks/echodevicelink.h"
#include <QDebug>
-LoopbackAnnouncer::LoopbackAnnouncer()
+LoopbackLinkProvider::LoopbackLinkProvider()
{
echoDeviceLink = new EchoDeviceLink("fake", this);
NetworkPackage::createIdentityPackage(&identityPackage);
}
-LoopbackAnnouncer::~LoopbackAnnouncer()
+LoopbackLinkProvider::~LoopbackLinkProvider()
{
//delete echoDeviceLink;
}
-void LoopbackAnnouncer::setDiscoverable(bool b)
+void LoopbackLinkProvider::setDiscoverable(bool b)
{
qDebug() << "Echo Device discovery emitted";
if (b) emit onNewDeviceLink(identityPackage, echoDeviceLink);
diff --git a/daemon/announcers/fakeannouncer.h b/daemon/linkproviders/loopbacklinkprovider.h
similarity index 81%
rename from daemon/announcers/fakeannouncer.h
rename to daemon/linkproviders/loopbacklinkprovider.h
index 4ca6040..d4918f6 100644
--- a/daemon/announcers/fakeannouncer.h
+++ b/daemon/linkproviders/loopbacklinkprovider.h
@@ -18,20 +18,21 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef LOOPBACKANNOUNCER_H
-#define LOOPBACKANNOUNCER_H
+#ifndef LOOPBACKLINKPROVIDER_H
+#define LOOPBACKLINKPROVIDER_H
-#include "announcer.h"
+#include "linkprovider.h"
#include "networkpackage.h"
-class LoopbackAnnouncer : public Announcer
+class LoopbackLinkProvider
+ : public LinkProvider
{
Q_OBJECT
public:
- LoopbackAnnouncer();
- ~LoopbackAnnouncer();
+ LoopbackLinkProvider();
+ ~LoopbackLinkProvider();
- QString name() { return "LoopbackAnnouncer"; }
+ QString name() { return "LoopbackLinkProvider"; }
int priority() { return PRIORITY_LOW; }
void setDiscoverable(bool b);
diff --git a/daemon/networkpackage.cpp b/daemon/networkpackage.cpp
index c43cd26..79c8ee0 100644
--- a/daemon/networkpackage.cpp
+++ b/daemon/networkpackage.cpp
@@ -55,6 +55,9 @@ QByteArray NetworkPackage::serialize() const
QJson::Serializer serializer;
QByteArray json = serializer.serialize(variant,&ok);
if (!ok) qDebug() << "Serialization error:" << serializer.errorMessage();
+ json.append('
');
+
+ qDebug() << "utlims chars:" << (int)(json[json.size()-1]) << (int)(json[json.size()-2]) << (int)(json[json.size()-3]);
return json;
}
@@ -80,7 +83,7 @@ void NetworkPackage::unserialize(QByteArray a, NetworkPackage* np)
QJson::QObjectHelper::qvariant2qobject(variant,np);
if (np->version() > CURRENT_PACKAGE_VERSION) {
- qDebug() << "Warning: package version " << np->version() << " greater than supported version " << CURRENT_PACKAGE_VERSION;
+ qDebug() << "Warning: package version" << np->version() << "is greater than supported version" << CURRENT_PACKAGE_VERSION;
}
}
diff --git a/daemon/packageinterfaces/clipboardpackageinterface.h b/daemon/packageinterfaces/clipboardpackageinterface.h
index 0f41064..0b12a2e 100644
--- a/daemon/packageinterfaces/clipboardpackageinterface.h
+++ b/daemon/packageinterfaces/clipboardpackageinterface.h
@@ -26,10 +26,10 @@
#include "networkpackage.h"
#include "device.h"
-#include "packagereceiver.h"
+#include "packageinterface.h"
class ClipboardPackageInterface
- : public PackageReceiver
+ : public PackageInterface
{
Q_OBJECT
diff --git a/daemon/packageinterfaces/notificationpackagereceiver.cpp b/daemon/packageinterfaces/notificationpackageinterface.cpp
similarity index 92%
rename from daemon/packageinterfaces/notificationpackagereceiver.cpp
rename to daemon/packageinterfaces/notificationpackageinterface.cpp
index 66eb4a6..47f4d9f 100644
--- a/daemon/packageinterfaces/notificationpackagereceiver.cpp
+++ b/daemon/packageinterfaces/notificationpackageinterface.cpp
@@ -18,12 +18,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "notificationpackagereceiver.h"
+#include "notificationpackageinterface.h"
#include <QDebug>
#include <kicon.h>
-KNotification* NotificationPackageReceiver::createNotification(const QString& deviceName, const NetworkPackage& np) {
+KNotification* NotificationPackageInterface::createNotification(const QString& deviceName, const NetworkPackage& np) {
QString npType = np.get<QString>("notificationType");
@@ -70,7 +70,7 @@ KNotification* NotificationPackageReceiver::createNotification(const QString& de
}
-bool NotificationPackageReceiver::receivePackage(const Device& device, const NetworkPackage& np) {
+bool NotificationPackageInterface::receivePackage(const Device& device, const NetworkPackage& np) {
if (np.type() != PACKAGE_TYPE_NOTIFICATION) return false;
diff --git a/daemon/packageinterfaces/notificationpackagereceiver.h b/daemon/packageinterfaces/notificationpackageinterface.h
similarity index 84%
rename from daemon/packageinterfaces/notificationpackagereceiver.h
rename to daemon/packageinterfaces/notificationpackageinterface.h
index eb4fe53..dae8749 100644
--- a/daemon/packageinterfaces/notificationpackagereceiver.h
+++ b/daemon/packageinterfaces/notificationpackageinterface.h
@@ -18,15 +18,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef NOTIFICATIONPACKAGERECEIVER_H
-#define NOTIFICATIONPACKAGERECEIVER_H
+#ifndef NOTIFICATIONPACKAGEINTERFACE_H
+#define NOTIFICATIONPACKAGEINTERFACE_H
#include <knotification.h>
-#include "packagereceiver.h"
+#include "packageinterface.h"
-class NotificationPackageReceiver
- : public PackageReceiver
+class NotificationPackageInterface
+ : public PackageInterface
{
public:
@@ -38,4 +38,4 @@ private:
};
-#endif // NOTIFICATIONPACKAGERECEIVER_H
+#endif
diff --git a/daemon/packageinterfaces/packagereceiver.cpp b/daemon/packageinterfaces/packageinterface.cpp
similarity index 93%
rename from daemon/packageinterfaces/packagereceiver.cpp
rename to daemon/packageinterfaces/packageinterface.cpp
index 082460f..18a3431 100644
--- a/daemon/packageinterfaces/packagereceiver.cpp
+++ b/daemon/packageinterfaces/packageinterface.cpp
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "packagereceiver.h"
+#include "packageinterface.h"
-PackageReceiver::PackageReceiver() {
+PackageInterface::PackageInterface() {
//gcc complains if we don't add something to compile on a class with virtual functions
}
diff --git a/daemon/packageinterfaces/packagereceiver.h b/daemon/packageinterfaces/packageinterface.h
similarity index 88%
rename from daemon/packageinterfaces/packagereceiver.h
rename to daemon/packageinterfaces/packageinterface.h
index ab979bc..89f2be9 100644
--- a/daemon/packageinterfaces/packagereceiver.h
+++ b/daemon/packageinterfaces/packageinterface.h
@@ -18,22 +18,22 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PACKAGERECEIVER_H
-#define PACKAGERECEIVER_H
+#ifndef PACKAGEINTERFACE_H
+#define PACKAGEINTERFACE_H
#include <QObject>
#include "networkpackage.h"
#include "device.h"
-class PackageReceiver
+class PackageInterface
: public QObject
{
Q_OBJECT
public:
- PackageReceiver();
- virtual ~PackageReceiver() { }
+ PackageInterface();
+ virtual ~PackageInterface() { }
public Q_SLOTS:
//Returns true if it has handled the package in some way
@@ -43,4 +43,4 @@ Q_SIGNALS:
void sendPackage(const NetworkPackage& np);
};
-#endif // PACKAGERECEIVER_H
+#endif
diff --git a/daemon/packageinterfaces/pausemusicpackagereceiver.cpp b/daemon/packageinterfaces/pausemusicpackageinterface.cpp
similarity index 92%
rename from daemon/packageinterfaces/pausemusicpackagereceiver.cpp
rename to daemon/packageinterfaces/pausemusicpackageinterface.cpp
index f997372..fff3270 100644
--- a/daemon/packageinterfaces/pausemusicpackagereceiver.cpp
+++ b/daemon/packageinterfaces/pausemusicpackageinterface.cpp
@@ -18,11 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pausemusicpackagereceiver.h"
+#include "pausemusicpackageinterface.h"
#include <QDebug>
-PauseMusicPackageReceiver::PauseMusicPackageReceiver()
+PauseMusicPackageInterface::PauseMusicPackageInterface()
{
//TODO: Be able to change this from settings
pauseWhen = PauseWhenRinging;
@@ -30,7 +30,7 @@ PauseMusicPackageReceiver::PauseMusicPackageReceiver()
}
-bool PauseMusicPackageReceiver::receivePackage (const Device& device, const NetworkPackage& np)
+bool PauseMusicPackageInterface::receivePackage (const Device& device, const NetworkPackage& np)
{
Q_UNUSED(device);
diff --git a/daemon/packageinterfaces/pausemusicpackagereceiver.h b/daemon/packageinterfaces/pausemusicpackageinterface.h
similarity index 90%
rename from daemon/packageinterfaces/pausemusicpackagereceiver.h
rename to daemon/packageinterfaces/pausemusicpackageinterface.h
index 179ac8e..6e7e433 100644
--- a/daemon/packageinterfaces/pausemusicpackagereceiver.h
+++ b/daemon/packageinterfaces/pausemusicpackageinterface.h
@@ -21,13 +21,13 @@
#ifndef PAUSEMUSICPACKAGERECEIVER_H
#define PAUSEMUSICPACKAGERECEIVER_H
-#include "packagereceiver.h"
+#include "packageinterface.h"
-class PauseMusicPackageReceiver
- : public PackageReceiver
+class PauseMusicPackageInterface
+ : public PackageInterface
{
public:
- PauseMusicPackageReceiver();
+ PauseMusicPackageInterface();
virtual bool receivePackage(const Device& device, const NetworkPackage& np);
private:
diff --git a/daemon/packageinterfaces/pingpackagereceiver.cpp b/daemon/packageinterfaces/pingpackageinterface.cpp
similarity index 89%
rename from daemon/packageinterfaces/pingpackagereceiver.cpp
rename to daemon/packageinterfaces/pingpackageinterface.cpp
index 9b0eea0..b81ebd0 100644
--- a/daemon/packageinterfaces/pingpackagereceiver.cpp
+++ b/daemon/packageinterfaces/pingpackageinterface.cpp
@@ -18,15 +18,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "pingpackagereceiver.h"
+#include "pingpackageinterface.h"
#include <KDebug>
#include <kicon.h>
-bool PingPackageReceiver::receivePackage(const Device& device, const NetworkPackage& np) {
-
-
- kDebug() << np.type();
+bool PingPackageInterface::receivePackage(const Device& device, const NetworkPackage& np) {
if (np.type() != PACKAGE_TYPE_PING) return false;
diff --git a/daemon/packageinterfaces/pingpackagereceiver.h b/daemon/packageinterfaces/pingpackageinterface.h
similarity index 85%
rename from daemon/packageinterfaces/pingpackagereceiver.h
rename to daemon/packageinterfaces/pingpackageinterface.h
index 841e7cc..29dd64b 100644
--- a/daemon/packageinterfaces/pingpackagereceiver.h
+++ b/daemon/packageinterfaces/pingpackageinterface.h
@@ -18,15 +18,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef PINGPACKAGERECEIVER_H
-#define PINGPACKAGERECEIVER_H
+#ifndef PINGPACKAGEINTERFACE_H
+#define PINGPACKAGEINTERFACE_H
#include <knotification.h>
-#include "packagereceiver.h"
+#include "packageinterface.h"
-class PingPackageReceiver
- : public PackageReceiver
+class PingPackageInterface
+ : public PackageInterface
{
public:
@@ -34,4 +34,4 @@ public:
};
-#endif // PINGPACKAGERECEIVER_H
+#endif
diff --git a/kcm/dbusinterfaces.h b/kcm/dbusinterfaces.h
index 2e2d7d3..ccf7b33 100644
--- a/kcm/dbusinterfaces.h
+++ b/kcm/dbusinterfaces.h
@@ -24,7 +24,9 @@
#ifndef DbusInterfaces_H_
#define DbusInterfaces_H_
-class DaemonDbusInterface : public KdeconnectDaemonInterface {
+class DaemonDbusInterface
+ : public KdeconnectDaemonInterface
+{
Q_OBJECT
public:
DaemonDbusInterface(QObject* parent);
diff --git a/kcm/devicesmodel.h b/kcm/devicesmodel.h
index cabdc24..c266ff2 100644
--- a/kcm/devicesmodel.h
+++ b/kcm/devicesmodel.h
@@ -30,7 +30,8 @@
#include <QList>
#include "dbusinterfaces.h"
-class DevicesModel : public QAbstractListModel
+class DevicesModel
+ : public QAbstractListModel
{
Q_OBJECT
public:
diff --git a/kcm/kcm.h b/kcm/kcm.h
index efbd2fd..dbfb943 100644
--- a/kcm/kcm.h
+++ b/kcm/kcm.h
@@ -42,7 +42,8 @@ namespace Ui {
class KdeConnectKcmUi;
}
-class KdeConnectKcm : public KCModule
+class KdeConnectKcm
+ : public KCModule
{
Q_OBJECT
public:
diff --git a/kcm/kcm.ui b/kcm/kcm.ui
index 635f6da..13f8063 100644
--- a/kcm/kcm.ui
+++ b/kcm/kcm.ui
@@ -93,7 +93,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Show notifications from this source</string>
+ <string>Trust this device</string>
</property>
</widget>
</item>
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list