[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:26 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=39c72cb
The following commit has been merged in the master branch:
commit 39c72cb4b226dd64eb814be0b22a88014148fe78
Author: Lukáš Tinkl <lukas at kde.org>
Date: Fri Feb 28 18:50:06 2014 +0100
i18n fixes
---
kded/kded.cpp | 2 +-
kded/plugins/battery/batteryplugin.cpp | 2 +-
kded/plugins/mpriscontrol/mpriscontrolplugin.cpp | 6 +++---
kded/plugins/pausemusic/pausemusic_config.cpp | 2 +-
kded/plugins/ping/pingplugin.cpp | 2 +-
kded/plugins/sftp/sftp_config.cpp | 2 +-
kded/plugins/sftp/sftpplugin.cpp | 4 ++--
kded/plugins/share/shareplugin.cpp | 2 +-
kded/plugins/telephony/telephonyplugin.cpp | 2 +-
plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp | 2 +-
plasmoid/declarativeplugin/objectfactory.h | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/kded/kded.cpp b/kded/kded.cpp
index a15afcc..1b3c8df 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -28,7 +28,7 @@
#include "kdebugnamespace.h"
K_PLUGIN_FACTORY(KdeConnectFactory, registerPlugin<Kded>();)
-K_EXPORT_PLUGIN(KdeConnectFactory("kdeconnect", "kdeconnect"))
+K_EXPORT_PLUGIN(KdeConnectFactory("kdeconnect", "kdeconnect-kded"))
Kded::Kded(QObject *parent, const QList<QVariant>&)
: KDEDModule(parent)
diff --git a/kded/plugins/battery/batteryplugin.cpp b/kded/plugins/battery/batteryplugin.cpp
index 60038ae..c361ba3 100644
--- a/kded/plugins/battery/batteryplugin.cpp
+++ b/kded/plugins/battery/batteryplugin.cpp
@@ -73,7 +73,7 @@ bool BatteryPlugin::receivePackage(const NetworkPackage& np)
if ( thresholdEvent == ThresholdBatteryLow && !isCharging ) {
KNotification* notification = new KNotification("batteryLow");
notification->setPixmap(KIcon("battery-040").pixmap(48, 48));
- notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
+ notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded"));
notification->setTitle(i18nc("device name: low battery", "%1: low battery", device()->name()));
notification->setText(i18n("Battery at %1%", currentCharge));
notification->sendEvent();
diff --git a/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp b/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp
index 843a68a..89f964a 100644
--- a/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp
+++ b/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp
@@ -75,7 +75,7 @@ void MprisControlPlugin::addPlayer(const QString& service)
{
QDBusInterface mprisInterface(service, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2");
//FIXME: This call hangs and returns an empty string if KDED is still starting!
- const QString& identity = mprisInterface.property("Identity").toString();
+ const QString identity = mprisInterface.property("Identity").toString();
playerList[identity] = service;
kDebug(kdeconnect_kded()) << "Mpris addPlayer" << service << "->" << identity;
sendPlayerList();
@@ -130,7 +130,7 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con
void MprisControlPlugin::removePlayer(const QString& ifaceName)
{
- QString identity = playerList.key(ifaceName);
+ const QString identity = playerList.key(ifaceName);
kDebug(kdeconnect_kded()) << "Mpris removePlayer" << ifaceName << "->" << identity;
playerList.remove(identity);
sendPlayerList();
@@ -143,7 +143,7 @@ bool MprisControlPlugin::receivePackage (const NetworkPackage& np)
}
//Send the player list
- const QString& player = np.get<QString>("player");
+ const QString player = np.get<QString>("player");
bool valid_player = playerList.contains(player);
if (!valid_player || np.get<bool>("requestPlayerList")) {
sendPlayerList();
diff --git a/kded/plugins/pausemusic/pausemusic_config.cpp b/kded/plugins/pausemusic/pausemusic_config.cpp
index d32dc43..59174f2 100644
--- a/kded/plugins/pausemusic/pausemusic_config.cpp
+++ b/kded/plugins/pausemusic/pausemusic_config.cpp
@@ -29,7 +29,7 @@
#include "ui_pausemusic_config.h"
K_PLUGIN_FACTORY(PauseMusicConfigFactory, registerPlugin<PauseMusicConfig>();)
-K_EXPORT_PLUGIN(PauseMusicConfigFactory("kdeconnect_pausemusic_config", "kdeconnect_pausemusic_config"))
+K_EXPORT_PLUGIN(PauseMusicConfigFactory("kdeconnect_pausemusic_config", "kdeconnect-kded"))
PauseMusicConfig::PauseMusicConfig(QWidget *parent, const QVariantList& )
: KCModule(PauseMusicConfigFactory::componentData(), parent)
diff --git a/kded/plugins/ping/pingplugin.cpp b/kded/plugins/ping/pingplugin.cpp
index 344d856..f0bb2e1 100644
--- a/kded/plugins/ping/pingplugin.cpp
+++ b/kded/plugins/ping/pingplugin.cpp
@@ -44,7 +44,7 @@ bool PingPlugin::receivePackage(const NetworkPackage& np)
{
KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
notification->setPixmap(KIcon("dialog-ok").pixmap(48, 48));
- notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
+ notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded"));
notification->setTitle(device()->name());
notification->setText(np.get<QString>("message",i18n("Ping!"))); //This can be a source of spam
notification->sendEvent();
diff --git a/kded/plugins/sftp/sftp_config.cpp b/kded/plugins/sftp/sftp_config.cpp
index 4b79752..05f2622 100644
--- a/kded/plugins/sftp/sftp_config.cpp
+++ b/kded/plugins/sftp/sftp_config.cpp
@@ -32,7 +32,7 @@
#include "ui_sftp_config.h"
K_PLUGIN_FACTORY(SftpConfigFactory, registerPlugin<SftpConfig>();)
-K_EXPORT_PLUGIN(SftpConfigFactory("kdeconnect_sftp_config", "kdeconnect_sftp_config"))
+K_EXPORT_PLUGIN(SftpConfigFactory("kdeconnect_sftp_config", "kdeconnect-kded"))
SftpConfig::SftpConfig(QWidget *parent, const QVariantList& )
: KCModule(SftpConfigFactory::componentData(), parent)
diff --git a/kded/plugins/sftp/sftpplugin.cpp b/kded/plugins/sftp/sftpplugin.cpp
index ae7ce04..7fb7514 100644
--- a/kded/plugins/sftp/sftpplugin.cpp
+++ b/kded/plugins/sftp/sftpplugin.cpp
@@ -38,7 +38,7 @@
#include "../../kdebugnamespace.h"
K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< SftpPlugin >(); )
-K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect_sftp") )
+K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect-kded") )
static const QSet<QString> fields_c = QSet<QString>() << "ip" << "port" << "user" << "port" << "path";
@@ -164,7 +164,7 @@ void SftpPlugin::onMounted()
KNotification* notification = new KNotification("mounted", KNotification::CloseOnTimeout, this);
notification->setPixmap(KIconLoader::global()->loadIcon("drive-removable-media", KIconLoader::Desktop));
- notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
+ notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded"));
notification->setTitle(i18n("Device %1", device()->name()));
notification->setText(i18n("Filesystem mounted at %1", mountPoint()));
notification->sendEvent();
diff --git a/kded/plugins/share/shareplugin.cpp b/kded/plugins/share/shareplugin.cpp
index 306a228..480faef 100644
--- a/kded/plugins/share/shareplugin.cpp
+++ b/kded/plugins/share/shareplugin.cpp
@@ -128,7 +128,7 @@ void SharePlugin::finished(KJob* job)
FileTransferJob* transferJob = (FileTransferJob*)job;
KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
notification->setPixmap(KIcon(error? "edit-delete" : "dialog-ok").pixmap(48, 48));
- notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
+ notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded"));
notification->setTitle(i18n("Transfer finished"));
notification->setText(transferJob->destination().fileName());
notification->setActions(QStringList(i18n("Open destination folder")));
diff --git a/kded/plugins/telephony/telephonyplugin.cpp b/kded/plugins/telephony/telephonyplugin.cpp
index b76ac4b..b38025e 100644
--- a/kded/plugins/telephony/telephonyplugin.cpp
+++ b/kded/plugins/telephony/telephonyplugin.cpp
@@ -70,7 +70,7 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
KNotification* notification = new KNotification(type, KNotification::CloseOnTimeout, this); //, KNotification::Persistent
notification->setPixmap(KIcon(icon).pixmap(48, 48));
- notification->setComponentData(KComponentData("kdeconnect", "kdeconnect"));
+ notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded"));
notification->setTitle(title);
notification->setText(content);
diff --git a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
index 0ca4218..edd5b27 100644
--- a/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
+++ b/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp
@@ -32,7 +32,7 @@
#include "libkdeconnect/devicesmodel.h"
#include "libkdeconnect/notificationsmodel.h"
-Q_EXPORT_PLUGIN2(kdeconnectdeclarativeplugin, KdeConnectDeclarativePlugin);
+Q_EXPORT_PLUGIN2(kdeconnectdeclarativeplugin, KdeConnectDeclarativePlugin)
QObject* createDeviceDbusInterface(QVariant deviceId)
{
diff --git a/plasmoid/declarativeplugin/objectfactory.h b/plasmoid/declarativeplugin/objectfactory.h
index a574203..0a4a8ca 100644
--- a/plasmoid/declarativeplugin/objectfactory.h
+++ b/plasmoid/declarativeplugin/objectfactory.h
@@ -19,7 +19,7 @@ public:
ObjectFactory(QObject* parent, Func1 f1) : QObject(parent), m_f0(0), m_f1(f1), m_f2(0) {}
ObjectFactory(QObject* parent, Func2 f2) : QObject(parent), m_f0(0), m_f1(0), m_f2(f2) {}
- virtual ~ObjectFactory() {};
+ virtual ~ObjectFactory() {}
Q_INVOKABLE QObject* create() {
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list