aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-01-28 16:28:40 -0600
committerCharles Kerr <charles.kerr@canonical.com>2014-01-28 16:28:40 -0600
commitfd92ac35f12176225e910f1d25f57acf16a35cda (patch)
treed8f79e85a9e2ce0aa76b786693ee7375746abfa2 /include
parentee9f4c7ef822a101cea8d12c565d8a8a93d9caf5 (diff)
downloadayatana-indicator-datetime-fd92ac35f12176225e910f1d25f57acf16a35cda.tar.gz
ayatana-indicator-datetime-fd92ac35f12176225e910f1d25f57acf16a35cda.tar.bz2
ayatana-indicator-datetime-fd92ac35f12176225e910f1d25f57acf16a35cda.zip
cleanup from previous commit: since Formatter code was migrated to utils.c so that it could be used standalone by the panels, there's now code duplication between Utils and Formatter. Remove code duplication s.t. Formatter uses the Utils code as well.
Diffstat (limited to 'include')
-rw-r--r--include/datetime/formatter.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/datetime/formatter.h b/include/datetime/formatter.h
index 86fa64a..3de109e 100644
--- a/include/datetime/formatter.h
+++ b/include/datetime/formatter.h
@@ -25,6 +25,7 @@
#include <datetime/clock.h>
#include <datetime/settings.h>
+#include <datetime/utils.h> // is_locale_12h()
#include <glib.h>
@@ -88,16 +89,8 @@ protected:
Formatter(const std::shared_ptr<Clock>&);
virtual ~Formatter();
- /** \brief Returns true if the current locale prefers 12h display instead of 24h */
- static bool is_locale_12h();
-
static const char* getDefaultHeaderTimeFormat(bool twelvehour, bool show_seconds);
- /** \brief Translate the string based on LC_TIME instead of LC_MESSAGES.
- The intent of this is to let users set LC_TIME to override
- their other locale settings when generating time format string */
- static const char* T_(const char * fmt);
-
private:
Formatter(const Formatter&) =delete;