Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plasma6-activities for openSUSE:Factory checked in at 2026-06-18 21:35:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma6-activities (Old) and /work/SRC/openSUSE:Factory/.plasma6-activities.new.1981 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma6-activities" Thu Jun 18 21:35:51 2026 rev:42 rq:1359173 version:6.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma6-activities/plasma6-activities.changes 2026-05-13 21:38:46.758319814 +0200 +++ /work/SRC/openSUSE:Factory/.plasma6-activities.new.1981/plasma6-activities.changes 2026-06-18 21:36:36.566054615 +0200 @@ -1,0 +2,33 @@ +Fri Jun 12 19:07:54 UTC 2026 - Fabian Vogt <[email protected]> + +- Update to 6.7.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.7.0 +- Changes since 6.6.91: + * Update version for new release 6.7.0 + +------------------------------------------------------------------- +Thu May 28 18:44:45 UTC 2026 - Fabian Vogt <[email protected]> + +- Update to 6.6.91: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.6.91 +- Changes since 6.6.90: + * Update version for new release 6.6.91 + +------------------------------------------------------------------- +Sun May 24 11:18:55 UTC 2026 - Fabian Vogt <[email protected]> + +- Update to 6.6.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.6.90 +- Changes since 6.6.5: + * Update version for new release 6.6.90 + * Use default DEFAULT_SEVERITY for logging + * Fix build with qt dev + * Port API documentation to QDoc + * Drop commented out code + * Fix dbus methods for ActivityInfo + * Update version for new release 6.6.80 + +------------------------------------------------------------------- Old: ---- plasma-activities-6.6.5.tar.xz plasma-activities-6.6.5.tar.xz.sig New: ---- plasma-activities-6.7.0.tar.xz plasma-activities-6.7.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma6-activities.spec ++++++ --- /var/tmp/diff_new_pack.cXpSb5/_old 2026-06-18 21:36:37.674100821 +0200 +++ /var/tmp/diff_new_pack.cXpSb5/_new 2026-06-18 21:36:37.678100988 +0200 @@ -16,24 +16,23 @@ # -%define kf6_version 6.18.0 -%define qt6_version 6.9.0 +%define kf6_version 6.26.0 +%define qt6_version 6.10.0 %define sover 7 %define rname plasma-activities %bcond_without released Name: plasma6-activities -Version: 6.6.5 +Version: 6.7.0 Release: 0 Summary: Plasma Activities support License: GPL-2.0-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +Source: %{rname}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig +Source1: %{rname}-%{version}.tar.xz.sig Source2: plasma.keyring %endif -BuildRequires: doxygen BuildRequires: fdupes BuildRequires: kf6-extra-cmake-modules >= %{kf6_version} BuildRequires: cmake(KF6Config) >= %{kf6_version} @@ -44,7 +43,6 @@ BuildRequires: cmake(Qt6Qml) >= %{qt6_version} BuildRequires: cmake(Qt6Quick) >= %{qt6_version} BuildRequires: cmake(Qt6Sql) >= %{qt6_version} -BuildRequires: cmake(Qt6ToolsTools) >= %{qt6_version} BuildRequires: cmake(Qt6Widgets) >= %{qt6_version} %description @@ -85,7 +83,7 @@ %autosetup -p1 -n %{rname}-%{version} %build -%cmake_kf6 -DBUILD_QCH:BOOL=ON +%cmake_kf6 %kf6_build @@ -112,7 +110,6 @@ %{_kf6_qmldir}/org/kde/activities/ %files devel -%doc %{_kf6_qchdir}/PlasmaActivities.* %{_kf6_cmakedir}/PlasmaActivities/ %{_includedir}/PlasmaActivities/ %{_kf6_libdir}/libPlasmaActivities.so ++++++ plasma-activities-6.6.5.tar.xz -> plasma-activities-6.7.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/CMakeLists.txt new/plasma-activities-6.7.0/CMakeLists.txt --- old/plasma-activities-6.6.5/CMakeLists.txt 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/CMakeLists.txt 2026-06-11 11:35:03.000000000 +0200 @@ -1,11 +1,11 @@ # vim:set softtabstop=3 shiftwidth=3 tabstop=3 expandtab: cmake_minimum_required(VERSION 3.16) -set(PROJECT_VERSION "6.6.5") +set(PROJECT_VERSION "6.7.0") project(PlasmaActivities VERSION ${PROJECT_VERSION}) set(QT_MIN_VERSION "6.10.0") -set(KF6_MIN_VERSION "6.22.0") +set(KF6_MIN_VERSION "6.26.0") set(KDE_COMPILERSETTINGS_LEVEL "5.82") set(CMAKE_CXX_STANDARD 20) @@ -27,15 +27,12 @@ include(ECMGenerateHeaders) include(ECMGeneratePkgConfigFile) include(ECMQtDeclareLoggingCategory) -include(ECMAddQch) include(ECMMarkNonGuiExecutable) include(ECMDeprecationSettings) include(ECMQmlModule) +include(ECMGenerateQDoc) include(KDEClangFormat) -option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) -add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") - find_package (Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) include (CMakePackageConfigHelpers) @@ -51,8 +48,8 @@ ) ecm_set_disabled_deprecation_versions( - QT 6.8.1 - KF 6.12.0 + QT 6.11.0 + KF 6.26.0 ) add_subdirectory (src) @@ -63,16 +60,6 @@ set (CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/PlasmaActivities") -if (BUILD_QCH) - ecm_install_qch_export( - TARGETS PlasmaActivities_QCH - FILE PlasmaActivitiesLibraryQchTargets.cmake - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/PlasmaActivitiesLibraryQchTargets.cmake\")") -endif() - install ( EXPORT PlasmaActivitiesLibraryTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/imports/CMakeLists.txt new/plasma-activities-6.7.0/src/imports/CMakeLists.txt --- old/plasma-activities-6.6.5/src/imports/CMakeLists.txt 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/imports/CMakeLists.txt 2026-06-11 11:35:03.000000000 +0200 @@ -31,3 +31,5 @@ ) ecm_finalize_qml_module(plasmaactivitiesextensionplugin DESTINATION ${KDE_INSTALL_QMLDIR}) + +ecm_generate_qdoc(plasmaactivitiesextensionplugin plasmaactivitiesqml.qdocconf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/imports/activityinfo.h new/plasma-activities-6.7.0/src/imports/activityinfo.h --- old/plasma-activities-6.6.5/src/imports/activityinfo.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/imports/activityinfo.h 2026-06-11 11:35:03.000000000 +0200 @@ -22,36 +22,51 @@ { namespace Imports { -/** - * ActivityInfo - */ +/*! + * \qmltype ActivityInfo + * \inqmlmodule org.kde.activities + * + * \brief Activity info. + */ class ActivityInfo : public QObject { Q_OBJECT QML_ELEMENT - /** + /*! + * \qmlproperty string ActivityInfo::activityId + * * Unique identifier of the activity */ Q_PROPERTY(QString activityId READ activityId WRITE setActivityId NOTIFY activityIdChanged) - /** + /*! + * \qmlproperty string ActivityInfo::name + * * Name of the activity */ Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) - /** + /*! + * \qmlproperty string ActivityInfo::description + * * Name of the activity */ Q_PROPERTY(QString description READ description WRITE setDescription NOTIFY descriptionChanged) - /** + /*! + * \qmlproperty string ActivityInfo::icon + * * Activity icon */ Q_PROPERTY(QString icon READ icon WRITE setIcon NOTIFY iconChanged) - /** + /*! + * \qmlproperty bool ActivityInfo::valid + * + * \readonly + * * Is the activity a valid one - does it exist? */ Q_PROPERTY(bool valid READ valid NOTIFY validChanged) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/imports/activitymodel.h new/plasma-activities-6.7.0/src/imports/activitymodel.h --- old/plasma-activities-6.6.5/src/imports/activitymodel.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/imports/activitymodel.h 2026-06-11 11:35:03.000000000 +0200 @@ -30,10 +30,24 @@ { namespace Imports { -/** - * ActivityModel - */ +/*! + * \qmltype ActivityModel + * \inqmlmodule org.kde.activities + * + * \brief Activities model. + * + * This model provides the following roles: + * \list + * \li name (string) + * \li icon (QIcon) + * \li id (string) + * \li iconSource (string) + * \li description (string) + * \li background (string) + * \li current (bool) + * \endlist + */ class ActivityModel : public QAbstractListModel { Q_OBJECT @@ -61,16 +75,41 @@ public Q_SLOTS: // Activity control methods + + /*! + * \qmlmethod void ActivityModel::setActivityName(string id, string name, var callback) + */ void setActivityName(const QString &id, const QString &name, const QJSValue &callback); + + /*! + * \qmlmethod void ActivityModel::setActivityDescription(string id, string description, var callback) + */ void setActivityDescription(const QString &id, const QString &description, const QJSValue &callback); + + /*! + * \qmlmethod void ActivityModel::setActivityIcon(string id, string icon, var callback) + */ void setActivityIcon(const QString &id, const QString &icon, const QJSValue &callback); + /*! + * \qmlmethod void ActivityModel::setCurrentActivity(string id, var callback) + */ void setCurrentActivity(const QString &id, const QJSValue &callback); + /*! + * \qmlmethod void ActivityModel::addActivity(string name, var callback) + */ void addActivity(const QString &name, const QJSValue &callback); + + /*! + * \qmlmethod void ActivityModel::removeActivity(string id, var callback) + */ void removeActivity(const QString &id, const QJSValue &callback); Q_SIGNALS: + /*! + * \qmlsignal ActivityModel::shownStatesChanged(string state) + */ void shownStatesChanged(const QString &state); private Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/imports/plasmaactivitiesqml.qdoc new/plasma-activities-6.7.0/src/imports/plasmaactivitiesqml.qdoc --- old/plasma-activities-6.6.5/src/imports/plasmaactivitiesqml.qdoc 1970-01-01 01:00:00.000000000 +0100 +++ new/plasma-activities-6.7.0/src/imports/plasmaactivitiesqml.qdoc 2026-06-11 11:35:03.000000000 +0200 @@ -0,0 +1,6 @@ +/*! + \qmlmodule org.kde.activities + \title Plasma Activities QML Types + \ingroup qmlmodules + \brief QML API for Plasma Activities +*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/imports/plasmaactivitiesqml.qdocconf new/plasma-activities-6.7.0/src/imports/plasmaactivitiesqml.qdocconf --- old/plasma-activities-6.6.5/src/imports/plasmaactivitiesqml.qdocconf 1970-01-01 01:00:00.000000000 +0100 +++ new/plasma-activities-6.7.0/src/imports/plasmaactivitiesqml.qdocconf 2026-06-11 11:35:03.000000000 +0200 @@ -0,0 +1,35 @@ +include($KDE_DOCS/global/qt-module-defaults.qdocconf) + +project = PlasmaActivitiesQml +description = QML API for Plasma Activities + +documentationinheaders = true + +headerdirs += . +sourcedirs += . + +outputformats = HTML + +depends += \ + kde \ + qtcore \ + qtqml \ + plasmaactivities + +navigation.landingpage = "PlasmaActivities" + +qhp.projects = PlasmaActivitiesQml + +qhp.PlasmaActivitiesQml.file = plasmaactivitiesqml.qhp +qhp.PlasmaActivitiesQml.namespace = org.kde.plasmaactivitiesqml.$QT_VERSION_TAG +qhp.PlasmaActivitiesQml.virtualFolder = plasmaactivitiesqml +qhp.PlasmaActivitiesQml.indexTitle = Plasma Activities QML +qhp.PlasmaActivitiesQml.indexRoot = + +qhp.PlasmaActivitiesQml.subprojects = qmltypes +qhp.PlasmaActivitiesQml.subprojects.qmltypes.title = QML Types +qhp.PlasmaActivitiesQml.subprojects.qmltypes.indexTitle = Plasma Activities QML Types +qhp.PlasmaActivitiesQml.subprojects.qmltypes.selectors = qmlmodule:org.kde.coreaddons +qhp.PlasmaActivitiesQml.subprojects.qmltypes.sortPages = true + +tagfile = plasmaactivitiesqml.tags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/CMakeLists.txt new/plasma-activities-6.7.0/src/lib/CMakeLists.txt --- old/plasma-activities-6.6.5/src/lib/CMakeLists.txt 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/lib/CMakeLists.txt 2026-06-11 11:35:03.000000000 +0200 @@ -47,23 +47,23 @@ ) set(PlasmaActivities_DBus_SRCS) -qt_add_dbus_interface(PlasmaActivities_DBus_SRCS +qt6_add_dbus_interface(PlasmaActivities_DBus_SRCS ${PLASMA_ACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.Activities.xml activities_interface ) -qt_add_dbus_interface(PlasmaActivities_DBus_SRCS +qt6_add_dbus_interface(PlasmaActivities_DBus_SRCS ${PLASMA_ACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.Resources.xml resources_interface ) -qt_add_dbus_interface(PlasmaActivities_DBus_SRCS +qt6_add_dbus_interface(PlasmaActivities_DBus_SRCS ${PLASMA_ACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.Features.xml features_interface ) -qt_add_dbus_interface(PlasmaActivities_DBus_SRCS +qt6_add_dbus_interface(PlasmaActivities_DBus_SRCS ${PLASMA_ACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.ResourcesLinking.xml resources_linking_interface ) -qt_add_dbus_interface(PlasmaActivities_DBus_SRCS +qt6_add_dbus_interface(PlasmaActivities_DBus_SRCS ${PLASMA_ACTIVITIES_CURRENT_ROOT_SOURCE_DIR}/src/common/dbus/org.kde.ActivityManager.Application.xml application_interface ) @@ -76,7 +76,6 @@ IDENTIFIER KAMD_CORELIB CATEGORY_NAME kde.plasma.activities OLD_CATEGORY_NAMES org.kde.kactivities.lib.core - DEFAULT_SEVERITY Warning DESCRIPTION "Plasma Activities core lib" EXPORT PLASMA_ACTIVITIES ) @@ -106,6 +105,8 @@ DEPRECATED_BASE_VERSION 0 ) +ecm_generate_qdoc(PlasmaActivities plasmaactivities.qdocconf) + ecm_generate_headers ( PlasmaActivities_CamelCase_HEADERS HEADER_NAMES @@ -136,31 +137,6 @@ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) -if(BUILD_QCH) - ecm_add_qch( - PlasmaActivities_QCH - NAME PlasmaActivities - BASE_NAME PlasmaActivities - VERSION ${PROJECT_VERSION} - ORG_DOMAIN org.kde - SOURCES # using only public headers, to cover only public API - ${PlasmaActivities_HEADERS} - MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" - LINK_QCHS - Qt6Core_QCH - INCLUDE_DIRS - ${PLASMA_ACTIVITIES_BUILD_INCLUDE_DIRS} - BLANK_MACROS - PLASMA_ACTIVITIES_EXPORT - PLASMA_ACTIVITIES_DEPRECATED - PLASMA_ACTIVITIES_DEPRECATED_EXPORT - TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} - QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} - COMPONENT Devel - ) -endif() - - if (NOT WIN32) ecm_generate_pkgconfig_file(BASE_NAME PlasmaActivities LIB_NAME PlasmaActivities diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/activitiesmodel.h new/plasma-activities-6.7.0/src/lib/activitiesmodel.h --- old/plasma-activities-6.6.5/src/lib/activitiesmodel.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/lib/activitiesmodel.h 2026-06-11 11:35:03.000000000 +0200 @@ -24,14 +24,21 @@ { class ActivitiesModelPrivate; -/** - * Data model that shows existing activities +/*! + * \class KActivities::ActivitiesModel + * \inmodule PlasmaActivities + * \inheaderfile PlasmaActivities/ActivitiesModel + * + * \brief Data model that shows existing activities. */ class PLASMA_ACTIVITIES_EXPORT ActivitiesModel : public QAbstractListModel { Q_OBJECT public: + /*! + * + */ explicit ActivitiesModel(QObject *parent = nullptr); ~ActivitiesModel() override; @@ -44,15 +51,24 @@ QHash<int, QByteArray> roleNames() const override; + /*! + * \value ActivityId UUID of the activity + * \value ActivityName Activity name + * \value ActivityDescription Activity description + * \value ActivityIconSource Activity icon source name + * \value ActivityBackground Activity wallpaper (currently unsupported) + * \value ActivityIsCurrent Is this activity the current one current + * \value UserRole To be used by models that inherit this one + */ enum Roles { - ActivityId = Qt::UserRole, ///< UUID of the activity - ActivityName = Qt::UserRole + 1, ///< Activity name - ActivityDescription = Qt::UserRole + 2, ///< Activity description - ActivityIconSource = Qt::UserRole + 3, ///< Activity icon source name - ActivityBackground = Qt::UserRole + 5, ///< Activity wallpaper (currently unsupported) - ActivityIsCurrent = Qt::UserRole + 6, ///< Is this activity the current one current + ActivityId = Qt::UserRole, + ActivityName = Qt::UserRole + 1, + ActivityDescription = Qt::UserRole + 2, + ActivityIconSource = Qt::UserRole + 3, + ActivityBackground = Qt::UserRole + 5, + ActivityIsCurrent = Qt::UserRole + 6, - UserRole = Qt::UserRole + 32, ///< To be used by models that inherit this one + UserRole = Qt::UserRole + 32, }; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/consumer.h new/plasma-activities-6.7.0/src/lib/consumer.h --- old/plasma-activities-6.6.5/src/lib/consumer.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/lib/consumer.h 2026-06-11 11:35:03.000000000 +0200 @@ -21,7 +21,13 @@ { class ConsumerPrivate; -/** +/*! + * \class KActivities::Consumer + * \inmodule PlasmaActivities + * \inheaderfile PlasmaActivities/Consumer + * + * \brief Read-only information about activities. + * * Contextual information can be, from the user's point of view, divided * into three aspects - "who am I?", "where am I?" (what are my surroundings?) * and "what am I doing?". @@ -46,91 +52,116 @@ * For example, if this is the only existing instance of the Consumer class, * the listActivities method will return an empty list. * - * @code + * \code * void someMethod() { * // Do not copy. This approach is not a good one! * Consumer c; * doSomethingWith(c.listActivities()); * } - * @endcode + * \endcode * * Instances of the Consumer class should be long-lived. For example, members * of the classes that use them, and you should listen for the changes in the * provided properties. * - * @since 4.5 + * \since 4.5 */ class PLASMA_ACTIVITIES_EXPORT Consumer : public QObject { Q_OBJECT + /*! + * \property KActivities::Consumer::currentActivity + */ Q_PROPERTY(QString currentActivity READ currentActivity NOTIFY currentActivityChanged) + + /*! + * \property KActivities::Consumer::activities + */ Q_PROPERTY(QStringList activities READ activities NOTIFY activitiesChanged) + + /*! + * \property KActivities::Consumer::serviceStatus + */ Q_PROPERTY(ServiceStatus serviceStatus READ serviceStatus NOTIFY serviceStatusChanged) public: - /** + /*! * Different states of the activities service + * + * \value NotRunning Service is not running + * \value Unknown Unable to determine the status of the service + * \value Running Service is running properly */ enum ServiceStatus { - NotRunning, ///< Service is not running - Unknown, ///< Unable to determine the status of the service - Running, ///< Service is running properly + NotRunning, + Unknown, + Running, }; + /*! + * + */ explicit Consumer(QObject *parent = nullptr); ~Consumer() override; - /** - * @returns the id of the current activity - * @note Activity ID is a UUID-formatted string. If the serviceStatus + /*! + * Returns the id of the current activity + * + * \note Activity ID is a UUID-formatted string. If the serviceStatus * is not Running, a null UUID is returned. The ID can also be an empty * string in the case there is no current activity. */ QString currentActivity() const; - /** - * @returns the list of all existing activities - * @note If the serviceStatus is not Running, only a null activity will be + /*! + * Returns the list of all existing activities + * + * \note If the serviceStatus is not Running, only a null activity will be * returned. */ QStringList activities() const; - /** - * @returns status of the activities service + /*! + * Returns status of the activities service */ ServiceStatus serviceStatus(); Q_SIGNALS: - /** + /*! * This signal is emitted when the current activity is changed - * @param id id of the new current activity + * + * \a id id of the new current activity */ void currentActivityChanged(const QString &id); - /** + /*! * This signal is emitted when the activity service goes online or offline, * or when the class manages to synchronize the data with the service. - * @param status new status of the service + * + * \a status new status of the service */ void serviceStatusChanged(Consumer::ServiceStatus status); - /** + /*! * This signal is emitted when a new activity is added - * @param id id of the new activity + * + * \a id id of the new activity */ void activityAdded(const QString &id); - /** + /*! * This signal is emitted when an activity has been removed - * @param id id of the removed activity + * + * \a id id of the removed activity */ void activityRemoved(const QString &id); - /** + /*! * This signal is emitted when the activity list changes - * @param activities list of activities + * + * \a activities list of activities */ void activitiesChanged(const QStringList &activities); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/controller.h new/plasma-activities-6.7.0/src/lib/controller.h --- old/plasma-activities-6.6.5/src/lib/controller.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/lib/controller.h 2026-06-11 11:35:03.000000000 +0200 @@ -21,77 +21,96 @@ { class ControllerPrivate; -/** - * This class provides methods for controlling and managing +/*! + * \class KActivities::Controller + * \inmodule PlasmaActivities + * \inheaderfile PlasmaActivities/Controller + * + * \brief Methods for controlling and managing * the activities. * - * @note The QFuture objects returned by these methods are not thread-based, + * \note The QFuture objects returned by these methods are not thread-based, * you can not call synchronous methods like waitForFinished, cancel, pause on * them. You need either to register watchers to check when those have finished, * or to check whether they are ready from time to time manually. * - * @see Consumer for info about activities - * - * @since 5.0 + * \since 5.0 */ class PLASMA_ACTIVITIES_EXPORT Controller : public Consumer { Q_OBJECT + /*! + * \property KActivities::Controller::currentActivity + */ Q_PROPERTY(QString currentActivity READ currentActivity WRITE setCurrentActivity) public: + /*! + * + */ explicit Controller(QObject *parent = nullptr); ~Controller() override; - /** + /*! * Sets the name of the specified activity - * @param id id of the activity - * @param name name to be set + * + * \a id id of the activity + * + * \a name name to be set */ QFuture<void> setActivityName(const QString &id, const QString &name); - /** + /*! * Sets the description of the specified activity - * @param id id of the activity - * @param description description to be set + * + * \a id id of the activity + * + * \a description description to be set */ QFuture<void> setActivityDescription(const QString &id, const QString &description); - /** + /*! * Sets the icon of the specified activity - * @param id id of the activity - * @param icon icon to be set - freedesktop.org name or file path + * + * \a id id of the activity + * + * \a icon icon to be set - freedesktop.org name or file path */ QFuture<void> setActivityIcon(const QString &id, const QString &icon); - /** + /*! * Sets the current activity - * @param id id of the activity to make current - * @returns true if successful + * + * \a id id of the activity to make current + * + * Returns \c true if successful */ QFuture<bool> setCurrentActivity(const QString &id); - /** + /*! * Adds a new activity - * @param name name of the activity - * @returns id of the newly created activity + * + * \a name name of the activity + * + * Returns the id of the newly created activity */ QFuture<QString> addActivity(const QString &name); - /** + /*! * Removes the specified activity - * @param id id of the activity to delete + * + * \a id id of the activity to delete */ QFuture<void> removeActivity(const QString &id); - /** + /*! * Switches to the previous activity */ QFuture<void> previousActivity(); - /** + /*! * Switches to the next activity */ QFuture<void> nextActivity(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/info.h new/plasma-activities-6.7.0/src/lib/info.h --- old/plasma-activities-6.6.5/src/lib/info.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/lib/info.h 2026-06-11 11:35:03.000000000 +0200 @@ -19,14 +19,18 @@ { class InfoPrivate; -/** - * This class provides info about an activity. Most methods in it require a +/*! + * \class KActivities::Info + * \inmodule PlasmaActivities + * \inheaderfile PlasmaActivities/Info + * + * \brief Info about an activity. + * + * Most methods in it require a * semantic backend running to function properly. * * This class is not thread-safe. * - * @see Consumer for info about activities - * * The API of the class is synchronous, but the most used properties * are pre-fetched and cached. This means that, in order to get the least * amount of d-bus related locks, you should declare long-lived instances @@ -41,137 +45,139 @@ * name method will return an empty string. * * For example, this is wrong (works, but blocks): - * @code + * \code * void someMethod(const QString & activity) { * // Do not copy. This approach is not a good one! * Info info(activity); * doSomethingWith(info.name()); * } - * @endcode + * \endcode * * Instances of the Info class should be long-lived. For example, members * of the classes that use them, and you should listen for the changes in the * provided properties. * - * @since 4.5 + * \since 4.5 */ class PLASMA_ACTIVITIES_EXPORT Info : public QObject { Q_OBJECT + /*! + * \property KActivities::Info::id + */ Q_PROPERTY(QString id READ id) + + /*! + * \property KActivities::Info::name + */ Q_PROPERTY(QString name READ name NOTIFY nameChanged) + + /*! + * \property KActivities::Info::description + */ Q_PROPERTY(QString description READ description NOTIFY descriptionChanged) + + /*! + * \property KActivities::Info::icon + */ Q_PROPERTY(QString icon READ icon NOTIFY iconChanged) + + /*! + * \property KActivities::Info::isCurrent + */ Q_PROPERTY(bool isCurrent READ isCurrent NOTIFY isCurrentChanged) public: + /*! + * + */ explicit Info(const QString &activity, QObject *parent = nullptr); ~Info() override; - /** + /*! * Specifies which parts of this class are functional + * + * \value Nothing No activity info provided (isValid is false) + * \value BasicInfo Basic info is provided + * \value Everything Everything is available */ enum Availability { - Nothing = 0, ///< No activity info provided (isValid is false) - BasicInfo = 1, ///< Basic info is provided - Everything = 2, ///< Everything is available + Nothing = 0, + BasicInfo = 1, + Everything = 2, }; - /** - * @returns what info is provided by this instance of Info + /*! + * Returns what info is provided by this instance of Info */ Availability availability() const; - /** - * @returns the URI of this activity. The same URI is used by activities + /*! + * Returns the URI of this activity. The same URI is used by activities * KIO worker. */ QString uri() const; - /** - * @returns the id of the activity + /*! + * Returns the id of the activity */ QString id() const; - /** - * @returns whether this activity is the current one + /*! + * Returns whether this activity is the current one */ bool isCurrent() const; - /** - * @returns the name of the activity + /*! + * Returns the name of the activity */ QString name() const; - /** - * @returns the description of the activity + /*! + * Returns the description of the activity */ QString description() const; - /** - * @returns the icon of the activity. Icon can be a freedesktop.org name or + /*! + * Returns the icon of the activity. Icon can be a freedesktop.org name or * a file path. Or empty if no icon is set. */ QString icon() const; - /** - * Links the specified resource to the activity - * @param resourceUri resource URI - * @note This method is <b>asynchronous</b>. It will return before the - * resource is actually linked to the activity. - */ - // QFuture<void> linkResource(const QString &resourceUri); - - /** - * Unlinks the specified resource from the activity - * @param resourceUri resource URI - * @note This method is <b>asynchronous</b>. It will return before the - * resource is actually unlinked from the activity. - */ - // QFuture<void> unlinkResource(const QString &resourceUri); - - /** - * @returns whether a resource is linked to this activity - * @note This QFuture is not thread-based, you can not call synchronous - * methods like waitForFinished, cancel, pause on it. - * @since 5.0 - */ - // QFuture<bool> isResourceLinked(const QString &resourceUri); - Q_SIGNALS: - /** + /*! * Emitted when the activity's name, icon or some custom property is changed */ void infoChanged(); - /** + /*! * Emitted when the name is changed */ void nameChanged(const QString &name); - /** + /*! * Emitted when the activity becomes the current one, or when it stops * being the current one */ void isCurrentChanged(bool current); - /** + /*! * Emitted when the description is changed */ void descriptionChanged(const QString &description); - /** + /*! * Emitted when the icon was changed */ void iconChanged(const QString &icon); - /** + /*! * Emitted when the activity is added */ void added(); - /** + /*! * Emitted when the activity is removed */ void removed(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/plasmaactivities-index.qdoc new/plasma-activities-6.7.0/src/lib/plasmaactivities-index.qdoc --- old/plasma-activities-6.6.5/src/lib/plasmaactivities-index.qdoc 1970-01-01 01:00:00.000000000 +0100 +++ new/plasma-activities-6.7.0/src/lib/plasmaactivities-index.qdoc 2026-06-11 11:35:03.000000000 +0200 @@ -0,0 +1,21 @@ +/*! + \page plasmaactivities-index.html + \title Plasma Activities + + Library for interacting with Plasma Activities. + + \section1 Using the Module + + \include {module-use.qdocinc} {using the c++ api} + + \section2 Building with CMake + + \include {module-use.qdocinc} {building with cmake nomodule} {PlasmaActivities} {Plasma::Activities} + + \section1 API Reference + + \list + \li \l{Plasma Activities C++ Classes} + \li \l{Plasma Activities QML Types} + \endlist +*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/plasmaactivities.qdoc new/plasma-activities-6.7.0/src/lib/plasmaactivities.qdoc --- old/plasma-activities-6.6.5/src/lib/plasmaactivities.qdoc 1970-01-01 01:00:00.000000000 +0100 +++ new/plasma-activities-6.7.0/src/lib/plasmaactivities.qdoc 2026-06-11 11:35:03.000000000 +0200 @@ -0,0 +1,9 @@ +/*! + \module PlasmaActivities + \title Plasma Activities C++ Classes + \ingroup modules + \cmakepackage Plasma + \cmakecomponent Activities + + \brief Library for interacting with Plasma Activities. +*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/plasmaactivities.qdocconf new/plasma-activities-6.7.0/src/lib/plasmaactivities.qdocconf --- old/plasma-activities-6.6.5/src/lib/plasmaactivities.qdocconf 1970-01-01 01:00:00.000000000 +0100 +++ new/plasma-activities-6.7.0/src/lib/plasmaactivities.qdocconf 2026-06-11 11:35:03.000000000 +0200 @@ -0,0 +1,35 @@ +include($KDE_DOCS/global/qt-module-defaults.qdocconf) + +project = PlasmaActivities +description = Library for interacting with Plasma Activities + +documentationinheaders = true + +headerdirs += . +sourcedirs += . + +outputformats = HTML + +depends += \ + kde \ + qtcore \ + qtgui \ + plasmaactivitiesqml + +navigation.landingpage = "PlasmaActivities" + +qhp.projects = PlasmaActivities + +qhp.PlasmaActivities.file = plasmaactivities.qhp +qhp.PlasmaActivities.namespace = org.kde.plasmaactivities.$QT_VERSION_TAG +qhp.PlasmaActivities.virtualFolder = plasmaactivities +qhp.PlasmaActivities.indexTitle = Plasma Activities +qhp.PlasmaActivities.indexRoot = + +qhp.PlasmaActivities.subprojects = classes +qhp.PlasmaActivities.subprojects.classes.title = C++ Classes +qhp.PlasmaActivities.subprojects.classes.indexTitle = Plasma Activities C++ Classes +qhp.PlasmaActivities.subprojects.classes.selectors = class fake:headerfile +qhp.PlasmaActivities.subprojects.classes.sortPages = true + +tagfile = plasmaactivities.tags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/resourceinstance.h new/plasma-activities-6.7.0/src/lib/resourceinstance.h --- old/plasma-activities-6.6.5/src/lib/resourceinstance.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/lib/resourceinstance.h 2026-06-11 11:35:03.000000000 +0200 @@ -12,14 +12,20 @@ #include "plasma_activities_export.h" +/*! + * \namespace KActivities::ResourceInstance + * \inmodule PlasmaActivities + * \inheaderfile KActivities/ResourceInstance + */ namespace KActivities::ResourceInstance { -/** +/*! * This function is used to notify the system that a file, web page * or some other resource has been accessed. * - * @param uri URI of the resource - * @param application application's name (the name used for the .desktop file). + * \a uri URI of the resource + * + * \a application application's name (the name used for the .desktop file). * If not specified, QCoreApplication::applicationName is used */ PLASMA_ACTIVITIES_EXPORT void notifyAccessed(const QUrl &uri, const QString &application = QString()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-activities-6.6.5/src/lib/version.h new/plasma-activities-6.7.0/src/lib/version.h --- old/plasma-activities-6.6.5/src/lib/version.h 2026-05-12 12:29:04.000000000 +0200 +++ new/plasma-activities-6.7.0/src/lib/version.h 2026-06-11 11:35:03.000000000 +0200 @@ -7,39 +7,41 @@ #ifndef PLASMA_ACTIVITIES_VERSION_BIN_H #define PLASMA_ACTIVITIES_VERSION_BIN_H -/** @file version.h <PlasmaActivities/Version> */ - #include "plasma_activities_export.h" #include <plasma_activities_version.h> #define PLASMA_ACTIVITIES_VERSION_RELEASE PLASMA_ACTIVITIES_VERSION_PATCH -/** - * Namespace for everything in libkactivities +/*! + * \namespace KActivities + * \inmodule PlasmaActivities + * \inheaderfile KActivities/Version + * + * \brief Namespace for everything in libkactivities. */ namespace KActivities { -/** +/*! * The runtime version of libkactivities */ PLASMA_ACTIVITIES_EXPORT unsigned int version(); -/** +/*! * The runtime major version of libkactivities */ PLASMA_ACTIVITIES_EXPORT unsigned int versionMajor(); -/** +/*! * The runtime major version of libkactivities */ PLASMA_ACTIVITIES_EXPORT unsigned int versionMinor(); -/** +/*! * The runtime major version of libkactivities */ PLASMA_ACTIVITIES_EXPORT unsigned int versionRelease(); -/** +/*! * The runtime version string of libkactivities */ PLASMA_ACTIVITIES_EXPORT const char *versionString();
