summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-20 05:22:11 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-20 05:22:11 (GMT)
commit660f9e8d541a731fdf285472c7d235bc04be218c (patch)
treea88fa05512bb55e5648c6b2888fa0a724850121c
parent223808ce7ced8d9f9805c90bfd76c7d0d7934f9b (diff)
Rename categories
-rw-r--r--CMakeLists.txt2
-rw-r--r--kioslave/src/sieve/CMakeLists.txt2
-rw-r--r--libksieve.categories6
-rw-r--r--libksieve.renamecategories3
-rw-r--r--src/kmanagesieve/CMakeLists.txt2
-rw-r--r--src/ksieveui/CMakeLists.txt2
-rw-r--r--src/ksieveui/vacation/autotests/CMakeLists.txt2
7 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eac47a3..14fd163 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ add_subdirectory(kioslave)
if(BUILD_TESTING)
add_subdirectory(autotests)
endif()
-install( FILES libksieve.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+install( FILES libksieve.categories libksieve.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR} )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kioslave/src/sieve/CMakeLists.txt b/kioslave/src/sieve/CMakeLists.txt
index 5a6efeb..7fffb05 100644
--- a/kioslave/src/sieve/CMakeLists.txt
+++ b/kioslave/src/sieve/CMakeLists.txt
@@ -3,7 +3,7 @@ configure_file (sieve-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/sieve-config.h
set(kio_sieve_PART_SRCS sieve.cpp )
-ecm_qt_declare_logging_category(kio_sieve_PART_SRCS HEADER sieve_debug.h IDENTIFIER SIEVE_LOG CATEGORY_NAME log_sieve)
+ecm_qt_declare_logging_category(kio_sieve_PART_SRCS HEADER sieve_debug.h IDENTIFIER SIEVE_LOG CATEGORY_NAME org.kde.pim.sieve)
add_library(kio_sieve MODULE ${kio_sieve_PART_SRCS})
diff --git a/libksieve.categories b/libksieve.categories
index 8b3030b..ad92f58 100644
--- a/libksieve.categories
+++ b/libksieve.categories
@@ -1,3 +1,3 @@
-log_libksieve kdepim (libksieve)
-log_kmanagersieve kdepim (libksieve manager)
-log_sieve kioslave (sieve)
+org.kde.pim.libksieve kdepim (libksieve)
+org.kde.pim.kmanagersieve kdepim (libksieve manager)
+org.kde.pim.sieve kioslave (sieve)
diff --git a/libksieve.renamecategories b/libksieve.renamecategories
new file mode 100644
index 0000000..4c74aa0
--- /dev/null
+++ b/libksieve.renamecategories
@@ -0,0 +1,3 @@
+log_libksieve org.kde.pim.libksieve
+log_kmanagersieve org.kde.pim.kmanagersieve
+log_sieve org.kde.pim.sieve
diff --git a/src/kmanagesieve/CMakeLists.txt b/src/kmanagesieve/CMakeLists.txt
index e5988d4..e85efa5 100644
--- a/src/kmanagesieve/CMakeLists.txt
+++ b/src/kmanagesieve/CMakeLists.txt
@@ -9,7 +9,7 @@ set(kmanagesieve_LIB_SRCS
sessionthread.cpp
sievejob.cpp
)
-ecm_qt_declare_logging_category(kmanagesieve_LIB_SRCS HEADER kmanagersieve_debug.h IDENTIFIER KMANAGERSIEVE_LOG CATEGORY_NAME log_kmanagersieve)
+ecm_qt_declare_logging_category(kmanagesieve_LIB_SRCS HEADER kmanagersieve_debug.h IDENTIFIER KMANAGERSIEVE_LOG CATEGORY_NAME org.kde.pim.kmanagersieve)
add_library(KF5KManageSieve ${kmanagesieve_LIB_SRCS})
generate_export_header(KF5KManageSieve BASE_NAME kmanagesieve)
diff --git a/src/ksieveui/CMakeLists.txt b/src/ksieveui/CMakeLists.txt
index 0af9402..8400dda 100644
--- a/src/ksieveui/CMakeLists.txt
+++ b/src/ksieveui/CMakeLists.txt
@@ -194,7 +194,7 @@ set(ksieveui_LIB_SRCS
${ksieveui_sievescriptdebugger_LIB_SRCS}
)
-ecm_qt_declare_logging_category(ksieveui_LIB_SRCS HEADER libksieve_debug.h IDENTIFIER LIBKSIEVE_LOG CATEGORY_NAME log_libksieve)
+ecm_qt_declare_logging_category(ksieveui_LIB_SRCS HEADER libksieve_debug.h IDENTIFIER LIBKSIEVE_LOG CATEGORY_NAME org.kde.pim.libksieve)
kconfig_add_kcfg_files(ksieveui_LIB_SRCS settings/sieve-vacation.kcfgc settings/sieve-editor.kcfgc)
diff --git a/src/ksieveui/vacation/autotests/CMakeLists.txt b/src/ksieveui/vacation/autotests/CMakeLists.txt
index 155668c..70d2c6c 100644
--- a/src/ksieveui/vacation/autotests/CMakeLists.txt
+++ b/src/ksieveui/vacation/autotests/CMakeLists.txt
@@ -12,7 +12,7 @@ macro( add_vacation_test _source )
configure_file(../../settings/sieve-editor.kcfg.cmake ${CMAKE_CURRENT_BINARY_DIR}/sieve-editor.kcfg)
kconfig_add_kcfg_files(_test ../../settings/sieve-vacation.kcfgc ../../settings/sieve-editor.kcfgc)
get_filename_component(_name ${_source}test NAME_WE)
- ecm_qt_declare_logging_category(_test HEADER libksieve_debug.h IDENTIFIER LIBKSIEVE_LOG CATEGORY_NAME log_libksieve)
+ ecm_qt_declare_logging_category(_test HEADER libksieve_debug.h IDENTIFIER LIBKSIEVE_LOG CATEGORY_NAME org.kde.pim.libksieve)
add_executable(${_name} ${_test})
add_test(vacation-${_name} ${_name})
ecm_mark_as_test(vacation-${_name})