Refine coding style

diff --git a/src/Bopomofo.h b/src/Bopomofo.h
index 7777910..855aa5f 100644 (file)
--- a/src/Bopomofo.h
+++ b/src/Bopomofo.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef BOPOMOFO_H_
-#define BOPOMOFO_H_
+#ifndef __PY_BOPOMOFO_H_
+#define __PY_BOPOMOFO_H_
 
 #define MAX_BOPOMOFO_LEN (4)
 
@@ -68,13 +68,13 @@
 #define BOPOMOFO_TONE_5             (41)
 
 const static wchar_t bopomofo_char[] = {
-    L'\0',L'ㄅ',L'ㄆ',L'ㄇ',L'ㄈ',L'ㄉ',L'ㄊ',L'ㄋ',L'ㄌ',L'ㄍ',L'ㄎ',
-    L'ㄏ',L'ㄐ',L'ㄑ',L'ㄒ',L'ㄓ',L'ㄔ',L'ㄕ',L'ㄖ',L'ㄗ',L'ㄘ',L'ㄙ',
+    L'\0', L'ㄅ', L'ㄆ', L'ㄇ', L'ㄈ', L'ㄉ', L'ㄊ', L'ㄋ', L'ㄌ', L'ㄍ', L'ㄎ',
+    L'ㄏ', L'ㄐ', L'ㄑ', L'ㄒ', L'ㄓ', L'ㄔ', L'ㄕ', L'ㄖ', L'ㄗ', L'ㄘ', L'ㄙ',
 
-    L'ㄧ',L'ㄨ',L'ㄩ',L'ㄚ',L'ㄛ',L'ㄜ',L'ㄝ',L'ㄞ',L'ㄟ',L'ㄠ',L'ㄡ',
-    L'ㄢ',L'ㄣ',L'ㄤ',L'ㄥ',L'ㄦ',
+    L'ㄧ', L'ㄨ', L'ㄩ', L'ㄚ', L'ㄛ', L'ㄜ', L'ㄝ', L'ㄞ', L'ㄟ', L'ㄠ', L'ㄡ',
+    L'ㄢ', L'ㄣ', L'ㄤ', L'ㄥ', L'ㄦ',
 
-    L'ˊ',L'ˇ',L'ˋ',L'˙',
+    L'ˊ', L'ˇ', L'ˋ', L'˙',
 };
 
-#endif /* BOPOMOFO_H_ */
+#endif /* __PY_BOPOMOFO_H_ */

diff --git a/src/BopomofoEngine.h b/src/BopomofoEngine.h
index 9d25c7f..2690256 100644 (file)
--- a/src/BopomofoEngine.h
+++ b/src/BopomofoEngine.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_BOPOMOFO_ENGINE_H__
-#define __PY_BOPOMOFO_ENGINE_H__
+#ifndef __PY_BOPOMOFO_ENGINE_H_
+#define __PY_BOPOMOFO_ENGINE_H_
 
 #include "Engine.h"
 #include "PinyinProperties.h"

diff --git a/src/Database.h b/src/Database.h
index df2f377..ce0f418 100644 (file)
--- a/src/Database.h
+++ b/src/Database.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_DATABASE_H__
-#define __PY_DATABASE_H__
+#ifndef __PY_DATABASE_H_
+#define __PY_DATABASE_H_
 
 #include <sqlite3.h>
 #include <boost/shared_ptr.hpp>

diff --git a/src/Engine.h b/src/Engine.h
index 1af0a73..17f1e18 100644 (file)
--- a/src/Engine.h
+++ b/src/Engine.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_ENGINE_H__
-#define __PY_ENGINE_H__
+#ifndef __PY_ENGINE_H_
+#define __PY_ENGINE_H_
 
 #include <ibus.h>
 

diff --git a/src/ExtEditor.h b/src/ExtEditor.h
index e9d51b1..ff9d5ea 100644 (file)
--- a/src/ExtEditor.h
+++ b/src/ExtEditor.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_EXT_EDITOR__
-#define __PY_EXT_EDITOR__
+#ifndef __PY_EXT_EDITOR_
+#define __PY_EXT_EDITOR_
 
 #include <glib.h>
 #include "Editor.h"

diff --git a/src/FallbackEditor.h b/src/FallbackEditor.h
index 34c30f0..a361af3 100644 (file)
--- a/src/FallbackEditor.h
+++ b/src/FallbackEditor.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_FALLBACK_EDITOR__
-#define __PY_FALLBACK_EDITOR__
+#ifndef __PY_FALLBACK_EDITOR_
+#define __PY_FALLBACK_EDITOR_
 
 #include <glib.h>
 #include "Editor.h"

diff --git a/src/PinyinEngine.h b/src/PinyinEngine.h
index 2a1bd22..33f5d91 100644 (file)
--- a/src/PinyinEngine.h
+++ b/src/PinyinEngine.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_PINYIN_ENGINE_H__
-#define __PY_PINYIN_ENGINE_H__
+#ifndef __PY_PINYIN_ENGINE_H_
+#define __PY_PINYIN_ENGINE_H_
 
 #include "Engine.h"
 #include "PinyinProperties.h"

diff --git a/src/PinyinParser.h b/src/PinyinParser.h
index 51079a4..918c086 100644 (file)
--- a/src/PinyinParser.h
+++ b/src/PinyinParser.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_PARSER_H__
-#define __PY_PARSER_H__
+#ifndef __PY_PARSER_H_
+#define __PY_PARSER_H_
 
 #include <glib.h>
 #include "String.h"

diff --git a/src/PunctEditor.h b/src/PunctEditor.h
index a134d72..27db01d 100644 (file)
--- a/src/PunctEditor.h
+++ b/src/PunctEditor.h
@@ -19,8 +19,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_PUNCT_EDITOR__
-#define __PY_PUNCT_EDITOR__
+#ifndef __PY_PUNCT_EDITOR_
+#define __PY_PUNCT_EDITOR_
 
 #include <glib.h>
 #include "Editor.h"

diff --git a/src/RawEditor.h b/src/RawEditor.h
index 681ce81..9a0110c 100644 (file)
--- a/src/RawEditor.h
+++ b/src/RawEditor.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_RAW_EDITOR__
-#define __PY_RAW_EDITOR__
+#ifndef __PY_RAW_EDITOR_
+#define __PY_RAW_EDITOR_
 
 #include <glib.h>
 #include "Editor.h"

diff --git a/src/Types.h b/src/Types.h
index c8f506c..c8919ad 100644 (file)
--- a/src/Types.h
+++ b/src/Types.h
@@ -18,8 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#ifndef __PY_TYPE_H_
-#define __PY_TYPE_H_
+#ifndef __PY_TYPES_H_
+#define __PY_TYPES_H_
 
 #include <glib.h>