From cc9afb7af24d442117c81571a57ba382d8013207 Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sun, 26 Dec 2021 22:01:41 +0100 Subject: [PATCH] [applets/digitalclock] Rename lauchOrganizer to launchCalendar We want to be able to lauch other services than KOrganizer, so make the name more generic and appropriate --- .../package/contents/ui/CalendarView.qml | 4 ++-- .../digital-clock/plugin/applicationintegration.cpp | 12 ++++++------ .../digital-clock/plugin/applicationintegration.h | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/applets/digital-clock/package/contents/ui/CalendarView.qml b/applets/digital-clock/package/contents/ui/CalendarView.qml index d1db0132e..8e2bf55d9 100644 --- a/applets/digital-clock/package/contents/ui/CalendarView.qml +++ b/applets/digital-clock/package/contents/ui/CalendarView.qml @@ -91,11 +91,11 @@ PlasmaExtras.Representation { elide: Text.ElideRight } PlasmaComponents3.ToolButton { - visible: agenda.visible && ApplicationIntegration.korganizerInstalled + visible: agenda.visible && ApplicationIntegration.calendarInstalled text: i18nc("@action:button Add event", "Add…") Layout.rightMargin: calendar.paddings icon.name: "list-add" - onClicked: ApplicationIntegration.launchKorganizer() + onClicked: ApplicationIntegration.launchCalendar() } } } diff --git a/applets/digital-clock/plugin/applicationintegration.cpp b/applets/digital-clock/plugin/applicationintegration.cpp index c5868d7aa..13c3571a3 100644 --- a/applets/digital-clock/plugin/applicationintegration.cpp +++ b/applets/digital-clock/plugin/applicationintegration.cpp @@ -6,19 +6,19 @@ ApplicationIntegration::ApplicationIntegration(QObject *parent) : QObject(parent) - , m_korganizerService(KService::serviceByDesktopName(QStringLiteral("org.kde.korganizer"))) + , m_calendarService(KService::serviceByDesktopName(QStringLiteral("org.kde.korganizer"))) { } -bool ApplicationIntegration::korganizerInstalled() const +bool ApplicationIntegration::calendarInstalled() const { - return m_korganizerService != nullptr; + return m_calendarService != nullptr; } -void ApplicationIntegration::launchKorganizer() const +void ApplicationIntegration::launchCalendar() const { - Q_ASSERT(m_korganizerService); + Q_ASSERT(m_calendarService); - auto job = new KIO::ApplicationLauncherJob(m_korganizerService); + auto job = new KIO::ApplicationLauncherJob(m_calendarService); job->start(); } diff --git a/applets/digital-clock/plugin/applicationintegration.h b/applets/digital-clock/plugin/applicationintegration.h index fa2927e4c..5972ccaff 100644 --- a/applets/digital-clock/plugin/applicationintegration.h +++ b/applets/digital-clock/plugin/applicationintegration.h @@ -8,15 +8,15 @@ class ApplicationIntegration : public QObject { Q_OBJECT - Q_PROPERTY(bool korganizerInstalled READ korganizerInstalled CONSTANT) + Q_PROPERTY(bool calendarInstalled READ calendarInstalled CONSTANT) public: explicit ApplicationIntegration(QObject *parent = nullptr); ~ApplicationIntegration() = default; - bool korganizerInstalled() const; - Q_INVOKABLE void launchKorganizer() const; + bool calendarInstalled() const; + Q_INVOKABLE void launchCalendar() const; private: - KService::Ptr m_korganizerService; + KService::Ptr m_calendarService; };