diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2010-05-17 10:41:11 +0800 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2010-05-17 10:41:11 +0800 |
| commit | 51438d761eb28fc9c19efc7eef82681ebdc86e65 (patch) | |
| tree | e4376d04599181443cfd85c12c9c9edc8c6794b4 /src/PinyinEngine.h | |
| parent | 28d811bfa3676d1f96ec7b366caedececb6cc60b (diff) | |
| parent | c5aefb2ca27010474d12032f51be840c92ed4770 (diff) | |
| download | ibus-libpinyin-51438d761eb28fc9c19efc7eef82681ebdc86e65.tar.gz ibus-libpinyin-51438d761eb28fc9c19efc7eef82681ebdc86e65.tar.xz ibus-libpinyin-51438d761eb28fc9c19efc7eef82681ebdc86e65.zip | |
Merge branch 'bopomofo'
Conflicts:
ibus-pinyin.spec.in
Diffstat (limited to 'src/PinyinEngine.h')
| -rw-r--r-- | src/PinyinEngine.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/PinyinEngine.h b/src/PinyinEngine.h index 6f2d0b7..398c028 100644 --- a/src/PinyinEngine.h +++ b/src/PinyinEngine.h @@ -1,20 +1,13 @@ /* vim:set et sts=4: */ -#ifndef __PY_PIN_YIN_ENGINE_H__ -#define __PY_PIN_YIN_ENGINE_H__ - -#include <ibus.h> -#include "Pointer.h" -#include "Database.h" -#include "LookupTable.h" -#include "Property.h" -#include "Config.h" -#include "Editor.h" -#include "FallbackEditor.h" +#ifndef __PY_PINYIN_ENGINE_H__ +#define __PY_PINYIN_ENGINE_H__ + +#include "Engine.h" #include "PinyinProperties.h" namespace PY { -class PinyinEngine { +class PinyinEngine : public Engine { public: PinyinEngine (IBusEngine *engine); ~PinyinEngine (void); @@ -25,7 +18,7 @@ public: reset (); } - void reset (gboolean need_update = TRUE) { + void reset (void) { m_prev_pressed_key = IBUS_VoidSymbol; m_input_mode = MODE_INIT; for (gint i = 0; i < MODE_LAST; i++) { @@ -67,10 +60,8 @@ private: void slotUpdateProperty (Property & prop); private: - Pointer<IBusEngine> m_engine; // engine pointer PinyinProperties m_props; - guint m_prev_pressed_key; enum { |