summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-20 05:14:02 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-20 05:14:13 (GMT)
commit50a35995d0203e41765a70784fbb33419d962506 (patch)
tree3d2f6cde9c5c8f77e21a5f4018b07779d5440ac7
parentb793fa15d2045b59257c891e917192b7516602b3 (diff)
Rename categories
-rw-r--r--CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/checkgravatar/CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/checkgravatar/gravatar/autotests/CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/checkgravatar/gravatar/tests/CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/mergelib/CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/mergelib/autotests/CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/sendmail/CMakeLists.txt2
-rw-r--r--kaddressbook/plugins/sendvcards/CMakeLists.txt2
-rw-r--r--kdepim-addons.renamecategories22
-rw-r--r--kmail/editorplugins/changecase/CMakeLists.txt2
-rw-r--r--kmail/editorplugins/changecase/autotests/CMakeLists.txt2
-rw-r--r--kmail/editorplugins/zoomtext/CMakeLists.txt2
-rw-r--r--kmail/editorplugins/zoomtext/autotests/CMakeLists.txt2
-rw-r--r--kmail/editorsendcheckplugins/automaticaddcontacts/CMakeLists.txt2
-rw-r--r--kmail/editorsendcheckplugins/automaticaddcontacts/autotests/CMakeLists.txt2
-rw-r--r--kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt2
-rw-r--r--kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt2
-rw-r--r--kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt2
-rw-r--r--kmail/editorsendcheckplugins/confirm-address/autotests/CMakeLists.txt2
-rw-r--r--korganizer/plugins/hebrew/CMakeLists.txt2
-rw-r--r--korganizer/plugins/picoftheday/CMakeLists.txt2
-rw-r--r--plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/isgdshorturlengineplugin/CMakeLists.txt2
-rw-r--r--plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/ur1cashorturlengineplugin/CMakeLists.txt2
-rw-r--r--plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt2
-rw-r--r--plugins/messageviewer/bodypartformatter/ms-tnef/CMakeLists.txt2
-rw-r--r--plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt2
-rw-r--r--plugins/messageviewerplugins/autotests/CMakeLists.txt8
-rw-r--r--plugins/messageviewerplugins/common/expandurlplugin/CMakeLists.txt2
-rw-r--r--plugins/messageviewerplugins/createeventplugin/CMakeLists.txt2
-rw-r--r--plugins/messageviewerplugins/createnoteplugin/CMakeLists.txt2
-rw-r--r--plugins/messageviewerplugins/createtodoplugin/CMakeLists.txt2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt2
-rw-r--r--plugins/plasma/pimeventsplugin/CMakeLists.txt2
-rw-r--r--plugins/webengineurlinterceptor/adblock/CMakeLists.txt2
-rw-r--r--plugins/webengineurlinterceptor/adblock/autotests/CMakeLists.txt2
-rw-r--r--plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt2
-rw-r--r--plugins/webengineurlinterceptor/adblock/lib/autotests/CMakeLists.txt2
-rw-r--r--plugins/webengineurlinterceptor/adblock/tests/CMakeLists.txt2
-rw-r--r--plugins/webengineurlinterceptor/donottrack/CMakeLists.txt2
39 files changed, 63 insertions, 41 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d0574c..ba6d9a1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -114,5 +114,5 @@ add_subdirectory(kaddressbook)
add_subdirectory(akregator)
add_subdirectory(sieveeditor)
-install( FILES kdepim-addons.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+install( FILES kdepim-addons.categories kdepim-addons.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR} )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kaddressbook/plugins/checkgravatar/CMakeLists.txt b/kaddressbook/plugins/checkgravatar/CMakeLists.txt
index 8e2db08..0a11e30 100644
--- a/kaddressbook/plugins/checkgravatar/CMakeLists.txt
+++ b/kaddressbook/plugins/checkgravatar/CMakeLists.txt
@@ -14,7 +14,7 @@ set(kaddressbook_checkgravatarplugin_SRCS
${kaddressbook_gravatar_SRCS}
)
-ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME log_kaddressbook_checkgravatar)
+ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME org.kde.pim.kaddressbook_checkgravatar)
kcoreaddons_add_plugin(kaddressbook_checkgravatarplugin JSON kaddressbook_checkgravatarplugin.json SOURCES
${kaddressbook_checkgravatarplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
diff --git a/kaddressbook/plugins/checkgravatar/gravatar/autotests/CMakeLists.txt b/kaddressbook/plugins/checkgravatar/gravatar/autotests/CMakeLists.txt
index d75f652..2befea6 100644
--- a/kaddressbook/plugins/checkgravatar/gravatar/autotests/CMakeLists.txt
+++ b/kaddressbook/plugins/checkgravatar/gravatar/autotests/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/
set(KDEPIMLIBS_RUN_ISOLATED_TESTS TRUE)
set(KDEPIMLIBS_RUN_SQLITE_ISOLATED_TESTS TRUE)
set(kaddressbook_checkgravatarplugin_test_SRCS)
-ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_test_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME log_kaddressbook_checkgravatar)
+ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_test_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME org.kde.pim.kaddressbook_checkgravatar)
add_akonadi_isolated_test_advanced( gravatarupdatejobtest.cpp "../job/gravatarupdatejob.cpp;${kaddressbook_checkgravatarplugin_test_SRCS}" "KF5::PimCommon;KF5::Contacts;KF5::Gravatar;KF5::I18n")
diff --git a/kaddressbook/plugins/checkgravatar/gravatar/tests/CMakeLists.txt b/kaddressbook/plugins/checkgravatar/gravatar/tests/CMakeLists.txt
index a522335..8aa8239 100644
--- a/kaddressbook/plugins/checkgravatar/gravatar/tests/CMakeLists.txt
+++ b/kaddressbook/plugins/checkgravatar/gravatar/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
set(kaddressbook_checkgravatarplugin_test_SRCS)
-ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_test_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME log_kaddressbook_checkgravatar)
+ecm_qt_declare_logging_category(kaddressbook_checkgravatarplugin_test_SRCS HEADER kaddressbook_checkgravatarplugin_debug.h IDENTIFIER KADDRESSBOOK_CHECKGRAVATAR_LOG CATEGORY_NAME org.kde.pim.kaddressbook_checkgravatar)
set(gravatarupdatedialog_gui_SRCS ${kaddressbook_checkgravatarplugin_test_SRCS} gravatarupdatedialog_gui.cpp ../widgets/gravatarupdatedialog.cpp ../widgets/gravatarupdatewidget.cpp ../job/gravatarupdatejob.cpp)
add_executable(gravatarupdatedialog_gui ${gravatarupdatedialog_gui_SRCS})
diff --git a/kaddressbook/plugins/mergelib/CMakeLists.txt b/kaddressbook/plugins/mergelib/CMakeLists.txt
index 71a5ac7..fdafa10 100644
--- a/kaddressbook/plugins/mergelib/CMakeLists.txt
+++ b/kaddressbook/plugins/mergelib/CMakeLists.txt
@@ -20,7 +20,7 @@ set(kaddressbookmergelibprivate_SRCS
widgets/mergecontactselectinformationscrollarea.cpp
widgets/mergecontacterrorlabel.cpp
)
-ecm_qt_declare_logging_category(kaddressbookmergelibprivate_SRCS HEADER kaddressbookmergelibprivate_debug.h IDENTIFIER KADDRESSBOOKMERGELIBPRIVATE_LOG CATEGORY_NAME log_kaddressbookmergelibprivate)
+ecm_qt_declare_logging_category(kaddressbookmergelibprivate_SRCS HEADER kaddressbookmergelibprivate_debug.h IDENTIFIER KADDRESSBOOKMERGELIBPRIVATE_LOG CATEGORY_NAME org.kde.pim.kaddressbookmergelibprivate)
add_library(kaddressbookmergelibprivate ${kaddressbookmergelibprivate_SRCS})
generate_export_header(kaddressbookmergelibprivate BASE_NAME kaddressbookmergelib)
diff --git a/kaddressbook/plugins/mergelib/autotests/CMakeLists.txt b/kaddressbook/plugins/mergelib/autotests/CMakeLists.txt
index ec75667..a30c1db 100644
--- a/kaddressbook/plugins/mergelib/autotests/CMakeLists.txt
+++ b/kaddressbook/plugins/mergelib/autotests/CMakeLists.txt
@@ -1,7 +1,7 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(kaddressbookmergelibprivate_common_SRCS)
-ecm_qt_declare_logging_category(kaddressbookmergelibprivate_common_SRCS HEADER kaddressbookmergelibprivate_debug.h IDENTIFIER KADDRESSBOOKMERGELIBPRIVATE_LOG CATEGORY_NAME log_kaddressbookmergelibprivate)
+ecm_qt_declare_logging_category(kaddressbookmergelibprivate_common_SRCS HEADER kaddressbookmergelibprivate_debug.h IDENTIFIER KADDRESSBOOKMERGELIBPRIVATE_LOG CATEGORY_NAME org.kde.pim.kaddressbookmergelibprivate)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../.. )
include_directories(${CMAKE_BINARY_DIR}/kaddressbook/)
diff --git a/kaddressbook/plugins/sendmail/CMakeLists.txt b/kaddressbook/plugins/sendmail/CMakeLists.txt
index 2b87d3e..73fd5b8 100644
--- a/kaddressbook/plugins/sendmail/CMakeLists.txt
+++ b/kaddressbook/plugins/sendmail/CMakeLists.txt
@@ -9,7 +9,7 @@ set(kaddressbook_sendmailplugin_SRCS
mailsenderjob.cpp
)
-ecm_qt_declare_logging_category(kaddressbook_sendmailplugin_SRCS HEADER kaddressbook_sendmailplugin_debug.h IDENTIFIER KADDRESSBOOK_SENDMAIL_LOG CATEGORY_NAME log_kaddressbook_sendmail)
+ecm_qt_declare_logging_category(kaddressbook_sendmailplugin_SRCS HEADER kaddressbook_sendmailplugin_debug.h IDENTIFIER KADDRESSBOOK_SENDMAIL_LOG CATEGORY_NAME org.kde.pim.kaddressbook_sendmail)
kcoreaddons_add_plugin(kaddressbook_sendmailplugin JSON kaddressbook_sendmailplugin.json SOURCES
${kaddressbook_sendmailplugin_SRCS} INSTALL_NAMESPACE kaddressbook)
diff --git a/kaddressbook/plugins/sendvcards/CMakeLists.txt b/kaddressbook/plugins/sendvcards/CMakeLists.txt
index a872f73..cc2074a 100644
--- a/kaddressbook/plugins/sendvcards/CMakeLists.txt
+++ b/kaddressbook/plugins/sendvcards/CMakeLists.txt
@@ -7,7 +7,7 @@ set(kaddressbook_sendvcardsplugin_SRCS
sendvcardsplugin.cpp
sendvcardsjob.cpp
)
-ecm_qt_declare_logging_category(kaddressbook_sendvcardsplugin_SRCS HEADER kaddressbook_sendvcardsplugin_debug.h IDENTIFIER KADDRESSBOOK_SENDVCARDS_LOG CATEGORY_NAME log_kaddressbook_sendvcards)
+ecm_qt_declare_logging_category(kaddressbook_sendvcardsplugin_SRCS HEADER kaddressbook_sendvcardsplugin_debug.h IDENTIFIER KADDRESSBOOK_SENDVCARDS_LOG CATEGORY_NAME org.kde.pim.kaddressbook_sendvcards)
kcoreaddons_add_plugin(kaddressbook_sendvcardsplugin JSON kaddressbook_sendvcardsplugin.json SOURCES
diff --git a/kdepim-addons.renamecategories b/kdepim-addons.renamecategories
new file mode 100644
index 0000000..a749d2c
--- /dev/null
+++ b/kdepim-addons.renamecategories
@@ -0,0 +1,22 @@
+# kdepim-addons
+log_createeventplugin org.kde.pim.createeventplugin
+log_createnoteplugin org.kde.pim.createnoteplugin
+log_createtodoplugin org.kde.pim.createtodoplugin
+log_isgdshorturlengineplugin org.kde.pim.isgdshorturlengineplugin
+log_ur1cashorturlengineplugin org.kde.pim.ur1cashorturlengineplugin
+log_korganizer_picoftheday_plugins org.kde.pim.korganizer_picoftheday_plugins
+log_kaddressbook_sendvcards org.kde.pim.kaddressbook_sendvcards
+log_kaddressbook_sendmail org.kde.pim.kaddressbook_sendmail
+log_kmail_zoomtexteditorplugin org.kde.pim.kmail_zoomtexteditorplugin
+log_kmail_changecaseeditorplugin org.kde.pim.kmail_changecaseeditorplugin
+log_adblockinterceptor org.kde.pim.adblockinterceptor
+log_donottrackinterceptor org.kde.pim.donottrackinterceptor
+log_expandurlplugin org.kde.pim.expandurlplugin
+log_externalscriptplugin org.kde.pim.externalscriptplugin
+log_text_calendar org.kde.pim.text_calendar
+log_ms_tnef org.kde.pim.ms_tnef
+log_vcard org.kde.pim.vcard
+log_pimeventsplugin org.kde.pim.pimeventsplugin
+log_kmail_confirmaddressplugin org.kde.pim.kmail_confirmaddressplugin
+log_kmail_checkbeforesend org.kde.pim.kmail_checkbeforesend
+log_kmail_automaticaddcontactsplugin org.kde.pim.kmail_automaticaddcontactsplugin
diff --git a/kmail/editorplugins/changecase/CMakeLists.txt b/kmail/editorplugins/changecase/CMakeLists.txt
index 27de71a..10afd2f 100644
--- a/kmail/editorplugins/changecase/CMakeLists.txt
+++ b/kmail/editorplugins/changecase/CMakeLists.txt
@@ -3,7 +3,7 @@ set(kmail_changecaseeditorplugin_SRCS
changecaseplugineditorinterface.cpp
)
-ecm_qt_declare_logging_category(kmail_changecaseeditorplugin_SRCS HEADER changecaseeditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_CHANGECASE_PLUGIN_LOG CATEGORY_NAME log_kmail_changecaseeditorplugin)
+ecm_qt_declare_logging_category(kmail_changecaseeditorplugin_SRCS HEADER changecaseeditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_CHANGECASE_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_changecaseeditorplugin)
kcoreaddons_add_plugin(kmail_changecaseeditorplugin JSON kmail_changecaseeditorplugin.json SOURCES
${kmail_changecaseeditorplugin_SRCS} INSTALL_NAMESPACE kmail)
diff --git a/kmail/editorplugins/changecase/autotests/CMakeLists.txt b/kmail/editorplugins/changecase/autotests/CMakeLists.txt
index bbe8f12..61c9209 100644
--- a/kmail/editorplugins/changecase/autotests/CMakeLists.txt
+++ b/kmail/editorplugins/changecase/autotests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(changecaseplugineditor_common_SRCS)
-ecm_qt_declare_logging_category(changecaseplugineditor_common_SRCS HEADER changecaseeditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_CHANGECASE_PLUGIN_LOG CATEGORY_NAME log_kmail_changecaseeditorplugin)
+ecm_qt_declare_logging_category(changecaseplugineditor_common_SRCS HEADER changecaseeditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_CHANGECASE_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_changecaseeditorplugin)
macro(add_kmail_editorplugin_unittest _source _additional)
set( _test ${_source} ${_additional} ${changecaseplugineditor_common_SRCS})
diff --git a/kmail/editorplugins/zoomtext/CMakeLists.txt b/kmail/editorplugins/zoomtext/CMakeLists.txt
index 83c7b34..6ae86f6 100644
--- a/kmail/editorplugins/zoomtext/CMakeLists.txt
+++ b/kmail/editorplugins/zoomtext/CMakeLists.txt
@@ -3,7 +3,7 @@ set(kmail_zoomtexteditorplugin_SRCS
zoomtextplugineditorinterface.cpp
)
-ecm_qt_declare_logging_category(kmail_zoomtexteditorplugin_SRCS HEADER zoomtexteditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_ZOOMTEXT_PLUGIN_LOG CATEGORY_NAME log_kmail_zoomtexteditorplugin)
+ecm_qt_declare_logging_category(kmail_zoomtexteditorplugin_SRCS HEADER zoomtexteditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_ZOOMTEXT_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_zoomtexteditorplugin)
kcoreaddons_add_plugin(kmail_zoomtexteditorplugin JSON kmail_zoomtexteditorplugin.json SOURCES
diff --git a/kmail/editorplugins/zoomtext/autotests/CMakeLists.txt b/kmail/editorplugins/zoomtext/autotests/CMakeLists.txt
index 94c4f4a..06c9c88 100644
--- a/kmail/editorplugins/zoomtext/autotests/CMakeLists.txt
+++ b/kmail/editorplugins/zoomtext/autotests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(zoomdebug_SRCS)
-ecm_qt_declare_logging_category(zoomdebug_SRCS HEADER zoomtexteditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_ZOOMTEXT_PLUGIN_LOG CATEGORY_NAME log_kmail_zoomtexteditorplugin)
+ecm_qt_declare_logging_category(zoomdebug_SRCS HEADER zoomtexteditorplugin_debug.h IDENTIFIER KMAIL_EDITOR_ZOOMTEXT_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_zoomtexteditorplugin)
macro(add_kmail_editorplugin_unittest _source _additional)
set( _test ${_source} ${_additional} ${zoomdebug_SRCS})
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/CMakeLists.txt b/kmail/editorsendcheckplugins/automaticaddcontacts/CMakeLists.txt
index 07d438f..ab81b37 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/CMakeLists.txt
@@ -7,7 +7,7 @@ set(kmail_automaticaddcontactseditorplugin_SRCS
automaticaddcontactsconfiguretab.cpp
)
-ecm_qt_declare_logging_category(kmail_automaticaddcontactseditorplugin_SRCS HEADER automaticaddcontactsplugin_debug.h IDENTIFIER KMAIL_EDITOR_AUTOMATICADDCONTACTS_PLUGIN_LOG CATEGORY_NAME log_kmail_automaticaddcontactsplugin)
+ecm_qt_declare_logging_category(kmail_automaticaddcontactseditorplugin_SRCS HEADER automaticaddcontactsplugin_debug.h IDENTIFIER KMAIL_EDITOR_AUTOMATICADDCONTACTS_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_automaticaddcontactsplugin)
kcoreaddons_add_plugin(kmail_automaticaddcontactseditorplugin JSON kmail_automaticaddcontactsplugin.json SOURCES
${kmail_automaticaddcontactseditorplugin_SRCS} INSTALL_NAMESPACE kmail)
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/CMakeLists.txt b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/CMakeLists.txt
index 15dbe9f..cdcd6ce 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/autotests/CMakeLists.txt
@@ -1,7 +1,7 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(automaticaddcontacts_common_SRCS)
-ecm_qt_declare_logging_category(automaticaddcontacts_common_SRCS HEADER automaticaddcontactsplugin_debug.h IDENTIFIER KMAIL_EDITOR_AUTOMATICADDCONTACTS_PLUGIN_LOG CATEGORY_NAME log_kmail_automaticaddcontactsplugin)
+ecm_qt_declare_logging_category(automaticaddcontacts_common_SRCS HEADER automaticaddcontactsplugin_debug.h IDENTIFIER KMAIL_EDITOR_AUTOMATICADDCONTACTS_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_automaticaddcontactsplugin)
macro(add_kmail_automaticaddscontacts_unittest _source _additional)
set( _test ${_source} ${_additional} ${automaticaddcontacts_common_SRCS})
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt b/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt
index b5723e8..eca1b0d 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/checkbeforesend/CMakeLists.txt
@@ -8,7 +8,7 @@ set(kmail_checkbeforesendeditorplugin_SRCS
sendattachments/checkattachmentjob.cpp
)
-ecm_qt_declare_logging_category(kmail_checkbeforesendeditorplugin_SRCS HEADER checkbeforesendplugin_debug.h IDENTIFIER KMAIL_EDITOR_checkbeforesend_PLUGIN_LOG CATEGORY_NAME log_kmail_checkbeforesendplugin)
+ecm_qt_declare_logging_category(kmail_checkbeforesendeditorplugin_SRCS HEADER checkbeforesendplugin_debug.h IDENTIFIER KMAIL_EDITOR_checkbeforesend_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_checkbeforesendplugin)
kcoreaddons_add_plugin(kmail_checkbeforesendeditorplugin JSON kmail_checkbeforesendplugin.json SOURCES
${kmail_checkbeforesendeditorplugin_SRCS} INSTALL_NAMESPACE kmail)
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt b/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt
index bc9cb5e..0bca109 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/checkbeforesend/autotests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(checkbeforesend_common_SRCS)
-ecm_qt_declare_logging_category(checkbeforesend_common_SRCS HEADER checkbeforesend_debug.h IDENTIFIER KMAIL_EDITOR_CHECKBEFORESEND_PLUGIN_LOG CATEGORY_NAME log_kmail_checkbeforesend)
+ecm_qt_declare_logging_category(checkbeforesend_common_SRCS HEADER checkbeforesend_debug.h IDENTIFIER KMAIL_EDITOR_CHECKBEFORESEND_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_checkbeforesend)
macro(add_kmail_checkbeforesend_unittest _source _additional)
set( _test ${_source} ${_additional} ${checkbeforesend_common_SRCS})
diff --git a/kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt b/kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt
index d00683c..3ac2692 100644
--- a/kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/confirm-address/CMakeLists.txt
@@ -9,7 +9,7 @@ set(kmail_confirmaddresseditorplugin_SRCS
confirmaddresscheckjob.cpp
)
-ecm_qt_declare_logging_category(kmail_confirmaddresseditorplugin_SRCS HEADER confirmaddressplugin_debug.h IDENTIFIER KMAIL_EDITOR_CONFIRMADDRESS_PLUGIN_LOG CATEGORY_NAME log_kmail_confirmaddressplugin)
+ecm_qt_declare_logging_category(kmail_confirmaddresseditorplugin_SRCS HEADER confirmaddressplugin_debug.h IDENTIFIER KMAIL_EDITOR_CONFIRMADDRESS_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_confirmaddressplugin)
kcoreaddons_add_plugin(kmail_confirmaddresseditorplugin JSON kmail_confirmaddressplugin.json SOURCES
${kmail_confirmaddresseditorplugin_SRCS} INSTALL_NAMESPACE kmail)
diff --git a/kmail/editorsendcheckplugins/confirm-address/autotests/CMakeLists.txt b/kmail/editorsendcheckplugins/confirm-address/autotests/CMakeLists.txt
index 47bd541..de066c1 100644
--- a/kmail/editorsendcheckplugins/confirm-address/autotests/CMakeLists.txt
+++ b/kmail/editorsendcheckplugins/confirm-address/autotests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(confirmaddressplugin_common_SRCS)
-ecm_qt_declare_logging_category(confirmaddressplugin_common_SRCS HEADER confirmaddressplugin_debug.h IDENTIFIER KMAIL_EDITOR_CONFIRMADDRESS_PLUGIN_LOG CATEGORY_NAME log_kmail_confirmaddressplugin)
+ecm_qt_declare_logging_category(confirmaddressplugin_common_SRCS HEADER confirmaddressplugin_debug.h IDENTIFIER KMAIL_EDITOR_CONFIRMADDRESS_PLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_confirmaddressplugin)
macro(add_kmail_confirmaddress_unittest _source _additional)
set( _test ${_source} ${_additional} ${confirmaddressplugin_common_SRCS})
diff --git a/korganizer/plugins/hebrew/CMakeLists.txt b/korganizer/plugins/hebrew/CMakeLists.txt
index 98b2f73..0ccd1d3 100644
--- a/korganizer/plugins/hebrew/CMakeLists.txt
+++ b/korganizer/plugins/hebrew/CMakeLists.txt
@@ -9,7 +9,7 @@ set(korg_hebrew_PART_SRCS
parsha.cpp
)
-ecm_qt_declare_logging_category(korg_hebrew_PART_SRCS HEADER korganizer_hebrew_debug.h IDENTIFIER KORGANIZER_HEBREWPLUGIN_LOG CATEGORY_NAME log_korganizer_hebrew_plugin)
+ecm_qt_declare_logging_category(korg_hebrew_PART_SRCS HEADER korganizer_hebrew_debug.h IDENTIFIER KORGANIZER_HEBREWPLUGIN_LOG CATEGORY_NAME org.kde.pim.korganizer_hebrew_plugin)
add_library(korg_hebrew MODULE ${korg_hebrew_PART_SRCS})
target_link_libraries(korg_hebrew
diff --git a/korganizer/plugins/picoftheday/CMakeLists.txt b/korganizer/plugins/picoftheday/CMakeLists.txt
index 0499a69..c560b50 100644
--- a/korganizer/plugins/picoftheday/CMakeLists.txt
+++ b/korganizer/plugins/picoftheday/CMakeLists.txt
@@ -5,7 +5,7 @@ set(korg_picoftheday_PART_SRCS
picoftheday.cpp
)
-ecm_qt_declare_logging_category(korg_picoftheday_PART_SRCS HEADER korganizer_picoftheday_plugin_debug.h IDENTIFIER KORGANIZERPICOFTHEDAYPLUGIN_LOG CATEGORY_NAME log_korganizer_picoftheday_plugins)
+ecm_qt_declare_logging_category(korg_picoftheday_PART_SRCS HEADER korganizer_picoftheday_plugin_debug.h IDENTIFIER KORGANIZERPICOFTHEDAYPLUGIN_LOG CATEGORY_NAME org.kde.pim.korganizer_picoftheday_plugins)
add_library(korg_picoftheday MODULE ${korg_picoftheday_PART_SRCS})
diff --git a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/isgdshorturlengineplugin/CMakeLists.txt b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/isgdshorturlengineplugin/CMakeLists.txt
index 9a7d82a..4b5514a 100644
--- a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/isgdshorturlengineplugin/CMakeLists.txt
+++ b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/isgdshorturlengineplugin/CMakeLists.txt
@@ -2,7 +2,7 @@ set(pimcommon_isgdshorturlengineplugin_SRCS
isgdshorturlengineplugin.cpp
isgdshorturlengineinterface.cpp
)
-ecm_qt_declare_logging_category(pimcommon_isgdshorturlengineplugin_SRCS HEADER isgdshorturlengineplugin_debug.h IDENTIFIER ISGDSHORTURLENGINEPLUGIN_LOG CATEGORY_NAME log_isgdshorturlengineplugin)
+ecm_qt_declare_logging_category(pimcommon_isgdshorturlengineplugin_SRCS HEADER isgdshorturlengineplugin_debug.h IDENTIFIER ISGDSHORTURLENGINEPLUGIN_LOG CATEGORY_NAME org.kde.pim.isgdshorturlengineplugin)
kcoreaddons_add_plugin(pimcommon_isgdshorturlengineplugin JSON pimcommon_isgdshorturlengineplugin.json SOURCES
${pimcommon_isgdshorturlengineplugin_SRCS} INSTALL_NAMESPACE pimcommon)
diff --git a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/ur1cashorturlengineplugin/CMakeLists.txt b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/ur1cashorturlengineplugin/CMakeLists.txt
index c96f3cd..40cd744 100644
--- a/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/ur1cashorturlengineplugin/CMakeLists.txt
+++ b/plugins/customtoolsplugins/shorturlplugin/shorturl/shorturlengineplugin/ur1cashorturlengineplugin/CMakeLists.txt
@@ -3,7 +3,7 @@ set(pimcommon_ur1cashorturlengineplugin_SRCS
ur1cashorturlengineinterface.cpp
)
ecm_qt_declare_logging_category(pimcommon_ur1cashorturlengineplugin_SRCS HEADER ur1cashorturlengineplugin_debug.h
- IDENTIFIER UR1CASHORTURLENGINEPLUGIN_LOG CATEGORY_NAME log_ur1cashorturlengineplugin)
+ IDENTIFIER UR1CASHORTURLENGINEPLUGIN_LOG CATEGORY_NAME org.kde.pim.ur1cashorturlengineplugin)
kcoreaddons_add_plugin(pimcommon_ur1cashorturlengineplugin JSON pimcommon_ur1cashorturlengineplugin.json SOURCES
${pimcommon_ur1cashorturlengineplugin_SRCS} INSTALL_NAMESPACE pimcommon)
diff --git a/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt
index cccf6e7..aeb75f3 100644
--- a/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt
+++ b/plugins/messageviewer/bodypartformatter/calendar/CMakeLists.txt
@@ -5,7 +5,7 @@ set(messageviewer_bodypartformatter_text_calendar_PART_SRCS
text_calendar.cpp delegateselector.cpp attendeeselector.cpp memorycalendarmemento.cpp syncitiphandler.cpp
reactiontoinvitationdialog.cpp)
-ecm_qt_declare_logging_category(messageviewer_bodypartformatter_text_calendar_PART_SRCS HEADER text_calendar_debug.h IDENTIFIER TEXT_CALENDAR_LOG CATEGORY_NAME log_text_calendar)
+ecm_qt_declare_logging_category(messageviewer_bodypartformatter_text_calendar_PART_SRCS HEADER text_calendar_debug.h IDENTIFIER TEXT_CALENDAR_LOG CATEGORY_NAME org.kde.pim.text_calendar)
qt5_add_dbus_interfaces(messageviewer_bodypartformatter_text_calendar_PART_SRCS
korganizer/org.kde.Korganizer.Calendar.xml
diff --git a/plugins/messageviewer/bodypartformatter/ms-tnef/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/ms-tnef/CMakeLists.txt
index c3c9c59..8e3a079 100644
--- a/plugins/messageviewer/bodypartformatter/ms-tnef/CMakeLists.txt
+++ b/plugins/messageviewer/bodypartformatter/ms-tnef/CMakeLists.txt
@@ -2,7 +2,7 @@
add_definitions(-DTRANSLATION_DOMAIN=\"messageviewer_application_mstnef_plugin\")
set(messageviewer_bodypartformatter_application_mstnef_SRCS application_ms-tnef.cpp)
-ecm_qt_declare_logging_category(messageviewer_bodypartformatter_application_mstnef_SRCS HEADER ms_tnef_debug.h IDENTIFIER MS_TNEF_LOG CATEGORY_NAME log_ms_tnef)
+ecm_qt_declare_logging_category(messageviewer_bodypartformatter_application_mstnef_SRCS HEADER ms_tnef_debug.h IDENTIFIER MS_TNEF_LOG CATEGORY_NAME org.kde.pim.ms_tnef)
add_library(messageviewer_bodypartformatter_application_mstnef MODULE ${messageviewer_bodypartformatter_application_mstnef_SRCS})
diff --git a/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt
index a5be9be..36c79d5 100644
--- a/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt
+++ b/plugins/messageviewer/bodypartformatter/vcard/CMakeLists.txt
@@ -2,7 +2,7 @@
add_definitions(-DTRANSLATION_DOMAIN=\"messageviewer_text_vcard_plugin\")
set(messageviewer_bodypartformatter_text_vcard_PART_SRCS text_vcard.cpp vcardmemento.cpp updatecontactjob.cpp)
-ecm_qt_declare_logging_category(messageviewer_bodypartformatter_text_vcard_PART_SRCS HEADER vcard_debug.h IDENTIFIER VCARD_LOG CATEGORY_NAME log_vcard)
+ecm_qt_declare_logging_category(messageviewer_bodypartformatter_text_vcard_PART_SRCS HEADER vcard_debug.h IDENTIFIER VCARD_LOG CATEGORY_NAME org.kde.pim.vcard)
add_library(messageviewer_bodypartformatter_text_vcard MODULE ${messageviewer_bodypartformatter_text_vcard_PART_SRCS})
target_link_libraries(messageviewer_bodypartformatter_text_vcard KF5::Contacts KF5::Libkdepim KF5::MessageViewer KF5::IconThemes KF5::JobWidgets KF5::I18n)
diff --git a/plugins/messageviewerplugins/autotests/CMakeLists.txt b/plugins/messageviewerplugins/autotests/CMakeLists.txt
index 14e3f38..950b851 100644
--- a/plugins/messageviewerplugins/autotests/CMakeLists.txt
+++ b/plugins/messageviewerplugins/autotests/CMakeLists.txt
@@ -1,9 +1,9 @@
add_definitions (-DTEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/externaldatas")
set(common_SRCS)
-ecm_qt_declare_logging_category(common_SRCS HEADER createeventplugin_debug.h IDENTIFIER CREATEEVENTPLUGIN_LOG CATEGORY_NAME log_createeventplugin)
-ecm_qt_declare_logging_category(common_SRCS HEADER createnoteplugin_debug.h IDENTIFIER CREATENOTEPLUGIN_LOG CATEGORY_NAME log_createnoteplugin)
-ecm_qt_declare_logging_category(common_SRCS HEADER createtodoplugin_debug.h IDENTIFIER CREATETODOPLUGIN_LOG CATEGORY_NAME log_createtodoplugin)
-ecm_qt_declare_logging_category(common_SRCS HEADER externalscriptplugin_debug.h IDENTIFIER EXTERNALSCRIPTPLUGIN_LOG CATEGORY_NAME log_externalscriptplugin)
+ecm_qt_declare_logging_category(common_SRCS HEADER createeventplugin_debug.h IDENTIFIER CREATEEVENTPLUGIN_LOG CATEGORY_NAME org.kde.pim.createeventplugin)
+ecm_qt_declare_logging_category(common_SRCS HEADER createnoteplugin_debug.h IDENTIFIER CREATENOTEPLUGIN_LOG CATEGORY_NAME org.kde.pim.createnoteplugin)
+ecm_qt_declare_logging_category(common_SRCS HEADER createtodoplugin_debug.h IDENTIFIER CREATETODOPLUGIN_LOG CATEGORY_NAME org.kde.pim.createtodoplugin)
+ecm_qt_declare_logging_category(common_SRCS HEADER externalscriptplugin_debug.h IDENTIFIER EXTERNALSCRIPTPLUGIN_LOG CATEGORY_NAME org.kde.pim.externalscriptplugin)
macro(add_messageviewer_viewerplugin_unittest _source _additional _jsonfile)
set( _test ${_source} ${_additional} ${common_SRCS})
diff --git a/plugins/messageviewerplugins/common/expandurlplugin/CMakeLists.txt b/plugins/messageviewerplugins/common/expandurlplugin/CMakeLists.txt
index bf01e3c..5c20fdf 100644
--- a/plugins/messageviewerplugins/common/expandurlplugin/CMakeLists.txt
+++ b/plugins/messageviewerplugins/common/expandurlplugin/CMakeLists.txt
@@ -3,7 +3,7 @@ set(messageviewer_expandurlplugin_SRCS
viewerpluginexpandurlinterface.cpp
)
-ecm_qt_declare_logging_category(messageviewer_expandurlplugin_SRCS HEADER expandurlplugin_debug.h IDENTIFIER EXPANDURLPLUGIN_LOG CATEGORY_NAME log_expandurlplugin)
+ecm_qt_declare_logging_category(messageviewer_expandurlplugin_SRCS HEADER expandurlplugin_debug.h IDENTIFIER EXPANDURLPLUGIN_LOG CATEGORY_NAME org.kde.pim.expandurlplugin)
kcoreaddons_add_plugin(messageviewer_expandurlplugin JSON messageviewer_expandurlplugin.json SOURCES
${messageviewer_expandurlplugin_SRCS} INSTALL_NAMESPACE messageviewer)
diff --git a/plugins/messageviewerplugins/createeventplugin/CMakeLists.txt b/plugins/messageviewerplugins/createeventplugin/CMakeLists.txt
index 3759988..9f60625 100644
--- a/plugins/messageviewerplugins/createeventplugin/CMakeLists.txt
+++ b/plugins/messageviewerplugins/createeventplugin/CMakeLists.txt
@@ -6,7 +6,7 @@ set(messageviewer_createeventplugin_SRCS
createeventjob.cpp
)
-ecm_qt_declare_logging_category(messageviewer_createeventplugin_SRCS HEADER createeventplugin_debug.h IDENTIFIER CREATEEVENTPLUGIN_LOG CATEGORY_NAME log_createeventplugin)
+ecm_qt_declare_logging_category(messageviewer_createeventplugin_SRCS HEADER createeventplugin_debug.h IDENTIFIER CREATEEVENTPLUGIN_LOG CATEGORY_NAME org.kde.pim.createeventplugin)
kcoreaddons_add_plugin(messageviewer_createeventplugin JSON messageviewer_createeventplugin.json SOURCES
${messageviewer_createeventplugin_SRCS} INSTALL_NAMESPACE messageviewer)
diff --git a/plugins/messageviewerplugins/createnoteplugin/CMakeLists.txt b/plugins/messageviewerplugins/createnoteplugin/CMakeLists.txt
index f591544..f7dd7e0 100644
--- a/plugins/messageviewerplugins/createnoteplugin/CMakeLists.txt
+++ b/plugins/messageviewerplugins/createnoteplugin/CMakeLists.txt
@@ -4,7 +4,7 @@ set(messageviewer_createnoteplugin_SRCS
noteedit.cpp
createnotejob.cpp
)
-ecm_qt_declare_logging_category(messageviewer_createnoteplugin_SRCS HEADER createnoteplugin_debug.h IDENTIFIER CREATENOTEPLUGIN_LOG CATEGORY_NAME log_createnoteplugin)
+ecm_qt_declare_logging_category(messageviewer_createnoteplugin_SRCS HEADER createnoteplugin_debug.h IDENTIFIER CREATENOTEPLUGIN_LOG CATEGORY_NAME org.kde.pim.createnoteplugin)
kcoreaddons_add_plugin(messageviewer_createnoteplugin JSON messageviewer_createnoteplugin.json SOURCES
${messageviewer_createnoteplugin_SRCS} INSTALL_NAMESPACE messageviewer)
diff --git a/plugins/messageviewerplugins/createtodoplugin/CMakeLists.txt b/plugins/messageviewerplugins/createtodoplugin/CMakeLists.txt
index f992385..58b485c 100644
--- a/plugins/messageviewerplugins/createtodoplugin/CMakeLists.txt
+++ b/plugins/messageviewerplugins/createtodoplugin/CMakeLists.txt
@@ -4,7 +4,7 @@ set(messageviewer_createtodoplugin_SRCS
todoedit.cpp
createtodojob.cpp
)
-ecm_qt_declare_logging_category(messageviewer_createtodoplugin_SRCS HEADER createtodoplugin_debug.h IDENTIFIER CREATETODOPLUGIN_LOG CATEGORY_NAME log_createtodoplugin)
+ecm_qt_declare_logging_category(messageviewer_createtodoplugin_SRCS HEADER createtodoplugin_debug.h IDENTIFIER CREATETODOPLUGIN_LOG CATEGORY_NAME org.kde.pim.createtodoplugin)
kcoreaddons_add_plugin(messageviewer_createtodoplugin JSON messageviewer_createtodoplugin.json SOURCES
${messageviewer_createtodoplugin_SRCS} INSTALL_NAMESPACE messageviewer)
diff --git a/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt b/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt
index b4ee3a2..02e4fb5 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt
+++ b/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt
@@ -7,7 +7,7 @@ set(messageviewer_externalscriptplugin_SRCS
viewerpluginexternalscriptparseargument.cpp
)
-ecm_qt_declare_logging_category(messageviewer_externalscriptplugin_SRCS HEADER externalscriptplugin_debug.h IDENTIFIER EXTERNALSCRIPTPLUGIN_LOG CATEGORY_NAME log_externalscriptplugin)
+ecm_qt_declare_logging_category(messageviewer_externalscriptplugin_SRCS HEADER externalscriptplugin_debug.h IDENTIFIER EXTERNALSCRIPTPLUGIN_LOG CATEGORY_NAME org.kde.pim.externalscriptplugin)
kcoreaddons_add_plugin(messageviewer_externalscriptplugin JSON messageviewer_externalscriptplugin.json SOURCES ${messageviewer_externalscriptplugin_SRCS} INSTALL_NAMESPACE messageviewer)
target_link_libraries(messageviewer_externalscriptplugin
diff --git a/plugins/plasma/pimeventsplugin/CMakeLists.txt b/plugins/plasma/pimeventsplugin/CMakeLists.txt
index 2c6829c..da8cc60 100644
--- a/plugins/plasma/pimeventsplugin/CMakeLists.txt
+++ b/plugins/plasma/pimeventsplugin/CMakeLists.txt
@@ -12,7 +12,7 @@ set(pimeventsplugin_SRCS
ecm_qt_declare_logging_category(loggingcategory_SRCS
HEADER pimeventsplugin_debug.h
IDENTIFIER PIMEVENTSPLUGIN_LOG
- CATEGORY_NAME log_pimeventsplugin
+ CATEGORY_NAME org.kde.pim.pimeventsplugin
)
set(pimeventsplugins_full_SRCS ${pimeventsplugin_SRCS} ${loggingcategory_SRCS})
diff --git a/plugins/webengineurlinterceptor/adblock/CMakeLists.txt b/plugins/webengineurlinterceptor/adblock/CMakeLists.txt
index 18c6b03..66685f1 100644
--- a/plugins/webengineurlinterceptor/adblock/CMakeLists.txt
+++ b/plugins/webengineurlinterceptor/adblock/CMakeLists.txt
@@ -3,7 +3,7 @@ set(webengineviewer_webengineurlinterceptor_adblock_SRCS
adblockpluginurlinterceptor.cpp
)
-ecm_qt_declare_logging_category(webengineviewer_webengineurlinterceptor_adblock_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME log_adblockinterceptor)
+ecm_qt_declare_logging_category(webengineviewer_webengineurlinterceptor_adblock_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME org.kde.pim.adblockinterceptor)
kcoreaddons_add_plugin(webengineviewer_adblockplugin JSON messageviewer_adblockurlinterceptor.json SOURCES
diff --git a/plugins/webengineurlinterceptor/adblock/autotests/CMakeLists.txt b/plugins/webengineurlinterceptor/adblock/autotests/CMakeLists.txt
index 5192382..1741590 100644
--- a/plugins/webengineurlinterceptor/adblock/autotests/CMakeLists.txt
+++ b/plugins/webengineurlinterceptor/adblock/autotests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(messageviewer_adblock_test_common_SRCS)
-ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME log_adblockinterceptor)
+ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME org.kde.pim.adblockinterceptor)
ecm_add_test(adblockmanagertest.cpp ${messageviewer_adblock_test_common_SRCS}
TEST_NAME adblockmanagertest
diff --git a/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt b/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt
index 5b2e284..64c15af 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt
+++ b/plugins/webengineurlinterceptor/adblock/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
set(messageviewer_adblock_lib_common_SRCS)
-ecm_qt_declare_logging_category(messageviewer_adblock_lib_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME log_adblockinterceptor)
+ecm_qt_declare_logging_category(messageviewer_adblock_lib_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME org.kde.pim.adblockinterceptor)
set(adblocklibprivate_widget_SRCS
widgets/adblockblockableitemsdialog.cpp
diff --git a/plugins/webengineurlinterceptor/adblock/lib/autotests/CMakeLists.txt b/plugins/webengineurlinterceptor/adblock/lib/autotests/CMakeLists.txt
index 1cb4b9c..fc98c74 100644
--- a/plugins/webengineurlinterceptor/adblock/lib/autotests/CMakeLists.txt
+++ b/plugins/webengineurlinterceptor/adblock/lib/autotests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(messageviewer_adblock_test_common_SRCS)
-ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME log_adblockinterceptor)
+ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME org.kde.pim.adblockinterceptor)
set( adblockpluginurlinterceptorconfigurewidgettest_SRCS ${messageviewer_adblock_test_common_SRCS} adblockpluginurlinterceptorconfigurewidgettest.cpp ../widgets/adblockpluginurlinterceptorconfigurewidget.cpp)
diff --git a/plugins/webengineurlinterceptor/adblock/tests/CMakeLists.txt b/plugins/webengineurlinterceptor/adblock/tests/CMakeLists.txt
index 5d6bcfa..3c2938b 100644
--- a/plugins/webengineurlinterceptor/adblock/tests/CMakeLists.txt
+++ b/plugins/webengineurlinterceptor/adblock/tests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(messageviewer_adblock_test_common_SRCS)
-ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME log_adblockinterceptor)
+ecm_qt_declare_logging_category(messageviewer_adblock_test_common_SRCS HEADER adblockinterceptor_debug.h IDENTIFIER ADBLOCKINTERCEPTOR_LOG CATEGORY_NAME org.kde.pim.adblockinterceptor)
set(adblockblockableelementgui_SRCS adblockblockableelementgui.cpp ${messageviewer_adblock_test_common_SRCS})
add_executable(adblockblockableelementgui ${adblockblockableelementgui_SRCS})
diff --git a/plugins/webengineurlinterceptor/donottrack/CMakeLists.txt b/plugins/webengineurlinterceptor/donottrack/CMakeLists.txt
index 5031b98..2d32175 100644
--- a/plugins/webengineurlinterceptor/donottrack/CMakeLists.txt
+++ b/plugins/webengineurlinterceptor/donottrack/CMakeLists.txt
@@ -3,7 +3,7 @@ set(webengineviewer_webengineurlinterceptor_donottrack_SRCS
donottrackpluginurlinterceptor.cpp
)
-ecm_qt_declare_logging_category(webengineviewer_webengineurlinterceptor_donottrack_SRCS HEADER donottrackinterceptor_debug.h IDENTIFIER DONOTTRACKINTERCEPTOR_LOG CATEGORY_NAME log_donottrackinterceptor)
+ecm_qt_declare_logging_category(webengineviewer_webengineurlinterceptor_donottrack_SRCS HEADER donottrackinterceptor_debug.h IDENTIFIER DONOTTRACKINTERCEPTOR_LOG CATEGORY_NAME org.kde.pim.donottrackinterceptor)
kconfig_add_kcfg_files(webengineviewer_webengineurlinterceptor_donottrack_SRCS
settings/donottracksettings.kcfgc