[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=82a8d92

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

    Port KIO free of KDElibs4Support
---
 kio/CMakeLists.txt    |  6 +++---
 kio/kiokdeconnect.cpp | 25 ++++++-------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index 99f4022..fc81f4a 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -8,11 +8,11 @@ set(kio_kdeconnect_PART_SRCS
 add_library(kio_kdeconnect MODULE ${kio_kdeconnect_PART_SRCS})
 
 target_link_libraries(kio_kdeconnect
-    KF5::KIOCore
-    KF5::KDELibs4Support
+    kdeconnectinterfaces
     Qt5::Core
     Qt5::Gui
-    kdeconnectinterfaces
+    KF5::KIOCore
+    KF5::I18n
 )
 
 ########### install files ###############
diff --git a/kio/kiokdeconnect.cpp b/kio/kiokdeconnect.cpp
index 91eb704..0d393ca 100644
--- a/kio/kiokdeconnect.cpp
+++ b/kio/kiokdeconnect.cpp
@@ -24,24 +24,14 @@
 #include <QtCore/QThread>
 #include <QDBusMetaType>
 
+#include <KLocalizedString>
+
 #include <QDebug>
-#include <KComponentData>
-#include <KCmdLineArgs>
-#include <KProcess>
-#include <KApplication>
-#include <KLocale>
-#include <k4aboutdata.h>
-#include <kdemacros.h>
 
 Q_LOGGING_CATEGORY(KDECONNECT_KIO, "kdeconnect.kio")
 
-extern "C" int KDE_EXPORT kdemain(int argc, char **argv)
+extern "C" int Q_DECL_EXPORT kdemain(int argc, char **argv)
 {
-    K4AboutData about("kiokdeconnect", "kdeconnect-kio", ki18n("kiokdeconnect"), "1.0");
-    KCmdLineArgs::init(&about);
-
-    KApplication app;
-
     if (argc != 4) {
         fprintf(stderr, "Usage: kio_kdeconnect protocol pool app
");
         exit(-1);
@@ -115,13 +105,12 @@ void KioKdeconnect::listAllDevices()
         entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
         entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
         entry.insert(KIO::UDSEntry::UDS_URL, target);
-        listEntry(entry, false);
+        listEntry(entry);
 
         processedSize(i++);
 
     }
 
-    listEntry(KIO::UDSEntry(), true);
     infoMessage("");
     finished();
 }
@@ -164,7 +153,7 @@ void KioKdeconnect::listDevice()
     entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
     entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
     entry.insert(KIO::UDSEntry::UDS_URL, url + "/DCIM/Camera");
-    listEntry(entry, false);
+    listEntry(entry);
 
     entry.insert(KIO::UDSEntry::UDS_NAME, "files");
     entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, i18n("All files"));
@@ -173,9 +162,8 @@ void KioKdeconnect::listDevice()
     entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
     entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
     entry.insert(KIO::UDSEntry::UDS_URL, url);
-    listEntry(entry, false);
+    listEntry(entry);
 
-    listEntry(KIO::UDSEntry(), true);
     infoMessage("");
     finished();
 
@@ -193,7 +181,6 @@ void KioKdeconnect::listDir(const QUrl &url)
 
     if (!m_dbusInterface->isValid()) {
         infoMessage(i18n("Could not contact background service."));
-        listEntry(KIO::UDSEntry(), true);
         finished();
         return;
     }

-- 
kdeconnect packaging