summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-20 12:02:08 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-20 12:02:08 (GMT)
commit252cac8f325bd5bbf73ab719d773cbef0c5d8391 (patch)
tree587a22be1e4c240883093c0af657c116929251bf
parent0fec4e68d2ceae34867224fd5c81176dc759876d (diff)
Rename categories
-rw-r--r--CMakeLists.txt2
-rw-r--r--autotests/CMakeLists.txt2
-rw-r--r--kleopatra.categories6
-rw-r--r--kleopatra.renamecategories3
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/kwatchgnupg/CMakeLists.txt2
-rw-r--r--src/libkleopatraclient/core/CMakeLists.txt2
7 files changed, 11 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38c327e..053b2b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,7 +133,7 @@ if(BUILD_TESTING)
add_subdirectory(tests)
add_subdirectory(autotests)
endif()
-install( FILES kleopatra.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+install( FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
if(KF5DocTools_FOUND)
add_subdirectory(doc)
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 7e9b9ed..e5a7d86 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
set(kuniqueservicetest_src kuniqueservicetest.cpp ${CMAKE_SOURCE_DIR}/src/utils/kuniqueservice.cpp)
-ecm_qt_declare_logging_category(kuniqueservicetest_src HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME log_kleopatra)
+ecm_qt_declare_logging_category(kuniqueservicetest_src HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME org.kde.pim.kleopatra)
add_executable(kuniqueservicetest ${kuniqueservicetest_src})
add_test(kuniqueservicetest kuniqueservicetest)
ecm_mark_as_test(kuniqueservicetest)
diff --git a/kleopatra.categories b/kleopatra.categories
index 64a6401..c58cd98 100644
--- a/kleopatra.categories
+++ b/kleopatra.categories
@@ -1,3 +1,3 @@
-log_kleopatra kleopatra (kleopatra)
-log_kwatchgnupg kwatchgnupg (kwatchgnupg)
-log_libkleopatraclientcore kleopatra (kleopatra)
+org.kde.pim.kleopatra kleopatra (kleopatra)
+org.kde.pim.kwatchgnupg kwatchgnupg (kwatchgnupg)
+org.kde.pim.libkleopatraclientcore kleopatra (kleopatra)
diff --git a/kleopatra.renamecategories b/kleopatra.renamecategories
new file mode 100644
index 0000000..235e938
--- /dev/null
+++ b/kleopatra.renamecategories
@@ -0,0 +1,3 @@
+log_kleopatra org.kde.pim.kleopatra
+log_kwatchgnupg org.kde.pim.kwatchgnupg
+log_libkleopatraclientcore org.kde.pim.libkleopatraclientcore
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d9ae5a..14e4f07 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -223,7 +223,7 @@ else()
set (_kleopatra_SRCS conf/kleopageconfigdialog.cpp ${_kleopatra_SRCS})
endif()
-ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME log_kleopatra)
+ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME org.kde.pim.kleopatra)
if(KLEO_MODEL_TEST)
add_definitions(-DKLEO_MODEL_TEST)
diff --git a/src/kwatchgnupg/CMakeLists.txt b/src/kwatchgnupg/CMakeLists.txt
index 98f6d00..ac8cf9c 100644
--- a/src/kwatchgnupg/CMakeLists.txt
+++ b/src/kwatchgnupg/CMakeLists.txt
@@ -15,7 +15,7 @@ set(kwatchgnupg_SRCS
main.cpp
)
-ecm_qt_declare_logging_category(kwatchgnupg_SRCS HEADER kwatchgnupg_debug.h IDENTIFIER KWATCHGNUPG_LOG CATEGORY_NAME log_kwatchgnupg)
+ecm_qt_declare_logging_category(kwatchgnupg_SRCS HEADER kwatchgnupg_debug.h IDENTIFIER KWATCHGNUPG_LOG CATEGORY_NAME org.kde.pim.kwatchgnupg)
qt5_add_resources(kwatchgnupg_SRCS kwatchgnupg.qrc)
if(WIN32)
diff --git a/src/libkleopatraclient/core/CMakeLists.txt b/src/libkleopatraclient/core/CMakeLists.txt
index 266f992..ff97d1a 100644
--- a/src/libkleopatraclient/core/CMakeLists.txt
+++ b/src/libkleopatraclient/core/CMakeLists.txt
@@ -9,7 +9,7 @@ else()
set(_kleopatraclientcore_extra_SRCS)
endif()
-ecm_qt_declare_logging_category(_kleopatraclientcore_common_SRCS HEADER libkleopatraclientcore_debug.h IDENTIFIER LIBKLEOPATRACLIENTCORE_LOG CATEGORY_NAME log_libkleopatraclientcore)
+ecm_qt_declare_logging_category(_kleopatraclientcore_common_SRCS HEADER libkleopatraclientcore_debug.h IDENTIFIER LIBKLEOPATRACLIENTCORE_LOG CATEGORY_NAME org.kde.pim.libkleopatraclientcore)
add_library(kleopatraclientcore
${_kleopatraclientcore_extra_SRCS}