summaryrefslogtreecommitdiffstats
path: root/src/PYPConfig.cc
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2014-05-21 09:46:16 +0800
committerPeng Wu <alexepico@gmail.com>2014-05-21 09:46:16 +0800
commit7a98868d07581655b7a11c84005ec9cef7d50539 (patch)
treeba2f8ad45139916ebc2882a820d165a31e5a2765 /src/PYPConfig.cc
parent7813d0b1711f08b0164242499c6ac02d30fab966 (diff)
downloadibus-libpinyin-7a98868d07581655b7a11c84005ec9cef7d50539.tar.gz
ibus-libpinyin-7a98868d07581655b7a11c84005ec9cef7d50539.tar.xz
ibus-libpinyin-7a98868d07581655b7a11c84005ec9cef7d50539.zip
remove LibPinyin* class prefix
Diffstat (limited to 'src/PYPConfig.cc')
-rw-r--r--src/PYPConfig.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc
index 8597b07..a6b8902 100644
--- a/src/PYPConfig.cc
+++ b/src/PYPConfig.cc
@@ -61,8 +61,8 @@ const pinyin_option_t PINYIN_DEFAULT_OPTION =
PINYIN_CORRECT_ALL|
0;
-std::unique_ptr<LibPinyinPinyinConfig> LibPinyinPinyinConfig::m_instance;
-std::unique_ptr<LibPinyinBopomofoConfig> LibPinyinBopomofoConfig::m_instance;
+std::unique_ptr<PinyinConfig> PinyinConfig::m_instance;
+std::unique_ptr<BopomofoConfig> BopomofoConfig::m_instance;
LibPinyinConfig::LibPinyinConfig (Bus & bus, const std::string & name)
: Config (bus, name)
@@ -286,22 +286,22 @@ static const struct{
{5, DOUBLE_PINYIN_XHE}
};
-LibPinyinPinyinConfig::LibPinyinPinyinConfig (Bus & bus)
+PinyinConfig::PinyinConfig (Bus & bus)
: LibPinyinConfig (bus, "pinyin")
{
}
void
-LibPinyinPinyinConfig::init (Bus & bus)
+PinyinConfig::init (Bus & bus)
{
if (m_instance.get () == NULL) {
- m_instance.reset (new LibPinyinPinyinConfig (bus));
+ m_instance.reset (new PinyinConfig (bus));
m_instance->readDefaultValues ();
}
}
void
-LibPinyinPinyinConfig::readDefaultValues (void)
+PinyinConfig::readDefaultValues (void)
{
LibPinyinConfig::readDefaultValues ();
#if !defined(HAVE_IBUS_CONFIG_GET_VALUES)
@@ -352,7 +352,7 @@ LibPinyinPinyinConfig::readDefaultValues (void)
}
gboolean
-LibPinyinPinyinConfig::valueChanged (const std::string &section,
+PinyinConfig::valueChanged (const std::string &section,
const std::string &name,
GVariant *value)
{
@@ -439,22 +439,22 @@ static const struct {
{3, CHEWING_IBM}
};
-LibPinyinBopomofoConfig::LibPinyinBopomofoConfig (Bus & bus)
+BopomofoConfig::BopomofoConfig (Bus & bus)
: LibPinyinConfig (bus, "bopomofo")
{
}
void
-LibPinyinBopomofoConfig::init (Bus & bus)
+BopomofoConfig::init (Bus & bus)
{
if (m_instance.get () == NULL) {
- m_instance.reset (new LibPinyinBopomofoConfig (bus));
+ m_instance.reset (new BopomofoConfig (bus));
m_instance->readDefaultValues ();
}
}
void
-LibPinyinBopomofoConfig::readDefaultValues (void)
+BopomofoConfig::readDefaultValues (void)
{
LibPinyinConfig::readDefaultValues ();
#if !defined(HAVE_IBUS_CONFIG_GET_VALUES)
@@ -486,7 +486,7 @@ LibPinyinBopomofoConfig::readDefaultValues (void)
}
gboolean
-LibPinyinBopomofoConfig::valueChanged (const std::string &section,
+BopomofoConfig::valueChanged (const std::string &section,
const std::string &name,
GVariant *value)
{