summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-20 05:32:31 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-20 05:32:31 (GMT)
commit81240c41470a7457dae10b7c274443f3e142b288 (patch)
treec35f2a0228c711be64833a84f38b453dd02b3fe3
parent3f2ace681ed08f326541556b4e163b2061237af8 (diff)
Rename categories
-rw-r--r--CMakeLists.txt2
-rw-r--r--kioslave/src/smtp/CMakeLists.txt2
-rw-r--r--kioslave/src/smtp/tests/CMakeLists.txt6
-rw-r--r--kmailtransport.categories4
-rw-r--r--kmailtransport.renamecategories3
5 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 953f98a..6fd60ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,6 +87,6 @@ if(BUILD_TESTING)
add_subdirectory(autotests)
endif()
-install( FILES kmailtransport.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+install( FILES kmailtransport.renamecategories kmailtransport.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/kioslave/src/smtp/CMakeLists.txt b/kioslave/src/smtp/CMakeLists.txt
index 3f809a2..ec7c354 100644
--- a/kioslave/src/smtp/CMakeLists.txt
+++ b/kioslave/src/smtp/CMakeLists.txt
@@ -28,7 +28,7 @@ set(kio_smtp_PART_SRCS
kioslavesession.cpp
)
-ecm_qt_declare_logging_category(kio_smtp_PART_SRCS HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME log_smtp)
+ecm_qt_declare_logging_category(kio_smtp_PART_SRCS HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME org.kde.pim.smtp)
add_library(kio_smtp MODULE ${kio_smtp_PART_SRCS})
diff --git a/kioslave/src/smtp/tests/CMakeLists.txt b/kioslave/src/smtp/tests/CMakeLists.txt
index 24e6046..1289095 100644
--- a/kioslave/src/smtp/tests/CMakeLists.txt
+++ b/kioslave/src/smtp/tests/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(test_responseparser Qt5::Test KF5::I18n KF5::KIOCore)
########### next target ###############
set(test_headergeneration_SRCS test_headergeneration.cpp)
-ecm_qt_declare_logging_category(test_headergeneration_SRCS HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME log_smtp)
+ecm_qt_declare_logging_category(test_headergeneration_SRCS HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME org.kde.pim.smtp)
add_executable( test_headergeneration ${test_headergeneration_SRCS} )
add_test( test_headergeneration test_headergeneration )
@@ -28,7 +28,7 @@ target_link_libraries(test_headergeneration Qt5::Test )
########### next target ###############
set(test_commands_SRCS test_commands.cpp )
-ecm_qt_declare_logging_category(test_commands_SRCS HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME log_smtp)
+ecm_qt_declare_logging_category(test_commands_SRCS HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME org.kde.pim.smtp)
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../ ${Sasl2_INCLUDE_DIRS} )
@@ -58,7 +58,7 @@ target_link_libraries(test_capabilities KF5::KIOCore)
########### next target ###############
set( test_request_source requesttest.cpp ../request.cpp )
-ecm_qt_declare_logging_category(test_request_source HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME log_smtp)
+ecm_qt_declare_logging_category(test_request_source HEADER smtp_debug.h IDENTIFIER SMTP_LOG CATEGORY_NAME org.kde.pim.smtp)
add_executable( requesttest ${test_request_source})
add_test(requesttest requesttest)
diff --git a/kmailtransport.categories b/kmailtransport.categories
index 029e708..25c0694 100644
--- a/kmailtransport.categories
+++ b/kmailtransport.categories
@@ -1,3 +1,3 @@
-log_smtp kioslave (smtp)
-log_mailtransport kmailtransport (kmailtransport)
+org.kde.pim.smtp kioslave (smtp)
+org.kde.pim.mailtransport kmailtransport (kmailtransport)
diff --git a/kmailtransport.renamecategories b/kmailtransport.renamecategories
new file mode 100644
index 0000000..f200ca8
--- /dev/null
+++ b/kmailtransport.renamecategories
@@ -0,0 +1,3 @@
+log_smtp org.kde.pim.smtp
+log_mailtransport org.kde.pim.mailtransport
+