aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/datetime/clock-mock.h4
-rw-r--r--include/datetime/clock.h10
-rw-r--r--include/datetime/formatter.h12
-rw-r--r--include/datetime/planner.h6
-rw-r--r--src/actions.cpp4
-rw-r--r--src/clock-live.cpp6
-rw-r--r--src/clock.cpp22
-rw-r--r--src/formatter-desktop.cpp4
-rw-r--r--src/formatter.cpp12
-rw-r--r--src/menu.cpp14
-rw-r--r--src/planner-eds.cpp2
-rw-r--r--tests/test-clock.cpp8
-rw-r--r--tests/test-formatter.cpp10
-rw-r--r--tests/test-live-actions.cpp4
-rw-r--r--tests/test-planner.cpp6
15 files changed, 62 insertions, 62 deletions
diff --git a/include/datetime/clock-mock.h b/include/datetime/clock-mock.h
index 27926ff..fb9b52f 100644
--- a/include/datetime/clock-mock.h
+++ b/include/datetime/clock-mock.h
@@ -45,9 +45,9 @@ public:
const auto old = m_localtime;
m_localtime = dt;
if (!DateTime::is_same_minute(old, m_localtime))
- minuteChanged();
+ minute_changed();
if (!DateTime::is_same_day(old, m_localtime))
- dateChanged();
+ date_changed();
}
private:
diff --git a/include/datetime/clock.h b/include/datetime/clock.h
index 4a9db8f..1d488d1 100644
--- a/include/datetime/clock.h
+++ b/include/datetime/clock.h
@@ -43,20 +43,20 @@ public:
virtual DateTime localtime() const =0;
/** \brief A signal which fires when the clock's minute changes */
- core::Signal<> minuteChanged;
+ core::Signal<> minute_changed;
/** \brief A signal which fires when the clock's date changes */
- core::Signal<> dateChanged;
+ core::Signal<> date_changed;
protected:
Clock();
- /** \brief Compares old and new times, emits minuteChanged() or dateChanged() signals if appropriate */
+ /** \brief Compares old and new times, emits minute_changed() or date_changed() signals if appropriate */
void maybe_emit (const DateTime& a, const DateTime& b);
private:
- static void onSystemBusReady(GObject*, GAsyncResult*, gpointer);
- static void onPrepareForSleep(GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, gpointer);
+ static void on_system_bus_ready(GObject*, GAsyncResult*, gpointer);
+ static void on_prepare_for_sleep(GDBusConnection*, const gchar*, const gchar*, const gchar*, const gchar*, GVariant*, gpointer);
GCancellable * m_cancellable = nullptr;
GDBusConnection * m_system_bus = nullptr;
diff --git a/include/datetime/formatter.h b/include/datetime/formatter.h
index f323858..0d695e2 100644
--- a/include/datetime/formatter.h
+++ b/include/datetime/formatter.h
@@ -69,27 +69,27 @@ class Formatter
public:
/** \brief The time format string for the menu header */
- core::Property<std::string> headerFormat;
+ core::Property<std::string> header_format;
- /** \brief The time string for the menu header. (eg, the headerFormat + the clock's time */
+ /** \brief The time string for the menu header. (eg, the header_format + the clock's time */
core::Property<std::string> header;
/** \brief Signal to denote when the relativeFormat has changed.
When this is emitted, clients will want to rebuild their
menuitems that contain relative time strings
(ie, the Appointments and Locations menuitems) */
- core::Signal<> relativeFormatChanged;
+ core::Signal<> relative_format_changed;
/** \brief Generate a relative time format for some time (or time range)
from the current clock's value. For example, a full-day interval
starting at the end of the current clock's day yields "Tomorrow" */
- std::string getRelativeFormat(GDateTime* then, GDateTime* then_end=nullptr) const;
+ std::string relative_format(GDateTime* then, GDateTime* then_end=nullptr) const;
protected:
Formatter(const std::shared_ptr<const Clock>&);
virtual ~Formatter();
- static const char* getDefaultHeaderTimeFormat(bool twelvehour, bool show_seconds);
+ static const char* default_header_time_format(bool twelvehour, bool show_seconds);
private:
@@ -127,7 +127,7 @@ class PhoneFormatter: public Formatter
{
public:
PhoneFormatter(const std::shared_ptr<const Clock>& clock): Formatter(clock) {
- headerFormat.set(getDefaultHeaderTimeFormat(is_locale_12h(), false));
+ header_format.set(default_header_time_format(is_locale_12h(), false));
}
};
diff --git a/include/datetime/planner.h b/include/datetime/planner.h
index a8f9941..376a31f 100644
--- a/include/datetime/planner.h
+++ b/include/datetime/planner.h
@@ -43,9 +43,9 @@ public:
virtual ~Planner() =default;
/**
- * \brief Timestamp used to determine the appointments in the `upcoming' and `thisMonth' properties.
+ * \brief Timestamp used to determine the appointments in the `upcoming' and `this_month' properties.
* Setting this value will cause the planner to re-query its backend and
- * update the `upcoming' and `thisMonth' properties.
+ * update the `upcoming' and `this_month' properties.
*/
core::Property<DateTime> time;
@@ -57,7 +57,7 @@ public:
/**
* \brief The appointments that occur in the same month as the time property
*/
- core::Property<std::vector<Appointment>> thisMonth;
+ core::Property<std::vector<Appointment>> this_month;
protected:
Planner() =default;
diff --git a/src/actions.cpp b/src/actions.cpp
index cdeb77f..d6fa698 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -146,7 +146,7 @@ GVariant* create_default_header_state()
GVariant* create_calendar_state(const std::shared_ptr<State>& state)
{
gboolean days[32] = { 0 };
- for (const auto& appt : state->planner->thisMonth.get())
+ for (const auto& appt : state->planner->this_month.get())
days[appt.begin.day_of_month()] = true;
GVariantBuilder day_builder;
@@ -222,7 +222,7 @@ Actions::Actions(const std::shared_ptr<State>& state):
m_state->planner->time.changed().connect([this](const DateTime&){
update_calendar_state();
});
- m_state->planner->thisMonth.changed().connect([this](const std::vector<Appointment>&){
+ m_state->planner->this_month.changed().connect([this](const std::vector<Appointment>&){
update_calendar_state();
});
m_state->settings->show_week_numbers.changed().connect([this](bool){
diff --git a/src/clock-live.cpp b/src/clock-live.cpp
index 7c9db40..21a18a3 100644
--- a/src/clock-live.cpp
+++ b/src/clock-live.cpp
@@ -95,7 +95,7 @@ private:
{
g_clear_pointer(&m_timezone, g_time_zone_unref);
m_timezone = g_time_zone_new(str.c_str());
- m_owner.minuteChanged();
+ m_owner.minute_changed();
}
/***
@@ -109,9 +109,9 @@ private:
// maybe emit change signals
const auto now = localtime();
if (!DateTime::is_same_minute(m_prev_datetime, now))
- m_owner.minuteChanged();
+ m_owner.minute_changed();
if (!DateTime::is_same_day(m_prev_datetime, now))
- m_owner.dateChanged();
+ m_owner.date_changed();
// queue up a timer to fire at the next minute
m_prev_datetime = now;
diff --git a/src/clock.cpp b/src/clock.cpp
index d5293cc..f41a0cc 100644
--- a/src/clock.cpp
+++ b/src/clock.cpp
@@ -33,7 +33,7 @@ namespace datetime {
Clock::Clock():
m_cancellable(g_cancellable_new())
{
- g_bus_get(G_BUS_TYPE_SYSTEM, m_cancellable, onSystemBusReady, this);
+ g_bus_get(G_BUS_TYPE_SYSTEM, m_cancellable, on_system_bus_ready, this);
}
Clock::~Clock()
@@ -48,7 +48,7 @@ Clock::~Clock()
}
void
-Clock::onSystemBusReady(GObject*, GAsyncResult * res, gpointer gself)
+Clock::on_system_bus_ready(GObject*, GAsyncResult * res, gpointer gself)
{
GDBusConnection * system_bus;
@@ -66,22 +66,22 @@ Clock::onSystemBusReady(GObject*, GAsyncResult * res, gpointer gself)
"/org/freedesktop/login1", // object path
nullptr, // arg0
G_DBUS_SIGNAL_FLAGS_NONE,
- onPrepareForSleep,
+ on_prepare_for_sleep,
self,
nullptr);
}
}
void
-Clock::onPrepareForSleep(GDBusConnection* /*connection*/,
- const gchar* /*sender_name*/,
- const gchar* /*object_path*/,
- const gchar* /*interface_name*/,
- const gchar* /*signal_name*/,
- GVariant* /*parameters*/,
- gpointer gself)
+Clock::on_prepare_for_sleep(GDBusConnection* /*connection*/,
+ const gchar* /*sender_name*/,
+ const gchar* /*object_path*/,
+ const gchar* /*interface_name*/,
+ const gchar* /*signal_name*/,
+ GVariant* /*parameters*/,
+ gpointer gself)
{
- static_cast<Clock*>(gself)->minuteChanged();
+ static_cast<Clock*>(gself)->minute_changed();
}
/***
diff --git a/src/formatter-desktop.cpp b/src/formatter-desktop.cpp
index 9a098c6..336d2d3 100644
--- a/src/formatter-desktop.cpp
+++ b/src/formatter-desktop.cpp
@@ -81,7 +81,7 @@ DesktopFormatter::DesktopFormatter(const std::shared_ptr<const Clock>& clock_
void DesktopFormatter::rebuildHeaderFormat()
{
- headerFormat.set(getHeaderLabelFormatString());
+ header_format.set(getHeaderLabelFormatString());
}
std::string DesktopFormatter::getHeaderLabelFormatString() const
@@ -126,7 +126,7 @@ const gchar* DesktopFormatter::getFullTimeFormatString() const
break;
}
- return getDefaultHeaderTimeFormat(twelvehour, show_seconds);
+ return default_header_time_format(twelvehour, show_seconds);
}
const gchar* DesktopFormatter::getDateFormat(bool show_day, bool show_date, bool show_year) const
diff --git a/src/formatter.cpp b/src/formatter.cpp
index 638eac4..9aa9bbb 100644
--- a/src/formatter.cpp
+++ b/src/formatter.cpp
@@ -122,8 +122,8 @@ public:
m_owner(owner),
m_clock(clock)
{
- m_owner->headerFormat.changed().connect([this](const std::string& /*fmt*/){update_header();});
- m_clock->minuteChanged.connect([this](){update_header();});
+ m_owner->header_format.changed().connect([this](const std::string& /*fmt*/){update_header();});
+ m_clock->minute_changed.connect([this](){update_header();});
update_header();
restartRelativeTimer();
@@ -149,7 +149,7 @@ private:
void update_header()
{
// update the header property
- const auto fmt = m_owner->headerFormat.get();
+ const auto fmt = m_owner->header_format.get();
const auto str = m_clock->localtime().format(fmt);
m_owner->header.set(str);
@@ -197,7 +197,7 @@ private:
static gboolean onRelativeTimer(gpointer gself)
{
auto self = static_cast<Formatter::Impl*>(gself);
- self->m_owner->relativeFormatChanged();
+ self->m_owner->relative_format_changed();
self->restartRelativeTimer();
return G_SOURCE_REMOVE;
}
@@ -225,7 +225,7 @@ Formatter::~Formatter()
}
const char*
-Formatter::getDefaultHeaderTimeFormat(bool twelvehour, bool show_seconds)
+Formatter::default_header_time_format(bool twelvehour, bool show_seconds)
{
const char* fmt;
@@ -250,7 +250,7 @@ Formatter::getDefaultHeaderTimeFormat(bool twelvehour, bool show_seconds)
***/
std::string
-Formatter::getRelativeFormat(GDateTime* then_begin, GDateTime* then_end) const
+Formatter::relative_format(GDateTime* then_begin, GDateTime* then_end) const
{
auto cstr = generate_full_format_string_at_time (p->m_clock->localtime().get(), then_begin, then_end);
const std::string ret = cstr;
diff --git a/src/menu.cpp b/src/menu.cpp
index e92d398..91f7dd2 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -90,12 +90,12 @@ protected:
m_formatter->header.changed().connect([this](const std::string&){
update_header();
});
- m_formatter->headerFormat.changed().connect([this](const std::string&){
+ m_formatter->header_format.changed().connect([this](const std::string&){
update_section(Locations); // need to update x-canonical-time-format
});
- m_formatter->relativeFormatChanged.connect([this](){
- update_section(Appointments); // uses formatter.getRelativeFormat()
- update_section(Locations); // uses formatter.getRelativeFormat()
+ m_formatter->relative_format_changed.connect([this](){
+ update_section(Appointments); // uses formatter.relative_format()
+ update_section(Locations); // uses formatter.relative_format()
});
m_state->settings->show_clock.changed().connect([this](bool){
update_header(); // update header's label
@@ -110,7 +110,7 @@ protected:
m_state->planner->upcoming.changed().connect([this](const std::vector<Appointment>&){
update_section(Appointments); // "upcoming" is the list of Appointments we show
});
- m_state->clock->dateChanged.connect([this](){
+ m_state->clock->date_changed.connect([this](){
update_section(Calendar); // need to update the Date menuitem
update_section(Locations); // locations' relative time may have changed
});
@@ -305,7 +305,7 @@ private:
GDateTime* begin = appt.begin();
GDateTime* end = appt.end();
- auto fmt = m_formatter->getRelativeFormat(begin, end);
+ auto fmt = m_formatter->relative_format(begin, end);
auto unix_time = g_date_time_to_unix(begin);
auto menu_item = g_menu_item_new (appt.summary.c_str(), nullptr);
@@ -380,7 +380,7 @@ private:
const auto& zone = location.zone();
const auto& name = location.name();
const auto zone_now = now.to_timezone(zone);
- const auto fmt = m_formatter->getRelativeFormat(zone_now.get());
+ const auto fmt = m_formatter->relative_format(zone_now.get());
auto detailed_action = g_strdup_printf("indicator.set-location::%s %s", zone.c_str(), name.c_str());
auto i = g_menu_item_new (name.c_str(), detailed_action);
g_menu_item_set_attribute(i, "x-canonical-type", "s", "com.canonical.indicator.location");
diff --git a/src/planner-eds.cpp b/src/planner-eds.cpp
index 98cfe0a..cb42d6e 100644
--- a/src/planner-eds.cpp
+++ b/src/planner-eds.cpp
@@ -227,7 +227,7 @@ private:
{
getAppointments(begin, end, [this](const std::vector<Appointment>& appointments) {
g_debug("got %d appointments in this calendar month", (int)appointments.size());
- m_owner.thisMonth.set(appointments);
+ m_owner.this_month.set(appointments);
});
}
g_clear_pointer(&begin, g_date_time_unref);
diff --git a/tests/test-clock.cpp b/tests/test-clock.cpp
index 4271374..4287e1c 100644
--- a/tests/test-clock.cpp
+++ b/tests/test-clock.cpp
@@ -54,12 +54,12 @@ TEST_F(ClockFixture, MinuteChangedSignalShouldTriggerOncePerMinute)
LiveClock clock(zones);
wait_msec(500); // wait for the bus to set up
- // count how many times clock.minuteChanged() is emitted over the next minute
+ // count how many times clock.minute_changed() is emitted over the next minute
const DateTime now = clock.localtime();
const auto gnow = now.get();
auto gthen = g_date_time_add_minutes(gnow, 1);
int count = 0;
- clock.minuteChanged.connect([&count](){count++;});
+ clock.minute_changed.connect([&count](){count++;});
const auto msec = g_date_time_difference(gthen,gnow) / 1000;
wait_msec(msec);
EXPECT_EQ(1, count);
@@ -95,7 +95,7 @@ TEST_F(ClockFixture, TimezoneChangeTriggersSkew)
g_time_zone_unref(tz_nyc);
/// change the timezones!
- clock.minuteChanged.connect([this](){
+ clock.minute_changed.connect([this](){
g_main_loop_quit(loop);
});
g_idle_add([](gpointer gs){
@@ -124,7 +124,7 @@ TEST_F(ClockFixture, SleepTriggersSkew)
wait_msec(500); // wait for the bus to set up
bool skewed = false;
- clock.minuteChanged.connect([&skewed, this](){
+ clock.minute_changed.connect([&skewed, this](){
skewed = true;
g_main_loop_quit(loop);
return G_SOURCE_REMOVE;
diff --git a/tests/test-formatter.cpp b/tests/test-formatter.cpp
index 9950453..01df4f2 100644
--- a/tests/test-formatter.cpp
+++ b/tests/test-formatter.cpp
@@ -97,7 +97,7 @@ TEST_F(FormatterFixture, TestPhoneHeader)
if(Set24hLocale())
{
PhoneFormatter formatter(clock);
- EXPECT_EQ(std::string("%H:%M"), formatter.headerFormat.get());
+ EXPECT_EQ(std::string("%H:%M"), formatter.header_format.get());
EXPECT_EQ(std::string("18:30"), formatter.header.get());
}
@@ -105,7 +105,7 @@ TEST_F(FormatterFixture, TestPhoneHeader)
if(Set12hLocale())
{
PhoneFormatter formatter(clock);
- EXPECT_EQ(std::string("%l:%M %p"), formatter.headerFormat.get());
+ EXPECT_EQ(std::string("%l:%M %p"), formatter.header_format.get());
EXPECT_EQ(std::string(" 6:30 PM"), formatter.header.get());
}
}
@@ -156,7 +156,7 @@ TEST_F(FormatterFixture, TestDesktopHeader)
m_settings->show_date.set(test_case.show_date);
m_settings->show_year.set(test_case.show_year);
- ASSERT_STREQ(test_case.expected_format_string, f.headerFormat.get().c_str());
+ ASSERT_STREQ(test_case.expected_format_string, f.header_format.get().c_str());
}
}
}
@@ -196,7 +196,7 @@ TEST_F(FormatterFixture, TestUpcomingTimes)
std::shared_ptr<Clock> clock (new MockClock(DateTime(test_case.now)));
DesktopFormatter f(clock, m_settings);
- const auto fmt = f.getRelativeFormat(test_case.then);
+ const auto fmt = f.relative_format(test_case.then);
ASSERT_EQ(test_case.expected_format_string, fmt);
g_clear_pointer(&test_case.now, g_date_time_unref);
@@ -239,7 +239,7 @@ TEST_F(FormatterFixture, TestEventTimes)
std::shared_ptr<Clock> clock(new MockClock(DateTime(test_case.now)));
DesktopFormatter f(clock, m_settings);
- const auto fmt = f.getRelativeFormat(test_case.then, test_case.then_end);
+ const auto fmt = f.relative_format(test_case.then, test_case.then_end);
ASSERT_STREQ(test_case.expected_format_string, fmt.c_str());
g_clear_pointer(&test_case.now, g_date_time_unref);
diff --git a/tests/test-live-actions.cpp b/tests/test-live-actions.cpp
index 562b358..eab8596 100644
--- a/tests/test-live-actions.cpp
+++ b/tests/test-live-actions.cpp
@@ -356,11 +356,11 @@ TEST_F(LiveActionsFixture, CalendarState)
a2.begin = next_begin;
a2.end = next_end;
- m_state->planner->thisMonth.set(std::vector<Appointment>({a1, a2}));
+ m_state->planner->this_month.set(std::vector<Appointment>({a1, a2}));
///
/// Now test the calendar state again.
- /// The thisMonth field should now contain the appointments we just added.
+ /// The this_month field should now contain the appointments we just added.
///
calendar_state = g_action_group_get_action_state (action_group, "calendar");
diff --git a/tests/test-planner.cpp b/tests/test-planner.cpp
index 3072aea..b476ee8 100644
--- a/tests/test-planner.cpp
+++ b/tests/test-planner.cpp
@@ -47,9 +47,9 @@ TEST_F(PlannerFixture, EDS)
planner.time.set(DateTime(now));
wait_msec(2500);
- std::vector<Appointment> thisMonth = planner.thisMonth.get();
- std::cerr << thisMonth.size() << " appointments this month" << std::endl;
- for(const auto& a : thisMonth)
+ std::vector<Appointment> this_month = planner.this_month.get();
+ std::cerr << this_month.size() << " appointments this month" << std::endl;
+ for(const auto& a : this_month)
std::cerr << a.summary << std::endl;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 00:42:56 +0000