tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port KIO free of KDElibs4Support

Browse source
This commit is contained in:
Àlex Fiestas 2014-09-23 14:26:56 +02:00
parent 968ccb22c6
commit 82a8d921b8
2 changed files with 9 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kio/CMakeLists.txt
View file

@ -8,11 +8,11 @@ set(kio_kdeconnect_PART_SRCS
add_library(kio_kdeconnect MODULE ${kio_kdeconnect_PART_SRCS}) add_library(kio_kdeconnect MODULE ${kio_kdeconnect_PART_SRCS})
target_link_libraries(kio_kdeconnect target_link_libraries(kio_kdeconnect
KF5::KIOCore kdeconnectinterfaces
KF5::KDELibs4Support
Qt5::Core Qt5::Core
Qt5::Gui Qt5::Gui
kdeconnectinterfaces KF5::KIOCore
KF5::I18n
) )
########### install files ############### ########### install files ###############

25
kio/kiokdeconnect.cpp
View file

@ -24,24 +24,14 @@
#include <QtCore/QThread> #include <QtCore/QThread>
#include <QDBusMetaType> #include <QDBusMetaType>
#include <KLocalizedString>
#include <QDebug> #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") 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) { if (argc != 4) {
fprintf(stderr, "Usage: kio_kdeconnect protocol pool app\n"); fprintf(stderr, "Usage: kio_kdeconnect protocol pool app\n");
exit(-1); 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_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, ""); entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
entry.insert(KIO::UDSEntry::UDS_URL, target); entry.insert(KIO::UDSEntry::UDS_URL, target);
listEntry(entry, false); listEntry(entry);
processedSize(i++); processedSize(i++);
} }
listEntry(KIO::UDSEntry(), true);
infoMessage(""); infoMessage("");
finished(); 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_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, ""); entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
entry.insert(KIO::UDSEntry::UDS_URL, url + "/DCIM/Camera"); 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_NAME, "files");
entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, i18n("All 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_ACCESS, S_IRUSR | S_IRGRP | S_IROTH);
entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, ""); entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, "");
entry.insert(KIO::UDSEntry::UDS_URL, url); entry.insert(KIO::UDSEntry::UDS_URL, url);
listEntry(entry, false); listEntry(entry);
listEntry(KIO::UDSEntry(), true);
infoMessage(""); infoMessage("");
finished(); finished();
@ -193,7 +181,6 @@ void KioKdeconnect::listDir(const QUrl &url)
if (!m_dbusInterface->isValid()) { if (!m_dbusInterface->isValid()) {
infoMessage(i18n("Could not contact background service.")); infoMessage(i18n("Could not contact background service."));
listEntry(KIO::UDSEntry(), true);
finished(); finished();
return; return;
} }