diff options
Diffstat (limited to 'src/formatter-desktop.cpp')
| -rw-r--r-- | src/formatter-desktop.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/formatter-desktop.cpp b/src/formatter-desktop.cpp index d542ec4..336d2d3 100644 --- a/src/formatter-desktop.cpp +++ b/src/formatter-desktop.cpp @@ -64,8 +64,8 @@ std::string joinDateAndTimeFormatStrings(const char* date_string, **** ***/ -DesktopFormatter::DesktopFormatter(const std::shared_ptr<Clock>& clock_in, - const std::shared_ptr<Settings>& settings_in): +DesktopFormatter::DesktopFormatter(const std::shared_ptr<const Clock>& clock_in, + const std::shared_ptr<const Settings>& settings_in): Formatter(clock_in), m_settings(settings_in) { @@ -81,7 +81,7 @@ DesktopFormatter::DesktopFormatter(const std::shared_ptr<Clock>& clock_in, 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 |