[pim/akregator] /: Add pre-commit support
Laurent Montel
null at kde.org
Wed Jun 11 19:31:26 BST 2025
Git commit 558f8e584ad72a0020fbe47be5db68107db69048 by Laurent Montel.
Committed on 11/06/2025 at 18:31.
Pushed by mlaurent into branch 'master'.
Add pre-commit support
M +1 -3 .gitlab-ci.yml
M +59 -19 CMakeLists.txt
M +1 -1 LICENSES/GPL-2.0-or-later.txt
M +0 -1 Mainpage.dox
M +89 -48 configuration/CMakeLists.txt
M +17 -17 doc/index.docbook
M +3 -6 export/CMakeLists.txt
M +28 -20 interfaces/CMakeLists.txt
M +1 -1 interfaces/akregator.kcfg
M +18 -7 kontactplugin/CMakeLists.txt
M +0 -1 readme-build-ftime.txt
M +235 -236 src/CMakeLists.txt
M +1 -2 src/data/akregator.notifyrc
M +1 -1 src/data/akregator_part.rc
M +2 -2 src/data/akregator_shell.rc
M +0 -1 src/icons/CMakeLists.txt
M +1 -1 src/job/autotests/CMakeLists.txt
M +1 -1 src/mainwindow.cpp
M +31 -31 src/storage/metakit/CHANGES
M +0 -1 src/storage/metakit/include/mk4.h
M +39 -39 src/storage/metakit/include/mk4.inl
M +0 -1 src/storage/metakit/include/mk4io.h
M +0 -1 src/storage/metakit/include/mk4str.h
M +8 -8 src/storage/metakit/include/mk4str.inl
M +0 -1 src/storage/metakit/src/column.h
M +1 -1 src/storage/metakit/src/column.inl
M +0 -1 src/storage/metakit/src/custom.h
M +0 -1 src/storage/metakit/src/derived.h
M +0 -1 src/storage/metakit/src/field.h
M +2 -2 src/storage/metakit/src/field.inl
M +0 -1 src/storage/metakit/src/format.h
M +1 -1 src/storage/metakit/src/handler.cpp
M +0 -1 src/storage/metakit/src/handler.h
M +2 -2 src/storage/metakit/src/handler.inl
M +0 -1 src/storage/metakit/src/header.h
M +1 -1 src/storage/metakit/src/persist.cpp
M +0 -1 src/storage/metakit/src/persist.h
M +3 -3 src/storage/metakit/src/remap.cpp
M +0 -1 src/storage/metakit/src/remap.h
M +0 -1 src/storage/metakit/src/store.h
M +1 -1 src/storage/metakit/src/store.inl
M +2 -2 src/storage/metakit/src/table.cpp
M +26 -26 src/storage/metakit/src/univ.inl
M +1 -1 src/widgets/autotests/CMakeLists.txt
https://invent.kde.org/pim/akregator/-/commit/558f8e584ad72a0020fbe47be5db68107db69048
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3d817ed5..12a141367 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,11 +6,9 @@ include:
file:
- /gitlab-templates/linux-qt6.yml
- /gitlab-templates/linux-qt6-next.yml
- - /gitlab-templates/json-validation.yml
- /gitlab-templates/freebsd-qt6.yml
- /gitlab-templates/cppcheck.yml
- /gitlab-templates/windows-qt6.yml
- /gitlab-templates/craft-windows-x86-64-qt6.yml
- /gitlab-templates/craft-windows-appx-qt6.yml
- - /gitlab-templates/xml-lint.yml
- - /gitlab-templates/yaml-lint.yml
+ - /gitlab-templates/pre-commit.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32ad90a41..ddc211ec1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,17 +18,28 @@ find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(ECMInstallIcons)
-
include(ECMSetupVersion)
include(ECMAddTests)
include(GenerateExportHeader)
include(ECMGenerateHeaders)
-include(KDEGitCommitHooks)
-include(KDEClangFormat)
file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c)
-kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+set(PRE_COMMIT_INSTALLED FALSE)
+if(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+ if(EXISTS "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit")
+ file(READ "${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit" FILE_CONTENTS)
+ string(FIND "${FILE_CONTENTS}" "File generated by pre-commit" INDEX)
+ if(${INDEX} GREATER_EQUAL 0)
+ set(PRE_COMMIT_INSTALLED TRUE)
+ endif()
+ endif()
+endif()
+if(NOT ${PRE_COMMIT_INSTALLED})
+ include(KDEGitCommitHooks)
+ include(KDEClangFormat)
+ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES})
+endif()
include(CheckFunctionExists)
include(KDEInstallDirs)
@@ -45,10 +56,12 @@ set(KDEPIM_DEV_VERSION alpha)
# add an extra space
if(DEFINED KDEPIM_DEV_VERSION)
- set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
+ set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
endif()
-set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})")
+set(KDEPIM_VERSION
+ "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})"
+)
set(KDEPIM_LIB_VERSION "${PIM_VERSION}")
set(KDEPIM_LIB_SOVERSION "6")
@@ -58,7 +71,12 @@ set(LIBKDEPIM_LIB_VERSION "6.4.40")
set(MESSAGELIB_LIB_VERSION "6.4.40")
set(PIMCOMMON_LIB_VERSION "6.4.40")
-find_package(Qt6 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebEngineWidgets PrintSupport)
+find_package(
+ Qt6
+ ${QT_REQUIRED_VERSION}
+ CONFIG
+ REQUIRED Widgets Test WebEngineWidgets PrintSupport
+)
# Find KF6 package
find_package(KF6I18n ${KF_MIN_VERSION} REQUIRED)
find_package(KF6Crash ${KF_MIN_VERSION} REQUIRED)
@@ -72,14 +90,19 @@ find_package(KF6Codecs ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6StatusNotifierItem ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6IconThemes ${KF_MIN_VERSION} CONFIG REQUIRED)
find_package(KF6DocTools ${KF_MIN_VERSION})
-set_package_properties(KF6DocTools PROPERTIES DESCRIPTION
- "Tools to generate documentation"
- TYPE OPTIONAL
+set_package_properties(
+ KF6DocTools
+ PROPERTIES DESCRIPTION "Tools to generate documentation" TYPE OPTIONAL
)
# Find KdepimLibs Package
find_package(KPim6GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
-find_package(KPim6KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
+find_package(
+ KPim6KontactInterface
+ ${KONTACTINTERFACE_LIB_VERSION}
+ CONFIG
+ REQUIRED
+)
find_package(KPim6Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KPim6MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
find_package(KF6TextEditTextToSpeech ${KTEXTADDONS_MIN_VERSION} CONFIG)
@@ -95,8 +118,14 @@ find_package(KPim6PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
find_package(KPim6PimCommonActivities ${PIMCOMMON_LIB_VERSION} CONFIG)
find_package(KF6UserFeedback ${KF_MIN_VERSION} CONFIG)
-set_package_properties(KF6UserFeedback PROPERTIES DESCRIPTION "User Feedback lib" TYPE OPTIONAL PURPOSE "Allow to send Telemetry Information (optional). It can be disable in apps.")
-
+set_package_properties(
+ KF6UserFeedback
+ PROPERTIES
+ DESCRIPTION "User Feedback lib"
+ TYPE OPTIONAL
+ PURPOSE
+ "Allow to send Telemetry Information (optional). It can be disable in apps."
+)
include_directories(${akregator_SOURCE_DIR} ${akregator_BINARY_DIR})
add_definitions(-DTRANSLATION_DOMAIN=\"akregator\")
@@ -111,7 +140,11 @@ if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
endif()
-option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)
+option(
+ USE_UNITY_CMAKE_SUPPORT
+ "Use UNITY cmake support (speedup compile time)"
+ OFF
+)
set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF)
if(USE_UNITY_CMAKE_SUPPORT)
@@ -130,9 +163,11 @@ if(TARGET KPim6::PimCommonActivities)
if(OPTION_USE_PLASMA_ACTIVITIES)
if(NOT WIN32 AND NOT APPLE)
find_package(PlasmaActivities "6.3.0")
- set_package_properties(PlasmaActivities PROPERTIES DESCRIPTION
- "Allow to compile with plasma activities"
- TYPE OPTIONAL
+ set_package_properties(
+ PlasmaActivities
+ PROPERTIES
+ DESCRIPTION "Allow to compile with plasma activities"
+ TYPE OPTIONAL
)
endif()
@@ -142,7 +177,10 @@ if(TARGET KPim6::PimCommonActivities)
endif()
endif()
-configure_file(config-akregator.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-akregator.h)
+configure_file(
+ config-akregator.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/config-akregator.h
+)
add_subdirectory(export)
add_subdirectory(interfaces)
@@ -155,7 +193,9 @@ ecm_qt_install_logging_categories(
FILE akregator.categories
DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
)
-kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+if(DEFINED kde_configure_git_pre_commit_hook)
+ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
+endif()
ki18n_install(po)
if(KF6DocTools_FOUND)
kdoctools_install(po)
diff --git a/LICENSES/GPL-2.0-or-later.txt b/LICENSES/GPL-2.0-or-later.txt
index 1d80ac365..96e2bf1e9 100644
--- a/LICENSES/GPL-2.0-or-later.txt
+++ b/LICENSES/GPL-2.0-or-later.txt
@@ -2,7 +2,7 @@ GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
diff --git a/Mainpage.dox b/Mainpage.dox
index 559a70bf6..641893c8b 100644
--- a/Mainpage.dox
+++ b/Mainpage.dox
@@ -1,3 +1,2 @@
// DOXYGEN_REFERENCES = kdecore kdeui kio kparts kjs khtml syndication
// DOXYGEN_EXCLUDE = plugins
-
diff --git a/configuration/CMakeLists.txt b/configuration/CMakeLists.txt
index e78ee9bcd..ed7f54703 100644
--- a/configuration/CMakeLists.txt
+++ b/configuration/CMakeLists.txt
@@ -8,98 +8,128 @@ include_directories(
########### next target ###############
add_library(akregator_config_general MODULE)
-target_sources(akregator_config_general PRIVATE akregator_config_general.cpp akregator_config_general.h)
+target_sources(
+ akregator_config_general
+ PRIVATE akregator_config_general.cpp akregator_config_general.h
+)
ki18n_wrap_ui(akregator_config_general ui/settings_general.ui)
-target_link_libraries(akregator_config_general
+target_link_libraries(
+ akregator_config_general
akregatorinterfaces
-
KF6::KCMUtils
KF6::I18n
)
-install(TARGETS akregator_config_general DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
+install(
+ TARGETS akregator_config_general
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+)
########### next target ###############
add_library(akregator_config_appearance MODULE)
-target_sources(akregator_config_appearance PRIVATE akregator_config_appearance.cpp akregator_config_appearance.h)
+target_sources(
+ akregator_config_appearance
+ PRIVATE akregator_config_appearance.cpp akregator_config_appearance.h
+)
ki18n_wrap_ui(akregator_config_appearance ui/settings_appearance.ui)
-target_link_libraries(akregator_config_appearance
+target_link_libraries(
+ akregator_config_appearance
akregatorinterfaces
-
KF6::KCMUtils
KF6::I18n
)
-install(TARGETS akregator_config_appearance DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
+install(
+ TARGETS akregator_config_appearance
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+)
########### next target ###############
add_library(akregator_config_archive MODULE)
-target_sources(akregator_config_archive PRIVATE akregator_config_archive.cpp akregator_config_archive.h)
+target_sources(
+ akregator_config_archive
+ PRIVATE akregator_config_archive.cpp akregator_config_archive.h
+)
ki18n_wrap_ui(akregator_config_archive ui/settings_archive.ui)
-target_link_libraries(akregator_config_archive
+target_link_libraries(
+ akregator_config_archive
KF6::KCMUtils
akregatorinterfaces
-
KF6::I18n
)
-install(TARGETS akregator_config_archive DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
+install(
+ TARGETS akregator_config_archive
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+)
########### next target ###############
add_library(akregator_config_browser MODULE)
-target_sources(akregator_config_browser PRIVATE akregator_config_browser.cpp akregator_config_browser.h)
+target_sources(
+ akregator_config_browser
+ PRIVATE akregator_config_browser.cpp akregator_config_browser.h
+)
ki18n_wrap_ui(akregator_config_browser ui/settings_browser.ui)
-target_link_libraries(akregator_config_browser
+target_link_libraries(
+ akregator_config_browser
akregatorinterfaces
KF6::KCMUtils
KF6::I18n
-
)
-install(TARGETS akregator_config_browser DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
+install(
+ TARGETS akregator_config_browser
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+)
########### next target ###############
add_library(akregator_config_advanced MODULE)
-target_sources(akregator_config_advanced PRIVATE
- akregator_config_advanced.cpp
- settings_advanced.cpp
- akregator_config_advanced.h
- settings_advanced.h
+target_sources(
+ akregator_config_advanced
+ PRIVATE
+ akregator_config_advanced.cpp
+ settings_advanced.cpp
+ akregator_config_advanced.h
+ settings_advanced.h
)
ki18n_wrap_ui(akregator_config_advanced ui/settings_advancedbase.ui)
-target_link_libraries(akregator_config_advanced
+target_link_libraries(
+ akregator_config_advanced
akregatorinterfaces
-
KF6::KCMUtils
KF6::I18n
)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregator_config_advanced PROPERTIES UNITY_BUILD ON)
endif()
-install(TARGETS akregator_config_advanced DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
-
+install(
+ TARGETS akregator_config_advanced
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+)
########### next target ###############
add_library(akregator_config_plugins MODULE)
-target_sources(akregator_config_plugins PRIVATE
- akregator_config_plugins.cpp
- akregatorconfigurepluginlistwidget.cpp
- akregator_config_plugins.h
- akregatorconfigurepluginlistwidget.h
+target_sources(
+ akregator_config_plugins
+ PRIVATE
+ akregator_config_plugins.cpp
+ akregatorconfigurepluginlistwidget.cpp
+ akregator_config_plugins.h
+ akregatorconfigurepluginlistwidget.h
)
ecm_qt_declare_logging_category(akregator_config_plugins HEADER kcm_config_plugins_debug.h IDENTIFIER AKREGATOR_CONFIG_PLUGIN_LOG CATEGORY_NAME org.kde.pim.akregator_config_plugin
@@ -107,9 +137,8 @@ ecm_qt_declare_logging_category(akregator_config_plugins HEADER kcm_config_plugi
EXPORT AKREGATOR
)
-
-
-target_link_libraries(akregator_config_plugins
+target_link_libraries(
+ akregator_config_plugins
akregatorinterfaces
KF6::KCMUtils
KF6::I18n
@@ -119,38 +148,47 @@ if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregator_config_plugins PROPERTIES UNITY_BUILD ON)
endif()
-install(TARGETS akregator_config_plugins DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
-
+install(
+ TARGETS akregator_config_plugins
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+)
########### next target ###############
if(TARGET KF6::UserFeedbackWidgets)
add_library(akregator_config_userfeedback MODULE)
- target_sources(akregator_config_userfeedback PRIVATE akregator_config_userfeedback.cpp akregator_config_userfeedback.h)
-
-
- target_link_libraries(akregator_config_userfeedback
+ target_sources(
+ akregator_config_userfeedback
+ PRIVATE
+ akregator_config_userfeedback.cpp
+ akregator_config_userfeedback.h
+ )
+
+ target_link_libraries(
+ akregator_config_userfeedback
akregatorinterfaces
-
KF6::KCMUtils
KF6::I18n
KF6::UserFeedbackWidgets
-)
+ )
- install(TARGETS akregator_config_userfeedback DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
+ install(
+ TARGETS akregator_config_userfeedback
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+ )
endif()
-
###########
add_library(akregator_config_security MODULE)
-target_sources(akregator_config_security PRIVATE
- akregator_config_security.cpp
- akregator_config_security.h
+target_sources(
+ akregator_config_security
+ PRIVATE akregator_config_security.cpp akregator_config_security.h
)
ki18n_wrap_ui(akregator_config_security ui/settings_security.ui)
-target_link_libraries(akregator_config_security
+target_link_libraries(
+ akregator_config_security
akregatorinterfaces
KF6::KCMUtils
KF6::I18n
@@ -160,4 +198,7 @@ if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregator_config_security PROPERTIES UNITY_BUILD ON)
endif()
-install(TARGETS akregator_config_security DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator)
+install(
+ TARGETS akregator_config_security
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kcms/akregator
+)
diff --git a/doc/index.docbook b/doc/index.docbook
index 9e8350c93..d1d2d491c 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -14,13 +14,13 @@
<author>
<firstname>Frank</firstname>
<surname>Osterfeld</surname>
-<affiliation><address><email>frank.osterfeld at kdemail.net</email>
+<affiliation><address><email>frank.osterfeld at kdemail.net</email>
</address></affiliation>
</author>
<author>
<firstname>Anne-Marie</firstname>
<surname>Mahfouf</surname>
-<affiliation><address>&Anne-Marie.Mahfouf.mail;
+<affiliation><address>&Anne-Marie.Mahfouf.mail;
</address></affiliation>
</author>
@@ -229,11 +229,11 @@ On pages with this <quote>RSS</quote> or this icon<inlinemediaobject>
</mediaobject>
</screenshot>
</para>
-<para>Switch to &akregator;, select <guimenuitem>Add Feed...</guimenuitem> and the
+<para>Switch to &akregator;, select <guimenuitem>Add Feed...</guimenuitem> and the
<guilabel>Feed URL</guilabel> is filled out with the link address.
</para>
-<para>All feeds added using this procedures appear under <guilabel>Imported Feeds</guilabel> folder
+<para>All feeds added using this procedures appear under <guilabel>Imported Feeds</guilabel> folder
in the feed list, and from there you can use your mouse to drag it to a different folder.
</para>
</sect1>
@@ -385,7 +385,7 @@ start.</para>
<varlistentry>
<term><guilabel>Use the browser cache (less network traffic)</guilabel></term>
<listitem><para>When enabled, the &kde;-wide browser cache settings are used when
-updating feeds. You can configure the &kde;-wide browser cache
+updating feeds. You can configure the &kde;-wide browser cache
in &konqueror;'s configuration dialog.</para>
<note><para>You should leave this option enabled whenever possible. Disabling
this option leads to increased network traffic. The traffic caused by
@@ -442,7 +442,7 @@ tab.</para>
</listitem>
</varlistentry>
<varlistentry>
-<term><guilabel>Limit feed archive size to:</guilabel></term>
+<term><guilabel>Limit feed archive size to:</guilabel></term>
<listitem><para>If the number of articles exceeds the chosen limit, the oldest
articles are deleted. Note that flagged articles are ignored when counting the
number of articles: if your limit is 500, and you have 510 unflagged and 50
@@ -628,7 +628,7 @@ close tabs.</para>
</varlistentry>
<varlistentry>
<term><guilabel>Open links in new tab instead of in new window</guilabel></term>
-<listitem><para>If checked, &akregator; will open a link which would normally open in a new window (external browser) in
+<listitem><para>If checked, &akregator; will open a link which would normally open in a new window (external browser) in
a new tab instead.</para>
</listitem>
</varlistentry>
@@ -741,7 +741,7 @@ article as read after a specified number of seconds.</para>
<guimenu>File</guimenu>
<guimenuitem>Import Feeds</guimenuitem>
</menuchoice></term>
-<listitem><para><action>Open</action> the import feeds dialog to load <quote>OPML Outlines</quote>
+<listitem><para><action>Open</action> the import feeds dialog to load <quote>OPML Outlines</quote>
with feed subscriptions.
</para></listitem>
</varlistentry>
@@ -805,11 +805,11 @@ the Properties dialog</para></listitem>
<varlistentry>
<term><menuchoice><shortcut><keycombo
action="simul">&Ctrl;&Shift;<keycap>1</keycap></keycombo></shortcut>
-<guimenu>View</guimenu><guimenuitem>Normal View</guimenuitem></menuchoice>,
+<guimenu>View</guimenu><guimenuitem>Normal View</guimenuitem></menuchoice>,
<menuchoice><shortcut><keycombo
action="simul">&Ctrl;&Shift;<keycap>2</keycap></keycombo></shortcut>
<guimenu>View</guimenu><guimenuitem>Widescreen View</guimenuitem>
-</menuchoice> and
+</menuchoice> and
<menuchoice><shortcut><keycombo
action="simul">&Ctrl;&Shift;<keycap>3</keycap></keycombo></shortcut>
<guimenu>View</guimenu><guimenuitem>Combined View</guimenuitem>
@@ -1016,8 +1016,8 @@ tab within &akregator;</para></listitem>
<guimenuitem>Open in Background Tab</guimenuitem>
</menuchoice></term>
<listitem><para><action>Load</action> the current article in
-into a new tab, but not automatically activate that tab.
-That is useful to browse a feed, open all interesting articles into background
+into a new tab, but not automatically activate that tab.
+That is useful to browse a feed, open all interesting articles into background
tabs and later read them all.
</para></listitem>
</varlistentry>
@@ -1047,8 +1047,8 @@ important</para></listitem>
<guimenuitem>Mark as</guimenuitem>
</menuchoice></term>
<listitem><para><action>Mark</action> the current article as
-Read <keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo>,
-New <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> or
+Read <keycombo action="simul">&Ctrl;<keycap>E</keycap></keycombo>,
+New <keycombo action="simul">&Ctrl;<keycap>N</keycap></keycombo> or
Unread <keycombo action="simul">&Ctrl;<keycap>U</keycap></keycombo></para></listitem>
</varlistentry>
<varlistentry>
@@ -1084,7 +1084,7 @@ action="simul">&Ctrl;<keycap>S</keycap></keycombo></shortcut>
<guimenu>Article</guimenu>
<guimenuitem>Share Article</guimenuitem>
</menuchoice></term>
-<listitem><para>Use this action you to share news
+<listitem><para>Use this action you to share news
with your friends using the microblog services identi.ca and twitter.
</para></listitem>
</varlistentry>
@@ -1121,7 +1121,7 @@ menu items, for more information read the sections about the <ulink url="help:/f
of the &kde; Fundamentals.
</para>
-<para>Many actions provided in the menu are also available in the context menus of the feed list,
+<para>Many actions provided in the menu are also available in the context menus of the feed list,
the article list and the article viewer.
</para>
@@ -1142,7 +1142,7 @@ Program copyright 2004-2010 Akregator authors
</para>
<para>
-Documentation copyright 2006
+Documentation copyright 2006
Frank Osterfeld <email>frank.osterfeld at kdemail.net</email>
</para>
diff --git a/export/CMakeLists.txt b/export/CMakeLists.txt
index b93b09d10..a312ee1c6 100644
--- a/export/CMakeLists.txt
+++ b/export/CMakeLists.txt
@@ -1,13 +1,11 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
-include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
-)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
add_executable(akregatorstorageexporter)
target_sources(akregatorstorageexporter PRIVATE akregatorstorageexporter.cpp)
-target_link_libraries(akregatorstorageexporter
+target_link_libraries(
+ akregatorstorageexporter
KF6::Syndication
akregatorprivate
KF6::I18n
@@ -15,4 +13,3 @@ target_link_libraries(akregatorstorageexporter
)
install(TARGETS akregatorstorageexporter ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 3f458c820..0b0018e1f 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -3,24 +3,27 @@
########### next target ###############
add_library(akregatorinterfaces)
-target_sources(akregatorinterfaces PRIVATE
- command.cpp
- feedlistmanagementinterface.cpp
- command.h
- feedlistmanagementinterface.h
+target_sources(
+ akregatorinterfaces
+ PRIVATE
+ command.cpp
+ feedlistmanagementinterface.cpp
+ command.h
+ feedlistmanagementinterface.h
)
set(akregatorinterfaces_userfeedback_LIB_SRCS)
if(TARGET KF6::UserFeedbackWidgets)
- target_sources(akregatorinterfaces PRIVATE
- userfeedback/userfeedbackmanager.cpp
- userfeedback/akregatoruserfeedbackprovider.cpp
- userfeedback/userfeedbackmanager.h
- userfeedback/akregatoruserfeedbackprovider.h
-)
+ target_sources(
+ akregatorinterfaces
+ PRIVATE
+ userfeedback/userfeedbackmanager.cpp
+ userfeedback/akregatoruserfeedbackprovider.cpp
+ userfeedback/userfeedbackmanager.h
+ userfeedback/akregatoruserfeedbackprovider.h
+ )
endif()
-
kconfig_add_kcfg_files(akregatorinterfaces akregatorconfig.kcfgc)
generate_export_header(akregatorinterfaces BASE_NAME akregatorinterfaces)
@@ -29,18 +32,23 @@ if(TARGET KF6::UserFeedbackWidgets)
target_link_libraries(akregatorinterfaces KF6::UserFeedbackWidgets)
endif()
-target_link_libraries(akregatorinterfaces
- KF6::ConfigGui
- Qt::Widgets
-)
+target_link_libraries(akregatorinterfaces KF6::ConfigGui Qt::Widgets)
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
set_target_properties(akregatorinterfaces PROPERTIES UNITY_BUILD ON)
endif()
-target_include_directories(akregatorinterfaces PUBLIC "$<BUILD_INTERFACE:${akregator_SOURCE_DIR}/interfaces;${akregator_BINARY_DIR}/interfaces>")
+target_include_directories(
+ akregatorinterfaces
+ PUBLIC
+ "$<BUILD_INTERFACE:${akregator_SOURCE_DIR}/interfaces;${akregator_BINARY_DIR}/interfaces>"
+)
-set_target_properties(akregatorinterfaces PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
+set_target_properties(
+ akregatorinterfaces
+ PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
)
-install(TARGETS akregatorinterfaces ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(
+ TARGETS akregatorinterfaces ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ LIBRARY NAMELINK_SKIP
+)
install(FILES akregator.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
-
diff --git a/interfaces/akregator.kcfg b/interfaces/akregator.kcfg
index a47dfb07e..53c6f5a7d 100644
--- a/interfaces/akregator.kcfg
+++ b/interfaces/akregator.kcfg
@@ -196,7 +196,7 @@
<label>Enabled Plasma Activity</label>
<default>false</default>
</entry>
-
+
</group>
<group name="Browser" >
<entry key="EnableJavascript" type="Bool">
diff --git a/kontactplugin/CMakeLists.txt b/kontactplugin/CMakeLists.txt
index 96abad175..96ec0e5d7 100644
--- a/kontactplugin/CMakeLists.txt
+++ b/kontactplugin/CMakeLists.txt
@@ -1,18 +1,29 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
-include_directories(
- ${akregator_SOURCE_DIR}/src
-)
+include_directories(${akregator_SOURCE_DIR}/src)
########### next target ###############
add_library(kontact_akregatorplugin MODULE)
qt_add_dbus_interfaces(kontact_akregator_PART_SRCS ${akregator_SOURCE_DIR}/src/org.kde.akregator.part.xml)
-target_sources(kontact_akregatorplugin PRIVATE akregator_plugin.cpp akregator_plugin.h ${kontact_akregator_PART_SRCS})
-
+target_sources(
+ kontact_akregatorplugin
+ PRIVATE
+ akregator_plugin.cpp
+ akregator_plugin.h
+ ${kontact_akregator_PART_SRCS}
+)
-target_link_libraries(kontact_akregatorplugin KF6::I18n KPim6::KontactInterface Qt::DBus)
+target_link_libraries(
+ kontact_akregatorplugin
+ KF6::I18n
+ KPim6::KontactInterface
+ Qt::DBus
+)
########### install files ###############
-install(TARGETS kontact_akregatorplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kontact)
+install(
+ TARGETS kontact_akregatorplugin
+ DESTINATION ${KDE_INSTALL_PLUGINDIR}/pim6/kontact
+)
diff --git a/readme-build-ftime.txt b/readme-build-ftime.txt
index 833cfa009..b931a1804 100644
--- a/readme-build-ftime.txt
+++ b/readme-build-ftime.txt
@@ -23,4 +23,3 @@ ClangBuildAnalyzer --analyze build-ftime.txt > analyze-build-ftime.txt
see https://aras-p.info/blog/2019/09/28/Clang-Build-Analyzer/
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dfdb9b753..a8873b2b7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,6 +1,10 @@
# SPDX-License-Identifier: CC0-1.0
# SPDX-FileCopyrightText: none
-configure_file(akregator-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/akregator-version.h @ONLY)
+configure_file(
+ akregator-version.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/akregator-version.h
+ @ONLY
+)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/command/
${CMAKE_CURRENT_SOURCE_DIR}/formatter/
@@ -13,7 +17,6 @@ include_directories(
add_subdirectory(icons)
-
########### next target ###############
set(akregator_common_SRCS)
@@ -30,14 +33,25 @@ if(TARGET Plasma::Activities)
)
endif()
-set(akregator_SRCS main.cpp mainwindow.cpp mainwindow.h systemsignalhandlers.cpp systemsignalhandlers.h ${akregator_common_SRCS})
+set(akregator_SRCS
+ main.cpp
+ mainwindow.cpp
+ mainwindow.h
+ systemsignalhandlers.cpp
+ systemsignalhandlers.h
+ ${akregator_common_SRCS}
+)
-file(GLOB ICONS_AKREGATOR_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-akregator.png")
+file(
+ GLOB ICONS_AKREGATOR_SRCS
+ "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-akregator.png"
+)
ecm_add_app_icon(akregator_SRCS ICONS ${ICONS_AKREGATOR_SRCS})
add_executable(akregator ${akregator_SRCS})
-target_link_libraries(akregator
+target_link_libraries(
+ akregator
KF6::I18n
KF6::Crash
KF6::Notifications
@@ -58,131 +72,118 @@ install(TARGETS akregator ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
add_library(akregatorprivate)
-target_sources(akregatorprivate PRIVATE
- ${akregator_common_SRCS}
- articleviewer-ng/webengine/articleviewerwebengine.cpp
- articleviewer-ng/webengine/articleviewerwebenginepage.cpp
- articleviewer-ng/webengine/articlehtmlwebenginewriter.cpp
- articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
-
- job/downloadarticlejob.cpp
- job/downloadfeediconjob.cpp
-
-
- widgets/statussearchbuttons.h
- widgets/statussearchbuttons.cpp
-
- formatter/articleformatter.cpp
- formatter/defaultnormalviewformatter.cpp
- formatter/defaultcombinedviewformatter.cpp
- formatter/grantleeviewformatter.cpp
- formatter/articlegrantleeobject.cpp
- formatter/grantleeutil.cpp
-
- frame/webengine/webengineframe.cpp
- frame/webengine/akrwebengineviewer.cpp
- frame/frame.cpp
- frame/mainframe.cpp
- frame/framemanager.cpp
-
- urlhandler/webengine/urlhandlerwebengine.cpp
- urlhandler/webengine/urlhandlerwebenginemanager.cpp
- articleviewerwidget.cpp
- aboutdata.cpp
- trayicon.cpp
- unityservicemanager.cpp
- article.cpp
- feed/feed.cpp
- feed/feedlist.cpp
- feed/feedretriever.cpp
- treenode.cpp
- treenodevisitor.cpp
- utils.cpp
- notificationmanager.cpp
- articlejobs.cpp
- folder.cpp
- kernel.cpp
- subscription/subscriptionlistjobs.cpp
- fetchqueue.cpp
- openurlrequest.cpp
- actions/actionmanager.cpp
- actions/actions.cpp
- akregator.qrc
-
- articleviewer-ng/webengine/articleviewerwebengine.h
- articleviewer-ng/webengine/articleviewerwebenginepage.h
- articleviewer-ng/webengine/articlehtmlwebenginewriter.h
- articleviewer-ng/webengine/articleviewerwebenginewidgetng.h
-
- job/downloadarticlejob.h
- job/downloadfeediconjob.h
-
- formatter/articleformatter.h
- formatter/defaultnormalviewformatter.h
- formatter/defaultcombinedviewformatter.h
- formatter/grantleeviewformatter.h
- formatter/articlegrantleeobject.h
- formatter/grantleeutil.h
-
- frame/webengine/webengineframe.h
- frame/webengine/akrwebengineviewer.h
- frame/frame.h
- frame/mainframe.h
- frame/framemanager.h
-
- storage/metakit/src/column.cpp
- storage/metakit/src/custom.cpp
- storage/metakit/src/derived.cpp
- storage/metakit/src/field.cpp
- storage/metakit/src/fileio.cpp
- storage/metakit/src/format.cpp
- storage/metakit/src/handler.cpp
- storage/metakit/src/persist.cpp
- storage/metakit/src/remap.cpp
- storage/metakit/src/std.cpp
- storage/metakit/src/store.cpp
- storage/metakit/src/string.cpp
- storage/metakit/src/table.cpp
- storage/metakit/src/univ.cpp
- storage/metakit/src/view.cpp
- storage/metakit/src/viewx.cpp
- storage/feedstorage.cpp
- storage/storage.cpp
-
-
- urlhandler/webengine/urlhandlerwebengine.h
- urlhandler/webengine/urlhandlerwebenginemanager.h
- articleviewerwidget.h
- aboutdata.h
- trayicon.h
- unityservicemanager.h
- feed/feed.h
- feed/feedlist.h
- feed/feedretriever.h
- treenode.h
- treenodevisitor.h
- utils.h
- notificationmanager.h
- articlejobs.h
- folder.h
- kernel.h
- subscription/subscriptionlistjobs.h
- fetchqueue.h
- openurlrequest.h
- actions/actionmanager.h
- actions/actions.h
- akregator_options.h
-
+target_sources(
+ akregatorprivate
+ PRIVATE
+ ${akregator_common_SRCS}
+ articleviewer-ng/webengine/articleviewerwebengine.cpp
+ articleviewer-ng/webengine/articleviewerwebenginepage.cpp
+ articleviewer-ng/webengine/articlehtmlwebenginewriter.cpp
+ articleviewer-ng/webengine/articleviewerwebenginewidgetng.cpp
+ job/downloadarticlejob.cpp
+ job/downloadfeediconjob.cpp
+ widgets/statussearchbuttons.h
+ widgets/statussearchbuttons.cpp
+ formatter/articleformatter.cpp
+ formatter/defaultnormalviewformatter.cpp
+ formatter/defaultcombinedviewformatter.cpp
+ formatter/grantleeviewformatter.cpp
+ formatter/articlegrantleeobject.cpp
+ formatter/grantleeutil.cpp
+ frame/webengine/webengineframe.cpp
+ frame/webengine/akrwebengineviewer.cpp
+ frame/frame.cpp
+ frame/mainframe.cpp
+ frame/framemanager.cpp
+ urlhandler/webengine/urlhandlerwebengine.cpp
+ urlhandler/webengine/urlhandlerwebenginemanager.cpp
+ articleviewerwidget.cpp
+ aboutdata.cpp
+ trayicon.cpp
+ unityservicemanager.cpp
+ article.cpp
+ feed/feed.cpp
+ feed/feedlist.cpp
+ feed/feedretriever.cpp
+ treenode.cpp
+ treenodevisitor.cpp
+ utils.cpp
+ notificationmanager.cpp
+ articlejobs.cpp
+ folder.cpp
+ kernel.cpp
+ subscription/subscriptionlistjobs.cpp
+ fetchqueue.cpp
+ openurlrequest.cpp
+ actions/actionmanager.cpp
+ actions/actions.cpp
+ akregator.qrc
+ articleviewer-ng/webengine/articleviewerwebengine.h
+ articleviewer-ng/webengine/articleviewerwebenginepage.h
+ articleviewer-ng/webengine/articlehtmlwebenginewriter.h
+ articleviewer-ng/webengine/articleviewerwebenginewidgetng.h
+ job/downloadarticlejob.h
+ job/downloadfeediconjob.h
+ formatter/articleformatter.h
+ formatter/defaultnormalviewformatter.h
+ formatter/defaultcombinedviewformatter.h
+ formatter/grantleeviewformatter.h
+ formatter/articlegrantleeobject.h
+ formatter/grantleeutil.h
+ frame/webengine/webengineframe.h
+ frame/webengine/akrwebengineviewer.h
+ frame/frame.h
+ frame/mainframe.h
+ frame/framemanager.h
+ storage/metakit/src/column.cpp
+ storage/metakit/src/custom.cpp
+ storage/metakit/src/derived.cpp
+ storage/metakit/src/field.cpp
+ storage/metakit/src/fileio.cpp
+ storage/metakit/src/format.cpp
+ storage/metakit/src/handler.cpp
+ storage/metakit/src/persist.cpp
+ storage/metakit/src/remap.cpp
+ storage/metakit/src/std.cpp
+ storage/metakit/src/store.cpp
+ storage/metakit/src/string.cpp
+ storage/metakit/src/table.cpp
+ storage/metakit/src/univ.cpp
+ storage/metakit/src/view.cpp
+ storage/metakit/src/viewx.cpp
+ storage/feedstorage.cpp
+ storage/storage.cpp
+ urlhandler/webengine/urlhandlerwebengine.h
+ urlhandler/webengine/urlhandlerwebenginemanager.h
+ articleviewerwidget.h
+ aboutdata.h
+ trayicon.h
+ unityservicemanager.h
+ feed/feed.h
+ feed/feedlist.h
+ feed/feedretriever.h
+ treenode.h
+ treenodevisitor.h
+ utils.h
+ notificationmanager.h
+ articlejobs.h
+ folder.h
+ kernel.h
+ subscription/subscriptionlistjobs.h
+ fetchqueue.h
+ openurlrequest.h
+ actions/actionmanager.h
+ actions/actions.h
+ akregator_options.h
)
if(HAVE_ACTIVITY_SUPPORT)
- target_sources(akregatorprivate PRIVATE
- activities/activitiesmanager.cpp
- activities/activitiesmanager.h
+ target_sources(
+ akregatorprivate
+ PRIVATE activities/activitiesmanager.cpp activities/activitiesmanager.h
)
endif()
-
target_include_directories(akregatorprivate PRIVATE storage/metakit/include)
qt_add_resources(akregatorprivate "html"
@@ -203,126 +204,115 @@ if(TARGET KF6::UserFeedbackWidgets)
target_link_libraries(akregatorprivate PRIVATE KF6::UserFeedbackWidgets)
endif()
-
-target_link_libraries(akregatorprivate
+target_link_libraries(
+ akregatorprivate
PRIVATE
- KF6::I18n
- KF6::Parts
- KF6::Notifications
- KPim6::Libkdepim
- KF6::Syndication
- KF6::Codecs
- KF6::JobWidgets
- KF6::KIOWidgets
- KF6::StatusNotifierItem
- akregatorinterfaces
- KPim6::PimCommon
- KPim6::GrantleeTheme
- KF6::KIOGui
- KPim6::MessageViewer
- Qt::PrintSupport
- KPim6::WebEngineViewer
- KF6::TextAddonsWidgets
+ KF6::I18n
+ KF6::Parts
+ KF6::Notifications
+ KPim6::Libkdepim
+ KF6::Syndication
+ KF6::Codecs
+ KF6::JobWidgets
+ KF6::KIOWidgets
+ KF6::StatusNotifierItem
+ akregatorinterfaces
+ KPim6::PimCommon
+ KPim6::GrantleeTheme
+ KF6::KIOGui
+ KPim6::MessageViewer
+ Qt::PrintSupport
+ KPim6::WebEngineViewer
+ KF6::TextAddonsWidgets
)
if(TARGET KF6::TextEditTextToSpeech)
- target_link_libraries(akregatorprivate
- PRIVATE
- KF6::TextEditTextToSpeech
-)
+ target_link_libraries(akregatorprivate PRIVATE KF6::TextEditTextToSpeech)
endif()
if(TARGET KPim6::PimCommonActivities AND HAVE_ACTIVITY_SUPPORT)
- target_link_libraries(akregatorprivate
- PUBLIC
- KPim6::PimCommonActivities
- )
+ target_link_libraries(akregatorprivate PUBLIC KPim6::PimCommonActivities)
endif()
-target_include_directories(akregatorprivate PUBLIC "$<BUILD_INTERFACE:${akregator_SOURCE_DIR}/src;${akregator_BINARY_DIR}/src>")
+target_include_directories(
+ akregatorprivate
+ PUBLIC
+ "$<BUILD_INTERFACE:${akregator_SOURCE_DIR}/src;${akregator_BINARY_DIR}/src>"
+)
-set_target_properties(akregatorprivate
- PROPERTIES VERSION ${KDEPIM_LIB_VERSION}
- SOVERSION ${KDEPIM_LIB_SOVERSION}
+set_target_properties(
+ akregatorprivate
+ PROPERTIES VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
+)
+install(
+ TARGETS akregatorprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+ LIBRARY NAMELINK_SKIP
)
-install(TARGETS akregatorprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
########### next target ###############
add_library(akregatorpart MODULE)
set(akregator_adaptator_SRCS)
qt_add_dbus_adaptor(akregator_adaptator_SRCS org.kde.akregator.part.xml akregator_part.h Akregator::Part)
-target_sources(akregatorpart PRIVATE
- ${akregator_common_SRCS}
- ${akregator_adaptator_SRCS}
-
- crashwidget/crashwidget.cpp
-
- utils/filtercolumnsproxymodel.cpp
-
- command/deletesubscriptioncommand.cpp
- command/createfeedcommand.cpp
- command/createfoldercommand.cpp
- command/expireitemscommand.cpp
- command/loadfeedlistcommand.cpp
- command/editsubscriptioncommand.cpp
- command/importfeedlistcommand.cpp
-
- widgets/statussearchline.cpp
- widgets/searchbar.cpp
- widgets/akregatorcentralwidget.cpp
-
-
- subscription/subscriptionlistview.cpp
- subscription/subscriptionlistdelegate.cpp
- subscription/subscriptionlistmodel.cpp
-
- abstractselectioncontroller.cpp
- articlematcher.cpp
- articlemodel.cpp
- selectioncontroller.cpp
- articlelistview.cpp
- actions/actionmanagerimpl.cpp
- addfeeddialog.cpp
- feed/feedpropertiesdialog.cpp
- tabwidget.cpp
- progressmanager.cpp
- akregator_part.cpp
- mainwidget.cpp
-
- crashwidget/crashwidget.h
-
- utils/filtercolumnsproxymodel.h
-
- command/deletesubscriptioncommand.h
- command/createfeedcommand.h
- command/createfoldercommand.h
- command/expireitemscommand.h
- command/loadfeedlistcommand.h
- command/editsubscriptioncommand.h
- command/importfeedlistcommand.h
-
- widgets/statussearchline.h
- widgets/searchbar.h
- widgets/akregatorcentralwidget.h
-
- subscription/subscriptionlistview.h
- subscription/subscriptionlistdelegate.h
- subscription/subscriptionlistmodel.h
-
- abstractselectioncontroller.h
- articlematcher.h
- articlemodel.h
- selectioncontroller.h
- articlelistview.h
- actions/actionmanagerimpl.h
- addfeeddialog.h
- feed/feedpropertiesdialog.h
- tabwidget.h
- progressmanager.h
- akregator_part.h
- mainwidget.h
-
- whatsnew/whatsnewtranslations.cpp
- whatsnew/whatsnewtranslations.h
+target_sources(
+ akregatorpart
+ PRIVATE
+ ${akregator_common_SRCS}
+ ${akregator_adaptator_SRCS}
+ crashwidget/crashwidget.cpp
+ utils/filtercolumnsproxymodel.cpp
+ command/deletesubscriptioncommand.cpp
+ command/createfeedcommand.cpp
+ command/createfoldercommand.cpp
+ command/expireitemscommand.cpp
+ command/loadfeedlistcommand.cpp
+ command/editsubscriptioncommand.cpp
+ command/importfeedlistcommand.cpp
+ widgets/statussearchline.cpp
+ widgets/searchbar.cpp
+ widgets/akregatorcentralwidget.cpp
+ subscription/subscriptionlistview.cpp
+ subscription/subscriptionlistdelegate.cpp
+ subscription/subscriptionlistmodel.cpp
+ abstractselectioncontroller.cpp
+ articlematcher.cpp
+ articlemodel.cpp
+ selectioncontroller.cpp
+ articlelistview.cpp
+ actions/actionmanagerimpl.cpp
+ addfeeddialog.cpp
+ feed/feedpropertiesdialog.cpp
+ tabwidget.cpp
+ progressmanager.cpp
+ akregator_part.cpp
+ mainwidget.cpp
+ crashwidget/crashwidget.h
+ utils/filtercolumnsproxymodel.h
+ command/deletesubscriptioncommand.h
+ command/createfeedcommand.h
+ command/createfoldercommand.h
+ command/expireitemscommand.h
+ command/loadfeedlistcommand.h
+ command/editsubscriptioncommand.h
+ command/importfeedlistcommand.h
+ widgets/statussearchline.h
+ widgets/searchbar.h
+ widgets/akregatorcentralwidget.h
+ subscription/subscriptionlistview.h
+ subscription/subscriptionlistdelegate.h
+ subscription/subscriptionlistmodel.h
+ abstractselectioncontroller.h
+ articlematcher.h
+ articlemodel.h
+ selectioncontroller.h
+ articlelistview.h
+ actions/actionmanagerimpl.h
+ addfeeddialog.h
+ feed/feedpropertiesdialog.h
+ tabwidget.h
+ progressmanager.h
+ akregator_part.h
+ mainwidget.h
+ whatsnew/whatsnewtranslations.cpp
+ whatsnew/whatsnewtranslations.h
)
ki18n_wrap_ui(akregatorpart
@@ -331,7 +321,8 @@ ki18n_wrap_ui(akregatorpart
)
generate_export_header(akregatorpart BASE_NAME akregatorpart)
-target_link_libraries(akregatorpart
+target_link_libraries(
+ akregatorpart
akregatorinterfaces
akregatorprivate
KF6::I18n
@@ -345,7 +336,6 @@ target_link_libraries(akregatorpart
KPim6::MessageViewer
KF6::Parts
KF6::Notifications
-
Qt::WebEngineWidgets
KPim6::WebEngineViewer
KF6::KIOGui
@@ -361,12 +351,21 @@ install(TARGETS akregatorpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
########### install files ###############
-install(PROGRAMS data/org.kde.akregator.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES data/org.kde.akregator.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
-install(FILES org.kde.akregator.part.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR})
+install(
+ PROGRAMS data/org.kde.akregator.desktop
+ DESTINATION ${KDE_INSTALL_APPDIR}
+)
+install(
+ FILES data/org.kde.akregator.appdata.xml
+ DESTINATION ${KDE_INSTALL_METAINFODIR}
+)
+install(
+ FILES org.kde.akregator.part.xml
+ DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}
+)
install(FILES data/akregator.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFYRCDIR})
if(BUILD_TESTING)
- add_subdirectory(job/autotests)
- add_subdirectory(widgets/autotests)
+ add_subdirectory(job/autotests)
+ add_subdirectory(widgets/autotests)
endif()
diff --git a/src/data/akregator.notifyrc b/src/data/akregator.notifyrc
index 28dc832ae..2bb459c38 100644
--- a/src/data/akregator.notifyrc
+++ b/src/data/akregator.notifyrc
@@ -74,7 +74,7 @@ Comment[zh_TW]=Akregator
Name=Feed added
Name[af]=Stroom bygevoeg
Name[ar]=أُضيفت تغذية
-Name[az]=Lent əlavə edildi
+Name[az]=Lent əlavə edildi
Name[bg]=Добавена е емисия
Name[bs]=Dovod dodan
Name[ca]=Font afegida
@@ -333,4 +333,3 @@ Comment[x-test]=xxNew articles were fetchedxx
Comment[zh_CN]=获取了新文章
Comment[zh_TW]=已取得新文章
Action=Popup
-
diff --git a/src/data/akregator_part.rc b/src/data/akregator_part.rc
index 5777bb7c4..ab9ff8d84 100644
--- a/src/data/akregator_part.rc
+++ b/src/data/akregator_part.rc
@@ -96,7 +96,7 @@
</MenuBar>
<ToolBar noMerge="1" name="mainToolBar" fullWidth="true"><text>Main Toolbar</text>
- <Action name="feed_add"/>
+ <Action name="feed_add"/>
<Action name="feed_fetch"/>
<Action name="feed_fetch_all"/>
<Action name="feed_stop"/>
diff --git a/src/data/akregator_shell.rc b/src/data/akregator_shell.rc
index 295694275..68ab563a3 100644
--- a/src/data/akregator_shell.rc
+++ b/src/data/akregator_shell.rc
@@ -24,7 +24,7 @@
<text>&Go</text>
<Merge/>
</Menu>
-
+
<Menu noMerge="1" name="feed">
<text>Fee&d</text>
<Merge/>
@@ -34,7 +34,7 @@
<text>&Article</text>
<Merge/>
</Menu>
-
+
<Menu noMerge="1" name="settings" >
<text>&Settings</text>
<Merge name="StandardToolBarMenuHandler" />
diff --git a/src/icons/CMakeLists.txt b/src/icons/CMakeLists.txt
index 25bd8a0ee..5487f6350 100644
--- a/src/icons/CMakeLists.txt
+++ b/src/icons/CMakeLists.txt
@@ -7,4 +7,3 @@ ecm_install_icons(ICONS
DESTINATION ${KDE_INSTALL_ICONDIR}
THEME hicolor
)
-
diff --git a/src/job/autotests/CMakeLists.txt b/src/job/autotests/CMakeLists.txt
index 7d970b108..2ecc6f815 100644
--- a/src/job/autotests/CMakeLists.txt
+++ b/src/job/autotests/CMakeLists.txt
@@ -6,7 +6,7 @@ macro(akregator_job_unittest _source)
TEST_NAME ${_name}
NAME_PREFIX "akregator-job"
LINK_LIBRARIES Qt::Test akregatorprivate
-)
+ )
endmacro()
akregator_job_unittest(downloadfeediconjobtest.cpp)
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 20d6fe853..c96cdc9ae 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -134,7 +134,7 @@ void MainWindow::slotToggleMenubar(bool dontShowWarning)
void MainWindow::updateHamburgerMenu()
{
-#if 0
+#if 0
delete mHamburgerMenu->menu();
auto menu = new QMenu(this);
menu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Quit)));
diff --git a/src/storage/metakit/CHANGES b/src/storage/metakit/CHANGES
index 4596ed220..6976fa050 100644
--- a/src/storage/metakit/CHANGES
+++ b/src/storage/metakit/CHANGES
@@ -18,7 +18,7 @@
This is a potentially serious bug (though all data can still be
recovered if dealt with right away). When an I/O error occurs
under specific circumstances in the commit, the resulting file
- may be left in an improper state. Full details are desribed in
+ may be left in an improper state. Full details are described in
http://www.equi4.com/pipermail/metakit/2005-November/002144.html
2005-11-16 Ranlib called too early
@@ -34,7 +34,7 @@
Added logic to disable mmap calls on some HP-UX versions.
Plus other tweaks for the Tcl build. Mods by Matt Newman.
-
+
2005-10-01 The HP-UX fix did not work on macosx.
Made the 2005-09-06 change below conditional on __hpux, so that
@@ -152,7 +152,7 @@
Fixed configure.in + Makefile.in to support static builds again.
The Tcl static target is now Mk4tcl.a i.s.o. libmk4tcl.a (ouch).
-
+
For Tcl and Python, the following now works on my Linux box:
../unix/conficure --with-tcl=/usr/include --with-tcl=/usr
More elaborate params are also supported, see "configure --help".
@@ -174,7 +174,7 @@
2004-03-09 Added new build files for Mk4tcl
Added the TEA configure system to tcl/, so that Mk4tcl can now also
- be built with that approach. This supercedes the current Mk4tcl
+ be built with that approach. This supersedes the current Mk4tcl
code in unix/Makefile.in, which will probably be dropped soon.
2004-03-08 Added DESTDIR to makefile
@@ -191,7 +191,7 @@
Added a new win/msvc70/ directory with all MSVC 7.0 project files.
With thanks to David Van Maren for sharing his work on this.
-
+
Also added David McNab's info on how to build Mk4py with older
versions of Python. See python/README-dmn for details.
@@ -246,7 +246,7 @@
2004-01-18 Fixed rare but very serious subview resizing bug
- Fixed rare but serious file damaging bug, when resizing a comitted
+ Fixed rare but serious file damaging bug, when resizing a committed
subview to empty, committing, and then resizing back to containing
data. Added new s48 test to force this bug to the surface.
@@ -259,7 +259,7 @@
"myview[name:A]", the release code would crash on a null pointer
dereference at some point. Changed so the code now treats any type
it does not know about as "I" (works a bit better than using "S").
-
+
The debug build still hits an assertion, as before. Added s47 test.
2004-01-03 Fixed typo in PyView.cpp
@@ -272,7 +272,7 @@
interface (not in Mk4tcl), which returns a view, instead of a list
of integers. In the case of 1 row, optimization was done wrongly,
omitting the sort as well as the remapping. Fixed.
-
+
Oomk needs to be patched to work around this (don't sort if n=1).
2003-12-13 Tweak to avoid two unisgned/signed compiler warnings
@@ -307,7 +307,7 @@
2003-10-10 Added c22 test
- Added test to make sure groubpy/select bug is not present in the C++
+ Added test to make sure groupby/select bug is not present in the C++
core (bts #75 reports the bug found for Mk4tcl/Mk4too).
2003-10-01 Fixed bugs in Tcl test suite
@@ -315,7 +315,7 @@
The tests in tcl/test/ were incorrectly closing non-test datafiles,
such as the "exe" one open while tclkit runs, and needed when a
slave is created which needs to re-run init.tcl etc from VFS.
-
+
2003-09-30 Python 2.3.1 & cleanup
Tweaked PWONumber.h and PyRowRef.cpp and MSVC6 project so it can
@@ -534,7 +534,7 @@
2003-01-17 Add synonym for mk4tcl "info" command
- To avoid a name clash, "$view info" can now also be written as
+ To avoid a name clash, "$view info" can now also be written as
"$view properties" (or an abbreviation of that).
2003-01-16 Allow access to root view in Mk4tcl
@@ -570,7 +570,7 @@
2002-12-23 Tweak for Borland builder 5 & 6
Changed #ifdef line 22 in univ.cpp (fix by S. Cusack).
-
+
2002-12-09 Fixed bug in selection view change propagation
Fixed a bug when a row is inserted in a view on which a selection
@@ -595,7 +595,7 @@
Small changes to the source code to avoid errors from the MWCW 8.x
compilers. Omit stricmp and strdup with CW version >= 8.
-
+
2002-11-04 Fixed typo in Makefile
This prevented Mk4py from getting installed (thanks F. Majid).
@@ -613,7 +613,7 @@
done directly from a mmap'ed file (this can hang a process, hard).
Added a "mktcl" subproject to msevc3, to build "Mk4tcl.dll".
-
+
2002-10-27 Added multi-thread support for Unix
Added changes to support same appartment-threading model on Unix as
@@ -633,7 +633,7 @@
2002-10-16 Added "dup" subcommand to Mk4tcl OO
There was no way to duplicate a view in the mk4tcl OO interface.
- Needed to properly deal with re-use / ref counts - added "dup".
+ Needed to properly deal with reuse / ref counts - added "dup".
2002-10-11 Cast widened in Mk4tcl, support q4_TINY def for Mk4tcl
@@ -735,7 +735,7 @@
(or smaller if there are over 1000 rows).
The bug is forced by new (frightfully short) test cases s44 + s45.
- Fixed by performing a slightly less agressive optimization in the
+ Fixed by performing a slightly less aggressive optimization in the
c4_FormatB::Commit (which is also shared with strings, type 'S').
Removed a "--exclude" from diff, which is not portable enough.
@@ -748,7 +748,7 @@
Various bug fixes, fixed a number of platform issues.
-2002-04-28 Fix small-int re-use view bug
+2002-04-28 Fix small-int reuse view bug
A nasty bug was reported by VPI which caused upper bytes to be
truncated from int values. The problem appears when storing ints of
@@ -772,7 +772,7 @@
deletes were done, and can cause incorrect data to be copied. It is
relatively hard to reproduce (the test dataset was 12 Mb), but the
change explains things fully and is in fact very small.
-
+
2002-04-02 Fix bug in debug code
In remap.cpp line 531, a debug assertion was moved in the wrong way.
@@ -791,7 +791,7 @@
2002-03-31 ############################################## MK 2.4.4
- Various bug fixes and (blocked view) performance enhacements.
+ Various bug fixes and (blocked view) performance enhancements.
2002-03-28 More blocked optimizations, IRIX tweaks
@@ -847,7 +847,7 @@
works. This is not the case in commit-extend mode, where a load will
read th state as it was before extending - it cannot know there is
more.
-
+
Added test s40 to verify this case. Also reorged a few more files
(tbasics and tstore4 split into 2 each).
@@ -1081,7 +1081,7 @@
the commit. Fixed, and added test s37 to catch this case.
Don't strip symbols from installed static libs (whoops!).
-
+
2001-10-31 Fixed Mk4py error flag clear on delete
When deleting rows, a slice was constructed from a PWOSequence, which
@@ -1170,7 +1170,7 @@
- row.__index__ returns current position in view
- view.setsize(n) added, extends/truncates number of rows
- generalized makerow to allow any sequence, not just lists
-
+
Changed PyRowRef to inc/dec the reference it has to the underlying
view. Should prevent dangling pointer problems, such as deleting a
storage while rows are still in use. This adds a little overhead.
@@ -1180,7 +1180,7 @@
2001-06-12 Close DB filedesc on exec
Added an fcntl call to fileio.cpp, so that on Unix database file
- decriptors are closed on exec (relevant when doing "exec ... &").
+ descriptors are closed on exec (relevant when doing "exec ... &").
2001-05-30 Fixed mem-leak in Mk4tcl
@@ -1188,7 +1188,7 @@
2001-05-28 Security fix in Tclkit
- See end of the tcl/kit/README file for deatils.
+ See end of the tcl/kit/README file for details.
2001-03-30 Fixed long-standing commit bug
@@ -1278,7 +1278,7 @@
repository is up to date again.
Mk4py: improved number conversion and error handling.
-
+
2000-11-03 ############################################## MK 2.3.3
First final release candidate
@@ -1313,7 +1313,7 @@
Source code tweaks to avoid DEC CXX 5.7 compiler errors. Add
no-inherit flags for Win32 to not leak file handles.
-
+
2000-08-27 Allow derived row deletes in Mk4py
Added code to PyView.cpp to handle deletes (and slice deletes) in
@@ -1342,7 +1342,7 @@
This bug *only* applies to bytes properties in pre-2.0 data files.
Conversion of 2.0x files is unaffected.
-
+
2000-07-25 Fixed new self-referential views
The new recursive / self-referential view definition style has been
@@ -1355,7 +1355,7 @@
Solved a very long-standing bug in restructuring, which caused
incorrect (non-zero, small) default values when a c4_DoubleProp was
- added to a view which already had rows.
+ added to a view which already had rows.
2000-07-18 Added remapwith and pair to Mk4py
@@ -1424,7 +1424,7 @@
2000-06-16 Improved modifiable custom viewers
The Pair and Slice viewers now support set/insert/remove, while
- RemapWith/Concat/Rename support setting values.
+ RemapWith/Concat/Rename support setting values.
2000-06-15 Many changes to the Tcl code, hashing
@@ -1783,7 +1783,7 @@
Yet more fixes in comparisons, this is all one problem, caused by
changes in caching for ints, floats, and doubles. Added B24 test.
- These (last?) problems occured in custom / compound views.
+ These (last?) problems occurred in custom / compound views.
1999-11-08 MK 1.9f Fixed sort comparisons
@@ -1826,7 +1826,7 @@
to a view of which the underlying storage object goes away will end
up with the same number of rows as before, but no properties at all.
- Fixed a problem which would have occured when properties are being
+ Fixed a problem which would have occurred when properties are being
"restructured away" and then committed. The solution is to check
for this and delete all such properties at commit time.
diff --git a/src/storage/metakit/include/mk4.h b/src/storage/metakit/include/mk4.h
index a02235ebb..cadf8ad86 100644
--- a/src/storage/metakit/include/mk4.h
+++ b/src/storage/metakit/include/mk4.h
@@ -1086,4 +1086,3 @@ FILE *f4_LogPropMods(FILE *fp_, int propId_);
#endif
//---------------------------------------------------------------------------
-
diff --git a/src/storage/metakit/include/mk4.inl b/src/storage/metakit/include/mk4.inl
index 0af51b204..7efef95d7 100644
--- a/src/storage/metakit/include/mk4.inl
+++ b/src/storage/metakit/include/mk4.inl
@@ -7,7 +7,7 @@
/////////////////////////////////////////////////////////////////////////////
// Reordered inlines so they are always defined before their first use
-
+
d4_inline c4_Cursor c4_RowRef::operator& () const
{
return _cursor;
@@ -124,7 +124,7 @@ d4_inline int c4_View::NumProperties() const
}
/** Find the index of a property, given its id
- * @param propId_ Unique id associated to a specific propoerty
+ * @param propId_ Unique id associated to a specific property
* @return The index of the property, or -1 of it was not found
*/
d4_inline int c4_View::FindProperty(int propId_)
@@ -188,7 +188,7 @@ d4_inline bool operator<= (const c4_View& a_, const c4_View& b_)
/// True if first view is greater or equal to second view
d4_inline bool operator>= (const c4_View& a_, const c4_View& b_)
-{
+{
return !(a_ < b_);
}
@@ -297,7 +297,7 @@ d4_inline bool operator<= (c4_Cursor a_, c4_Cursor b_)
}
d4_inline bool operator>= (c4_Cursor a_, c4_Cursor b_)
-{
+{
return !(a_ < b_);
}
@@ -313,7 +313,7 @@ d4_inline c4_RowRef c4_RowRef::operator= (const c4_RowRef& rowRef_)
{
if (_cursor != rowRef_._cursor)
_cursor._seq->SetAt(_cursor._index, &rowRef_);
-
+
return *this;
}
@@ -325,7 +325,7 @@ d4_inline c4_View c4_RowRef::Container() const
d4_inline bool operator== (const c4_RowRef& a_, const c4_RowRef& b_)
{
return (&a_)._seq->Compare((&a_)._index, &b_) == 0;
-}
+}
d4_inline bool operator!= (const c4_RowRef& a_, const c4_RowRef& b_)
{
@@ -336,7 +336,7 @@ d4_inline bool operator< (const c4_RowRef& a_, const c4_RowRef& b_)
{
// 25-5-1998: don't exchange a and b, this comparison is -not- symmetric
return (&a_)._seq->Compare((&a_)._index, &b_) < 0;
-}
+}
d4_inline bool operator> (const c4_RowRef& a_, const c4_RowRef& b_)
{
@@ -350,7 +350,7 @@ d4_inline bool operator<= (const c4_RowRef& a_, const c4_RowRef& b_)
}
d4_inline bool operator>= (const c4_RowRef& a_, const c4_RowRef& b_)
-{
+{
return !(a_ < b_);
}
@@ -360,15 +360,15 @@ d4_inline bool operator>= (const c4_RowRef& a_, const c4_RowRef& b_)
/// Construct an empty binary object
d4_inline c4_Bytes::c4_Bytes ()
: _size (0), _copy (false)
-{
- _contents = nullptr; // moved out of intializers for DEC CXX 5.7
+{
+ _contents = nullptr; // moved out of initializers for DEC CXX 5.7
}
/// Construct an object with contents, no copy
d4_inline c4_Bytes::c4_Bytes (const void* buf_, int len_)
: _size (len_), _copy (false)
{
- _contents = (t4_byte*) buf_; // moved out of intializers for DEC CXX 5.7
+ _contents = (t4_byte*) buf_; // moved out of initializers for DEC CXX 5.7
}
/// Returns a pointer to the contents.
@@ -400,7 +400,7 @@ d4_inline c4_Bytes::~c4_Bytes ()
{
_LoseCopy();
}
-
+
/////////////////////////////////////////////////////////////////////////////
// c4_Reference
@@ -519,7 +519,7 @@ d4_inline char c4_Property::Type() const
/////////////////////////////////////////////////////////////////////////////
// c4_IntProp
-d4_inline c4_IntProp::c4_IntProp (const char* name_)
+d4_inline c4_IntProp::c4_IntProp (const char* name_)
: c4_Property ('I', name_)
{
}
@@ -548,18 +548,18 @@ d4_inline c4_Row c4_IntProp::AsRow(t4_i32 value_) const
operator() (row) = value_;
return row;
}
-
+
d4_inline c4_Row c4_IntProp::operator[] (t4_i32 value_) const
{
return AsRow(value_);
}
-
+
/////////////////////////////////////////////////////////////////////////////
#if !defined(q4_TINY)
/////////////////////////////////////////////////////////////////////////////
// c4_LongProp
-d4_inline c4_LongProp::c4_LongProp (const char* name_)
+d4_inline c4_LongProp::c4_LongProp (const char* name_)
: c4_Property ('L', name_)
{
}
@@ -588,16 +588,16 @@ d4_inline c4_Row c4_LongProp::AsRow(t4_i64 value_) const
operator() (row) = value_;
return row;
}
-
+
d4_inline c4_Row c4_LongProp::operator[] (t4_i64 value_) const
{
return AsRow(value_);
}
-
+
/////////////////////////////////////////////////////////////////////////////
// c4_FloatProp
-d4_inline c4_FloatProp::c4_FloatProp (const char* name_)
+d4_inline c4_FloatProp::c4_FloatProp (const char* name_)
: c4_Property ('F', name_)
{
}
@@ -626,16 +626,16 @@ d4_inline c4_Row c4_FloatProp::AsRow(double value_) const
operator() (row) = value_;
return row;
}
-
+
d4_inline c4_Row c4_FloatProp::operator[] (double value_) const
{
return AsRow(value_);
}
-
+
/////////////////////////////////////////////////////////////////////////////
// c4_DoubleProp
-d4_inline c4_DoubleProp::c4_DoubleProp (const char* name_)
+d4_inline c4_DoubleProp::c4_DoubleProp (const char* name_)
: c4_Property ('D', name_)
{
}
@@ -664,22 +664,22 @@ d4_inline c4_Row c4_DoubleProp::AsRow(double value_) const
operator() (row) = value_;
return row;
}
-
+
d4_inline c4_Row c4_DoubleProp::operator[] (double value_) const
{
return AsRow(value_);
}
-
+
/////////////////////////////////////////////////////////////////////////////
#endif // !q4_TINY
/////////////////////////////////////////////////////////////////////////////
// c4_BytesProp
-d4_inline c4_BytesProp::c4_BytesProp (const char* name_)
+d4_inline c4_BytesProp::c4_BytesProp (const char* name_)
: c4_Property ('B', name_)
{
}
-
+
d4_inline c4_BytesProp::~c4_BytesProp ()
= default;
@@ -704,20 +704,20 @@ d4_inline c4_Row c4_BytesProp::AsRow(const c4_Bytes& value_) const
operator() (row) = value_;
return row;
}
-
+
d4_inline c4_Row c4_BytesProp::operator[] (const c4_Bytes& value_) const
{
return AsRow(value_);
}
-
+
/////////////////////////////////////////////////////////////////////////////
// c4_StringProp
-d4_inline c4_StringProp::c4_StringProp (const char* name_)
+d4_inline c4_StringProp::c4_StringProp (const char* name_)
: c4_Property ('S', name_)
{
}
-
+
d4_inline c4_StringProp::~c4_StringProp ()
= default;
@@ -742,12 +742,12 @@ d4_inline c4_Row c4_StringProp::AsRow(const char* value_) const
operator() (row) = value_;
return row;
}
-
+
d4_inline c4_Row c4_StringProp::operator[] (const char* value_) const
{
return AsRow(value_);
}
-
+
/////////////////////////////////////////////////////////////////////////////
// c4_ViewProp
@@ -755,7 +755,7 @@ d4_inline c4_ViewProp::c4_ViewProp (const char* name_)
: c4_Property ('V', name_)
{
}
-
+
d4_inline c4_ViewProp::~c4_ViewProp ()
= default;
@@ -780,19 +780,19 @@ d4_inline c4_Row c4_ViewProp::AsRow(const c4_View& value_) const
operator() (row) = value_;
return row;
}
-
+
d4_inline c4_Row c4_ViewProp::operator[] (const c4_View& value_) const
{
return AsRow(value_);
}
-
+
/////////////////////////////////////////////////////////////////////////////
// c4_Strategy
/// True if we can do I/O with this object
d4_inline bool c4_Strategy::IsValid() const
-{
- return false;
+{
+ return false;
}
/////////////////////////////////////////////////////////////////////////////
@@ -821,7 +821,7 @@ d4_inline c4_Dependencies* c4_Sequence::GetDependencies() const
/////////////////////////////////////////////////////////////////////////////
// Reordered inlines so they are always used after their definition
-
+
/// Dereferences this cursor to "almost" a row.
d4_inline c4_RowRef c4_Cursor::operator* () const
{
@@ -850,7 +850,7 @@ d4_inline c4_RowRef c4_View::operator[] (
{
return GetAt(index_);
}
-
+
/** Element access, shorthand for GetAt
* @return A reference to the specified row in the view.
* This reference can be used on either side of the assignment operator.
diff --git a/src/storage/metakit/include/mk4io.h b/src/storage/metakit/include/mk4io.h
index a4219021d..9bb816e40 100644
--- a/src/storage/metakit/include/mk4io.h
+++ b/src/storage/metakit/include/mk4io.h
@@ -60,4 +60,3 @@ protected:
};
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/include/mk4str.h b/src/storage/metakit/include/mk4str.h
index 0c3e96c6c..7456b5828 100644
--- a/src/storage/metakit/include/mk4str.h
+++ b/src/storage/metakit/include/mk4str.h
@@ -175,4 +175,3 @@ bool operator!=(const char *s1, const c4_String &s2);
#endif
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/include/mk4str.inl b/src/storage/metakit/include/mk4str.inl
index a53f0b76b..e7683b5b4 100644
--- a/src/storage/metakit/include/mk4str.inl
+++ b/src/storage/metakit/include/mk4str.inl
@@ -9,7 +9,7 @@
// c4_String
#if defined(q4_MFC) // Microsoft Foundation Classes
-
+
#elif defined(q4_STD) // STL and standard strings
/// Construct empty string
@@ -61,20 +61,20 @@ d4_inline char c4_String::operator[] (int i) const
{
return at(i);
}
-
+
d4_inline c4_String operator+ (const c4_String& a_, const c4_String& b_)
{
- return (d4_std::string) a_ + (d4_std::string) b_;
+ return (d4_std::string) a_ + (d4_std::string) b_;
}
d4_inline c4_String operator+ (const c4_String& a_, const char* b_)
{
- return (d4_std::string) a_ + (d4_std::string) b_;
+ return (d4_std::string) a_ + (d4_std::string) b_;
}
d4_inline c4_String operator+ (const char* a_, const c4_String& b_)
{
- return (d4_std::string) a_ + (d4_std::string) b_;
+ return (d4_std::string) a_ + (d4_std::string) b_;
}
d4_inline const c4_String& c4_String::operator+= (const c4_String& s_)
@@ -117,7 +117,7 @@ d4_inline c4_String c4_String::Right(int nCount_) const
nCount_ = length();
return substr(length() - nCount_, nCount_);
}
-
+
d4_inline int c4_String::Compare(const char* str_) const
{
return compare(str_);
@@ -167,7 +167,7 @@ d4_inline bool operator!= (const c4_String& a_, const c4_String& b_)
{
return (d4_std::string) a_ != (d4_std::string) b_;
}
-
+
d4_inline bool operator== (const c4_String& a_, const char* b_)
{
return (d4_std::string) a_ == (d4_std::string) b_;
@@ -237,7 +237,7 @@ d4_inline char c4_String::operator[] (int i) const
{
return Data()[i];
}
-
+
d4_inline int c4_String::GetLength() const
{
return _value[1] != 255 ? _value[1] : FullLength();
diff --git a/src/storage/metakit/src/column.h b/src/storage/metakit/src/column.h
index ede4adf97..13fd23116 100644
--- a/src/storage/metakit/src/column.h
+++ b/src/storage/metakit/src/column.h
@@ -209,4 +209,3 @@ public:
#endif
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/column.inl b/src/storage/metakit/src/column.inl
index 219218e04..424f582a9 100644
--- a/src/storage/metakit/src/column.inl
+++ b/src/storage/metakit/src/column.inl
@@ -59,7 +59,7 @@ d4_inline const t4_byte* c4_Column::LoadNow(t4_i32 offset_)
offset_ += _slack;
auto* ptr = (t4_byte*) _segments.GetAt(fSegIndex(offset_));
- return ptr + fSegRest(offset_);
+ return ptr + fSegRest(offset_);
}
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/storage/metakit/src/custom.h b/src/storage/metakit/src/custom.h
index 8627a2bfe..9c7731e70 100644
--- a/src/storage/metakit/src/custom.h
+++ b/src/storage/metakit/src/custom.h
@@ -57,4 +57,3 @@ extern c4_CustomViewer *f4_CustJoin(c4_Sequence &, const c4_View &, const
c4_View &, bool);
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/derived.h b/src/storage/metakit/src/derived.h
index ce09eee80..f121134cc 100644
--- a/src/storage/metakit/src/derived.h
+++ b/src/storage/metakit/src/derived.h
@@ -18,4 +18,3 @@ extern c4_Sequence *f4_CreateSort(c4_Sequence &, c4_Sequence * = nullptr);
extern c4_Sequence *f4_CreateProject(c4_Sequence &, c4_Sequence &, bool, c4_Sequence * = nullptr);
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/field.h b/src/storage/metakit/src/field.h
index 0f714c352..8af3d71ba 100644
--- a/src/storage/metakit/src/field.h
+++ b/src/storage/metakit/src/field.h
@@ -58,4 +58,3 @@ private:
#endif
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/field.inl b/src/storage/metakit/src/field.inl
index 3d0a248ca..8ff246967 100644
--- a/src/storage/metakit/src/field.inl
+++ b/src/storage/metakit/src/field.inl
@@ -24,12 +24,12 @@ d4_inline const c4_String& c4_Field::Name() const
{
return _name;
}
-
+
d4_inline char c4_Field::OrigType() const
{
return _type;
}
-
+
d4_inline char c4_Field::Type() const
{
return _type == 'M' ? 'B' : _type;
diff --git a/src/storage/metakit/src/format.h b/src/storage/metakit/src/format.h
index 7ed3daf80..9b19cd916 100644
--- a/src/storage/metakit/src/format.h
+++ b/src/storage/metakit/src/format.h
@@ -17,4 +17,3 @@ extern int f4_ClearFormat(char);
extern int f4_CompareFormat(char, const c4_Bytes &, const c4_Bytes &);
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/handler.cpp b/src/storage/metakit/src/handler.cpp
index c5d9fe815..fe01f8a9f 100644
--- a/src/storage/metakit/src/handler.cpp
+++ b/src/storage/metakit/src/handler.cpp
@@ -449,7 +449,7 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq &dst_, int
}
#endif
// 10-4-2002: Need to use copies in case either item points into
- // memory that could move, or if access re-uses a shared buffer.
+ // memory that could move, or if access reuses a shared buffer.
// The special cases are sufficiently tricky that it's NOT being
// optimized for now (temp bufs, mmap ptrs, c4_Bytes buffering).
diff --git a/src/storage/metakit/src/handler.h b/src/storage/metakit/src/handler.h
index f55c873cd..9b62154d7 100644
--- a/src/storage/metakit/src/handler.h
+++ b/src/storage/metakit/src/handler.h
@@ -143,4 +143,3 @@ protected:
#endif
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/handler.inl b/src/storage/metakit/src/handler.inl
index ace9b4bb3..82babecd2 100644
--- a/src/storage/metakit/src/handler.inl
+++ b/src/storage/metakit/src/handler.inl
@@ -62,7 +62,7 @@ d4_inline int c4_HandlerSeq::NumRows() const
return _numRows;
}
-
+
d4_inline int c4_HandlerSeq::NumHandlers() const
{
return _handlers.GetSize();
@@ -71,7 +71,7 @@ d4_inline int c4_HandlerSeq::NumHandlers() const
d4_inline c4_Handler& c4_HandlerSeq::NthHandler(int index_) const
{
d4_assert(_handlers.GetAt(index_) != 0);
-
+
return *(c4_Handler*) _handlers.GetAt(index_);
}
diff --git a/src/storage/metakit/src/header.h b/src/storage/metakit/src/header.h
index a4d6a9ca4..cf4148d17 100644
--- a/src/storage/metakit/src/header.h
+++ b/src/storage/metakit/src/header.h
@@ -208,4 +208,3 @@ void f4_DoLogProp(const c4_Handler *, int, const char *, int);
#endif
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/persist.cpp b/src/storage/metakit/src/persist.cpp
index 41d1d0602..ed4adcf91 100644
--- a/src/storage/metakit/src/persist.cpp
+++ b/src/storage/metakit/src/persist.cpp
@@ -309,7 +309,7 @@ t4_i32 c4_Allocator::ReduceFrags(int goal_, int sHi_, int sLo_)
{
// drastic fail-safe measure: remove small gaps if vec gets too long
// this will cause some lost free space but avoids array overflow
- // the lost space will most probably be re-used after the next commit
+ // the lost space will most probably be reused after the next commit
int limit = GetSize() - 2;
t4_i32 loss = 0;
diff --git a/src/storage/metakit/src/persist.h b/src/storage/metakit/src/persist.h
index dbcf072ee..642824f66 100644
--- a/src/storage/metakit/src/persist.h
+++ b/src/storage/metakit/src/persist.h
@@ -123,4 +123,3 @@ public:
};
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/remap.cpp b/src/storage/metakit/src/remap.cpp
index 8f32d5c5b..78af3e357 100644
--- a/src/storage/metakit/src/remap.cpp
+++ b/src/storage/metakit/src/remap.cpp
@@ -109,11 +109,11 @@ public:
};
/////////////////////////////////////////////////////////////////////////////
-// The following contains code derived froms Python's dictionaries, hence:
+// The following contains code derived forms Python's dictionaries, hence:
// SPDX-FileCopyrightText: 1991-1995 Stichting Mathematisch Centrum Amsterdam,
// The Netherlands.
// Reduced and turned into a fast C++ class by Christian Tismer, hence:
-// SPDX-FileCopyrightText: 1999 Christian Tismer.
+// SPDX-FileCopyrightText: 1999 Christian Tismer.
// Vectorized and reorganized further by Jean-Claude Wippler.
/////////////////////////////////////////////////////////////////////////////
@@ -308,7 +308,7 @@ int c4_HashViewer::LookDict(t4_i32 hash_, c4_Cursor cursor_) const
if (incr > mask) {
incr ^= poly;
}
- /* This will implicitely clear the highest bit */
+ /* This will implicitly clear the highest bit */
}
return freeslot != -1 ? freeslot : i;
diff --git a/src/storage/metakit/src/remap.h b/src/storage/metakit/src/remap.h
index 98ed70a47..0872519da 100644
--- a/src/storage/metakit/src/remap.h
+++ b/src/storage/metakit/src/remap.h
@@ -20,4 +20,3 @@ extern c4_CustomViewer *f4_CreateIndexed(c4_Sequence &, c4_Sequence &, const
c4_View &, bool = false);
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/store.h b/src/storage/metakit/src/store.h
index 68f1f1bea..5477da8f4 100644
--- a/src/storage/metakit/src/store.h
+++ b/src/storage/metakit/src/store.h
@@ -110,4 +110,3 @@ public:
#endif
/////////////////////////////////////////////////////////////////////////////
-
diff --git a/src/storage/metakit/src/store.inl b/src/storage/metakit/src/store.inl
index 70b74dbf1..f60e22776 100644
--- a/src/storage/metakit/src/store.inl
+++ b/src/storage/metakit/src/store.inl
@@ -10,7 +10,7 @@
d4_inline c4_Notifier::c4_Notifier (c4_Sequence* origin_)
: _origin (origin_), _chain (nullptr), _next (nullptr),
- _type (kNone), _index (0), _propId (0), _count (0),
+ _type (kNone), _index (0), _propId (0), _count (0),
_cursor (nullptr), _bytes (nullptr)
{
d4_assert(_origin != 0);
diff --git a/src/storage/metakit/src/table.cpp b/src/storage/metakit/src/table.cpp
index d45f8dc65..b98ecf79c 100644
--- a/src/storage/metakit/src/table.cpp
+++ b/src/storage/metakit/src/table.cpp
@@ -50,7 +50,7 @@ c4_Bytes::c4_Bytes(const void *buf_, int len_, bool copy_) : _size(len_)
, _copy
(copy_)
{
- _contents = (t4_byte *)buf_; // moved out of intializers for DEC CXX 5.7
+ _contents = (t4_byte *)buf_; // moved out of initializers for DEC CXX 5.7
if (_copy) {
_MakeCopy();
}
@@ -60,7 +60,7 @@ c4_Bytes::c4_Bytes(const void *buf_, int len_, bool copy_) : _size(len_)
c4_Bytes::c4_Bytes(const c4_Bytes &src_) : _size(src_._size)
, _copy(src_._copy)
{
- _contents = src_._contents; // moved out of intializers for DEC CXX 5.7
+ _contents = src_._contents; // moved out of initializers for DEC CXX 5.7
if (_copy || _contents == src_._buffer) {
_MakeCopy();
}
diff --git a/src/storage/metakit/src/univ.inl b/src/storage/metakit/src/univ.inl
index 074d39f2d..3dbee8a93 100644
--- a/src/storage/metakit/src/univ.inl
+++ b/src/storage/metakit/src/univ.inl
@@ -34,32 +34,32 @@ d4_inline c4_PtrArray::~c4_PtrArray ()
d4_inline int c4_PtrArray::Off(int n_)
{
- return n_ * sizeof (void*);
+ return n_ * sizeof (void*);
}
d4_inline int c4_PtrArray::GetSize() const
-{
- return _vector.GetLength() / sizeof (void*);
+{
+ return _vector.GetLength() / sizeof (void*);
}
d4_inline void c4_PtrArray::SetSize(int nNewSize, int)
-{
- _vector.SetLength(Off(nNewSize));
+{
+ _vector.SetLength(Off(nNewSize));
}
d4_inline void* c4_PtrArray::GetAt(int nIndex) const
-{
- return *(void* const*) _vector.GetData(Off(nIndex));
+{
+ return *(void* const*) _vector.GetData(Off(nIndex));
}
d4_inline void c4_PtrArray::SetAt(int nIndex, const void* newElement)
-{
- *(const void**) _vector.GetData(Off(nIndex)) = newElement;
+{
+ *(const void**) _vector.GetData(Off(nIndex)) = newElement;
}
d4_inline void*& c4_PtrArray::ElementAt(int nIndex)
-{
- return *(void**) _vector.GetData(Off(nIndex));
+{
+ return *(void**) _vector.GetData(Off(nIndex));
}
/////////////////////////////////////////////////////////////////////////////
@@ -73,32 +73,32 @@ d4_inline c4_DWordArray::~c4_DWordArray ()
d4_inline int c4_DWordArray::Off(int n_)
{
- return n_ * sizeof (t4_i32);
+ return n_ * sizeof (t4_i32);
}
d4_inline int c4_DWordArray::GetSize() const
-{
- return _vector.GetLength() / sizeof (t4_i32);
+{
+ return _vector.GetLength() / sizeof (t4_i32);
}
d4_inline void c4_DWordArray::SetSize(int nNewSize, int)
-{
- _vector.SetLength(Off(nNewSize));
+{
+ _vector.SetLength(Off(nNewSize));
}
d4_inline t4_i32 c4_DWordArray::GetAt(int nIndex) const
-{
- return *(const t4_i32*) _vector.GetData(Off(nIndex));
+{
+ return *(const t4_i32*) _vector.GetData(Off(nIndex));
}
d4_inline void c4_DWordArray::SetAt(int nIndex, t4_i32 newElement)
-{
- *(t4_i32*) _vector.GetData(Off(nIndex)) = newElement;
+{
+ *(t4_i32*) _vector.GetData(Off(nIndex)) = newElement;
}
d4_inline t4_i32& c4_DWordArray::ElementAt(int nIndex)
-{
- return *(t4_i32*) _vector.GetData(Off(nIndex));
+{
+ return *(t4_i32*) _vector.GetData(Off(nIndex));
}
/////////////////////////////////////////////////////////////////////////////
@@ -108,13 +108,13 @@ d4_inline c4_StringArray::c4_StringArray ()
= default;
d4_inline int c4_StringArray::GetSize() const
-{
- return _ptrs.GetSize();
+{
+ return _ptrs.GetSize();
}
d4_inline const char* c4_StringArray::GetAt(int nIndex) const
-{
- return (const char*) _ptrs.GetAt(nIndex);
+{
+ return (const char*) _ptrs.GetAt(nIndex);
}
/////////////////////////////////////////////////////////////////////////////
diff --git a/src/widgets/autotests/CMakeLists.txt b/src/widgets/autotests/CMakeLists.txt
index 727804aeb..858dcc9f9 100644
--- a/src/widgets/autotests/CMakeLists.txt
+++ b/src/widgets/autotests/CMakeLists.txt
@@ -6,6 +6,6 @@ macro(akregator_widgets_unittest _source)
TEST_NAME ${_name}
NAME_PREFIX "akregator-widgets"
LINK_LIBRARIES Qt::Test akregatorprivate Qt::Widgets
-)
+ )
endmacro()
akregator_widgets_unittest(statussearchbuttonstest.cpp)
More information about the kde-doc-english
mailing list