aboutsummaryrefslogtreecommitdiff
path: root/src/formatter.cpp
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-30 18:33:14 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-30 18:33:14 -0600
commita7a09a5ca5012fb1c48f259d2587542316e7349b (patch)
treee6ac38cfefcbb049e4f77c1d546abc806e0389c9 /src/formatter.cpp
parent8564861a5026561d94310cd60ed77e3986f64246 (diff)
downloadayatana-indicator-datetime-a7a09a5ca5012fb1c48f259d2587542316e7349b.tar.gz
ayatana-indicator-datetime-a7a09a5ca5012fb1c48f259d2587542316e7349b.tar.bz2
ayatana-indicator-datetime-a7a09a5ca5012fb1c48f259d2587542316e7349b.zip
copyediting: as per review, use name_of_thing() instead of get_name_of_thing() or getNameOfThing()
Diffstat (limited to 'src/formatter.cpp')
-rw-r--r--src/formatter.cpp12
1 files changed, 6 insertions, 6 deletions
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;