aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2016-03-31 09:41:29 -0300
committerRobert Tari <robert@tari.in>2021-07-05 00:44:12 +0200
commit0b5b8b3d31eaff2302c2fd3eb11e68be96f1d219 (patch)
treecd1fb5e45864ac63f855e9ec075c80a14543e9de
parentd51a6d284f236232c845d89db475c98d0c11ac43 (diff)
downloadayatana-indicator-datetime-0b5b8b3d31eaff2302c2fd3eb11e68be96f1d219.tar.gz
ayatana-indicator-datetime-0b5b8b3d31eaff2302c2fd3eb11e68be96f1d219.tar.bz2
ayatana-indicator-datetime-0b5b8b3d31eaff2302c2fd3eb11e68be96f1d219.zip
Remove constructors from Alarm.
-rw-r--r--include/datetime/appointment.h9
-rw-r--r--tests/test-alarm-queue.cpp2
2 files changed, 2 insertions, 9 deletions
diff --git a/include/datetime/appointment.h b/include/datetime/appointment.h
index 14adb5d..2c225fc 100644
--- a/include/datetime/appointment.h
+++ b/include/datetime/appointment.h
@@ -42,14 +42,7 @@ struct Alarm
std::string text;
std::string audio_url;
DateTime time;
- int type = TEXT;
-
- Alarm(const std::string &text_, const std::string &audio_url_, const DateTime & time_, int type_ = TEXT)
- : text(text_), audio_url(audio_url_), time(time_), type(type_)
- {}
-
- Alarm()
- {}
+ int type : SOUND;
bool operator== (const Alarm& that) const;
bool has_sound() const;
diff --git a/tests/test-alarm-queue.cpp b/tests/test-alarm-queue.cpp
index 42edf74..c1f7929 100644
--- a/tests/test-alarm-queue.cpp
+++ b/tests/test-alarm-queue.cpp
@@ -79,7 +79,7 @@ protected:
a1.type = Appointment::UBUNTU_ALARM;
a1.begin = tomorrow_begin;
a1.end = tomorrow_end;
- a1.alarms.push_back(Alarm{"Alarm Text", "", a1.begin});
+ a1.alarms.push_back(Alarm{"Alarm Text", "", a1.begin, (int) Alarm::SOUND});
const auto ubermorgen_begin = now.add_days(2).start_of_day();
const auto ubermorgen_end = ubermorgen_begin.end_of_day();