wilderjds
/
kmail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename categories

Browse Source
wilder-work
Montel Laurent 10 years ago
parent 827b6a4e1a
commit 0f5e663ff5
11 changed files with 22 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      CMakeLists.txt
  2. 2
      agents/archivemailagent/CMakeLists.txt
  3. 2
      agents/archivemailagent/autotests/CMakeLists.txt
  4. 2
      agents/followupreminderagent/CMakeLists.txt
  5. 2
      agents/followupreminderagent/autotests/CMakeLists.txt
  6. 2
      agents/mailfilteragent/CMakeLists.txt
  7. 2
      agents/sendlateragent/CMakeLists.txt
  8. 12
      kmail.categories
  9. 7
      kmail.renamecategories
  10. 2
      src/CMakeLists.txt
  11. 2
      src/kontactplugin/kmail/CMakeLists.txt

2
CMakeLists.txt
Unescape View File

@ -154,7 +154,7 @@ add_definitions( -DQT_NO_CAST_TO_ASCII )
add_subdirectory(src)
add_subdirectory(agents)
install( FILES kmail.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
install( FILES kmail.renamecategories kmail.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
add_subdirectory(doc)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

2
agents/archivemailagent/CMakeLists.txt
Unescape View File

@ -23,7 +23,7 @@ kconfig_add_kcfg_files(archivemailagent_SRCS
qt5_add_dbus_adaptor(archivemailagent_SRCS org.freedesktop.Akonadi.ArchiveMailAgent.xml archivemailagent.h ArchiveMailAgent)
ecm_qt_declare_logging_category(archivemailagent_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME log_archivemailagent)
ecm_qt_declare_logging_category(archivemailagent_SRCS HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent)
ki18n_wrap_ui(archivemailagent_SRCS ui/archivemailwidget.ui )

2
agents/archivemailagent/autotests/CMakeLists.txt
Unescape View File

@ -4,7 +4,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/
macro( archivemail_agent _source)
set( _test ${_source} ../archivemailinfo.cpp ../archivemaildialog.cpp ../archivemailagentutil.cpp ../addarchivemaildialog.cpp ../widgets/formatcombobox.cpp ../widgets/unitcombobox.cpp ../archivemailwidget.cpp)
ki18n_wrap_ui(_test ../ui/archivemailwidget.ui )
ecm_qt_declare_logging_category(_test HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME log_archivemailagent)
ecm_qt_declare_logging_category(_test HEADER archivemailagent_debug.h IDENTIFIER ARCHIVEMAILAGENT_LOG CATEGORY_NAME org.kde.pim.archivemailagent)
get_filename_component( _name ${_source} NAME_WE )
add_executable( ${_name} ${_test} )
add_test( ${_name} ${_name} )

2
agents/followupreminderagent/CMakeLists.txt
Unescape View File

@ -17,7 +17,7 @@ set(followupreminderagent_SRCS
${followupreminderagent_job_SRCS}
)
ecm_qt_declare_logging_category(followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME log_followupreminderagent)
ecm_qt_declare_logging_category(followupreminderagent_SRCS HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent)
qt5_add_dbus_adaptor(followupreminderagent_SRCS org.freedesktop.Akonadi.FollowUpReminder.xml followupreminderagent.h FollowUpReminderAgent)
add_executable(akonadi_followupreminder_agent ${followupreminderagent_SRCS})

2
agents/followupreminderagent/autotests/CMakeLists.txt
Unescape View File

@ -2,7 +2,7 @@
# Convenience macro to add unit tests.
macro( followupreminder_agent _source )
set( _test ${_source} ../followupreminderinfodialog.cpp ../followupreminderinfowidget.cpp ../jobs/followupremindershowmessagejob.cpp ../followupremindernoanswerdialog.cpp)
ecm_qt_declare_logging_category(_test HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME log_followupreminderagent)
ecm_qt_declare_logging_category(_test HEADER followupreminderagent_debug.h IDENTIFIER FOLLOWUPREMINDERAGENT_LOG CATEGORY_NAME org.kde.pim.followupreminderagent)
get_filename_component( _name ${_source} NAME_WE )
ecm_add_test(${_test}
TEST_NAME ${_name}

2
agents/mailfilteragent/CMakeLists.txt
Unescape View File

@ -15,7 +15,7 @@ set(akonadi_mailfilter_agent_SRCS
qt5_add_dbus_adaptor(akonadi_mailfilter_agent_SRCS org.freedesktop.Akonadi.MailFilterAgent.xml mailfilteragent.h MailFilterAgent)
ecm_qt_declare_logging_category(akonadi_mailfilter_agent_SRCS HEADER mailfilteragent_debug.h IDENTIFIER MAILFILTERAGENT_LOG CATEGORY_NAME log_mailfilteragent)
ecm_qt_declare_logging_category(akonadi_mailfilter_agent_SRCS HEADER mailfilteragent_debug.h IDENTIFIER MAILFILTERAGENT_LOG CATEGORY_NAME org.kde.pim.mailfilteragent)
add_executable(akonadi_mailfilter_agent ${akonadi_mailfilter_agent_SRCS})

2
agents/sendlateragent/CMakeLists.txt
Unescape View File

@ -8,7 +8,7 @@ if(BUILD_TESTING)
endif()
set(sendlater_common_SRCS)
ecm_qt_declare_logging_category(sendlater_common_SRCS HEADER sendlateragent_debug.h IDENTIFIER SENDLATERAGENT_LOG CATEGORY_NAME log_sendlateragent)
ecm_qt_declare_logging_category(sendlater_common_SRCS HEADER sendlateragent_debug.h IDENTIFIER SENDLATERAGENT_LOG CATEGORY_NAME org.kde.pim.sendlateragent)
set(sendlateragent_SRCS
${sendlater_common_SRCS}

12
kmail.categories
Unescape View File

@ -1,7 +1,7 @@
log_kmail kmail (kmail)
log_sendlateragent kmail (sendlateragent)
log_archivemailagent kmail (archivemailagent)
log_followupreminderagent kmail (followupreminderagent)
log_kmail_plugin kmail (kmail kontact plugins)
log_mailfilteragent kmail (mailfilter agent)
org.kde.pim.kmail kmail (kmail)
org.kde.pim.sendlateragent kmail (sendlateragent)
org.kde.pim.archivemailagent kmail (archivemailagent)
org.kde.pim.followupreminderagent kmail (followupreminderagent)
org.kde.pim.kmail_plugin kmail (kmail kontact plugins)
org.kde.pim.mailfilteragent kmail (mailfilter agent)

7
kmail.renamecategories
Unescape View File

@ -0,0 +1,7 @@
log_kmail org.kde.pim.kmail
log_sendlateragent org.kde.pim.sendlateragent
log_archivemailagent org.kde.pim.archivemailagent
log_followupreminderagent org.kde.pim.followupreminderagent
log_kmail_plugin org.kde.pim.kmail_plugin
log_mailfilteragent org.kde.pim.mailfilteragent

2
src/CMakeLists.txt
Unescape View File

@ -165,7 +165,7 @@ set(kmailprivate_checkindexing_LIB_SRCS
)
set(kmail_common_SRCS)
ecm_qt_declare_logging_category(kmail_common_SRCS HEADER kmail_debug.h IDENTIFIER KMAIL_LOG CATEGORY_NAME log_kmail)
ecm_qt_declare_logging_category(kmail_common_SRCS HEADER kmail_debug.h IDENTIFIER KMAIL_LOG CATEGORY_NAME org.kde.pim.kmail)
set(kmailprivate_LIB_SRCS
${kmail_common_SRCS}
kmmainwin.cpp

2
src/kontactplugin/kmail/CMakeLists.txt
Unescape View File

@ -6,7 +6,7 @@ include_directories(
set(interface_SRCS)
set(kontact_kmail_plugins_interface_common_SRCS)
ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEADER kmailplugin_debug.h IDENTIFIER KMAILPLUGIN_LOG CATEGORY_NAME log_kmail_plugin)
ecm_qt_declare_logging_category(kontact_kmail_plugins_interface_common_SRCS HEADER kmailplugin_debug.h IDENTIFIER KMAILPLUGIN_LOG CATEGORY_NAME org.kde.pim.kmail_plugin)
set(kontact_kmail_plugins_interface_SRCS ${interface_SRCS})
qt5_add_dbus_interfaces(kontact_kmail_plugins_interface_SRCS ${kmail_BINARY_DIR}/src/org.kde.kmail.kmail.xml)

Write Preview
Loading…
Cancel
Save