diff options
| author | Peng Wu <alexepico@gmail.com> | 2014-04-23 16:31:13 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2014-04-23 16:31:13 +0800 |
| commit | feff197d776ebcd90d744255535b65e5149c3de6 (patch) | |
| tree | b26614ea91328db4d253c56c7fdce14ddc59a4bd /src | |
| parent | 5f91742301dfb7849a65e23b6d2860f1db2d363a (diff) | |
| download | ibus-libzhuyin-feff197d776ebcd90d744255535b65e5149c3de6.tar.gz ibus-libzhuyin-feff197d776ebcd90d744255535b65e5149c3de6.tar.xz ibus-libzhuyin-feff197d776ebcd90d744255535b65e5149c3de6.zip | |
re-factor code
Diffstat (limited to 'src')
| -rw-r--r-- | src/ZYConfig.cc | 24 | ||||
| -rw-r--r-- | src/ZYConfig.h | 24 | ||||
| -rw-r--r-- | src/ZYZConfig.cc | 24 |
3 files changed, 24 insertions, 48 deletions
diff --git a/src/ZYConfig.cc b/src/ZYConfig.cc index 5e6cf32..aa3c8e7 100644 --- a/src/ZYConfig.cc +++ b/src/ZYConfig.cc @@ -111,30 +111,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/ZYConfig.h b/src/ZYConfig.h index 87613ed..aaa3db0 100644 --- a/src/ZYConfig.h +++ b/src/ZYConfig.h @@ -86,5 +86,29 @@ protected: std::string m_candidate_keys; }; +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/ZYZConfig.cc b/src/ZYZConfig.cc index 60a6f8e..5725d9e 100644 --- a/src/ZYZConfig.cc +++ b/src/ZYZConfig.cc @@ -166,30 +166,6 @@ ZhuyinConfig::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 ZhuyinConfig::valueChanged (const std::string §ion, const std::string &name, |