diff options
| author | Peng Wu <alexepico@gmail.com> | 2014-04-23 16:29:04 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2014-04-23 16:29:04 +0800 |
| commit | 904ffe389825f1b9eae0765586560b7afb7efa35 (patch) | |
| tree | 7cbeaa946154ed858544204dc9db00bb39c88660 | |
| parent | f31155bf3ebadac7c4124009e8b571c1778f3692 (diff) | |
| download | ibus-libpinyin-904ffe389825f1b9eae0765586560b7afb7efa35.tar.gz ibus-libpinyin-904ffe389825f1b9eae0765586560b7afb7efa35.tar.xz ibus-libpinyin-904ffe389825f1b9eae0765586560b7afb7efa35.zip | |
re-factor code
| -rw-r--r-- | src/PYConfig.cc | 24 | ||||
| -rw-r--r-- | src/PYConfig.h | 25 | ||||
| -rw-r--r-- | src/PYPConfig.cc | 25 |
3 files changed, 25 insertions, 49 deletions
diff --git a/src/PYConfig.cc b/src/PYConfig.cc index 2ed964c..554a13a 100644 --- a/src/PYConfig.cc +++ b/src/PYConfig.cc @@ -122,30 +122,6 @@ Config::read (const gchar * name, return defval; } -static inline bool -normalizeGVariant (GVariant *value, bool defval) -{ - if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_BOOLEAN) - return defval; - return g_variant_get_boolean (value); -} - -static inline gint -normalizeGVariant (GVariant *value, gint defval) -{ - if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_INT32) - return defval; - return g_variant_get_int32 (value); -} - -static inline std::string -normalizeGVariant (GVariant *value, const std::string &defval) -{ - if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_STRING) - return defval; - return g_variant_get_string (value, NULL); -} - gboolean Config::valueChanged (const std::string §ion, const std::string &name, diff --git a/src/PYConfig.h b/src/PYConfig.h index 5396ef1..dfb86db 100644 --- a/src/PYConfig.h +++ b/src/PYConfig.h @@ -115,5 +115,30 @@ protected: gboolean m_enter_key; }; + +static inline bool +normalizeGVariant (GVariant *value, bool defval) +{ + if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_BOOLEAN) + return defval; + return g_variant_get_boolean (value); +} + +static inline gint +normalizeGVariant (GVariant *value, gint defval) +{ + if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_INT32) + return defval; + return g_variant_get_int32 (value); +} + +static inline std::string +normalizeGVariant (GVariant *value, const std::string &defval) +{ + if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_STRING) + return defval; + return g_variant_get_string (value, NULL); +} + }; #endif diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc index 3174d67..8b6d17c 100644 --- a/src/PYPConfig.cc +++ b/src/PYPConfig.cc @@ -187,31 +187,6 @@ LibPinyinConfig::readDefaultValues (void) #endif } - -static inline bool -normalizeGVariant (GVariant *value, bool defval) -{ - if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_BOOLEAN) - return defval; - return g_variant_get_boolean (value); -} - -static inline gint -normalizeGVariant (GVariant *value, gint defval) -{ - if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_INT32) - return defval; - return g_variant_get_int32 (value); -} - -static inline std::string -normalizeGVariant (GVariant *value, const std::string &defval) -{ - if (value == NULL || g_variant_classify (value) != G_VARIANT_CLASS_STRING) - return defval; - return g_variant_get_string (value, NULL); -} - gboolean LibPinyinConfig::valueChanged (const std::string §ion, const std::string &name, |