diff --git a/settings/CMakeLists.txt b/settings/CMakeLists.txt --- a/settings/CMakeLists.txt +++ b/settings/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_settings\") add_library(kio_settings MODULE kio_settings.cpp) -target_link_libraries(kio_settings KF5::KDELibs4Support KF5::KIOCore) +target_link_libraries(kio_settings KF5::KIOCore) set_target_properties(kio_settings PROPERTIES OUTPUT_NAME "settings") install(TARGETS kio_settings DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio ) diff --git a/settings/kio_settings.cpp b/settings/kio_settings.cpp --- a/settings/kio_settings.cpp +++ b/settings/kio_settings.cpp @@ -18,15 +18,13 @@ Boston, MA 02110-1301, USA. */ +#include +#include + #include #include -#include -#include -#include -#include #include #include -#include class SettingsProtocol : public KIO::SlaveBase @@ -50,10 +48,11 @@ }; extern "C" { - Q_DECL_EXPORT int kdemain( int, char **argv ) + Q_DECL_EXPORT int kdemain( int argc, char **argv ) { - kDebug() << "kdemain for settings kioslave"; - KComponentData componentData( "kio_settings" ); + QCoreApplication app(argc, argv); + app.setApplicationName("kio_settings"); + qDebug() << "kdemain for settings kioslave"; SettingsProtocol slave(argv[1], argv[2], argv[3]); slave.dispatchLoop(); return 0; @@ -122,7 +121,7 @@ { initSettingsData(); const QString fileName = url.fileName(); - kDebug() << fileName; + qDebug() << fileName; KIO::UDSEntry entry; // Root dir? @@ -139,7 +138,7 @@ const KService::Ptr service = it.value(); const QString parentCategory = service->property("X-KDE-System-Settings-Parent-Category").toString(); const QString category = service->property("X-KDE-System-Settings-Category").toString(); - //kDebug() << "category" << service->desktopEntryName() << service->name() << "category=" << category << "parentCategory=" << parentCategory; + //qDebug() << "category" << service->desktopEntryName() << service->name() << "category=" << category << "parentCategory=" << parentCategory; createDirEntry(entry, category, service->icon()); entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, service->name()); statEntry(entry); @@ -177,7 +176,7 @@ const KService::Ptr service = m_categories.at(i); QString parentCategory = service->property("X-KDE-System-Settings-Parent-Category").toString(); QString category = service->property("X-KDE-System-Settings-Category").toString(); - //kDebug() << "category" << service->desktopEntryName() << service->name() << "category=" << category << "parentCategory=" << parentCategory; + //qDebug() << "category" << service->desktopEntryName() << service->name() << "category=" << category << "parentCategory=" << parentCategory; if (parentCategory == fileName) { //KUrl dirUrl = url; //dirUrl.addPath(category);