Port away from KDE4_KIO_LIBS

CMakeLists.txt

@@ -41,16 +41,15 @@ find_package(Qt5X11Extras REQUIRED NO_MODULE)
 
 add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
 
-# Load CMake, Compiler and InstallDirs settings from KF5 and the following are already somewhat "done" tier1/tier2 libs from kdelibs:
+# Load CMake, Compiler and InstallDirs settings from KF5, as well as the frameworks we need
 find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
     KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver
     KConfig KAuth KJS KWallet KDBusAddons Sonnet
     KI18n KGuiAddons KService KConfigWidgets ItemViews KNotifications KIconThemes KStyle KCompletion KJobWidgets KTextWidgets XmlGui KCrash
-    KBookmarks KUnitConversion KDE4Attic KCMUtils Kross)
+    KBookmarks KUnitConversion KDE4Attic KCMUtils Kross KIO)
 
 find_package(Plasma REQUIRED NO_MODULE)
 find_package(KDeclarative REQUIRED NO_MODULE)
-find_package(KBookmarks REQUIRED NO_MODULE)
 find_package(KIO REQUIRED NO_MODULE)
 
 find_package(KInit)

appmenu/CMakeLists.txt

@@ -26,7 +26,7 @@ qt4_add_dbus_adaptor(kded_appmenu_SRCS org.kde.kded.appmenu.xml
 
 kde4_add_plugin(kded_appmenu ${kded_appmenu_SRCS})
 
-target_link_libraries(kded_appmenu ${KDE4_KIO_LIBS} ${X11_LIBRARIES} ${DBUSMENUQT_LIBRARIES} ${KDE4_PLASMA_LIBS})
+target_link_libraries(kded_appmenu KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES} ${DBUSMENUQT_LIBRARIES} ${KDE4_PLASMA_LIBS})
 
 install(TARGETS kded_appmenu  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

freespacenotifier/CMakeLists.txt

@@ -16,7 +16,7 @@ kde4_add_kcfg_files(kded_freespacenotifier_SRCS settings.kcfgc)
 
 kde4_add_plugin(kded_freespacenotifier ${kded_freespacenotifier_SRCS})
 
-target_link_libraries(kded_freespacenotifier ${KDE4_KIO_LIBS} )
+target_link_libraries(kded_freespacenotifier KF5::KIOCore KF5::KIOWidgets )
 
 install(TARGETS kded_freespacenotifier  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

kcontrol/access/CMakeLists.txt

@@ -9,7 +9,7 @@ set(kcm_access_PART_SRCS kcmaccess.cpp )
 kde4_add_plugin(kcm_access ${kcm_access_PART_SRCS})
 
 
-target_link_libraries(kcm_access  ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kcm_access  KF5::KIOCore KF5::KIOWidgets ${KDE4_PHONON_LIBS} ${KDE4_KNOTIFYCONFIG_LIBS} ${X11_LIBRARIES})
 
 install(TARGETS kcm_access  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

kcontrol/autostart/CMakeLists.txt

@@ -17,7 +17,7 @@ KDE4_ADD_UI_FILES(kcm_autostart_PART_SRCS autostartconfig.ui )
 
 KDE4_ADD_PLUGIN(kcm_autostart ${kcm_autostart_PART_SRCS})
 
-TARGET_LINK_LIBRARIES(kcm_autostart   ${KDE4_KIO_LIBS} )
+TARGET_LINK_LIBRARIES(kcm_autostart   KF5::KIOCore KF5::KIOWidgets )
 
 ########### install files ###############
 

kcontrol/dateandtime/CMakeLists.txt

@@ -5,7 +5,7 @@ set(kcm_clock_PART_SRCS dtime.cpp main.cpp )
 kde4_add_ui_files(kcm_clock_PART_SRCS dateandtime.ui)
 kde4_add_plugin(kcm_clock ${kcm_clock_PART_SRCS})
 
-target_link_libraries(kcm_clock  ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS} )
+target_link_libraries(kcm_clock  KF5::KIOCore KF5::KIOWidgets ${KDE4_PLASMA_LIBS} )
 
 install(TARGETS kcm_clock  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

kcontrol/desktoppaths/CMakeLists.txt

@@ -5,7 +5,7 @@ set(kcm_desktoppaths_PART_SRCS
 
 kde4_add_plugin(kcm_desktoppaths ${kcm_desktoppaths_PART_SRCS})
 
-target_link_libraries(kcm_desktoppaths ${KDE4_KCMUTILS_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(kcm_desktoppaths ${KDE4_KCMUTILS_LIBS} KF5::KIOCore KF5::KIOWidgets)
 
 install(TARGETS kcm_desktoppaths DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES desktoppath.desktop DESTINATION ${SERVICES_INSTALL_DIR})

kcontrol/desktoptheme/CMakeLists.txt

@@ -7,7 +7,7 @@ kde4_add_ui_files(kcmdesktoptheme_SRCS DesktopTheme.ui DesktopThemeDetails.ui)
 kde4_add_plugin(kcm_desktoptheme ${kcmdesktoptheme_SRCS})
 target_link_libraries(kcm_desktoptheme ${X11_LIBRARIES}
     ${KDE4_KDEUI_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KNEWSTUFF3_LIBS}
-    ${KDE4_KCMUTILS_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+    ${KDE4_KCMUTILS_LIBRARY} ${KDE4_PLASMA_LIBS} KF5::KIOCore KF5::KIOWidgets)
 
 install(TARGETS kcm_desktoptheme DESTINATION ${PLUGIN_INSTALL_DIR} )
 

kcontrol/input/CMakeLists.txt

@@ -65,7 +65,7 @@ kde4_add_ui_files(kcm_input_PART_SRCS kmousedlg.ui logitechmouse_base.ui )
 kde4_add_plugin(kcm_input ${kcm_input_PART_SRCS})
 
 
-target_link_libraries(kcm_input ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kcm_input KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES})
 if (LIBUSB_FOUND)
    target_link_libraries(kcm_input ${LIBUSB_LIBRARIES})
 endif (LIBUSB_FOUND)
@@ -86,7 +86,7 @@ set(kcm_cursortheme_PART_SRCS kcmcursortheme.cpp ${libnoinst_SRCS})
 kde4_add_plugin(kcm_cursortheme ${kcm_cursortheme_PART_SRCS})
 
 
-target_link_libraries(kcm_cursortheme ${KDE4_KIO_LIBS} ${KDE4_KNEWSTUFF3_LIBS} ${X11_LIBRARIES})
+target_link_libraries(kcm_cursortheme KF5::KIOCore KF5::KIOWidgets ${KDE4_KNEWSTUFF3_LIBS} ${X11_LIBRARIES})
 
 if (X11_Xcursor_FOUND)
    target_link_libraries(kcm_cursortheme ${X11_Xcursor_LIB})

kcontrol/keyboard/CMakeLists.txt

@@ -128,7 +128,7 @@ kde4_add_ui_files(kcm_keyboard_PART_SRCS kcm_keyboard.ui kcm_add_layout_dialog.u
 kde4_add_plugin(kcm_keyboard ${kcm_keyboard_PART_SRCS})
 
 target_link_libraries(kcm_keyboard
-    ${KDE4_KIO_LIBS} ${X11_Xkbfile_LIB} ${X11_LIBRARIES}
+    KF5::KIOCore KF5::KIOWidgets ${X11_Xkbfile_LIB} ${X11_LIBRARIES}
     ${text_paint_LIB}
 )
 

kcontrol/keys/CMakeLists.txt

@@ -25,7 +25,7 @@ set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES INCLUDE "kg
 qt4_add_dbus_interface(kdeui_LIB_SRCS ${kglobalaccel_component_xml} kglobalaccel_component_interface )
 
 kde4_add_plugin(kcm_keys ${kcm_keys_PART_SRCS})
-target_link_libraries(kcm_keys  ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB})
+target_link_libraries(kcm_keys  ${KDE4_KDEUI_LIBS} KF5::KIOCore KF5::KIOWidgets ${X11_X11_LIB})
 
 install(TARGETS kcm_keys  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

kcontrol/kfontinst/apps/CMakeLists.txt

@@ -18,7 +18,7 @@ set_target_properties(kfontinst_bin PROPERTIES OUTPUT_NAME kfontinst)
 set_target_properties(kfontprint_bin PROPERTIES OUTPUT_NAME kfontprint)
 set_target_properties(kfontview_bin PROPERTIES OUTPUT_NAME kfontview)
 
-target_link_libraries(kfontinst_bin ${KDE4_KIO_LIBS} ${KDE4_KDESU_LIBS} ${X11_X11_LIB} kfontinst)
+target_link_libraries(kfontinst_bin KF5::KIOCore KF5::KIOWidgets ${KDE4_KDESU_LIBS} ${X11_X11_LIB} kfontinst)
 target_link_libraries(kfontprint_bin ${X11_X11_LIB} ${KDE4_KDEUI_LIBS} ${FREETYPE_LIBRARIES} kfontinstui kfontinst)
 target_link_libraries(kfontview_bin ${KDE4_KPARTS_LIBS} kfontinstui kfontinst )
 

kcontrol/kfontinst/kcmfontinst/CMakeLists.txt

@@ -9,7 +9,7 @@ set(kcm_fontinst_PART_SRCS ${libkfontinstview_SRCS} ${libkfontinstjobrunner_SRCS
 
 kde4_add_plugin(kcm_fontinst ${kcm_fontinst_PART_SRCS})
 
-target_link_libraries(kcm_fontinst ${KDE4_KIO_LIBS} ${KDE4_KDESU_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} kfontinstui kfontinst ${X11_LIBRARIES})
+target_link_libraries(kcm_fontinst KF5::KIOCore KF5::KIOWidgets ${KDE4_KDESU_LIBS} ${KDE4_KNEWSTUFF3_LIBRARY} kfontinstui kfontinst ${X11_LIBRARIES})
 
 install(TARGETS kcm_fontinst  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES fontinst.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )

kcontrol/kfontinst/kio/CMakeLists.txt

@@ -5,7 +5,7 @@
 set(kio_fonts_PART_SRCS FontInstInterface.cpp KioFonts.cpp ${libkfontinstdbusiface_SRCS})
 # qt4_add_dbus_interface(kio_fonts_PART_SRCS ../dbus/org.kde.fontinst.xml FontinstIface)
 kde4_add_plugin(kio_fonts ${kio_fonts_PART_SRCS} ${KFI_FONTINST_AUTH_SRC} )
-target_link_libraries(kio_fonts ${KDE4_KIO_LIBS}  ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} kfontinst )
+target_link_libraries(kio_fonts KF5::KIOCore KF5::KIOWidgets  ${QT_QTXML_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} kfontinst )
 install(TARGETS kio_fonts  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES fonts.desktop  DESTINATION  ${DATA_INSTALL_DIR}/konqsidebartng/virtual_folders/services )
 install( FILES fonts.protocol  DESTINATION  ${SERVICES_INSTALL_DIR} )

kcontrol/kfontinst/lib/CMakeLists.txt

@@ -6,6 +6,6 @@ target_link_libraries(kfontinst ${KDE4_KDECORE_LIBRARY} ${QT_QTXML_LIBRARY} ${QT
 set_target_properties(kfontinst PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
 kde4_add_library(kfontinstui SHARED ${kfontinstui_LIB_SRCS})
-target_link_libraries(kfontinstui ${KDE4_KIO_LIBS} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${X11_X11_LIB} ${X11_Xft_LIB} kfontinst )
+target_link_libraries(kfontinstui KF5::KIOCore KF5::KIOWidgets ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${X11_X11_LIB} ${X11_Xft_LIB} kfontinst )
 set_target_properties(kfontinstui PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 install(TARGETS kfontinst kfontinstui ${INSTALL_TARGETS_DEFAULT_ARGS} )

kcontrol/kfontinst/strigi-analyzer/CMakeLists.txt

@@ -4,7 +4,7 @@ include_directories( ${KDEBASE_WORKSPACE_SOURCE_DIR}/kcontrol/kfontinst/lib/
 
 kde4_add_library(font MODULE FontThroughAnalyzer.cpp FontEngine.cpp )
 
-target_link_libraries(font ${STRIGI_STREAMANALYZER_LIBRARY} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} ${KDE4_KIO_LIBS} kfontinst )
+target_link_libraries(font ${STRIGI_STREAMANALYZER_LIBRARY} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} KF5::KIOCore KF5::KIOWidgets kfontinst )
 
 set_target_properties(font PROPERTIES  PREFIX strigita_)
 

kcontrol/kfontinst/thumbnail/CMakeLists.txt

@@ -7,7 +7,7 @@ set(fontthumbnail_PART_SRCS FontThumbnail.cpp )
 
 kde4_add_plugin(fontthumbnail ${fontthumbnail_PART_SRCS})
 
-target_link_libraries(fontthumbnail  ${KDE4_KIO_LIBS} kfontinstui kfontinst )
+target_link_libraries(fontthumbnail  KF5::KIOCore KF5::KIOWidgets kfontinstui kfontinst )
 
 install(TARGETS fontthumbnail  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install( FILES fontthumbnail.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )

kcontrol/smartcard/CMakeLists.txt

@@ -12,7 +12,7 @@ kde4_add_ui_files(kcm_smartcard_PART_SRCS smartcardbase.ui nosmartcardbase.ui )
 kde4_add_plugin(kcm_smartcard ${kcm_smartcard_PART_SRCS})
 
 
-target_link_libraries(kcm_smartcard   ksmartcard ${KDE4_KIO_LIBS} )
+target_link_libraries(kcm_smartcard   ksmartcard KF5::KIOCore KF5::KIOWidgets )
 
 install(TARGETS kcm_smartcard  DESTINATION ${PLUGIN_INSTALL_DIR} )
 

kcontrol/standard_actions/CMakeLists.txt

@@ -2,7 +2,7 @@ set(kcm_standard_actions_PART_SRCS standard_actions_module.cpp)
 
 kde4_add_plugin(kcm_standard_actions ${kcm_standard_actions_PART_SRCS})
 
-target_link_libraries(kcm_standard_actions ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_X11_LIB})
+target_link_libraries(kcm_standard_actions ${KDE4_KDEUI_LIBS} KF5::KIOCore KF5::KIOWidgets ${X11_X11_LIB})
 
 install(TARGETS kcm_standard_actions DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES standard_actions.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )

kcontrol/style/CMakeLists.txt

@@ -16,7 +16,7 @@ kde4_add_ui_files(kcm_style_PART_SRCS stylepreview.ui finetuning.ui)
 
 kde4_add_plugin(kcm_style ${kcm_style_PART_SRCS})
 
-target_link_libraries(kcm_style ${KDE4_KIO_LIBS} ${X11_LIBRARIES}
+target_link_libraries(kcm_style KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES}
     ${KDE4_PLASMA_LIBS} ${KDE4_KNEWSTUFF3_LIBS})
 if(NOT WIN32)
     target_link_libraries(kcm_style kdecorations)