[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=0c0cfb7

The following commit has been merged in the master branch:
commit 0c0cfb711d7dece3f75caf7ed2a1cb3b289459d7
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Tue Sep 23 14:30:56 2014 +0200

    Port fileitemactionplugin free of KDELibs4Support
---
 fileitemactionplugin/CMakeLists.txt         | 2 +-
 fileitemactionplugin/sendfileitemaction.cpp | 4 ++--
 fileitemactionplugin/sendfileitemaction.h   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt
index 53c84d3..3df94ad 100644
--- a/fileitemactionplugin/CMakeLists.txt
+++ b/fileitemactionplugin/CMakeLists.txt
@@ -2,6 +2,6 @@ add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
 include_directories(${CMAKE_SOURCE_DIR})
 
 add_library(kdeconnectfiletiemaction MODULE sendfileitemaction.cpp)
-target_link_libraries(kdeconnectfiletiemaction KF5::KIOWidgets KF5::I18n KF5::KDELibs4Support kdeconnectinterfaces)
+target_link_libraries(kdeconnectfiletiemaction KF5::KIOWidgets KF5::I18n kdeconnectinterfaces)
 install(TARGETS kdeconnectfiletiemaction DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES kdeconnectsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/fileitemactionplugin/sendfileitemaction.cpp b/fileitemactionplugin/sendfileitemaction.cpp
index 8722156..c959b2f 100644
--- a/fileitemactionplugin/sendfileitemaction.cpp
+++ b/fileitemactionplugin/sendfileitemaction.cpp
@@ -41,11 +41,11 @@ K_PLUGIN_FACTORY(SendFileItemActionFactory, registerPlugin<SendFileItemAction>()
 
 Q_LOGGING_CATEGORY(KDECONNECT_FILEITEMACTION, "kdeconnect.fileitemaction")
 
-SendFileItemAction::SendFileItemAction(QObject* parent, const QVariantList& ): KFileItemActionPlugin(parent)
+SendFileItemAction::SendFileItemAction(QObject* parent, const QVariantList& ): KAbstractFileItemActionPlugin(parent)
 {
 }
 
-QList<QAction*> SendFileItemAction::actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) const
+QList<QAction*> SendFileItemAction::actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget)
 {
     DevicesModel m;
 
diff --git a/fileitemactionplugin/sendfileitemaction.h b/fileitemactionplugin/sendfileitemaction.h
index 07ee985..21ad1fb 100644
--- a/fileitemactionplugin/sendfileitemaction.h
+++ b/fileitemactionplugin/sendfileitemaction.h
@@ -21,8 +21,8 @@
 #ifndef SENDFILEITEMACTION_H
 #define SENDFILEITEMACTION_H
 
-#include <kfileitemactionplugin.h>
 #include <KFileItemListProperties>
+#include <KAbstractFileItemActionPlugin>
 #include <QLoggingCategory>
 
 class QAction;
@@ -30,12 +30,12 @@ class KFileItemListProperties;
 class QWidget;
 
 Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_FILEITEMACTION)
-class SendFileItemAction : public KFileItemActionPlugin
+class SendFileItemAction : public KAbstractFileItemActionPlugin
 {
 Q_OBJECT
 public:
     SendFileItemAction(QObject* parent, const QVariantList &args);
-    virtual QList< QAction* > actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget) const;
+    virtual QList< QAction* > actions(const KFileItemListProperties& fileItemInfos, QWidget* parentWidget);
 
 private Q_SLOTS:
     void sendFile();

-- 
kdeconnect packaging