From f3f325b0603ed635d076a5e6430164b2c72b21da Mon Sep 17 00:00:00 2001 From: Peng Huang Date: Fri, 13 Aug 2010 16:20:01 +0800 Subject: [PATCH] Add PY prefix of all file names to avoid name conflict on some file system than is case insensitive. --- src/Makefile.am | 124 ++++++++++----------- src/{Bopomofo.h => PYBopomofo.h} | 0 src/{BopomofoEditor.cc => PYBopomofoEditor.cc} | 10 +- src/{BopomofoEditor.h => PYBopomofoEditor.h} | 2 +- src/{BopomofoEngine.cc => PYBopomofoEngine.cc} | 14 +-- src/{BopomofoEngine.h => PYBopomofoEngine.h} | 4 +- src/{BopomofoKeyboard.h => PYBopomofoKeyboard.h} | 2 +- src/{Bus.h => PYBus.h} | 2 +- src/{Config.cc => PYConfig.cc} | 8 +- src/{Config.h => PYConfig.h} | 2 +- src/{Database.cc => PYDatabase.cc} | 6 +- src/{Database.h => PYDatabase.h} | 6 +- ...ublePinyinEditor.cc => PYDoublePinyinEditor.cc} | 6 +- ...DoublePinyinEditor.h => PYDoublePinyinEditor.h} | 2 +- src/{DoublePinyinTable.h => PYDoublePinyinTable.h} | 0 ...cSpecialPhrase.cc => PYDynamicSpecialPhrase.cc} | 2 +- ...micSpecialPhrase.h => PYDynamicSpecialPhrase.h} | 2 +- src/{Editor.cc => PYEditor.cc} | 4 +- src/{Editor.h => PYEditor.h} | 6 +- src/{Engine.cc => PYEngine.cc} | 6 +- src/{Engine.h => PYEngine.h} | 8 +- src/{ExtEditor.cc => PYExtEditor.cc} | 12 +- src/{ExtEditor.h => PYExtEditor.h} | 0 src/{FallbackEditor.cc => PYFallbackEditor.cc} | 6 +- src/{FallbackEditor.h => PYFallbackEditor.h} | 4 +- src/{FullPinyinEditor.cc => PYFullPinyinEditor.cc} | 4 +- src/{FullPinyinEditor.h => PYFullPinyinEditor.h} | 2 +- ...HalfFullConverter.cc => PYHalfFullConverter.cc} | 2 +- src/{HalfFullConverter.h => PYHalfFullConverter.h} | 0 src/{LookupTable.h => PYLookupTable.h} | 4 +- src/{Main.cc => PYMain.cc} | 10 +- src/{Object.h => PYObject.h} | 2 +- src/{PhoneticEditor.cc => PYPhoneticEditor.cc} | 8 +- src/{PhoneticEditor.h => PYPhoneticEditor.h} | 10 +- src/{Phrase.h => PYPhrase.h} | 2 +- src/{PhraseArray.h => PYPhraseArray.h} | 2 +- src/{PhraseEditor.cc => PYPhraseEditor.cc} | 10 +- src/{PhraseEditor.h => PYPhraseEditor.h} | 6 +- src/{PinyinArray.h => PYPinyinArray.h} | 2 +- src/{PinyinEditor.cc => PYPinyinEditor.cc} | 10 +- src/{PinyinEditor.h => PYPinyinEditor.h} | 2 +- src/{PinyinEngine.cc => PYPinyinEngine.cc} | 16 +-- src/{PinyinEngine.h => PYPinyinEngine.h} | 4 +- src/{PinyinParser.cc => PYPinyinParser.cc} | 6 +- src/{PinyinParser.h => PYPinyinParser.h} | 4 +- src/{PinyinParserTable.h => PYPinyinParserTable.h} | 0 src/{PinyinProperties.cc => PYPinyinProperties.cc} | 6 +- src/{PinyinProperties.h => PYPinyinProperties.h} | 4 +- src/{Pointer.h => PYPointer.h} | 0 src/{Property.h => PYProperty.h} | 4 +- src/{PunctEditor.cc => PYPunctEditor.cc} | 6 +- src/{PunctEditor.h => PYPunctEditor.h} | 4 +- src/{PunctTable.h => PYPunctTable.h} | 0 src/{RawEditor.h => PYRawEditor.h} | 2 +- src/{Regex.h => PYRegex.h} | 0 src/{Signal.h => PYSignal.h} | 3 +- ...SimpTradConverter.cc => PYSimpTradConverter.cc} | 8 +- src/{SimpTradConverter.h => PYSimpTradConverter.h} | 0 ...ConverterTable.h => PYSimpTradConverterTable.h} | 0 src/{SpecialPhrase.cc => PYSpecialPhrase.cc} | 2 +- src/{SpecialPhrase.h => PYSpecialPhrase.h} | 0 ...ecialPhraseTable.cc => PYSpecialPhraseTable.cc} | 6 +- ...SpecialPhraseTable.h => PYSpecialPhraseTable.h} | 0 src/{String.h => PYString.h} | 0 src/{Text.h => PYText.h} | 2 +- src/{Types.h => PYTypes.h} | 0 src/{Util.h => PYUtil.h} | 2 +- 67 files changed, 197 insertions(+), 196 deletions(-) rename src/{Bopomofo.h => PYBopomofo.h} (100%) rename src/{BopomofoEditor.cc => PYBopomofoEditor.cc} (99%) rename src/{BopomofoEditor.h => PYBopomofoEditor.h} (98%) rename src/{BopomofoEngine.cc => PYBopomofoEngine.cc} (97%) rename src/{BopomofoEngine.h => PYBopomofoEngine.h} (97%) rename src/{BopomofoKeyboard.h => PYBopomofoKeyboard.h} (99%) rename src/{Bus.h => PYBus.h} (98%) rename src/{Config.cc => PYConfig.cc} (99%) rename src/{Config.h => PYConfig.h} (99%) rename src/{Database.cc => PYDatabase.cc} (99%) rename src/{Database.h => PYDatabase.h} (97%) rename src/{DoublePinyinEditor.cc => PYDoublePinyinEditor.cc} (99%) rename src/{DoublePinyinEditor.h => PYDoublePinyinEditor.h} (98%) rename src/{DoublePinyinTable.h => PYDoublePinyinTable.h} (100%) rename src/{DynamicSpecialPhrase.cc => PYDynamicSpecialPhrase.cc} (99%) rename src/{DynamicSpecialPhrase.h => PYDynamicSpecialPhrase.h} (98%) rename src/{Editor.cc => PYEditor.cc} (98%) rename src/{Editor.h => PYEditor.h} (98%) rename src/{Engine.cc => PYEngine.cc} (99%) rename src/{Engine.h => PYEngine.h} (97%) rename src/{ExtEditor.cc => PYExtEditor.cc} (99%) rename src/{ExtEditor.h => PYExtEditor.h} (100%) rename src/{FallbackEditor.cc => PYFallbackEditor.cc} (98%) rename src/{FallbackEditor.h => PYFallbackEditor.h} (98%) rename src/{FullPinyinEditor.cc => PYFullPinyinEditor.cc} (98%) rename src/{FullPinyinEditor.h => PYFullPinyinEditor.h} (98%) rename src/{HalfFullConverter.cc => PYHalfFullConverter.cc} (98%) rename src/{HalfFullConverter.h => PYHalfFullConverter.h} (100%) rename src/{LookupTable.h => PYLookupTable.h} (98%) rename src/{Main.cc => PYMain.cc} (97%) rename src/{Object.h => PYObject.h} (98%) rename src/{PhoneticEditor.cc => PYPhoneticEditor.cc} (98%) rename src/{PhoneticEditor.h => PYPhoneticEditor.h} (96%) rename src/{Phrase.h => PYPhrase.h} (98%) rename src/{PhraseArray.h => PYPhraseArray.h} (97%) rename src/{PhraseEditor.cc => PYPhraseEditor.cc} (96%) rename src/{PhraseEditor.h => PYPhraseEditor.h} (97%) rename src/{PinyinArray.h => PYPinyinArray.h} (98%) rename src/{PinyinEditor.cc => PYPinyinEditor.cc} (98%) rename src/{PinyinEditor.h => PYPinyinEditor.h} (98%) rename src/{PinyinEngine.cc => PYPinyinEngine.cc} (97%) rename src/{PinyinEngine.h => PYPinyinEngine.h} (97%) rename src/{PinyinParser.cc => PYPinyinParser.cc} (99%) rename src/{PinyinParser.h => PYPinyinParser.h} (97%) rename src/{PinyinParserTable.h => PYPinyinParserTable.h} (100%) rename src/{PinyinProperties.cc => PYPinyinProperties.cc} (98%) rename src/{PinyinProperties.h => PYPinyinProperties.h} (97%) rename src/{Pointer.h => PYPointer.h} (100%) rename src/{Property.h => PYProperty.h} (98%) rename src/{PunctEditor.cc => PYPunctEditor.cc} (99%) rename src/{PunctEditor.h => PYPunctEditor.h} (98%) rename src/{PunctTable.h => PYPunctTable.h} (100%) rename src/{RawEditor.h => PYRawEditor.h} (97%) rename src/{Regex.h => PYRegex.h} (100%) rename src/{Signal.h => PYSignal.h} (98%) rename src/{SimpTradConverter.cc => PYSimpTradConverter.cc} (97%) rename src/{SimpTradConverter.h => PYSimpTradConverter.h} (100%) rename src/{SimpTradConverterTable.h => PYSimpTradConverterTable.h} (100%) rename src/{SpecialPhrase.cc => PYSpecialPhrase.cc} (96%) rename src/{SpecialPhrase.h => PYSpecialPhrase.h} (100%) rename src/{SpecialPhraseTable.cc => PYSpecialPhraseTable.cc} (96%) rename src/{SpecialPhraseTable.h => PYSpecialPhraseTable.h} (100%) rename src/{String.h => PYString.h} (100%) rename src/{Text.h => PYText.h} (98%) rename src/{Types.h => PYTypes.h} (100%) rename src/{Util.h => PYUtil.h} (99%) diff --git a/src/Makefile.am b/src/Makefile.am index 9490ee0..d1666fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,73 +42,73 @@ ibus_engine_pinyin_built_h_sources = \ SimpTradConverterTable.h \ $(NULL) ibus_engine_pinyin_c_sources = \ - BopomofoEditor.cc \ - BopomofoEngine.cc \ - Config.cc \ - Database.cc \ - DoublePinyinEditor.cc \ - Editor.cc \ - Engine.cc \ - FallbackEditor.cc \ - FullPinyinEditor.cc \ - HalfFullConverter.cc \ - Main.cc \ - PhoneticEditor.cc \ - PhraseEditor.cc \ - PinyinEditor.cc \ - PinyinEngine.cc \ - PinyinParser.cc \ - PinyinProperties.cc \ - PunctEditor.cc \ - SimpTradConverter.cc \ - DynamicSpecialPhrase.cc \ - SpecialPhrase.cc \ - SpecialPhraseTable.cc \ + PYBopomofoEditor.cc \ + PYBopomofoEngine.cc \ + PYConfig.cc \ + PYDatabase.cc \ + PYDoublePinyinEditor.cc \ + PYEditor.cc \ + PYEngine.cc \ + PYFallbackEditor.cc \ + PYFullPinyinEditor.cc \ + PYHalfFullConverter.cc \ + PYMain.cc \ + PYPhoneticEditor.cc \ + PYPhraseEditor.cc \ + PYPinyinEditor.cc \ + PYPinyinEngine.cc \ + PYPinyinParser.cc \ + PYPinyinProperties.cc \ + PYPunctEditor.cc \ + PYSimpTradConverter.cc \ + PYDynamicSpecialPhrase.cc \ + PYSpecialPhrase.cc \ + PYSpecialPhraseTable.cc \ $(NULL) ibus_engine_pinyin_h_sources = \ - Bopomofo.h \ - BopomofoEditor.h \ - BopomofoEngine.h \ - Bus.h \ - Config.h \ - Database.h \ - DoublePinyinEditor.h \ - DoublePinyinTable.h \ - Editor.h \ - Engine.h \ - ExtEditor.h \ - FallbackEditor.h \ - FullPinyinEditor.h \ - HalfFullConverter.h \ - LookupTable.h \ - Object.h \ - PhoneticEditor.h \ - Phrase.h \ - PhraseArray.h \ - PhraseEditor.h \ - PinyinArray.h \ - PinyinEditor.h \ - PinyinEngine.h \ - PinyinParser.h \ - PinyinProperties.h \ - Pointer.h \ - Property.h \ - PunctEditor.h \ - RawEditor.h \ - Regex.h \ - Signal.h \ - SimpTradConverter.h \ - SpecialPhrase.h \ - DynamicSpecialPhrase.h \ - SpecialPhraseTable.h \ - String.h \ - Text.h \ - Types.h \ - Util.h \ + PYBopomofo.h \ + PYBopomofoEditor.h \ + PYBopomofoEngine.h \ + PYBus.h \ + PYConfig.h \ + PYDatabase.h \ + PYDoublePinyinEditor.h \ + PYDoublePinyinTable.h \ + PYEditor.h \ + PYEngine.h \ + PYExtEditor.h \ + PYFallbackEditor.h \ + PYFullPinyinEditor.h \ + PYHalfFullConverter.h \ + PYLookupTable.h \ + PYObject.h \ + PYPhoneticEditor.h \ + PYPhrase.h \ + PYPhraseArray.h \ + PYPhraseEditor.h \ + PYPinyinArray.h \ + PYPinyinEditor.h \ + PYPinyinEngine.h \ + PYPinyinParser.h \ + PYPinyinProperties.h \ + PYPointer.h \ + PYProperty.h \ + PYPunctEditor.h \ + PYRawEditor.h \ + PYRegex.h \ + PYSignal.h \ + PYSimpTradConverter.h \ + PYSpecialPhrase.h \ + PYDynamicSpecialPhrase.h \ + PYSpecialPhraseTable.h \ + PYString.h \ + PYText.h \ + PYTypes.h \ + PYUtil.h \ $(NULL) if IBUS_BUILD_LUA_EXTENSION -ibus_engine_pinyin_c_sources += ExtEditor.cc +ibus_engine_pinyin_c_sources += PYExtEditor.cc endif ibus_engine_pinyin_SOURCES = \ diff --git a/src/Bopomofo.h b/src/PYBopomofo.h similarity index 100% rename from src/Bopomofo.h rename to src/PYBopomofo.h diff --git a/src/BopomofoEditor.cc b/src/PYBopomofoEditor.cc similarity index 99% rename from src/BopomofoEditor.cc rename to src/PYBopomofoEditor.cc index 80441b9..d83086b 100644 --- a/src/BopomofoEditor.cc +++ b/src/PYBopomofoEditor.cc @@ -19,13 +19,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "BopomofoEditor.h" -#include "Config.h" -#include "PinyinProperties.h" -#include "SimpTradConverter.h" +#include "PYBopomofoEditor.h" +#include "PYConfig.h" +#include "PYPinyinProperties.h" +#include "PYSimpTradConverter.h" namespace PY { -#include "BopomofoKeyboard.h" +#include "PYBopomofoKeyboard.h" const static gchar * bopomofo_select_keys[] = { "1234567890", diff --git a/src/BopomofoEditor.h b/src/PYBopomofoEditor.h similarity index 98% rename from src/BopomofoEditor.h rename to src/PYBopomofoEditor.h index 0ace665..8ad9784 100644 --- a/src/BopomofoEditor.h +++ b/src/PYBopomofoEditor.h @@ -22,7 +22,7 @@ #ifndef __PY_BOPOMOFO_EDITOR_H_ #define __PY_BOPOMOFO_EDITOR_H_ -#include "PhoneticEditor.h" +#include "PYPhoneticEditor.h" namespace PY { diff --git a/src/BopomofoEngine.cc b/src/PYBopomofoEngine.cc similarity index 97% rename from src/BopomofoEngine.cc rename to src/PYBopomofoEngine.cc index 71acd13..2e7411e 100644 --- a/src/BopomofoEngine.cc +++ b/src/PYBopomofoEngine.cc @@ -19,16 +19,16 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "BopomofoEngine.h" +#include "PYBopomofoEngine.h" #include -#include "RawEditor.h" -#include "PunctEditor.h" +#include "PYRawEditor.h" +#include "PYPunctEditor.h" #ifdef IBUS_BUILD_LUA_EXTENSION -#include "ExtEditor.h" +#include "PYExtEditor.h" #endif -#include "BopomofoEditor.h" -#include "FallbackEditor.h" -#include "Config.h" +#include "PYBopomofoEditor.h" +#include "PYFallbackEditor.h" +#include "PYConfig.h" namespace PY { diff --git a/src/BopomofoEngine.h b/src/PYBopomofoEngine.h similarity index 97% rename from src/BopomofoEngine.h rename to src/PYBopomofoEngine.h index 06297b8..a99dc83 100644 --- a/src/BopomofoEngine.h +++ b/src/PYBopomofoEngine.h @@ -22,8 +22,8 @@ #ifndef __PY_BOPOMOFO_ENGINE_H_ #define __PY_BOPOMOFO_ENGINE_H_ -#include "Engine.h" -#include "PinyinProperties.h" +#include "PYEngine.h" +#include "PYPinyinProperties.h" namespace PY { diff --git a/src/BopomofoKeyboard.h b/src/PYBopomofoKeyboard.h similarity index 99% rename from src/BopomofoKeyboard.h rename to src/PYBopomofoKeyboard.h index 148bd3b..f23d6a2 100644 --- a/src/BopomofoKeyboard.h +++ b/src/PYBopomofoKeyboard.h @@ -22,7 +22,7 @@ #ifndef __PY_BOPOMOFO_KEYBOARD_H_ #define __PY_BOPOMOFO_KEYBOARD_H_ -#include "Bopomofo.h" +#include "PYBopomofo.h" static const guint8 bopomofo_keyboard[][41][2] = { diff --git a/src/Bus.h b/src/PYBus.h similarity index 98% rename from src/Bus.h rename to src/PYBus.h index 4ed9932..1172d25 100644 --- a/src/Bus.h +++ b/src/PYBus.h @@ -22,7 +22,7 @@ #define __PY_BUS_H_ #include -#include "Object.h" +#include "PYObject.h" namespace PY { diff --git a/src/Config.cc b/src/PYConfig.cc similarity index 99% rename from src/Config.cc rename to src/PYConfig.cc index 36bc019..09bb44f 100644 --- a/src/Config.cc +++ b/src/PYConfig.cc @@ -18,11 +18,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Config.h" +#include "PYConfig.h" -#include "Types.h" -#include "Bus.h" -#include "DoublePinyinTable.h" +#include "PYTypes.h" +#include "PYBus.h" +#include "PYDoublePinyinTable.h" namespace PY { diff --git a/src/Config.h b/src/PYConfig.h similarity index 99% rename from src/Config.h rename to src/PYConfig.h index 0d2c4ed..9bbb503 100644 --- a/src/Config.h +++ b/src/PYConfig.h @@ -24,7 +24,7 @@ #include #include #include -#include "Object.h" +#include "PYObject.h" namespace PY { diff --git a/src/Database.cc b/src/PYDatabase.cc similarity index 99% rename from src/Database.cc rename to src/PYDatabase.cc index 7661634..1fd3b86 100644 --- a/src/Database.cc +++ b/src/PYDatabase.cc @@ -18,10 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Database.h" +#include "PYDatabase.h" #include -#include "Util.h" -#include "PinyinArray.h" +#include "PYUtil.h" +#include "PYPinyinArray.h" namespace PY { diff --git a/src/Database.h b/src/PYDatabase.h similarity index 97% rename from src/Database.h rename to src/PYDatabase.h index d414da2..ab90fcf 100644 --- a/src/Database.h +++ b/src/PYDatabase.h @@ -23,9 +23,9 @@ #include #include -#include "String.h" -#include "Types.h" -#include "PhraseArray.h" +#include "PYString.h" +#include "PYTypes.h" +#include "PYPhraseArray.h" typedef struct sqlite3 sqlite3; diff --git a/src/DoublePinyinEditor.cc b/src/PYDoublePinyinEditor.cc similarity index 99% rename from src/DoublePinyinEditor.cc rename to src/PYDoublePinyinEditor.cc index 3386680..fb775d9 100644 --- a/src/DoublePinyinEditor.cc +++ b/src/PYDoublePinyinEditor.cc @@ -18,13 +18,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "DoublePinyinEditor.h" -#include "Config.h" +#include "PYDoublePinyinEditor.h" +#include "PYConfig.h" namespace PY { #define DEFINE_DOUBLE_PINYIN_TABLES -#include "DoublePinyinTable.h" +#include "PYDoublePinyinTable.h" /* * c in 'a' ... 'z' => id = c - 'a' diff --git a/src/DoublePinyinEditor.h b/src/PYDoublePinyinEditor.h similarity index 98% rename from src/DoublePinyinEditor.h rename to src/PYDoublePinyinEditor.h index 993ec90..e9ef1e9 100644 --- a/src/DoublePinyinEditor.h +++ b/src/PYDoublePinyinEditor.h @@ -21,7 +21,7 @@ #ifndef __PY_DOUBLE_PINYIN_EDITOR_H_ #define __PY_DOUBLE_PINYIN_EDITOR_H_ -#include "PinyinEditor.h" +#include "PYPinyinEditor.h" namespace PY { diff --git a/src/DoublePinyinTable.h b/src/PYDoublePinyinTable.h similarity index 100% rename from src/DoublePinyinTable.h rename to src/PYDoublePinyinTable.h diff --git a/src/DynamicSpecialPhrase.cc b/src/PYDynamicSpecialPhrase.cc similarity index 99% rename from src/DynamicSpecialPhrase.cc rename to src/PYDynamicSpecialPhrase.cc index 02c2fcb..2b65258 100644 --- a/src/DynamicSpecialPhrase.cc +++ b/src/PYDynamicSpecialPhrase.cc @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "DynamicSpecialPhrase.h" +#include "PYDynamicSpecialPhrase.h" namespace PY { diff --git a/src/DynamicSpecialPhrase.h b/src/PYDynamicSpecialPhrase.h similarity index 98% rename from src/DynamicSpecialPhrase.h rename to src/PYDynamicSpecialPhrase.h index dbe97fd..f259a97 100644 --- a/src/DynamicSpecialPhrase.h +++ b/src/PYDynamicSpecialPhrase.h @@ -24,7 +24,7 @@ #include #include #include -#include "SpecialPhrase.h" +#include "PYSpecialPhrase.h" namespace PY { diff --git a/src/Editor.cc b/src/PYEditor.cc similarity index 98% rename from src/Editor.cc rename to src/PYEditor.cc index 957e603..47c3a6e 100644 --- a/src/Editor.cc +++ b/src/PYEditor.cc @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Text.h" -#include "Editor.h" +#include "PYText.h" +#include "PYEditor.h" namespace PY { diff --git a/src/Editor.h b/src/PYEditor.h similarity index 98% rename from src/Editor.h rename to src/PYEditor.h index d0db6b5..e520d51 100644 --- a/src/Editor.h +++ b/src/PYEditor.h @@ -23,9 +23,9 @@ #include #include -#include "Signal.h" -#include "String.h" -#include "Util.h" +#include "PYSignal.h" +#include "PYString.h" +#include "PYUtil.h" namespace PY { diff --git a/src/Engine.cc b/src/PYEngine.cc similarity index 99% rename from src/Engine.cc rename to src/PYEngine.cc index 2dd1d17..1797e24 100644 --- a/src/Engine.cc +++ b/src/PYEngine.cc @@ -19,9 +19,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Engine.h" -#include "PinyinEngine.h" -#include "BopomofoEngine.h" +#include "PYEngine.h" +#include "PYPinyinEngine.h" +#include "PYBopomofoEngine.h" namespace PY { /* code of engine class of GObject */ diff --git a/src/Engine.h b/src/PYEngine.h similarity index 97% rename from src/Engine.h rename to src/PYEngine.h index 297acaf..50113e6 100644 --- a/src/Engine.h +++ b/src/PYEngine.h @@ -23,10 +23,10 @@ #include -#include "Pointer.h" -#include "LookupTable.h" -#include "Property.h" -#include "Editor.h" +#include "PYPointer.h" +#include "PYLookupTable.h" +#include "PYProperty.h" +#include "PYEditor.h" namespace PY { diff --git a/src/ExtEditor.cc b/src/PYExtEditor.cc similarity index 99% rename from src/ExtEditor.cc rename to src/PYExtEditor.cc index 826fdf7..d81d9b8 100644 --- a/src/ExtEditor.cc +++ b/src/PYExtEditor.cc @@ -25,14 +25,14 @@ extern "C" { #include "lua-plugin.h" } -#include "Config.h" -#include "Pointer.h" -#include "LookupTable.h" +#include "PYConfig.h" +#include "PYPointer.h" +#include "PYLookupTable.h" -#include "DynamicSpecialPhrase.h" +#include "PYDynamicSpecialPhrase.h" -#include "Editor.h" -#include "ExtEditor.h" +#include "PYEditor.h" +#include "PYExtEditor.h" namespace PY { diff --git a/src/ExtEditor.h b/src/PYExtEditor.h similarity index 100% rename from src/ExtEditor.h rename to src/PYExtEditor.h diff --git a/src/FallbackEditor.cc b/src/PYFallbackEditor.cc similarity index 98% rename from src/FallbackEditor.cc rename to src/PYFallbackEditor.cc index 0d85780..dea4ea9 100644 --- a/src/FallbackEditor.cc +++ b/src/PYFallbackEditor.cc @@ -18,9 +18,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "FallbackEditor.h" -#include "HalfFullConverter.h" -#include "PinyinProperties.h" +#include "PYFallbackEditor.h" +#include "PYHalfFullConverter.h" +#include "PYPinyinProperties.h" namespace PY { diff --git a/src/FallbackEditor.h b/src/PYFallbackEditor.h similarity index 98% rename from src/FallbackEditor.h rename to src/PYFallbackEditor.h index 74452ba..db8077e 100644 --- a/src/FallbackEditor.h +++ b/src/PYFallbackEditor.h @@ -21,8 +21,8 @@ #ifndef __PY_FALLBACK_EDITOR_ #define __PY_FALLBACK_EDITOR_ -#include "Text.h" -#include "Editor.h" +#include "PYText.h" +#include "PYEditor.h" namespace PY { diff --git a/src/FullPinyinEditor.cc b/src/PYFullPinyinEditor.cc similarity index 98% rename from src/FullPinyinEditor.cc rename to src/PYFullPinyinEditor.cc index 1d7e29e..4530395 100644 --- a/src/FullPinyinEditor.cc +++ b/src/PYFullPinyinEditor.cc @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "FullPinyinEditor.h" -#include "Config.h" +#include "PYFullPinyinEditor.h" +#include "PYConfig.h" namespace PY { diff --git a/src/FullPinyinEditor.h b/src/PYFullPinyinEditor.h similarity index 98% rename from src/FullPinyinEditor.h rename to src/PYFullPinyinEditor.h index f415a9f..aba2077 100644 --- a/src/FullPinyinEditor.h +++ b/src/PYFullPinyinEditor.h @@ -21,7 +21,7 @@ #ifndef __PY_FULL_PINYIN_EDITOR_H_ #define __PY_FULL_PINYIN_EDITOR_H_ -#include "PinyinEditor.h" +#include "PYPinyinEditor.h" namespace PY { diff --git a/src/HalfFullConverter.cc b/src/PYHalfFullConverter.cc similarity index 98% rename from src/HalfFullConverter.cc rename to src/PYHalfFullConverter.cc index 6b33ca0..3513d94 100644 --- a/src/HalfFullConverter.cc +++ b/src/PYHalfFullConverter.cc @@ -19,7 +19,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "HalfFullConverter.h" +#include "PYHalfFullConverter.h" namespace PY { diff --git a/src/HalfFullConverter.h b/src/PYHalfFullConverter.h similarity index 100% rename from src/HalfFullConverter.h rename to src/PYHalfFullConverter.h diff --git a/src/LookupTable.h b/src/PYLookupTable.h similarity index 98% rename from src/LookupTable.h rename to src/PYLookupTable.h index d62b978..d3db85f 100644 --- a/src/LookupTable.h +++ b/src/PYLookupTable.h @@ -22,8 +22,8 @@ #define __PY_LOOKUP_TABLE_H_ #include -#include "Object.h" -#include "Text.h" +#include "PYObject.h" +#include "PYText.h" namespace PY { diff --git a/src/Main.cc b/src/PYMain.cc similarity index 97% rename from src/Main.cc rename to src/PYMain.cc index e431cfc..463ec2f 100644 --- a/src/Main.cc +++ b/src/PYMain.cc @@ -25,11 +25,11 @@ #include #include #include -#include "Engine.h" -#include "Pointer.h" -#include "Bus.h" -#include "Config.h" -#include "Database.h" +#include "PYEngine.h" +#include "PYPointer.h" +#include "PYBus.h" +#include "PYConfig.h" +#include "PYDatabase.h" using namespace PY; diff --git a/src/Object.h b/src/PYObject.h similarity index 98% rename from src/Object.h rename to src/PYObject.h index a30ac9c..5703f8e 100644 --- a/src/Object.h +++ b/src/PYObject.h @@ -22,7 +22,7 @@ #define __PY_OBJECT_H_ #include -#include "Pointer.h" +#include "PYPointer.h" namespace PY { diff --git a/src/PhoneticEditor.cc b/src/PYPhoneticEditor.cc similarity index 98% rename from src/PhoneticEditor.cc rename to src/PYPhoneticEditor.cc index f38ea76..44e0004 100644 --- a/src/PhoneticEditor.cc +++ b/src/PYPhoneticEditor.cc @@ -18,10 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "PhoneticEditor.h" -#include "Config.h" -#include "PinyinProperties.h" -#include "SimpTradConverter.h" +#include "PYPhoneticEditor.h" +#include "PYConfig.h" +#include "PYPinyinProperties.h" +#include "PYSimpTradConverter.h" namespace PY { diff --git a/src/PhoneticEditor.h b/src/PYPhoneticEditor.h similarity index 96% rename from src/PhoneticEditor.h rename to src/PYPhoneticEditor.h index 9589cfa..7ff07d9 100644 --- a/src/PhoneticEditor.h +++ b/src/PYPhoneticEditor.h @@ -21,11 +21,11 @@ #ifndef __PY_PHONETIC_EDITOR_H_ #define __PY_PHONETIC_EDITOR_H_ -#include "LookupTable.h" -#include "Editor.h" -#include "PinyinParser.h" -#include "PhraseEditor.h" -#include "SpecialPhraseTable.h" +#include "PYLookupTable.h" +#include "PYEditor.h" +#include "PYPinyinParser.h" +#include "PYPhraseEditor.h" +#include "PYSpecialPhraseTable.h" namespace PY { diff --git a/src/Phrase.h b/src/PYPhrase.h similarity index 98% rename from src/Phrase.h rename to src/PYPhrase.h index 45a43e1..d97aa68 100644 --- a/src/Phrase.h +++ b/src/PYPhrase.h @@ -22,7 +22,7 @@ #define __PY_PHRASE_H_ #include -#include "Types.h" +#include "PYTypes.h" namespace PY { diff --git a/src/PhraseArray.h b/src/PYPhraseArray.h similarity index 97% rename from src/PhraseArray.h rename to src/PYPhraseArray.h index a7111f1..b01d2d3 100644 --- a/src/PhraseArray.h +++ b/src/PYPhraseArray.h @@ -22,7 +22,7 @@ #define __PY_PHRASE_ARRAY_H_ #include -#include "Phrase.h" +#include "PYPhrase.h" namespace PY { diff --git a/src/PhraseEditor.cc b/src/PYPhraseEditor.cc similarity index 96% rename from src/PhraseEditor.cc rename to src/PYPhraseEditor.cc index 472a83c..45da5e4 100644 --- a/src/PhraseEditor.cc +++ b/src/PYPhraseEditor.cc @@ -18,11 +18,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "PhraseEditor.h" -#include "Config.h" -#include "Database.h" -#include "PinyinProperties.h" -#include "SimpTradConverter.h" +#include "PYPhraseEditor.h" +#include "PYConfig.h" +#include "PYDatabase.h" +#include "PYPinyinProperties.h" +#include "PYSimpTradConverter.h" namespace PY { diff --git a/src/PhraseEditor.h b/src/PYPhraseEditor.h similarity index 97% rename from src/PhraseEditor.h rename to src/PYPhraseEditor.h index ed2ddfe..87758c0 100644 --- a/src/PhraseEditor.h +++ b/src/PYPhraseEditor.h @@ -22,9 +22,9 @@ #define __PY_PHRASE_EDITOR_H_ #include -#include "String.h" -#include "PhraseArray.h" -#include "PinyinArray.h" +#include "PYString.h" +#include "PYPhraseArray.h" +#include "PYPinyinArray.h" #define FILL_GRAN (12) diff --git a/src/PinyinArray.h b/src/PYPinyinArray.h similarity index 98% rename from src/PinyinArray.h rename to src/PYPinyinArray.h index 2377ae6..e48f17c 100644 --- a/src/PinyinArray.h +++ b/src/PYPinyinArray.h @@ -22,7 +22,7 @@ #define __PY_PINYIN_ARRAY_H_ #include -#include "Types.h" +#include "PYTypes.h" namespace PY { diff --git a/src/PinyinEditor.cc b/src/PYPinyinEditor.cc similarity index 98% rename from src/PinyinEditor.cc rename to src/PYPinyinEditor.cc index 1fe0498..5200113 100644 --- a/src/PinyinEditor.cc +++ b/src/PYPinyinEditor.cc @@ -18,11 +18,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "PinyinEditor.h" -#include "Config.h" -#include "PinyinProperties.h" -#include "SimpTradConverter.h" -#include "HalfFullConverter.h" +#include "PYPinyinEditor.h" +#include "PYConfig.h" +#include "PYPinyinProperties.h" +#include "PYSimpTradConverter.h" +#include "PYHalfFullConverter.h" namespace PY { diff --git a/src/PinyinEditor.h b/src/PYPinyinEditor.h similarity index 98% rename from src/PinyinEditor.h rename to src/PYPinyinEditor.h index cf62ae4..9e83228 100644 --- a/src/PinyinEditor.h +++ b/src/PYPinyinEditor.h @@ -21,7 +21,7 @@ #ifndef __PY_PINYIN_EDITOR_H_ #define __PY_PINYIN_EDITOR_H_ -#include "PhoneticEditor.h" +#include "PYPhoneticEditor.h" namespace PY { diff --git a/src/PinyinEngine.cc b/src/PYPinyinEngine.cc similarity index 97% rename from src/PinyinEngine.cc rename to src/PYPinyinEngine.cc index 17199b9..1625bc5 100644 --- a/src/PinyinEngine.cc +++ b/src/PYPinyinEngine.cc @@ -18,17 +18,17 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "PinyinEngine.h" +#include "PYPinyinEngine.h" #include -#include "Config.h" -#include "PunctEditor.h" -#include "RawEditor.h" +#include "PYConfig.h" +#include "PYPunctEditor.h" +#include "PYRawEditor.h" #ifdef IBUS_BUILD_LUA_EXTENSION -#include "ExtEditor.h" +#include "PYExtEditor.h" #endif -#include "FullPinyinEditor.h" -#include "DoublePinyinEditor.h" -#include "FallbackEditor.h" +#include "PYFullPinyinEditor.h" +#include "PYDoublePinyinEditor.h" +#include "PYFallbackEditor.h" namespace PY { diff --git a/src/PinyinEngine.h b/src/PYPinyinEngine.h similarity index 97% rename from src/PinyinEngine.h rename to src/PYPinyinEngine.h index 96bf731..4e98256 100644 --- a/src/PinyinEngine.h +++ b/src/PYPinyinEngine.h @@ -21,8 +21,8 @@ #ifndef __PY_PINYIN_ENGINE_H_ #define __PY_PINYIN_ENGINE_H_ -#include "Engine.h" -#include "PinyinProperties.h" +#include "PYEngine.h" +#include "PYPinyinProperties.h" namespace PY { diff --git a/src/PinyinParser.cc b/src/PYPinyinParser.cc similarity index 99% rename from src/PinyinParser.cc rename to src/PYPinyinParser.cc index 2c16ec0..5114606 100644 --- a/src/PinyinParser.cc +++ b/src/PYPinyinParser.cc @@ -21,12 +21,12 @@ #include #include -#include "PinyinParser.h" +#include "PYPinyinParser.h" namespace PY { -#include "Bopomofo.h" -#include "PinyinParserTable.h" +#include "PYBopomofo.h" +#include "PYPinyinParserTable.h" static gboolean check_flags (const Pinyin *pinyin, guint option) diff --git a/src/PinyinParser.h b/src/PYPinyinParser.h similarity index 97% rename from src/PinyinParser.h rename to src/PYPinyinParser.h index b948197..702d87a 100644 --- a/src/PinyinParser.h +++ b/src/PYPinyinParser.h @@ -22,8 +22,8 @@ #define __PY_PARSER_H_ #include -#include "String.h" -#include "PinyinArray.h" +#include "PYString.h" +#include "PYPinyinArray.h" namespace PY { diff --git a/src/PinyinParserTable.h b/src/PYPinyinParserTable.h similarity index 100% rename from src/PinyinParserTable.h rename to src/PYPinyinParserTable.h diff --git a/src/PinyinProperties.cc b/src/PYPinyinProperties.cc similarity index 98% rename from src/PinyinProperties.cc rename to src/PYPinyinProperties.cc index f4e4b0e..3461c35 100644 --- a/src/PinyinProperties.cc +++ b/src/PYPinyinProperties.cc @@ -18,10 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "PinyinProperties.h" +#include "PYPinyinProperties.h" #include -#include "Text.h" -#include "Config.h" +#include "PYText.h" +#include "PYConfig.h" namespace PY { diff --git a/src/PinyinProperties.h b/src/PYPinyinProperties.h similarity index 97% rename from src/PinyinProperties.h rename to src/PYPinyinProperties.h index 68fcd6b..b21fcb5 100644 --- a/src/PinyinProperties.h +++ b/src/PYPinyinProperties.h @@ -21,8 +21,8 @@ #ifndef __PY_PINYIN_PROPERTIES_H_ #define __PY_PINYIN_PROPERTIES_H_ -#include "Signal.h" -#include "Property.h" +#include "PYSignal.h" +#include "PYProperty.h" namespace PY { diff --git a/src/Pointer.h b/src/PYPointer.h similarity index 100% rename from src/Pointer.h rename to src/PYPointer.h diff --git a/src/Property.h b/src/PYProperty.h similarity index 98% rename from src/Property.h rename to src/PYProperty.h index 09429c4..801e856 100644 --- a/src/Property.h +++ b/src/PYProperty.h @@ -22,8 +22,8 @@ #define __PY_PROPERTY_H_ #include -#include "Object.h" -#include "Text.h" +#include "PYObject.h" +#include "PYText.h" namespace PY { diff --git a/src/PunctEditor.cc b/src/PYPunctEditor.cc similarity index 99% rename from src/PunctEditor.cc rename to src/PYPunctEditor.cc index f4b6a2e..091d639 100644 --- a/src/PunctEditor.cc +++ b/src/PYPunctEditor.cc @@ -19,12 +19,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "Config.h" -#include "PunctEditor.h" +#include "PYConfig.h" +#include "PYPunctEditor.h" namespace PY { -#include "PunctTable.h" +#include "PYPunctTable.h" PunctEditor::PunctEditor (PinyinProperties & props, Config & config) : Editor (props, config), diff --git a/src/PunctEditor.h b/src/PYPunctEditor.h similarity index 98% rename from src/PunctEditor.h rename to src/PYPunctEditor.h index 80b9ad8..0035813 100644 --- a/src/PunctEditor.h +++ b/src/PYPunctEditor.h @@ -22,8 +22,8 @@ #ifndef __PY_PUNCT_EDITOR_ #define __PY_PUNCT_EDITOR_ -#include "LookupTable.h" -#include "Editor.h" +#include "PYLookupTable.h" +#include "PYEditor.h" namespace PY { diff --git a/src/PunctTable.h b/src/PYPunctTable.h similarity index 100% rename from src/PunctTable.h rename to src/PYPunctTable.h diff --git a/src/RawEditor.h b/src/PYRawEditor.h similarity index 97% rename from src/RawEditor.h rename to src/PYRawEditor.h index 2b55cbe..0257142 100644 --- a/src/RawEditor.h +++ b/src/PYRawEditor.h @@ -21,7 +21,7 @@ #ifndef __PY_RAW_EDITOR_ #define __PY_RAW_EDITOR_ -#include "Editor.h" +#include "PYEditor.h" namespace PY { diff --git a/src/Regex.h b/src/PYRegex.h similarity index 100% rename from src/Regex.h rename to src/PYRegex.h diff --git a/src/Signal.h b/src/PYSignal.h similarity index 98% rename from src/Signal.h rename to src/PYSignal.h index 7454039..6721493 100644 --- a/src/Signal.h +++ b/src/PYSignal.h @@ -21,8 +21,9 @@ #ifndef __PY_SIGNAL_H_ #define __PY_SIGNAL_H_ + #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #ifdef HAVE_BOOST_SIGNALS2_HPP diff --git a/src/SimpTradConverter.cc b/src/PYSimpTradConverter.cc similarity index 97% rename from src/SimpTradConverter.cc rename to src/PYSimpTradConverter.cc index e2dc1b3..4ea6c0a 100644 --- a/src/SimpTradConverter.cc +++ b/src/PYSimpTradConverter.cc @@ -23,7 +23,7 @@ # include "config.h" #endif -#include "SimpTradConverter.h" +#include "PYSimpTradConverter.h" #ifdef HAVE_OPENCC # include @@ -32,8 +32,8 @@ # include #endif -#include "Types.h" -#include "String.h" +#include "PYTypes.h" +#include "PYString.h" namespace PY { @@ -119,7 +119,7 @@ static gint _cmp (gconstpointer p1, gconstpointer p2) return _xcmp (pp[0], pp[1], s2[0]); } -#include "SimpTradConverterTable.h" +#include "PYSimpTradConverterTable.h" void SimpTradConverter::simpToTrad (const gchar *in, String &out) diff --git a/src/SimpTradConverter.h b/src/PYSimpTradConverter.h similarity index 100% rename from src/SimpTradConverter.h rename to src/PYSimpTradConverter.h diff --git a/src/SimpTradConverterTable.h b/src/PYSimpTradConverterTable.h similarity index 100% rename from src/SimpTradConverterTable.h rename to src/PYSimpTradConverterTable.h diff --git a/src/SpecialPhrase.cc b/src/PYSpecialPhrase.cc similarity index 96% rename from src/SpecialPhrase.cc rename to src/PYSpecialPhrase.cc index 65f65b6..879964a 100644 --- a/src/SpecialPhrase.cc +++ b/src/PYSpecialPhrase.cc @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "SpecialPhrase.h" +#include "PYSpecialPhrase.h" namespace PY { diff --git a/src/SpecialPhrase.h b/src/PYSpecialPhrase.h similarity index 100% rename from src/SpecialPhrase.h rename to src/PYSpecialPhrase.h diff --git a/src/SpecialPhraseTable.cc b/src/PYSpecialPhraseTable.cc similarity index 96% rename from src/SpecialPhraseTable.cc rename to src/PYSpecialPhraseTable.cc index 7e6b6e4..7790798 100644 --- a/src/SpecialPhraseTable.cc +++ b/src/PYSpecialPhraseTable.cc @@ -18,10 +18,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "SpecialPhraseTable.h" +#include "PYSpecialPhraseTable.h" #include -#include "DynamicSpecialPhrase.h" -#include "SpecialPhrase.h" +#include "PYDynamicSpecialPhrase.h" +#include "PYSpecialPhrase.h" namespace PY { diff --git a/src/SpecialPhraseTable.h b/src/PYSpecialPhraseTable.h similarity index 100% rename from src/SpecialPhraseTable.h rename to src/PYSpecialPhraseTable.h diff --git a/src/String.h b/src/PYString.h similarity index 100% rename from src/String.h rename to src/PYString.h diff --git a/src/Text.h b/src/PYText.h similarity index 98% rename from src/Text.h rename to src/PYText.h index f286eb1..5042c31 100644 --- a/src/Text.h +++ b/src/PYText.h @@ -23,7 +23,7 @@ #include #include -#include "Object.h" +#include "PYObject.h" namespace PY { diff --git a/src/Types.h b/src/PYTypes.h similarity index 100% rename from src/Types.h rename to src/PYTypes.h diff --git a/src/Util.h b/src/PYUtil.h similarity index 99% rename from src/Util.h rename to src/PYUtil.h index bb3a712..1e22089 100644 --- a/src/Util.h +++ b/src/PYUtil.h @@ -22,7 +22,7 @@ #define __PY_UTIL_H_ #ifdef HAVE_CONFIG_H -# include "config.h" +# include #endif #if defined(HAVE_UUID_CREATE) -- 2.7.4