[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:44 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=73f5996
The following commit has been merged in the master branch:
commit 73f5996f1423645bcab53b10e3fd07d3bb81e556
Author: Albert Vaca <albertvaka at gmail.com>
Date: Fri Jun 3 00:46:47 2016 +0200
Consistent naming of _REQUEST package type macros
---
plugins/battery/batteryplugin.cpp | 2 +-
plugins/battery/batteryplugin.h | 2 +-
plugins/findmyphone/findmyphoneplugin.cpp | 2 +-
plugins/findmyphone/findmyphoneplugin.h | 2 +-
plugins/mousepad/mousepadplugin.h | 2 --
plugins/sendnotifications/notificationslistener.cpp | 2 +-
plugins/sendnotifications/sendnotificationsplugin.h | 2 +-
plugins/sftp/mounter.cpp | 2 +-
plugins/sftp/sftpplugin.h | 2 +-
plugins/share/shareplugin.cpp | 4 ++--
plugins/share/shareplugin.h | 2 +-
plugins/telephony/telephonyplugin.cpp | 4 ++--
plugins/telephony/telephonyplugin.h | 4 ++--
13 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/plugins/battery/batteryplugin.cpp b/plugins/battery/batteryplugin.cpp
index 32cf089..732c3a4 100644
--- a/plugins/battery/batteryplugin.cpp
+++ b/plugins/battery/batteryplugin.cpp
@@ -43,7 +43,7 @@ BatteryPlugin::BatteryPlugin(QObject *parent, const QVariantList &args)
void BatteryPlugin::connected()
{
- NetworkPackage np(PACKAGE_TYPE_BATTERY);
+ NetworkPackage np(PACKAGE_TYPE_BATTERY_REQUEST);
np.set("request",true);
sendPackage(np);
}
diff --git a/plugins/battery/batteryplugin.h b/plugins/battery/batteryplugin.h
index e50e8eb..de95f4e 100644
--- a/plugins/battery/batteryplugin.h
+++ b/plugins/battery/batteryplugin.h
@@ -24,7 +24,7 @@
#include <QLoggingCategory>
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_BATTERY QLatin1String("kdeconnect.battery.request")
+#define PACKAGE_TYPE_BATTERY_REQUEST QLatin1String("kdeconnect.battery.request")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_BATTERY)
class BatteryDbusInterface;
diff --git a/plugins/findmyphone/findmyphoneplugin.cpp b/plugins/findmyphone/findmyphoneplugin.cpp
index 889ea56..e405497 100644
--- a/plugins/findmyphone/findmyphoneplugin.cpp
+++ b/plugins/findmyphone/findmyphoneplugin.cpp
@@ -45,7 +45,7 @@ bool FindMyPhonePlugin::receivePackage(const NetworkPackage& np)
void FindMyPhonePlugin::ring()
{
- NetworkPackage np(PACKAGE_TYPE_FINDMYPHONE);
+ NetworkPackage np(PACKAGE_TYPE_FINDMYPHONE_REQUEST);
sendPackage(np);
}
diff --git a/plugins/findmyphone/findmyphoneplugin.h b/plugins/findmyphone/findmyphoneplugin.h
index 6853670..f0cbf48 100644
--- a/plugins/findmyphone/findmyphoneplugin.h
+++ b/plugins/findmyphone/findmyphoneplugin.h
@@ -25,7 +25,7 @@
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_FINDMYPHONE QStringLiteral("kdeconnect.findmyphone.request")
+#define PACKAGE_TYPE_FINDMYPHONE_REQUEST QStringLiteral("kdeconnect.findmyphone.request")
class FindMyPhonePlugin
: public KdeConnectPlugin
diff --git a/plugins/mousepad/mousepadplugin.h b/plugins/mousepad/mousepadplugin.h
index da8fad8..6044c38 100644
--- a/plugins/mousepad/mousepadplugin.h
+++ b/plugins/mousepad/mousepadplugin.h
@@ -25,8 +25,6 @@
#include <core/kdeconnectplugin.h>
#include <config-mousepad.h>
-#define PACKAGE_TYPE_INPUT_REQUEST QLatin1String("kdeconnect.input.request")
-
struct FakeKey;
#if HAVE_WAYLAND
diff --git a/plugins/sendnotifications/notificationslistener.cpp b/plugins/sendnotifications/notificationslistener.cpp
index 977d7a8..9a51167 100644
--- a/plugins/sendnotifications/notificationslistener.cpp
+++ b/plugins/sendnotifications/notificationslistener.cpp
@@ -144,7 +144,7 @@ uint NotificationsListener::Notify(const QString &appName, uint replacesId,
return 0;
//qCDebug(KDECONNECT_PLUGIN_SENDNOTIFICATION) << "Sending notification from" << appName << ":" <<ticker << "; appIcon=" << appIcon;
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST);
+ NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
np.set("id", QString::number(replacesId > 0 ? replacesId : ++id));
np.set("appName", appName);
np.set("ticker", ticker);
diff --git a/plugins/sendnotifications/sendnotificationsplugin.h b/plugins/sendnotifications/sendnotificationsplugin.h
index b724758..fcb8935 100644
--- a/plugins/sendnotifications/sendnotificationsplugin.h
+++ b/plugins/sendnotifications/sendnotificationsplugin.h
@@ -24,7 +24,7 @@
#include <knotification.h>
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_NOTIFICATION_REQUEST QLatin1String("kdeconnect.notification")
+#define PACKAGE_TYPE_NOTIFICATION QLatin1String("kdeconnect.notification")
/*
* This class is just a proxy for NotificationsDbusInterface
diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
index cadf78b..62a18e2 100644
--- a/plugins/sftp/mounter.cpp
+++ b/plugins/sftp/mounter.cpp
@@ -181,7 +181,7 @@ void Mounter::onMountTimeout()
void Mounter::start()
{
- NetworkPackage np(PACKAGE_TYPE_SFTP);
+ NetworkPackage np(PACKAGE_TYPE_SFTP_REQUEST);
np.set("startBrowsing", true);
m_sftp->sendPackage(np);
diff --git a/plugins/sftp/sftpplugin.h b/plugins/sftp/sftpplugin.h
index 49aea49..8015488 100644
--- a/plugins/sftp/sftpplugin.h
+++ b/plugins/sftp/sftpplugin.h
@@ -24,7 +24,7 @@
#include <core/kdeconnectplugin.h>
#include <core/device.h>
-#define PACKAGE_TYPE_SFTP QLatin1String("kdeconnect.sftp.request")
+#define PACKAGE_TYPE_SFTP_REQUEST QLatin1String("kdeconnect.sftp.request")
class KNotification;
diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp
index ecefba4..d6c16a4 100644
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@ -71,7 +71,7 @@ bool SharePlugin::receivePackage(const NetworkPackage& np)
qCDebug(KDECONNECT_PLUGIN_SHARE) << "sending file" << (QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc");
- NetworkPackage out(PACKAGE_TYPE_SHARE);
+ NetworkPackage out(PACKAGE_TYPE_SHARE_REQUEST);
out.set("filename", mDestinationDir + "itworks.txt");
AutoClosingQFile* file = new AutoClosingQFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc"); //Test file to transfer
@@ -147,7 +147,7 @@ void SharePlugin::openDestinationFolder()
void SharePlugin::shareUrl(const QUrl& url)
{
- NetworkPackage package(PACKAGE_TYPE_SHARE);
+ NetworkPackage package(PACKAGE_TYPE_SHARE_REQUEST);
if(url.isLocalFile()) {
QSharedPointer<QIODevice> ioFile(new QFile(url.toLocalFile()));
package.setPayload(ioFile, ioFile->size());
diff --git a/plugins/share/shareplugin.h b/plugins/share/shareplugin.h
index 43bb954..9f3082a 100644
--- a/plugins/share/shareplugin.h
+++ b/plugins/share/shareplugin.h
@@ -26,7 +26,7 @@
#include <core/kdeconnectplugin.h>
-#define PACKAGE_TYPE_SHARE QLatin1String("kdeconnect.share.request")
+#define PACKAGE_TYPE_SHARE_REQUEST QLatin1String("kdeconnect.share.request")
class SharePlugin
: public KdeConnectPlugin
diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp
index 239f80d..d285c39 100644
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@ -137,14 +137,14 @@ bool TelephonyPlugin::receivePackage(const NetworkPackage& np)
void TelephonyPlugin::sendMutePackage()
{
- NetworkPackage package(PACKAGE_TYPE_TELEPHONY);
+ NetworkPackage package(PACKAGE_TYPE_TELEPHONY_REQUEST);
package.set<QString>( "action", "mute" );
sendPackage(package);
}
void TelephonyPlugin::sendSms(const QString& phoneNumber, const QString& messageBody)
{
- NetworkPackage np(PACKAGE_TYPE_SMS);
+ NetworkPackage np(PACKAGE_TYPE_SMS_REQUEST);
np.set("sendSms", true);
np.set("phoneNumber", phoneNumber);
np.set("messageBody", messageBody);
diff --git a/plugins/telephony/telephonyplugin.h b/plugins/telephony/telephonyplugin.h
index 95300a2..d1a6873 100644
--- a/plugins/telephony/telephonyplugin.h
+++ b/plugins/telephony/telephonyplugin.h
@@ -31,8 +31,8 @@
#include "kdeconnecttelepathyprotocolfactory.h"
#endif
-#define PACKAGE_TYPE_TELEPHONY QLatin1String("kdeconnect.telephony.request")
-#define PACKAGE_TYPE_SMS QLatin1String("kdeconnect.sms.request")
+#define PACKAGE_TYPE_TELEPHONY_REQUEST QLatin1String("kdeconnect.telephony.request")
+#define PACKAGE_TYPE_SMS_REQUEST QLatin1String("kdeconnect.sms.request")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_TELEPHONY)
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list