aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-28 08:20:13 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-28 08:20:13 +0200
commit97cc3bfbcba9cbbf612f4c7e04b974816adae3e2 (patch)
treed35fc8583d82f4825a5da9fd0ebc4a7dc9e6bb70 /include
parent2a52d61b410b9d294c479ad53a06fb6f830b9605 (diff)
parent0492e95dbf6a1f6285a4701379adb6b7d8553d6b (diff)
downloadayatana-indicator-datetime-97cc3bfbcba9cbbf612f4c7e04b974816adae3e2.tar.gz
ayatana-indicator-datetime-97cc3bfbcba9cbbf612f4c7e04b974816adae3e2.tar.bz2
ayatana-indicator-datetime-97cc3bfbcba9cbbf612f4c7e04b974816adae3e2.zip
Merge branch 'tari01-pr/ubuntu-alarm'
Attributes GH PR #64: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/64
Diffstat (limited to 'include')
-rw-r--r--include/datetime/appointment.h6
-rw-r--r--include/datetime/engine-eds.h4
-rw-r--r--include/datetime/engine-mock.h4
-rw-r--r--include/datetime/engine.h4
4 files changed, 13 insertions, 5 deletions
diff --git a/include/datetime/appointment.h b/include/datetime/appointment.h
index faf8a18..c563f33 100644
--- a/include/datetime/appointment.h
+++ b/include/datetime/appointment.h
@@ -1,5 +1,6 @@
/*
* Copyright 2013 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#ifndef INDICATOR_DATETIME_APPOINTMENT_H
@@ -51,9 +53,9 @@ struct Alarm
struct Appointment
{
public:
- enum Type { EVENT, UBUNTU_ALARM };
+ enum Type { EVENT, ALARM };
Type type = EVENT;
- bool is_ubuntu_alarm() const { return type == UBUNTU_ALARM; }
+ bool is_alarm() const { return type == ALARM; }
std::string uid;
std::string source_uid;
diff --git a/include/datetime/engine-eds.h b/include/datetime/engine-eds.h
index 96b0f76..b4a9df6 100644
--- a/include/datetime/engine-eds.h
+++ b/include/datetime/engine-eds.h
@@ -1,5 +1,6 @@
/*
* Copyright 2014 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#ifndef INDICATOR_DATETIME_ENGINE_EDS_H
@@ -54,7 +56,7 @@ public:
const DateTime& end,
const Timezone& default_timezone,
std::function<void(const std::vector<Appointment>&)> appointment_func) override;
- void disable_ubuntu_alarm(const Appointment&) override;
+ void disable_alarm(const Appointment&) override;
core::Signal<>& changed() override;
diff --git a/include/datetime/engine-mock.h b/include/datetime/engine-mock.h
index 0bee29c..8ffe8bd 100644
--- a/include/datetime/engine-mock.h
+++ b/include/datetime/engine-mock.h
@@ -1,5 +1,6 @@
/*
* Copyright 2014 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#ifndef INDICATOR_DATETIME_ENGINE_MOCK_H
@@ -52,7 +54,7 @@ public:
return m_changed;
}
- void disable_ubuntu_alarm(const Appointment&) override {
+ void disable_alarm(const Appointment&) override {
}
private:
diff --git a/include/datetime/engine.h b/include/datetime/engine.h
index 91145fa..efbfcbf 100644
--- a/include/datetime/engine.h
+++ b/include/datetime/engine.h
@@ -1,5 +1,6 @@
/*
* Copyright 2014 Canonical Ltd.
+ * Copyright 2021 Robert Tari
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 3, as published
@@ -15,6 +16,7 @@
*
* Authors:
* Charles Kerr <charles.kerr@canonical.com>
+ * Robert Tari <robert@tari.in>
*/
#ifndef INDICATOR_DATETIME_ENGINE_H
@@ -50,7 +52,7 @@ public:
const DateTime& end,
const Timezone& default_timezone,
std::function<void(const std::vector<Appointment>&)> appointment_func) =0;
- virtual void disable_ubuntu_alarm(const Appointment&) =0;
+ virtual void disable_alarm(const Appointment&) =0;
virtual core::Signal<>& changed() =0;