summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-20 05:02:36 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-20 05:02:36 (GMT)
commit8641f14c8bd5612c434fd1c7a49cd4b1efe81c8b (patch)
tree521cdcd60f65cd9b47c8c5c73f4569c36926d579
parenta55aad3fd2aefeed0b09be66c29064fa35e5c5a5 (diff)
Rename categories
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagecomposer/src/CMakeLists.txt2
-rw-r--r--messagecore/src/CMakeLists.txt2
-rw-r--r--messagelib.categories12
-rw-r--r--messagelib.renamecategories7
-rw-r--r--messagelist/src/CMakeLists.txt2
-rw-r--r--messageviewer/src/CMakeLists.txt2
-rw-r--r--mimetreeparser/src/CMakeLists.txt2
-rw-r--r--templateparser/src/CMakeLists.txt2
-rw-r--r--webengineviewer/src/CMakeLists.txt2
-rw-r--r--webengineviewer/src/autotests/CMakeLists.txt2
11 files changed, 22 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f5b4d5..005e63a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -123,5 +123,5 @@ add_subdirectory(messagecore)
add_subdirectory(messagelist)
add_subdirectory(webengineviewer)
-install( FILES messagelib.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
+install( FILES messagelib.renamecategories messagelib.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/messagecomposer/src/CMakeLists.txt b/messagecomposer/src/CMakeLists.txt
index 328204d..7811fa9 100644
--- a/messagecomposer/src/CMakeLists.txt
+++ b/messagecomposer/src/CMakeLists.txt
@@ -124,7 +124,7 @@ set( messagecomposer_src
ki18n_wrap_ui(messagecomposer_src
imagescaling/ui/imagescalingwidget.ui
)
-ecm_qt_declare_logging_category(messagecomposer_src HEADER messagecomposer_debug.h IDENTIFIER MESSAGECOMPOSER_LOG CATEGORY_NAME log_messagecomposer)
+ecm_qt_declare_logging_category(messagecomposer_src HEADER messagecomposer_debug.h IDENTIFIER MESSAGECOMPOSER_LOG CATEGORY_NAME org.kde.pim.messagecomposer)
if(KDEPIM_ENTERPRISE_BUILD)
diff --git a/messagecore/src/CMakeLists.txt b/messagecore/src/CMakeLists.txt
index ecf1cf4..51bfc33 100644
--- a/messagecore/src/CMakeLists.txt
+++ b/messagecore/src/CMakeLists.txt
@@ -47,7 +47,7 @@ ki18n_wrap_ui(messagecore_LIB_SRCS
attachment/ui/attachmentpropertiesdialog_readonly.ui
)
-ecm_qt_declare_logging_category(messagecore_LIB_SRCS HEADER messagecore_debug.h IDENTIFIER MESSAGECORE_LOG CATEGORY_NAME log_messagecore)
+ecm_qt_declare_logging_category(messagecore_LIB_SRCS HEADER messagecore_debug.h IDENTIFIER MESSAGECORE_LOG CATEGORY_NAME org.kde.pim.messagecore)
add_library(KF5MessageCore ${messagecore_LIB_SRCS})
generate_export_header(KF5MessageCore BASE_NAME messagecore)
diff --git a/messagelib.categories b/messagelib.categories
index 533e49a..ae573d7 100644
--- a/messagelib.categories
+++ b/messagelib.categories
@@ -1,7 +1,7 @@
# messagelib
-log_messagecomposer messagelib (messagecomposer)
-log_messagecore messagelib (messagecore)
-log_messagelist messagelib (messagelist)
-log_messageviewer messagelib (messageviewer)
-log_templateparser messagelib (templateparser)
-log_mimetreeparser messagelib (mimetreeparser)
+org.kde.pim.messagecomposer messagelib (messagecomposer)
+org.kde.pim.messagecore messagelib (messagecore)
+org.kde.pim.messagelist messagelib (messagelist)
+org.kde.pim.messageviewer messagelib (messageviewer)
+org.kde.pim.templateparser messagelib (templateparser)
+org.kde.pim.mimetreeparser messagelib (mimetreeparser)
diff --git a/messagelib.renamecategories b/messagelib.renamecategories
new file mode 100644
index 0000000..51129c3
--- /dev/null
+++ b/messagelib.renamecategories
@@ -0,0 +1,7 @@
+# messagelib
+log_messagecomposer org.kde.pim.messagecomposer
+log_messagecore org.kde.pim.messagecore
+log_messagelist org.kde.pim.messagelist
+log_messageviewer org.kde.pim.messageviewer
+log_templateparser org.kde.pim.templateparser
+log_mimetreeparser org.kde.pim.mimetreeparser
diff --git a/messagelist/src/CMakeLists.txt b/messagelist/src/CMakeLists.txt
index bccf6c5..177c519 100644
--- a/messagelist/src/CMakeLists.txt
+++ b/messagelist/src/CMakeLists.txt
@@ -49,7 +49,7 @@ set(libmessagelist_SRCS
widget.cpp
messagelistutil.cpp
)
-ecm_qt_declare_logging_category(libmessagelist_SRCS HEADER messagelist_debug.h IDENTIFIER MESSAGELIST_LOG CATEGORY_NAME log_messagelist)
+ecm_qt_declare_logging_category(libmessagelist_SRCS HEADER messagelist_debug.h IDENTIFIER MESSAGELIST_LOG CATEGORY_NAME org.kde.pim.messagelist)
kconfig_add_kcfg_files(libmessagelist_SRCS
core/messagelistsettings.kcfgc
diff --git a/messageviewer/src/CMakeLists.txt b/messageviewer/src/CMakeLists.txt
index 20d5f7c..50deaa2 100644
--- a/messageviewer/src/CMakeLists.txt
+++ b/messageviewer/src/CMakeLists.txt
@@ -183,7 +183,7 @@ set(libmessageviewer_SRCS
qt5_add_resources(libmessageviewer_SRCS messagepartthemes.qrc)
-ecm_qt_declare_logging_category(libmessageviewer_SRCS HEADER messageviewer_debug.h IDENTIFIER MESSAGEVIEWER_LOG CATEGORY_NAME log_messageviewer)
+ecm_qt_declare_logging_category(libmessageviewer_SRCS HEADER messageviewer_debug.h IDENTIFIER MESSAGEVIEWER_LOG CATEGORY_NAME org.kde.pim.messageviewer)
kconfig_add_kcfg_files(libmessageviewer_SRCS
settings/globalsettings_messageviewer.kcfgc
diff --git a/mimetreeparser/src/CMakeLists.txt b/mimetreeparser/src/CMakeLists.txt
index f45f559..70679a9 100644
--- a/mimetreeparser/src/CMakeLists.txt
+++ b/mimetreeparser/src/CMakeLists.txt
@@ -141,7 +141,7 @@ set(libmimetreeparser_SRCS
${mimetreeparser_temporaryfile_SRCS}
)
-ecm_qt_declare_logging_category(libmimetreeparser_SRCS HEADER mimetreeparser_debug.h IDENTIFIER MIMETREEPARSER_LOG CATEGORY_NAME log_mimetreeparser)
+ecm_qt_declare_logging_category(libmimetreeparser_SRCS HEADER mimetreeparser_debug.h IDENTIFIER MIMETREEPARSER_LOG CATEGORY_NAME org.kde.pim.mimetreeparser)
add_library(KF5MimeTreeParser
${libmimetreeparser_SRCS}
diff --git a/templateparser/src/CMakeLists.txt b/templateparser/src/CMakeLists.txt
index 7b4b80d..579a393 100644
--- a/templateparser/src/CMakeLists.txt
+++ b/templateparser/src/CMakeLists.txt
@@ -19,7 +19,7 @@ set(templateparser_LIB_SRCS
)
-ecm_qt_declare_logging_category(templateparser_LIB_SRCS HEADER templateparser_debug.h IDENTIFIER TEMPLATEPARSER_LOG CATEGORY_NAME log_templateparser)
+ecm_qt_declare_logging_category(templateparser_LIB_SRCS HEADER templateparser_debug.h IDENTIFIER TEMPLATEPARSER_LOG CATEGORY_NAME org.kde.pim.templateparser)
kconfig_add_kcfg_files(templateparser_LIB_SRCS settings/templatesconfiguration_kfg.kcfgc)
diff --git a/webengineviewer/src/CMakeLists.txt b/webengineviewer/src/CMakeLists.txt
index ccb5f81..9664b0c 100644
--- a/webengineviewer/src/CMakeLists.txt
+++ b/webengineviewer/src/CMakeLists.txt
@@ -63,7 +63,7 @@ set(libwebengineviewer_SRCS
qt5_add_resources(libwebengineviewer_webengine_SRCS jquery.qrc)
-ecm_qt_declare_logging_category(libwebengineviewer_webengine_SRCS HEADER webengineviewer_debug.h IDENTIFIER WEBENGINEVIEWER_LOG CATEGORY_NAME log_webengineviewer)
+ecm_qt_declare_logging_category(libwebengineviewer_webengine_SRCS HEADER webengineviewer_debug.h IDENTIFIER WEBENGINEVIEWER_LOG CATEGORY_NAME org.kde.pim.webengineviewer)
add_library(KF5WebEngineViewer ${libwebengineviewer_SRCS} ${libwebengineviewer_webengine_SRCS})
diff --git a/webengineviewer/src/autotests/CMakeLists.txt b/webengineviewer/src/autotests/CMakeLists.txt
index 30e8922..cbbd182 100644
--- a/webengineviewer/src/autotests/CMakeLists.txt
+++ b/webengineviewer/src/autotests/CMakeLists.txt
@@ -1,5 +1,5 @@
set(testwebengineviewer_webengine_SRCS)
-ecm_qt_declare_logging_category(testwebengineviewer_webengine_SRCS HEADER webengineviewer_debug.h IDENTIFIER WEBENGINEVIEWER_LOG CATEGORY_NAME log_webengineviewer)
+ecm_qt_declare_logging_category(testwebengineviewer_webengine_SRCS HEADER webengineviewer_debug.h IDENTIFIER WEBENGINEVIEWER_LOG CATEGORY_NAME org.kde.pim.webengineviewer)
include_directories(${Messagelib_BINARY_DIR})
ecm_add_test(webhittestresulttest.cpp ../webhittestresult.cpp
TEST_NAME webhittestresulttest