summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2018-03-13 14:53:54 +0800
committerPeng Wu <alexepico@gmail.com>2018-03-13 14:53:54 +0800
commitd4ece7e7c48579d3cc6fe8376cd4474ec7d1db92 (patch)
treef5bc6ed9f592b17b25371ba77ca563ffe651cdc0
parent6066cc3c9b9615eff614eabec796fe77c8915597 (diff)
downloadibus-libzhuyin-d4ece7e7c48579d3cc6fe8376cd4474ec7d1db92.zip
ibus-libzhuyin-d4ece7e7c48579d3cc6fe8376cd4474ec7d1db92.tar.gz
ibus-libzhuyin-d4ece7e7c48579d3cc6fe8376cd4474ec7d1db92.tar.xz
update read method1.8.91
-rw-r--r--src/ZYConfig.cc2
-rw-r--r--src/ZYConfig.h2
-rw-r--r--src/ZYZConfig.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ZYConfig.cc b/src/ZYConfig.cc
index a1e40f3..42d533e 100644
--- a/src/ZYConfig.cc
+++ b/src/ZYConfig.cc
@@ -94,7 +94,7 @@ Config::read (const gchar * name,
std::string
Config::read (const gchar * name,
- const std::string &defval)
+ const gchar * defval)
{
GVariant *value = NULL;
if ((value = g_settings_get_value (m_settings, name)) != NULL) {
diff --git a/src/ZYConfig.h b/src/ZYConfig.h
index 5051063..e528696 100644
--- a/src/ZYConfig.h
+++ b/src/ZYConfig.h
@@ -60,7 +60,7 @@ public:
protected:
bool read (const gchar * name, bool defval);
gint read (const gchar * name, gint defval);
- std::string read (const gchar * name, const std::string &defval);
+ std::string read (const gchar * name, const gchar * defval);
void initDefaultValues (void);
virtual void readDefaultValues (void);
diff --git a/src/ZYZConfig.cc b/src/ZYZConfig.cc
index f00751c..5841b1e 100644
--- a/src/ZYZConfig.cc
+++ b/src/ZYZConfig.cc
@@ -213,7 +213,7 @@ ZhuyinConfig::readDefaultValues (void)
}
}
- m_candidate_keys = read (CONFIG_CANDIDATE_KEYS, std::string ("1234567890"));
+ m_candidate_keys = read (CONFIG_CANDIDATE_KEYS, "1234567890");
m_easy_symbol = read (CONFIG_EASY_SYMBOL, true);
m_user_symbol = read (CONFIG_USER_SYMBOL, true);