[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:55 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=42269a9
The following commit has been merged in the master branch:
commit 42269a9ddaaa6c564c4fba3f0719fef146001922
Author: Àlex Fiestas <afiestas at kde.org>
Date: Sat Sep 13 01:04:48 2014 +0200
Port from KIcon to QIcon
Executed kcm and some notifications, icons are still shown.
---
core/device.cpp | 4 ++--
fileitemactionplugin/sendfileitemaction.cpp | 2 +-
interfaces/devicesmodel.cpp | 4 ++--
interfaces/notificationsmodel.cpp | 4 ++--
plugins/battery/batteryplugin.cpp | 4 ++--
plugins/notifications/notificationsdbusinterface.cpp | 4 ++--
plugins/notifications/notificationsplugin.cpp | 2 --
plugins/ping/pingplugin.cpp | 4 ++--
plugins/share/shareplugin.cpp | 4 ++--
plugins/telephony/telephonyplugin.cpp | 4 ++--
10 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/core/device.cpp b/core/device.cpp
index 103cca9..26c6747 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -33,7 +33,7 @@
#include <KPluginSelector>
#include <KServiceTypeTrader>
#include <KNotification>
-#include <KIcon>
+#include <QIcon>
#include <KGlobal>
#include <KComponentData>
@@ -359,7 +359,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
kDebug(debugArea()) << "Pair request";
KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
- notification->setPixmap(KIcon("dialog-information").pixmap(48, 48));
+ notification->setPixmap(QIcon::fromTheme("dialog-information").pixmap(48, 48));
notification->setComponentName("kdeconnect");
notification->setTitle("KDE Connect");
notification->setText(i18n("Pairing request from %1", m_deviceName));
diff --git a/fileitemactionplugin/sendfileitemaction.cpp b/fileitemactionplugin/sendfileitemaction.cpp
index 89c04f8..bae8732 100644
--- a/fileitemactionplugin/sendfileitemaction.cpp
+++ b/fileitemactionplugin/sendfileitemaction.cpp
@@ -29,7 +29,7 @@
#include <QMessageBox>
#include <QVariantList>
-#include <KIcon>
+#include <QIcon>
#include <KPluginFactory>
#include <KPluginLoader>
diff --git a/interfaces/devicesmodel.cpp b/interfaces/devicesmodel.cpp
index bef9db4..1d2b767 100644
--- a/interfaces/devicesmodel.cpp
+++ b/interfaces/devicesmodel.cpp
@@ -24,7 +24,7 @@
#include <KSharedConfig>
#include <KConfigGroup>
-#include <KIcon>
+#include <QIcon>
#include <core/kdebugnamespace.h>
@@ -151,7 +151,7 @@ QVariant DevicesModel::data(const QModelIndex& index, int role) const
bool paired = device->isPaired();
bool reachable = device->isReachable();
QString icon = reachable? (paired? "user-online" : "user-busy") : "user-offline";
- return KIcon(icon).pixmap(32, 32);
+ return QIcon::fromTheme(icon).pixmap(32, 32);
}
case IdModelRole:
return QString(device->id());
diff --git a/interfaces/notificationsmodel.cpp b/interfaces/notificationsmodel.cpp
index 088165b..48d982b 100644
--- a/interfaces/notificationsmodel.cpp
+++ b/interfaces/notificationsmodel.cpp
@@ -24,7 +24,7 @@
#include <KSharedConfig>
#include <KConfigGroup>
-#include <KIcon>
+#include <QIcon>
#include <core/kdebugnamespace.h>
@@ -157,7 +157,7 @@ QVariant NotificationsModel::data(const QModelIndex& index, int role) const
//FIXME: This function gets called lots of times, producing lots of dbus calls. Add a cache.
switch (role) {
case IconModelRole:
- return KIcon("device-notifier").pixmap(32, 32);
+ return QIcon::fromTheme("device-notifier").pixmap(32, 32);
case IdModelRole:
return notification->internalId();
case NameModelRole:
diff --git a/plugins/battery/batteryplugin.cpp b/plugins/battery/batteryplugin.cpp
index 35148cc..034d068 100644
--- a/plugins/battery/batteryplugin.cpp
+++ b/plugins/battery/batteryplugin.cpp
@@ -21,7 +21,7 @@
#include "batteryplugin.h"
#include <KNotification>
-#include <KIcon>
+#include <QIcon>
#include <KLocalizedString>
#include <core/kdebugnamespace.h>
@@ -72,7 +72,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->setPixmap(QIcon::fromTheme("battery-040").pixmap(48, 48));
notification->setComponentName("kdeconnect");
notification->setTitle(i18nc("device name: low battery", "%1: low battery", device()->name()));
notification->setText(i18n("Battery at %1%", currentCharge));
diff --git a/plugins/notifications/notificationsdbusinterface.cpp b/plugins/notifications/notificationsdbusinterface.cpp
index 5d32f7c..7c4b08a 100644
--- a/plugins/notifications/notificationsdbusinterface.cpp
+++ b/plugins/notifications/notificationsdbusinterface.cpp
@@ -23,7 +23,7 @@
#include <QDBusConnection>
#include <KNotification>
-#include <KIcon>
+#include <QIcon>
#include <KMD5>
#include <core/device.h>
@@ -77,7 +77,7 @@ void NotificationsDbusInterface::processPackage(const NetworkPackage& np)
//Do not show updates to existent notification nor answers to a initialization request
if (!mInternalIdToPublicId.contains(noti->internalId()) && !np.get<bool>("requestAnswer", false)) {
KNotification* notification = new KNotification("notification", KNotification::CloseOnTimeout, this);
- notification->setPixmap(KIcon("preferences-desktop-notification").pixmap(48, 48));
+ notification->setPixmap(QIcon::fromTheme("preferences-desktop-notification").pixmap(48, 48));
notification->setComponentName("kdeconnect");
notification->setTitle(mDevice->name());
notification->setText(noti->appName() + ": " + noti->ticker());
diff --git a/plugins/notifications/notificationsplugin.cpp b/plugins/notifications/notificationsplugin.cpp
index c90b504..277f54a 100644
--- a/plugins/notifications/notificationsplugin.cpp
+++ b/plugins/notifications/notificationsplugin.cpp
@@ -20,8 +20,6 @@
#include "notificationsplugin.h"
-#include <KIcon>
-
#include <core/kdebugnamespace.h>
#include "notificationsdbusinterface.h"
diff --git a/plugins/ping/pingplugin.cpp b/plugins/ping/pingplugin.cpp
index 7a2f496..ee97eec 100644
--- a/plugins/ping/pingplugin.cpp
+++ b/plugins/ping/pingplugin.cpp
@@ -21,7 +21,7 @@
#include "pingplugin.h"
#include <KNotification>
-#include <KIcon>
+#include <QIcon>
#include <KLocalizedString>
#include <core/kdebugnamespace.h>
@@ -45,7 +45,7 @@ PingPlugin::~PingPlugin()
bool PingPlugin::receivePackage(const NetworkPackage& np)
{
KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent
- notification->setPixmap(KIcon("dialog-ok").pixmap(48, 48));
+ notification->setPixmap(QIcon::fromTheme("dialog-ok").pixmap(48, 48));
notification->setComponentName("kdeconnect");
notification->setTitle(device()->name());
notification->setText(np.get<QString>("message",i18n("Ping!"))); //This can be a source of spam
diff --git a/plugins/share/shareplugin.cpp b/plugins/share/shareplugin.cpp
index ae4888a..1768f0f 100644
--- a/plugins/share/shareplugin.cpp
+++ b/plugins/share/shareplugin.cpp
@@ -21,7 +21,7 @@
#include "shareplugin.h"
#include <KGlobalSettings>
-#include <KIcon>
+#include <QIcon>
#include <KLocalizedString>
#include <KStandardDirs>
#include <KSharedConfig>
@@ -130,7 +130,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->setPixmap(QIcon::fromTheme(error? "edit-delete" : "dialog-ok").pixmap(48, 48));
notification->setComponentName("kdeconnect");
notification->setTitle(i18n("Transfer finished"));
notification->setText(transferJob->destination().fileName());
diff --git a/plugins/telephony/telephonyplugin.cpp b/plugins/telephony/telephonyplugin.cpp
index c2bda72..8ffc4b3 100644
--- a/plugins/telephony/telephonyplugin.cpp
+++ b/plugins/telephony/telephonyplugin.cpp
@@ -21,7 +21,7 @@
#include "telephonyplugin.h"
#include <KLocalizedString>
-#include <KIcon>
+#include <QIcon>
#include <core/kdebugnamespace.h>
@@ -69,7 +69,7 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
kDebug(debugArea()) << "Creating notification with type:" << type;
KNotification* notification = new KNotification(type, KNotification::CloseOnTimeout, this); //, KNotification::Persistent
- notification->setPixmap(KIcon(icon).pixmap(48, 48));
+ notification->setPixmap(QIcon::fromTheme(icon).pixmap(48, 48));
notification->setComponentName("kdeconnect");
notification->setTitle(title);
notification->setText(content);
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list