aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-20 06:17:18 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-20 06:17:18 (GMT)
commitf49ccad7ab43a1da4b04d15f905750539eefea3b (patch)
tree520a3030a85caa3592d4b364c06efeb6bfd364fa
parent73e6a4c320d652c40c2c8e948d473bee4afde1b9 (diff)
Rename categories
-rw-r--r--CMakeLists.txt2
-rw-r--r--akonadi.categories13
-rw-r--r--akonadi.renamecategories7
-rw-r--r--autotests/server/CMakeLists.txt2
-rw-r--r--src/agentbase/CMakeLists.txt2
-rw-r--r--src/agentserver/CMakeLists.txt2
-rw-r--r--src/akonadicontrol/CMakeLists.txt2
-rw-r--r--src/akonadictl/CMakeLists.txt2
-rw-r--r--src/core/CMakeLists.txt2
-rw-r--r--src/private/CMakeLists.txt2
-rw-r--r--src/server/CMakeLists.txt2
-rw-r--r--src/widgets/CMakeLists.txt2
12 files changed, 24 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c931d8e..55a36d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,7 +293,7 @@ install(EXPORT
FILE KF5AkonadiTargets.cmake
NAMESPACE KF5::)
-install(FILES akonadi.categories
+install(FILES akonadi.categories akonadi.renamecategories
DESTINATION ${KDE_INSTALL_CONFDIR}
)
diff --git a/akonadi.categories b/akonadi.categories
index aee64d4..64c6e17 100644
--- a/akonadi.categories
+++ b/akonadi.categories
@@ -1,6 +1,7 @@
-log_akonadiagentserver akonadi (Akonadi Agent Server)
-log_akonadiserver akonadi (Akonadi Server)
-log_akonadiagentbase akonadi (Akonadi AgentBase Library)
-log_akonadiwidgets akonadi (Akonadi Widget Library)
-log_akonadiprivate akonadi (Akonadi Private Library)
-log_akonadicore akonadi (Akonadi Core Library)
+org.kde.pim.akonadiagentserver akonadi (Akonadi Agent Server)
+org.kde.pim.akonadiserver akonadi (Akonadi Server)
+org.kde.pim.akonadiagentbase akonadi (Akonadi AgentBase Library)
+org.kde.pim.akonadiwidgets akonadi (Akonadi Widget Library)
+org.kde.pim.akonadiprivate akonadi (Akonadi Private Library)
+org.kde.pim.akonadicore akonadi (Akonadi Core Library)
+org.kde.pim.akonadictl akonadi (Akonadi Control)
diff --git a/akonadi.renamecategories b/akonadi.renamecategories
new file mode 100644
index 0000000..ebab858
--- /dev/null
+++ b/akonadi.renamecategories
@@ -0,0 +1,7 @@
+log_akonadiagentserver org.kde.pim.akonadiagentserver
+log_akonadiserver org.kde.pim.akonadiserver
+akonadiagentbase_log org.kde.pim.akonadiagentbase
+akonadiwidgets_log org.kde.pim.akonadiwidgets
+akonadiprivate_log org.kde.pim.akonadiprivate
+log_akonadicore org.kde.pim.akonadicore
+log_akonadictl org.kde.pim.akonadictl
diff --git a/autotests/server/CMakeLists.txt b/autotests/server/CMakeLists.txt
index a6a5ebc..26e2c03 100644
--- a/autotests/server/CMakeLists.txt
+++ b/autotests/server/CMakeLists.txt
@@ -34,7 +34,7 @@ set(common_SRCS
dbinitializer.cpp
${CMAKE_CURRENT_BINARY_DIR}/dbpopulator.cpp
)
-ecm_qt_declare_logging_category(common_SRCS HEADER akonadiserver_debug.h IDENTIFIER AKONADISERVER_LOG CATEGORY_NAME log_akonadiserver)
+ecm_qt_declare_logging_category(common_SRCS HEADER akonadiserver_debug.h IDENTIFIER AKONADISERVER_LOG CATEGORY_NAME org.kde.pim.akonadiserver)
add_library(akonadi_unittest_common STATIC ${common_SRCS})
target_link_libraries(akonadi_unittest_common
diff --git a/src/agentbase/CMakeLists.txt b/src/agentbase/CMakeLists.txt
index 98cd66e..e6e10b4 100644
--- a/src/agentbase/CMakeLists.txt
+++ b/src/agentbase/CMakeLists.txt
@@ -10,7 +10,7 @@ set(akonadiagentbase_SRCS
transportresourcebase.cpp
)
-ecm_qt_declare_logging_category(akonadiagentbase_SRCS HEADER akonadiagentbase_debug.h IDENTIFIER AKONADIAGENTBASE_LOG CATEGORY_NAME akonadiagentbase_log)
+ecm_qt_declare_logging_category(akonadiagentbase_SRCS HEADER akonadiagentbase_debug.h IDENTIFIER AKONADIAGENTBASE_LOG CATEGORY_NAME org.kde.pim.akonadiagentbase)
ecm_generate_headers(AkonadiAgentBase_HEADERS
HEADER_NAMES
diff --git a/src/agentserver/CMakeLists.txt b/src/agentserver/CMakeLists.txt
index 86695d8..6ad6564 100644
--- a/src/agentserver/CMakeLists.txt
+++ b/src/agentserver/CMakeLists.txt
@@ -6,7 +6,7 @@ set(akonadi_agent_server_srcs
main.cpp
)
-ecm_qt_declare_logging_category(akonadi_agent_server_srcs HEADER akonadiagentserver_debug.h IDENTIFIER AKONADIAGENTSERVER_LOG CATEGORY_NAME log_akonadiagentserver)
+ecm_qt_declare_logging_category(akonadi_agent_server_srcs HEADER akonadiagentserver_debug.h IDENTIFIER AKONADIAGENTSERVER_LOG CATEGORY_NAME org.kde.pim.akonadiagentserver)
add_executable(akonadi_agent_server ${akonadi_agent_server_srcs})
diff --git a/src/akonadicontrol/CMakeLists.txt b/src/akonadicontrol/CMakeLists.txt
index 01b4de0..94ab0f5 100644
--- a/src/akonadicontrol/CMakeLists.txt
+++ b/src/akonadicontrol/CMakeLists.txt
@@ -13,7 +13,7 @@ set(control_SRCS
processcontrol.cpp
)
-ecm_qt_declare_logging_category(control_SRCS HEADER akonadicontrol_debug.h IDENTIFIER AKONADICONTROL_LOG CATEGORY_NAME log_akonadicontrol)
+ecm_qt_declare_logging_category(control_SRCS HEADER akonadicontrol_debug.h IDENTIFIER AKONADICONTROL_LOG CATEGORY_NAME org.kde.pim.akonadicontrol)
qt5_add_dbus_adaptor(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.AgentManager.xml agentmanager.h AgentManager)
qt5_add_dbus_adaptor(control_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.ControlManager.xml controlmanager.h ControlManager)
diff --git a/src/akonadictl/CMakeLists.txt b/src/akonadictl/CMakeLists.txt
index 44aea99..d35ad8a 100644
--- a/src/akonadictl/CMakeLists.txt
+++ b/src/akonadictl/CMakeLists.txt
@@ -7,7 +7,7 @@ set(akonadictl_SRCS
main.cpp
)
-ecm_qt_declare_logging_category(akonadictl_SRCS HEADER akonadictl_debug.h IDENTIFIER AKONADICTL_LOG CATEGORY_NAME log_akonadictl)
+ecm_qt_declare_logging_category(akonadictl_SRCS HEADER akonadictl_debug.h IDENTIFIER AKONADICTL_LOG CATEGORY_NAME org.kde.pim.akonadictl)
qt5_add_dbus_interfaces(akonadictl_SRCS
${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.ControlManager.xml
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 35d91d0..7cd634f 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -292,7 +292,7 @@ set(akonadicore_SRCS
${akonadicore_dbus_SRCS}
)
-ecm_qt_declare_logging_category(akonadicore_SRCS HEADER akonadicore_debug.h IDENTIFIER AKONADICORE_LOG CATEGORY_NAME log_akonadicore)
+ecm_qt_declare_logging_category(akonadicore_SRCS HEADER akonadicore_debug.h IDENTIFIER AKONADICORE_LOG CATEGORY_NAME org.kde.pim.akonadicore)
add_library(KF5AkonadiCore ${akonadicore_SRCS})
diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt
index d6b6de3..aee3691 100644
--- a/src/private/CMakeLists.txt
+++ b/src/private/CMakeLists.txt
@@ -12,7 +12,7 @@ set(akonadiprivate_SRCS
dbus.cpp
)
-ecm_qt_declare_logging_category(akonadiprivate_SRCS HEADER akonadiprivate_debug.h IDENTIFIER AKONADIPRIVATE_LOG CATEGORY_NAME akonadiprivate_log)
+ecm_qt_declare_logging_category(akonadiprivate_SRCS HEADER akonadiprivate_debug.h IDENTIFIER AKONADIPRIVATE_LOG CATEGORY_NAME org.kde.pim.akonadiprivate)
add_library(KF5AkonadiPrivate ${akonadiprivate_SRCS})
add_library(KF5::AkonadiPrivate ALIAS KF5AkonadiPrivate)
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 4548655..152de54 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -137,7 +137,7 @@ set(libakonadiserver_SRCS
set(akonadiserver_SRCS
main.cpp
)
-ecm_qt_declare_logging_category(akonadiserver_SRCS HEADER akonadiserver_debug.h IDENTIFIER AKONADISERVER_LOG CATEGORY_NAME log_akonadiserver)
+ecm_qt_declare_logging_category(akonadiserver_SRCS HEADER akonadiserver_debug.h IDENTIFIER AKONADISERVER_LOG CATEGORY_NAME org.kde.pim.akonadiserver)
qt5_generate_dbus_interface(debuginterface.h org.freedesktop.Akonadi.DebugInterface.xml)
qt5_add_dbus_adaptor(libakonadiserver_SRCS ${Akonadi_SOURCE_DIR}/src/interfaces/org.freedesktop.Akonadi.TracerNotification.xml dbustracer.h Akonadi::Server::DBusTracer)
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index bf691c1..898a25c 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -35,7 +35,7 @@ set(akonadiwidgets_SRCS
tagselectwidget.cpp
)
-ecm_qt_declare_logging_category(akonadiwidgets_SRCS HEADER akonadiwidgets_debug.h IDENTIFIER AKONADIWIDGETS_LOG CATEGORY_NAME akonadiwidgets_log)
+ecm_qt_declare_logging_category(akonadiwidgets_SRCS HEADER akonadiwidgets_debug.h IDENTIFIER AKONADIWIDGETS_LOG CATEGORY_NAME org.kde.pim.akonadiwidgets)
set(akonadiwidgets_UI
cachepolicypage.ui