Use KF-standardized Qt logging categories

See https://community.kde.org/Frameworks/Frameworks_Logging_Policy
KDE · Jul 13, 2020 · a0b5367 · a0b5367
1 parent 0c4a44e
commit a0b5367
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt
@@ -31,7 +31,8 @@ ecm_qt_declare_logging_category(
     HEADER "enginedebug.h"
     IDENTIFIER "Baloo::ENGINE"
     DEFAULT_SEVERITY Warning
-    CATEGORY_NAME "org.kde.baloo.engine"
+    CATEGORY_NAME kf.baloo.engine
+    OLD_CATEGORY_NAMES org.kde.baloo.engine
     DESCRIPTION "Baloo Engine"
     EXPORT BALOO
 )

diff --git a/src/file/CMakeLists.txt b/src/file/CMakeLists.txt
@@ -45,7 +45,11 @@ set(file_static_lib_SRCS
     propertydata.cpp
 )
 
-ecm_qt_declare_logging_category(file_static_lib_SRCS HEADER baloodebug.h IDENTIFIER BALOO CATEGORY_NAME org.kde.baloo)
+ecm_qt_declare_logging_category(file_static_lib_SRCS
+    HEADER baloodebug.h
+    IDENTIFIER BALOO
+    CATEGORY_NAME kf.baloo
+)
 
 # KF6 TODO - remove BalooWatcherApplication
 qt5_add_dbus_interface(file_static_lib_SRCS org.kde.BalooWatcherApplication.xml baloowatcherapplication_interface)

diff --git a/src/file/extractor/CMakeLists.txt b/src/file/extractor/CMakeLists.txt
@@ -14,7 +14,11 @@ set(EXTRACTOR_SRCS
   ../propertydata.cpp
 )
 
-ecm_qt_declare_logging_category(EXTRACTOR_SRCS HEADER baloodebug.h IDENTIFIER BALOO CATEGORY_NAME org.kde.baloo)
+ecm_qt_declare_logging_category(EXTRACTOR_SRCS
+    HEADER baloodebug.h
+    IDENTIFIER BALOO
+    CATEGORY_NAME kf.baloo
+)
 kconfig_add_kcfg_files(EXTRACTOR_SRCS ../baloosettings.kcfgc GENERATE_MOC)
 
 add_executable(baloo_file_extractor ${EXTRACTOR_SRCS})

diff --git a/src/kioslaves/tags/CMakeLists.txt b/src/kioslaves/tags/CMakeLists.txt
@@ -8,7 +8,8 @@ ecm_qt_declare_logging_category(tags_LIB_SRCS
     HEADER kio_tags_debug.h
     IDENTIFIER Baloo::KIO_TAGS
     DEFAULT_SEVERITY Warning
-    CATEGORY_NAME kf5.kio.kio_tags
+    CATEGORY_NAME kf.kio.slaves.tags
+    OLD_CATEGORY_NAMES kf5.kio.kio_tags
     DESCRIPTION "Baloo Tags (KIO)"
     EXPORT BALOO
 )

diff --git a/src/kioslaves/timeline/CMakeLists.txt b/src/kioslaves/timeline/CMakeLists.txt
@@ -9,7 +9,8 @@ ecm_qt_declare_logging_category(kio_timeline_SRCS
     HEADER kio_timeline_debug.h
     IDENTIFIER Baloo::KIO_TIMELINE
     DEFAULT_SEVERITY Warning
-    CATEGORY_NAME kf5.kio.kio_timeline
+    CATEGORY_NAME kf.kio.slaves.timeline
+    OLD_CATEGORY_NAMES kf5.kio.kio_timeline
     DESCRIPTION "Baloo Timeline (KIO)"
     EXPORT BALOO
 )

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
@@ -31,7 +31,8 @@ set(BALOO_LIB_SRCS
 ecm_qt_declare_logging_category(BALOO_LIB_SRCS
     HEADER baloodebug.h
     IDENTIFIER BALOO
-    CATEGORY_NAME org.kde.baloo
+    CATEGORY_NAME kf.baloo
+    OLD_CATEGORY_NAMES org.kde.baloo
     DESCRIPTION "Baloo File debug"
     EXPORT BALOO
 )