summaryrefslogtreecommitdiffstats
path: root/src/BopomofoEditor.cc
diff options
context:
space:
mode:
authorPeng Huang <shawn.p.huang@gmail.com>2010-05-23 11:59:06 +0800
committerPeng Huang <shawn.p.huang@gmail.com>2010-05-23 12:32:09 +0800
commit163587a5185b137df364194d862a671019e3528c (patch)
tree96bc474397104de36015e7ea9b4f42d721ccc8d2 /src/BopomofoEditor.cc
parentd30c3eb38d344234f0c2b4c64b7ade8fe32be667 (diff)
downloadibus-libpinyin-163587a5185b137df364194d862a671019e3528c.tar.gz
ibus-libpinyin-163587a5185b137df364194d862a671019e3528c.tar.xz
ibus-libpinyin-163587a5185b137df364194d862a671019e3528c.zip
Separate Config to PinyinConfig and BopomofoConfig
Diffstat (limited to 'src/BopomofoEditor.cc')
-rw-r--r--src/BopomofoEditor.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/BopomofoEditor.cc b/src/BopomofoEditor.cc
index ef292fc..6e18133 100644
--- a/src/BopomofoEditor.cc
+++ b/src/BopomofoEditor.cc
@@ -19,7 +19,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include "Config.h"
#include "BopomofoEditor.h"
#include "SimpTradConverter.h"
@@ -38,8 +37,8 @@ namespace PY {
#include "Bopomofo.h"
#include "BopomofoKeyboard.h"
-BopomofoEditor::BopomofoEditor (PinyinProperties & props)
- : PinyinEditor (props),
+BopomofoEditor::BopomofoEditor (PinyinProperties & props, Config & config)
+ : PinyinEditor (props, config),
m_select_mode (FALSE)
{
}
@@ -64,7 +63,7 @@ BopomofoEditor::insert (gint ch)
m_text.insert (m_cursor++, ch);
- if (G_UNLIKELY (!(Config::option () & PINYIN_INCOMPLETE_PINYIN))) {
+ if (G_UNLIKELY (!(m_config.option () & PINYIN_INCOMPLETE_PINYIN))) {
updateSpecialPhrases ();
updatePinyin ();
}
@@ -422,7 +421,7 @@ BopomofoEditor::updatePinyin (void)
m_pinyin_len = PinyinParser::parseBopomofo (bopomofo, // bopomofo
m_cursor, // text length
- Config::option (), // option
+ m_config.option (), // option
m_pinyin, // result
MAX_PHRASE_LEN); // max result length
}