Use std::string to replace String

diff --git a/src/Editor.h b/src/Editor.h
index e518a54..560e9a1 100644 (file)
--- a/src/Editor.h
+++ b/src/Editor.h
@@ -4,6 +4,7 @@
 #include <glib.h>
 #include <boost/shared_ptr.hpp>
 #include "Signal.h"
+#include "String.h"
 #include "Text.h"
 #include "LookupTable.h"
 #include "PinyinProperties.h"

diff --git a/src/Text.h b/src/Text.h
index 451cd63..ae98814 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -1,9 +1,9 @@
 #ifndef __PY_TEXT_H_
 #define __PY_TEXT_H_
 
+#include <string>
 #include <ibus.h>
 #include "Object.h"
-#include "String.h"
 
 namespace PY {
 
@@ -14,8 +14,8 @@ public:
     Text (const gchar *str)
         : Object (ibus_text_new_from_string (str)) {}
 
-    Text (const String & str)
-        : Object (ibus_text_new_from_string ((const gchar *) str)) {}
+    Text (const std::string & str)
+        : Object (ibus_text_new_from_string (str.c_str ())) {}
 
     Text (gunichar ch)
         : Object (ibus_text_new_from_unichar (ch)) {}
@@ -35,8 +35,8 @@ public:
         : Text (ibus_text_new_from_static_string (str)) {
     }
 
-    StaticText (const String & str)
-        : Text (ibus_text_new_from_static_string ((const gchar *) str)) {}
+    StaticText (const std::string & str)
+        : Text (ibus_text_new_from_static_string (str.c_str ())) {}
 
     StaticText (gunichar ch)
         : Text (ch) {}

diff --git a/src/Util.h b/src/Util.h
index c9be13b..d738f2b 100644 (file)
--- a/src/Util.h
+++ b/src/Util.h
@@ -13,7 +13,7 @@
 
 #include <sys/utsname.h>
 #include <cstdlib>
-#include "String.h"
+#include <string>
 
 namespace PY {
 
@@ -59,7 +59,7 @@ public:
     }
 };
 
-class Env : public String {
+class Env : public std::string {
 public:
     Env (const gchar *name) {
         gchar *str;