Renames for the KF5 prefix

2013-12-11 14:01:52 +01:00 · 2013-12-11 14:01:52 +01:00 · 02d6b37976
commit 02d6b37976
parent 175204c453
23 changed files with 68 additions and 68 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -42,10 +42,10 @@ set (QT_MIN_VERSION "5.2.0")

 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick X11Extras Sql UiTools Qml Widgets Svg Declarative Script Test PrintSupport)

-find_package(KF5 CONFIG REQUIRED KIdleTime ItemModels KWidgetsAddons KWindowSystem KCodecs KArchive KCoreAddons Solid ThreadWeaver KF5GlobalAccel
-                                            KConfig KAuth KJS KWallet KDBusAddons KI18n KGuiAddons KConfigWidgets
-                                            KService ItemViews KNotifications KIconThemes KCompletion KJobWidgets Sonnet KTextWidgets XmlGui KCrash
-                                            KBookmarks KDeclarative KUnitConversion KParts Kross KIO)
+find_package(KF5 CONFIG REQUIRED IdleTime ItemModels WidgetsAddons WindowSystem Codecs Archive CoreAddons Solid ThreadWeaver GlobalAccel
+                                            Config Auth JS Wallet DBusAddons I18n GuiAddons ConfigWidgets
+                                            Service ItemViews Notifications IconThemes Completion JobWidgets Sonnet TextWidgets XmlGui Crash
+                                            Bookmarks Declarative UnitConversion Parts Kross KIO)

 find_package(KActivities)
 set_package_properties(KActivities PROPERTIES DESCRIPTION "The KActivities library"
--- a/examples/dataengines/customDataContainers/CMakeLists.txt
+++ b/examples/dataengines/customDataContainers/CMakeLists.txt
@ -9,7 +9,7 @@ add_library(plasma_dataengine_example_customDataContainers MODULE ${customDataCo
 target_link_libraries(plasma_dataengine_example_customDataContainers
  KF5::Plasma
  KF5::KIOCore
-  KF5::KService
+  KF5::Service
 )

 install(TARGETS plasma_dataengine_example_customDataContainers DESTINATION ${PLUGIN_INSTALL_DIR})
--- a/examples/dataengines/simpleEngine/CMakeLists.txt
+++ b/examples/dataengines/simpleEngine/CMakeLists.txt
@ -8,8 +8,8 @@ add_library(plasma_dataengine_example_simpleEngine MODULE ${simpleEngine_SRCS})

 target_link_libraries(plasma_dataengine_example_simpleEngine
  KF5::Plasma
-  KF5::KService
-  KF5::KI18n
+  KF5::Service
+  KF5::I18n
 )

 install(TARGETS plasma_dataengine_example_simpleEngine DESTINATION ${PLUGIN_INSTALL_DIR})
--- a/examples/dataengines/sourcesOnRequest/CMakeLists.txt
+++ b/examples/dataengines/sourcesOnRequest/CMakeLists.txt
@ -8,7 +8,7 @@ add_library(plasma_dataengine_example_sourcesOnRequest MODULE ${sourcesOnRequest

 target_link_libraries(plasma_dataengine_example_sourcesOnRequest
  KF5::Plasma
-  KF5::KService
+  KF5::Service
 )

 install(TARGETS plasma_dataengine_example_sourcesOnRequest DESTINATION ${PLUGIN_INSTALL_DIR})
--- a/examples/kpart/CMakeLists.txt
+++ b/examples/kpart/CMakeLists.txt
@ -8,7 +8,7 @@ set(plasma_example_kpart_shell_SRCS
 qt5_wrap_ui(plasma_example_kpart_shell_SRCS appletselector.ui)
 add_executable(plasma-example-kpart-shell ${plasma_example_kpart_shell_SRCS})

-target_link_libraries(plasma-example-kpart-shell KF5::Plasma KF5::KParts)
+target_link_libraries(plasma-example-kpart-shell KF5::Plasma KF5::Parts)

 ########### install files ###############
 install(TARGETS plasma-example-kpart-shell ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- a/src/declarativeimports/core/CMakeLists.txt
+++ b/src/declarativeimports/core/CMakeLists.txt
@ -33,10 +33,10 @@ target_link_libraries(corebindingsplugin
        Qt5::Script
        Qt5::Quick
        Qt5::Qml
-        KF5::KDeclarative
-        KF5::KCoreAddons
-        KF5::KIconThemes
-        KF5::KWindowSystem
+        KF5::Declarative
+        KF5::CoreAddons
+        KF5::IconThemes
+        KF5::WindowSystem
        KF5::Plasma)

 if(X11_FOUND)
--- a/src/declarativeimports/core/tests/CMakeLists.txt
+++ b/src/declarativeimports/core/tests/CMakeLists.txt
@ -15,7 +15,7 @@ target_link_libraries(sortfiltermodeltest
    KF5::Plasma
    Qt5::Gui
    Qt5::Test
-    KF5::KI18n
+    KF5::I18n
    Qt5::Qml
    )

--- a/src/declarativeimports/dirmodel/CMakeLists.txt
+++ b/src/declarativeimports/dirmodel/CMakeLists.txt
@ -12,7 +12,7 @@ target_link_libraries(dirmodelplugin
        Qt5::Qml
        KF5::KIOCore
        KF5::KIOWidgets
-        KF5::KGuiAddons
+        KF5::GuiAddons
        )

 install(TARGETS dirmodelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/dirmodel)
--- a/src/declarativeimports/krunnermodel/CMakeLists.txt
+++ b/src/declarativeimports/krunnermodel/CMakeLists.txt
@ -9,7 +9,7 @@ add_library(runnermodelplugin SHARED ${runnermodel_SRCS})
 target_link_libraries(runnermodelplugin
        Qt5::Quick
        Qt5::Qml
-        KF5::KI18n
+        KF5::I18n
        KF5::Plasma
        )

--- a/src/declarativeimports/plasmacomponents/CMakeLists.txt
+++ b/src/declarativeimports/plasmacomponents/CMakeLists.txt
@ -1,6 +1,6 @@
 project(plasmacomponents)

-#find_package(KDeclarative REQUIRED NO_MODULE)
+#find_package(KF5Declarative REQUIRED NO_MODULE)

 set(plasmacomponents_SRCS
    #fullscreensheet.cpp
@ -20,7 +20,7 @@ target_link_libraries(plasmacomponentsplugin
        Qt5::Quick
        Qt5::Qml
        Qt5::Gui
-        KF5::KDeclarative
+        KF5::Declarative
        KF5::Plasma)


--- a/src/declarativeimports/qtextracomponents/CMakeLists.txt
+++ b/src/declarativeimports/qtextracomponents/CMakeLists.txt
@ -18,8 +18,8 @@ target_link_libraries(qtextracomponentsplugin
        Qt5::Quick
        Qt5::Qml
        Qt5::Gui
-        KF5::KDeclarative
-        KF5::KIconThemes
+        KF5::Declarative
+        KF5::IconThemes
        KF5::Plasma)

 install(TARGETS qtextracomponentsplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/qtextracomponents)
--- a/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
+++ b/src/declarativeimports/qtextracomponents/tests/CMakeLists.txt
@ -6,8 +6,8 @@ add_executable(fullmodelaccesstest columnproxymodeltest.cpp ../columnproxymodel.
 target_link_libraries(fullmodelaccesstest
    Qt5::Gui
    Qt5::Test
-    KF5::KCoreAddons
-    KF5::KI18n
+    KF5::CoreAddons
+    KF5::I18n
    )

 add_test(plasma-fullmodelaccesstest fullmodelaccesstest)
--- a/src/kpart/CMakeLists.txt
+++ b/src/kpart/CMakeLists.txt
@ -15,7 +15,7 @@ set(plasma_kpart_SRCS

 add_library(plasma-kpart MODULE ${plasma_kpart_SRCS})

-target_link_libraries(plasma-kpart Qt5::Script KF5::Plasma KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES} KF5::KParts )
+target_link_libraries(plasma-kpart Qt5::Script KF5::Plasma KF5::KIOCore KF5::KIOWidgets ${X11_LIBRARIES} KF5::Parts )

 install(TARGETS plasma-kpart DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES plasma-kpart.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--- a/src/plasma/CMakeLists.txt
+++ b/src/plasma/CMakeLists.txt
@ -122,19 +122,19 @@ target_link_libraries(KF5Plasma
    Qt5::DBus
    Qt5::UiTools
    Qt5::Xml
-    KF5::KArchive
-    KF5::KGuiAddons
-    KF5::KIconThemes
-    KF5::KI18n
-    KF5::KService
+    KF5::Archive
+    KF5::GuiAddons
+    KF5::IconThemes
+    KF5::I18n
+    KF5::Service
    KF5::KIOCore
    KF5::KIOWidgets
    KF5::ThreadWeaver
-    KF5::KWindowSystem
-    KF5::KAuth
-    KF5::KDeclarative
+    KF5::WindowSystem
+    KF5::Auth
+    KF5::Declarative
    KF5::XmlGui
-    KF5::KConfigWidgets
+    KF5::ConfigWidgets
    KF5::GlobalAccel
    ${PLASMA_EXTRA_LIBS}
 )
@ -147,7 +147,7 @@ if(DL_LIBRARY)
    target_link_libraries(KF5Plasma ${DL_LIBRARY})
 endif()

-target_link_libraries(KF5Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::KConfigWidgets)
+target_link_libraries(KF5Plasma LINK_INTERFACE_LIBRARIES Qt5::Widgets KF5::ConfigWidgets)
 target_include_directories(KF5Plasma PUBLIC
  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..;${CMAKE_CURRENT_SOURCE_DIR}/includes>"
 )
--- a/src/plasma/autotests/CMakeLists.txt
+++ b/src/plasma/autotests/CMakeLists.txt
@ -2,7 +2,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})

 include(ECMMarkAsTest)

-find_package(KCoreAddons REQUIRED)
+find_package(KF5CoreAddons REQUIRED)

 # add_definitions( -DKDESRCDIR=${CMAKE_CURRENT_SOURCE_DIR} )

@ -10,11 +10,11 @@ MACRO(PLASMA_UNIT_TESTS)
       FOREACH(_testname ${ARGN})
               add_executable(${_testname} ${_testname}.cpp)
               target_link_libraries(${_testname} Qt5::Test Qt5::Declarative
-                                     KF5::Plasma KF5::KArchive KF5::KCoreAddons
-                                     KF5::KConfigGui
-                                     KF5::KI18n
+                                     KF5::Plasma KF5::Archive KF5::CoreAddons
+                                     KF5::ConfigGui
+                                     KF5::I18n
                                     KF5::KIOCore
-                                     KF5::KService)
+                                     KF5::Service)
               if(QT_QTOPENGL_FOUND)
                   target_link_libraries(${_testname} Qt5::OpenGL)
               endif()
@ -32,7 +32,7 @@ PLASMA_UNIT_TESTS(
 )

 add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp)
-target_link_libraries(storagetest Qt5::Test Qt5::Declarative Qt5::Sql KF5::KIOCore KF5::Plasma KF5::KCoreAddons )
+target_link_libraries(storagetest Qt5::Test Qt5::Declarative Qt5::Sql KF5::KIOCore KF5::Plasma KF5::CoreAddons )
 add_test(plasma-storagetest storagetest)
 ecm_mark_as_test(storagetest)

--- a/src/plasma/tests/kplugins/CMakeLists.txt
+++ b/src/plasma/tests/kplugins/CMakeLists.txt
@ -5,7 +5,7 @@ add_executable(plugintest
    plugintest.cpp
 )

-target_link_libraries(plugintest KF5::Plasma KF5::KI18n KF5::KService Qt5::DBus)
+target_link_libraries(plugintest KF5::Plasma KF5::I18n KF5::Service Qt5::DBus)

 message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

--- a/src/plasmapkg/CMakeLists.txt
+++ b/src/plasmapkg/CMakeLists.txt
@ -5,7 +5,7 @@ add_executable(plasmapkg
    plasmapkg.cpp
 )

-target_link_libraries(plasmapkg KF5::Plasma KF5::KI18n KF5::KService KF5::KCoreAddons Qt5::DBus)
+target_link_libraries(plasmapkg KF5::Plasma KF5::I18n KF5::Service KF5::CoreAddons Qt5::DBus)

 message("INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS}")

--- a/src/plasmaquick/CMakeLists.txt
+++ b/src/plasmaquick/CMakeLists.txt
@ -13,14 +13,14 @@ add_library(KF5PlasmaQuick SHARED ${plasmaquick_LIB_SRC})
 target_link_libraries(KF5PlasmaQuick
    Qt5::Quick
    Qt5::Qml
-    KF5::KWindowSystem
+    KF5::WindowSystem
    KF5::KIOWidgets
-    KF5::KI18n
-    KF5::KService
-    KF5::KCoreAddons
+    KF5::I18n
+    KF5::Service
+    KF5::CoreAddons
    KF5::XmlGui
    KF5::Plasma
-    KF5::KDeclarative
+    KF5::Declarative
 )

 set_target_properties(KF5PlasmaQuick PROPERTIES
--- a/src/plasmaquick/autotests/CMakeLists.txt
+++ b/src/plasmaquick/autotests/CMakeLists.txt
@ -2,7 +2,7 @@ set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})

 include(ECMMarkAsTest)

-find_package(KCoreAddons REQUIRED)
+find_package(KF5CoreAddons REQUIRED)

 # add_definitions( -DKDESRCDIR=${CMAKE_CURRENT_SOURCE_DIR} )

@ -13,11 +13,11 @@ MACRO(PLASMA_UNIT_TESTS)
                                     Qt5::Test
                                     Qt5::Declarative
                                     KF5::Plasma
-                                     KF5::KArchive KF5::KCoreAddons
-                                     KF5::KConfigGui
-                                     KF5::KI18n
+                                     KF5::Archive KF5::CoreAddons
+                                     KF5::ConfigGui
+                                     KF5::I18n
                                     KF5::KIOCore
-                                     KF5::KService
+                                     KF5::Service
                                     KF5::PlasmaQuick
                                    )
               if(QT_QTOPENGL_FOUND)
--- a/src/platformstatus/CMakeLists.txt
+++ b/src/platformstatus/CMakeLists.txt
@ -13,10 +13,10 @@ add_library(kded_platformstatus MODULE ${kded_platformstatus_SRCS} )

 target_link_libraries(
   kded_platformstatus
-   KF5::KService
-   KF5::KCoreAddons
-   KF5::KDBusAddons
-   KF5::KI18n
+   KF5::Service
+   KF5::CoreAddons
+   KF5::DBusAddons
+   KF5::I18n
   KF5::KIOCore KF5::KIOWidgets
   Qt5::DBus
   Qt5::Quick
--- a/src/scriptengines/javascript/CMakeLists.txt
+++ b/src/scriptengines/javascript/CMakeLists.txt
@ -74,7 +74,7 @@ set(javascript_runner_engine_SRCS
 add_library(plasma_runnerscript_javascript MODULE ${javascript_runner_engine_SRCS})

 target_link_libraries(plasma_runnerscript_javascript
-                      KF5::KCoreAddons
+                      KF5::CoreAddons
                      KF5::KIOWidgets
                      KF5::Plasma
                      Qt5::Script)
@ -99,7 +99,7 @@ set(javascript_dataengine_engine_SRCS
 add_library(plasma_dataenginescript_javascript MODULE ${javascript_dataengine_engine_SRCS})

 target_link_libraries(plasma_dataenginescript_javascript
-                      KF5::KCoreAddons
+                      KF5::CoreAddons
                      KF5::KIOWidgets
                      KF5::Plasma
                      Qt5::Script)
--- a/src/scriptengines/qml/CMakeLists.txt
+++ b/src/scriptengines/qml/CMakeLists.txt
@ -24,8 +24,8 @@ target_link_libraries(plasma_appletscript_declarative
    Qt5::UiTools
    KF5::KIOCore
    KF5::KIOWidgets
-    KF5::KDeclarative
-    KF5::KI18n
+    KF5::Declarative
+    KF5::I18n
    KF5::XmlGui # KActionCollection
    KF5::Plasma
    KF5::PlasmaQuick
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@ -14,9 +14,9 @@ add_definitions(-DHAVE_X11=${HAVE_X11})
 find_package(Qt5Qml REQUIRED)
 find_package(Qt5Quick REQUIRED)
 find_package(Qt5Script REQUIRED)
-find_package(KCoreAddons REQUIRED)
-find_package(KCrash REQUIRED)
-find_package(Solid REQUIRED)
+find_package(KF5CoreAddons REQUIRED)
+find_package(KF5Crash REQUIRED)
+find_package(KF5Solid REQUIRED)
 find_package(KActivities REQUIRED)

 set(scripting_SRC
@ -63,17 +63,17 @@ target_link_libraries(plasma-shell
 Qt5::Quick
 Qt5::Qml
 KF5::KIOCore
- KF5::KWindowSystem
- KF5::KCoreAddons
- KF5::KCrash
+ KF5::WindowSystem
+ KF5::CoreAddons
+ KF5::Crash
 KF5::Plasma
 KF5::PlasmaQuick
 Qt5::Script
 KF5::Solid
- KF5::KDeclarative
- KF5::KI18n
+ KF5::Declarative
+ KF5::I18n
 KF5::XmlGui
- KF5::KIconThemes
+ KF5::IconThemes
 KF5::KActivities
 )
 target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")