From 1b161011fb6aa5f2197fe83d8e310bc44586de5d Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Thu, 15 Apr 2010 11:15:53 +0800 Subject: [PATCH] Remove some unused code --- src/DynamicSpecialPhrase.cc | 2 - src/SpecialPhraseTable.cc | 167 +------------------------------------------- 2 files changed, 1 insertion(+), 168 deletions(-) diff --git a/src/DynamicSpecialPhrase.cc b/src/DynamicSpecialPhrase.cc index f7b6b4f..2443a29 100644 --- a/src/DynamicSpecialPhrase.cc +++ b/src/DynamicSpecialPhrase.cc @@ -1,7 +1,5 @@ #include #include -#include -#include #include "DynamicSpecialPhrase.h" namespace PY { diff --git a/src/SpecialPhraseTable.cc b/src/SpecialPhraseTable.cc index ca4c9b7..7b98bf1 100644 --- a/src/SpecialPhraseTable.cc +++ b/src/SpecialPhraseTable.cc @@ -1,5 +1,3 @@ -#include -#include #include #include #include @@ -21,169 +19,6 @@ private: std::string m_text; }; -class DynamicPhrase : public SpecialPhrase { -public: - DynamicPhrase (const std::string &text, guint pos) : - SpecialPhrase (pos), m_text (text) { } - - std::string text (void) { - /* get the current time */ - std::time (&m_time); - - std::string result; - - size_t pos = 0; - size_t pnext; - gint s = 0; - while (s != 2) { - switch (s) { - case 0: - pnext = m_text.find ("${", pos); - if (pnext == m_text.npos) { - result += m_text.substr (pos); - s = 2; - } - else { - result += m_text.substr (pos, pnext - pos); - pos = pnext + 2; - s = 1; - } - break; - case 1: - pnext = m_text.find ("}", pos); - if (pnext == m_text.npos) { - result += "${"; - result += m_text.substr (pos); - s = 2; - } - else { - result += variable (m_text.substr(pos, pnext - pos)); - pos = pnext + 1; - s = 0; - } - break; - default: - g_assert_not_reached (); - } - } - return result; - } - - const std::string dec (gint d, const gchar *fmt = "%d") { - char string [32]; - std::snprintf (string, sizeof (string), fmt, d); - return string; - } - - const std::string year_cn (gboolean yy = FALSE) { - static const gchar * digits[] = { - "〇", "一", "二", "三", "四", - "五", "六", "七", "八", "九" - }; - - gint year = localtime (&m_time)->tm_year + 1900; - gint bit = 0; - if (yy) { - year %= 100; - bit = 2; - } - - std::string result; - while (year != 0 || bit > 0) { - result.insert(0, digits[year % 10]); - year /= 10; - bit -= 1; - } - return result; - } - - const std::string month_cn (void) { - static const gchar *month_num[] = { - "一", "二", "三", "四", "五", "六", "七", "八", - "九", "十", "十一", "十二" - }; - return month_num[localtime (&m_time)->tm_mon]; - } - - const std::string weekday_cn (void) { - static const gchar *week_num[] = { - "日", "一", "二", "三", "四", "五", "六" - }; - return week_num[localtime (&m_time)->tm_wday]; - } - - const std::string hour_cn (guint i) { - static const gchar *hour_num[] = { - "零", "一", "二", "三", "四", - "五", "六", "七", "八", "九", - "十", "十一", "十二", "十三", "十四", - "十五", "十六", "十七", "十八", "十九", - "二十", "二十一", "二十二", "二十三", - }; - return hour_num[i]; - } - - const std::string fullhour_cn (void) { - return hour_cn (localtime (&m_time)->tm_hour); - } - - const std::string halfhour_cn (void) { - return hour_cn (localtime (&m_time)->tm_hour % 12); - } - - const std::string day_cn (void) { - static const gchar *day_num[] = { - "", "一", "二", "三", "四", - "五", "六", "七", "八", "九", - "", "十","二十", "三十" - }; - guint day = localtime (&m_time)->tm_mday; - return std::string (day_num[day / 10 + 10]) + day_num[day % 10]; - } - - const std::string minsec_cn (guint i) { - static const gchar *num[] = { - "", "一", "二", "三", "四", - "五", "六", "七", "八", "九", - "零", "十","二十", "三十", "四十" - "五十", "六十" - }; - return std::string (num[i / 10 + 10]) + num[i % 10]; - } - - const std::string variable (const std::string &name) { - if (name == "year") return dec (localtime (&m_time)->tm_year + 1900); - if (name == "year_yy") return dec ((localtime (&m_time)->tm_year + 1900) % 100, "%02d"); - if (name == "month") return dec (localtime (&m_time)->tm_mon + 1); - if (name == "month_mm") return dec (localtime (&m_time)->tm_mon + 1, "%02d"); - if (name == "day") return dec (localtime (&m_time)->tm_mday); - if (name == "day_dd") return dec (localtime (&m_time)->tm_mday, "%02d"); - if (name == "weekday") return dec (localtime (&m_time)->tm_wday + 1); - if (name == "fullhour") return dec (localtime (&m_time)->tm_hour, "%02d"); - if (name == "falfhour") return dec (localtime (&m_time)->tm_hour % 12, "%02d"); - if (name == "ampm") return localtime (&m_time)->tm_hour < 12 ? "AM" : "PM"; - if (name == "minute") return dec (localtime (&m_time)->tm_min, "%02d"); - if (name == "second") return dec (localtime (&m_time)->tm_sec, "%02d"); - if (name == "year_cn") return year_cn (); - if (name == "year_yy_cn") return year_cn (TRUE); - if (name == "month_cn") return month_cn (); - if (name == "day_cn") return day_cn (); - if (name == "weekday_cn") return weekday_cn (); - if (name == "fullhour_cn") return fullhour_cn (); - if (name == "halfhour_cn") return halfhour_cn (); - if (name == "ampm_cn") return localtime (&m_time)->tm_hour < 12 ? "上午" : "下午"; - if (name == "minute_cn") return minsec_cn (localtime (&m_time)->tm_min); - if (name == "second_cn") return minsec_cn (localtime (&m_time)->tm_sec); - - return "${" + name + "}"; - } - -private: - std::string m_text; - time_t m_time; - -}; - SpecialPhraseTable::SpecialPhraseTable (void) { gchar * path = g_build_filename (g_get_user_config_dir (), @@ -220,7 +55,7 @@ SpecialPhraseTable::load (const gchar *file) insert (command, new StaticSpecialPhrase (phrase, 0)); } else if (phrase.size () > 1) { - insert (command, new DynamicPhrase (phrase.substr (1), 0)); + insert (command, new DynamicSpecialPhrase (phrase.substr (1), 0)); } } return TRUE; -- 2.7.4