From 15e5b18dfea9b6d66d39bf486070c6a33ffd6227 Mon Sep 17 00:00:00 2001
From: Peng Huang <shawn.p.huang@gmail.com>
Date: Mon, 19 Apr 2010 11:03:05 +0800
Subject: [PATCH] Remove PinyinEnginePtr

---
 src/Engine.cc      | 14 +++++++-------
 src/PinyinEngine.h |  3 ---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/Engine.cc b/src/Engine.cc
index d4c21f3..7894df0 100644
--- a/src/Engine.cc
+++ b/src/Engine.cc
@@ -26,7 +26,7 @@ struct _IBusPinyinEngine {
     IBusEngine parent;
 
     /* members */
-    PinyinEnginePtr engine;
+    PinyinEngine engine;
 };
 
 struct _IBusPinyinEngineClass {
@@ -115,13 +115,13 @@ ibus_pinyin_engine_init (IBusPinyinEngine *pinyin)
 {
     if (g_object_is_floating (pinyin))
         g_object_ref_sink (pinyin);  // make engine sink
-    new (& (pinyin->engine)) PinyinEnginePtr (new PinyinEngine (IBUS_ENGINE (pinyin)));
+    new (& (pinyin->engine)) PinyinEngine (IBUS_ENGINE (pinyin));
 }
 
 static void
 ibus_pinyin_engine_destroy (IBusPinyinEngine *pinyin)
 {
-    pinyin->engine.~PinyinEnginePtr ();
+    pinyin->engine.~PinyinEngine ();
     ((IBusObjectClass *) ibus_pinyin_engine_parent_class)->destroy ((IBusObject *)pinyin);
 }
 
@@ -132,7 +132,7 @@ ibus_pinyin_engine_process_key_event (IBusEngine     *engine,
                                       guint           modifiers)
 {
     IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine;
-    return pinyin->engine->processKeyEvent (keyval, keycode, modifiers);
+    return pinyin->engine.processKeyEvent (keyval, keycode, modifiers);
 }
 
 static void
@@ -141,7 +141,7 @@ ibus_pinyin_engine_property_activate (IBusEngine    *engine,
                                       guint          prop_state)
 {
     IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine;
-    pinyin->engine->propertyActivate (prop_name, prop_state);
+    pinyin->engine.propertyActivate (prop_name, prop_state);
 }
 static void
 ibus_pinyin_engine_candidate_clicked (IBusEngine *engine,
@@ -150,7 +150,7 @@ ibus_pinyin_engine_candidate_clicked (IBusEngine *engine,
                                       guint       state)
 {
     IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine;
-    pinyin->engine->candidateClicked (index, button, state);
+    pinyin->engine.candidateClicked (index, button, state);
 }
 
 #define FUNCTION(name, Name)                                        \
@@ -158,7 +158,7 @@ ibus_pinyin_engine_candidate_clicked (IBusEngine *engine,
     ibus_pinyin_engine_##name (IBusEngine *engine)                  \
     {                                                               \
         IBusPinyinEngine *pinyin = (IBusPinyinEngine *) engine;     \
-        pinyin->engine->Name ();                                    \
+        pinyin->engine.Name ();                                    \
         ((IBusEngineClass *) ibus_pinyin_engine_parent_class)       \
             ->name (engine);                                        \
     }
diff --git a/src/PinyinEngine.h b/src/PinyinEngine.h
index 6d81ec8..7094b1c 100644
--- a/src/PinyinEngine.h
+++ b/src/PinyinEngine.h
@@ -2,7 +2,6 @@
 #ifndef __PY_PIN_YIN_ENGINE_H__
 #define __PY_PIN_YIN_ENGINE_H__
 
-#include <boost/shared_ptr.hpp>
 #include <ibus.h>
 #include "Pointer.h"
 #include "Database.h"
@@ -15,8 +14,6 @@
 
 namespace PY {
 
-class PinyinEngine;
-typedef boost::shared_ptr<PinyinEngine> PinyinEnginePtr;
 class PinyinEngine {
 public:
     PinyinEngine (IBusEngine *engine);
-- 
2.7.4