From 0492e95dbf6a1f6285a4701379adb6b7d8553d6b Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Thu, 28 Oct 2021 06:06:45 +0200
Subject: Drop the 'ubuntu' prefix from the alarm types and functions

---
 include/datetime/appointment.h | 6 ++++--
 include/datetime/engine-eds.h  | 4 +++-
 include/datetime/engine-mock.h | 4 +++-
 include/datetime/engine.h      | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'include')

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;
 
-- 
cgit v1.2.3