diff --git a/recentdocuments/CMakeLists.txt b/recentdocuments/CMakeLists.txt --- a/recentdocuments/CMakeLists.txt +++ b/recentdocuments/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_recentdocuments\") add_library(kio_recentdocuments MODULE recentdocuments.cpp) -target_link_libraries(kio_recentdocuments KF5::KIOCore Qt5::DBus KF5::KDELibs4Support) +target_link_libraries(kio_recentdocuments KF5::KIOCore KF5::I18n Qt5::DBus) set_target_properties(kio_recentdocuments PROPERTIES OUTPUT_NAME "recentdocuments") install(TARGETS kio_recentdocuments DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio) @@ -11,7 +11,7 @@ set_target_properties(kded_recentdocumentsnotifier PROPERTIES OUTPUT_NAME recentdocumentsnotifier) kcoreaddons_desktop_to_json(kded_recentdocumentsnotifier recentdocumentsnotifier.desktop) -target_link_libraries(kded_recentdocumentsnotifier KF5::KIOCore KF5::DBusAddons KF5::KDELibs4Support) +target_link_libraries(kded_recentdocumentsnotifier KF5::KIOCore KF5::DBusAddons) install(TARGETS kded_recentdocumentsnotifier DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded ) diff --git a/recentdocuments/recentdocuments.cpp b/recentdocuments/recentdocuments.cpp --- a/recentdocuments/recentdocuments.cpp +++ b/recentdocuments/recentdocuments.cpp @@ -1,18 +1,14 @@ #include #include #include +#include +#include -#include -#include #include #include #include #include -#include #include -#include -#include -#include #include @@ -22,8 +18,7 @@ { // necessary to use other kio slaves QCoreApplication app(argc, argv); - KComponentData("kio_recentdocuments", "kio_recentdocuments"); - KLocale::global(); + app.setApplicationName("kio_recentdocuments"); if (argc != 4) { fprintf(stderr, "Usage: kio_recentdocuments protocol domain-socket1 domain-socket2\n"); exit(-1); @@ -91,7 +86,7 @@ // we do not want to wait for the event loop to delete the job QScopedPointer sp(job); job->setAutoDelete(false); - if (KIO::NetAccess::synchronousRun(job, 0)) { + if (job->exec()) { uds = job->statResult(); } } @@ -141,7 +136,7 @@ void RecentDocuments::stat(const QUrl& url) { if (isRootUrl(url)) { - kDebug() << "Stat root" << url; + qDebug() << "Stat root" << url; // // stat the root path // @@ -159,14 +154,14 @@ } // results are forwarded else { - kDebug() << "Stat forward" << url; + qDebug() << "Stat forward" << url; ForwardingSlaveBase::stat(url); } } void RecentDocuments::mimetype(const QUrl& url) { - kDebug() << url; + qDebug() << url; // the root url is always a folder if (isRootUrl(url)) { diff --git a/recentdocuments/recentdocumentsnotifier.cpp b/recentdocuments/recentdocumentsnotifier.cpp --- a/recentdocuments/recentdocumentsnotifier.cpp +++ b/recentdocuments/recentdocumentsnotifier.cpp @@ -1,9 +1,5 @@ #include -#include -#include #include -#include -#include #include #include #include