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.

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;