Author: yamakenz
Date: Sat Mar 29 01:44:36 2008
New Revision: 5348
Modified:
trunk/fep/callbacks.h
trunk/fep/escseq.h
trunk/fep/helper.h
trunk/fep/key.h
trunk/fep/str.h
trunk/fep/udsock.h
trunk/gtk/compose.h
trunk/gtk/key-util-gtk.h
trunk/gtk/text-util.h
trunk/gtk/uim-cand-win-gtk.h
trunk/gtk/uim-eb.h
trunk/helper/dict-anthy.h
trunk/helper/dict-canna-cclass.h
trunk/helper/dict-canna.h
trunk/helper/dict-cclass-dialog.h
trunk/helper/dict-dict.h
trunk/helper/dict-util.h
trunk/helper/dict-word-list-win-gtk.h
trunk/helper/dict-word-win-gtk.h
trunk/helper/dict-word.h
trunk/helper/eggtrayicon.h
trunk/qt/immodule-plugin.h
trunk/qt/immodule-qtextutil.h
trunk/qt/switcher-qt.h
trunk/qt/toolbar-applet-kde.h
trunk/xim/canddisp.h
trunk/xim/compose.h
trunk/xim/connection.h
trunk/xim/convdisp.h
trunk/xim/helper.h
trunk/xim/util.h
trunk/xim/xdispatch.h
trunk/xim/xim.h
trunk/xim/ximpn.h
trunk/xim/ximserver.h
Log:
* fep/callbacks.h
* fep/escseq.h
* fep/helper.h
* fep/key.h
* fep/str.h
* fep/udsock.h
* gtk/compose.h
* gtk/key-util-gtk.h
* gtk/text-util.h
* gtk/uim-cand-win-gtk.h
* gtk/uim-eb.h
* helper/dict-anthy.h
* helper/dict-canna-cclass.h
* helper/dict-canna.h
* helper/dict-cclass-dialog.h
* helper/dict-dict.h
* helper/dict-util.h
* helper/dict-word-list-win-gtk.h
* helper/dict-word-win-gtk.h
* helper/dict-word.h
* helper/eggtrayicon.h
* qt/immodule-plugin.h
* qt/immodule-qtextutil.h
* qt/switcher-qt.h
* qt/toolbar-applet-kde.h
* xim/canddisp.h
* xim/compose.h
* xim/connection.h
* xim/convdisp.h
* xim/helper.h
* xim/util.h
* xim/xdispatch.h
* xim/xim.h
* xim/ximpn.h
* xim/ximserver.h
- Oops, r5347 did not include all changes. Rename include
guard macros to be having appropriate prefix to avoid
conflicting with system headers
Modified: trunk/fep/callbacks.h
==============================================================================
--- trunk/fep/callbacks.h (original)
+++ trunk/fep/callbacks.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef CALLBACKS_H
-#define CALLBACKS_H
+#ifndef UIM_FEP_CALLBACKS_H
+#define UIM_FEP_CALLBACKS_H
struct preedit_tag {
/* ʸ������� */
Modified: trunk/fep/escseq.h
==============================================================================
--- trunk/fep/escseq.h (original)
+++ trunk/fep/escseq.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef ESCSEQ_H
-#define ESCSEQ_H
+#ifndef UIM_FEP_ESCSEQ_H
+#define UIM_FEP_ESCSEQ_H
struct point_tag {
int row;
Modified: trunk/fep/helper.h
==============================================================================
--- trunk/fep/helper.h (original)
+++ trunk/fep/helper.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef HELPER_H
-#define HELPER_H
+#ifndef UIM_FEP_HELPER_H
+#define UIM_FEP_HELPER_H
#define str_has_prefix(str, prefix) (strncmp((str), (prefix),
strlen((prefix))) == 0)
Modified: trunk/fep/key.h
==============================================================================
--- trunk/fep/key.h (original)
+++ trunk/fep/key.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef KEY_H
-#define KEY_H
+#ifndef UIM_FEP_KEY_H
+#define UIM_FEP_KEY_H
int tty2key(char key);
int tty2key_state(char key);
Modified: trunk/fep/str.h
==============================================================================
--- trunk/fep/str.h (original)
+++ trunk/fep/str.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef STR_H
-#define STR_H
+#ifndef UIM_FEP_STR_H
+#define UIM_FEP_STR_H
void init_str(void);
const char *get_enc(void);
Modified: trunk/fep/udsock.h
==============================================================================
--- trunk/fep/udsock.h (original)
+++ trunk/fep/udsock.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef UDSOCK_H
-#define UDSOCK_H
+#ifndef UIM_FEP_UDSOCK_H
+#define UIM_FEP_UDSOCK_H
#include "uim.h"
Modified: trunk/gtk/compose.h
==============================================================================
--- trunk/gtk/compose.h (original)
+++ trunk/gtk/compose.h Sat Mar 29 01:44:36 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef COMPOSE_H
-#define COMPOSE_H
+#ifndef UIM_GTK_COMPOSE_H
+#define UIM_GTK_COMPOSE_H
#include <X11/X.h>
Modified: trunk/gtk/key-util-gtk.h
==============================================================================
--- trunk/gtk/key-util-gtk.h (original)
+++ trunk/gtk/key-util-gtk.h Sat Mar 29 01:44:36 2008
@@ -35,8 +35,8 @@
* key utility for uim-gtk
*/
-#ifndef KEY_UTIL_GTK_H
-#define KEY_UTIL_GTK_H
+#ifndef UIM_GTK_KEY_UTIL_GTK_H
+#define UIM_GTK_KEY_UTIL_GTK_H
/*
* Initialize modifier key mappings.
Modified: trunk/gtk/text-util.h
==============================================================================
--- trunk/gtk/text-util.h (original)
+++ trunk/gtk/text-util.h Sat Mar 29 01:44:36 2008
@@ -35,8 +35,8 @@
* Text acquisition and injection utility
*/
-#ifndef TEXT_UTIL_H
-#define TEXT_UTIL_H
+#ifndef UIM_GTK_TEXT_UTIL_H
+#define UIM_GTK_TEXT_UTIL_H
int im_uim_acquire_primary_text(IMUIMContext *uic, enum UTextOrigin origin,
int former_req_len, int latter_req_len,
Modified: trunk/gtk/uim-cand-win-gtk.h
==============================================================================
--- trunk/gtk/uim-cand-win-gtk.h (original)
+++ trunk/gtk/uim-cand-win-gtk.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef UIM_CAND_WIN_GTK_H
-#define UIM_CAND_WIN_GTK_H
+#ifndef UIM_GTK_UIM_CAND_WIN_GTK_H
+#define UIM_GTK_UIM_CAND_WIN_GTK_H
#include <gtk/gtk.h>
@@ -123,4 +123,4 @@
G_END_DECLS
-#endif /*UIM_CAND_WIN_GTK_H */
+#endif /*UIM_GTK_UIM_CAND_WIN_GTK_H */
Modified: trunk/gtk/uim-eb.h
==============================================================================
--- trunk/gtk/uim-eb.h (original)
+++ trunk/gtk/uim-eb.h Sat Mar 29 01:44:36 2008
@@ -34,8 +34,8 @@
/* FIXME! This is a ad-hoc solution to advance
annotation related discussion. */
-#ifndef UIM_EB_H
-#define UIM_EB_H
+#ifndef UIM_GTK_UIM_EB_H
+#define UIM_GTK_UIM_EB_H
#include <gtk/gtk.h>
@@ -50,4 +50,4 @@
G_END_DECLS
-#endif /* UIM_EB_H */
+#endif /* UIM_GTK_UIM_EB_H */
Modified: trunk/helper/dict-anthy.h
==============================================================================
--- trunk/helper/dict-anthy.h (original)
+++ trunk/helper/dict-anthy.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
* SUCH DAMAGE.
*/
-#ifndef DICT_ANTHY_H
-#define DICT_ANTHY_H
+#ifndef UIM_DICT_ANTHY_H
+#define UIM_DICT_ANTHY_H
#include "dict-word.h"
#include "dict-dict.h"
@@ -57,4 +57,4 @@
#ifdef __cplusplus
}
#endif
-#endif /* DICT_ANTHY_H */
+#endif /* UIM_DICT_ANTHY_H */
Modified: trunk/helper/dict-canna-cclass.h
==============================================================================
--- trunk/helper/dict-canna-cclass.h (original)
+++ trunk/helper/dict-canna-cclass.h Sat Mar 29 01:44:36 2008
@@ -75,8 +75,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef DICT_CANNA_CCLASS_H
-#define DICT_CANNA_CCLASS_H
+#ifndef UIM_DICT_CANNA_CCLASS_H
+#define UIM_DICT_CANNA_CCLASS_H
#include "dict-word.h"
@@ -125,4 +125,4 @@
int find_cclass_type_from_code (const char *code);
int find_cclass_type_from_desc (const char *desc);
-#endif /* DICT_CANNA_CCLASS_H */
+#endif /* UIM_DICT_CANNA_CCLASS_H */
Modified: trunk/helper/dict-canna.h
==============================================================================
--- trunk/helper/dict-canna.h (original)
+++ trunk/helper/dict-canna.h Sat Mar 29 01:44:36 2008
@@ -29,8 +29,8 @@
* SUCH DAMAGE.
*/
-#ifndef DICT_CANNA_H
-#define DICT_CANNA_H
+#ifndef UIM_DICT_CANNA_H
+#define UIM_DICT_CANNA_H
#include "dict-word.h"
#include "dict-dict.h"
@@ -39,4 +39,4 @@
#define CANNA_PRIV_DIC_BUFLEN 1024
#define CANNA_STD_CONTEXT 0
-#endif /* DICT_CANNA_H */
+#endif /* UIM_DICT_CANNA_H */
Modified: trunk/helper/dict-cclass-dialog.h
==============================================================================
--- trunk/helper/dict-cclass-dialog.h (original)
+++ trunk/helper/dict-cclass-dialog.h Sat Mar 29 01:44:36 2008
@@ -31,12 +31,12 @@
* SUCH DAMAGE.
*/
-#ifndef DICT_CCLASS_DIALOG_H
-#define DICT_CCLASS_DIALOG_H
+#ifndef UIM_DICT_CCLASS_DIALOG_H
+#define UIM_DICT_CCLASS_DIALOG_H
#include <gtk/gtk.h>
#include "dict-canna-cclass.h"
gchar *cclass_dialog(gint cclass_type, gint system);
-#endif /* DICT_CCLASS_DIALOG_H */
+#endif /* UIM_DICT_CCLASS_DIALOG_H */
Modified: trunk/helper/dict-dict.h
==============================================================================
--- trunk/helper/dict-dict.h (original)
+++ trunk/helper/dict-dict.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef DICT_DICT_H
-#define DICT_DICT_H
+#ifndef UIM_DICT_DICT_H
+#define UIM_DICT_DICT_H
#include "dict-word.h"
@@ -105,4 +105,4 @@
DICT_ENUM_DICTIONARY_TYPE_UNKOWN
} DictEnumDictionaryType;
-#endif /* DICT_DICT_H */
+#endif /* UIM_DICT_DICT_H */
Modified: trunk/helper/dict-util.h
==============================================================================
--- trunk/helper/dict-util.h (original)
+++ trunk/helper/dict-util.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef DICT_UTIL_H
-#define DICT_UTIL_H
+#ifndef UIM_DICT_UTIL_H
+#define UIM_DICT_UTIL_H
#include <glib.h>
@@ -43,4 +43,4 @@
gchar *utf8_to_eucjp (const gchar *utf8);
gchar *eucjp_to_utf8 (const gchar *eucjp);
-#endif /* DICT_UTIL_H */
+#endif /* UIM_DICT_UTIL_H */
Modified: trunk/helper/dict-word-list-win-gtk.h
==============================================================================
--- trunk/helper/dict-word-list-win-gtk.h (original)
+++ trunk/helper/dict-word-list-win-gtk.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef DICT_ANTHY_WORD_LIST_GTK_H
-#define DICT_ANTHY_WORD_LIST_GTK_H
+#ifndef UIM_DICT_ANTHY_WORD_LIST_GTK_H
+#define UIM_DICT_ANTHY_WORD_LIST_GTK_H
#include <gtk/gtk.h>
@@ -79,4 +79,4 @@
DictEnumDictionaryType dict_get_dictionary_type(GtkWidget *window);
-#endif /* DICT_ANTHY_WORD_LIST_GTK_H */
+#endif /* UIM_DICT_ANTHY_WORD_LIST_GTK_H */
Modified: trunk/helper/dict-word-win-gtk.h
==============================================================================
--- trunk/helper/dict-word-win-gtk.h (original)
+++ trunk/helper/dict-word-win-gtk.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef DICT_ANTHY_WORD_GTK_H
-#define DICT_ANTHY_WORD_GTK_H
+#ifndef UIM_DICT_ANTHY_WORD_GTK_H
+#define UIM_DICT_ANTHY_WORD_GTK_H
#include <gtk/gtk.h>
#include "dict-dict.h"
@@ -101,4 +101,4 @@
G_END_DECLS
-#endif /* DICT_ANTHY_WORD_GTK_H */
+#endif /* UIM_DICT_ANTHY_WORD_GTK_H */
Modified: trunk/helper/dict-word.h
==============================================================================
--- trunk/helper/dict-word.h (original)
+++ trunk/helper/dict-word.h Sat Mar 29 01:44:36 2008
@@ -39,8 +39,8 @@
* * uim-pref�Ѥ˽��
*/
-#ifndef DICT_WORD_H
-#define DICT_WORD_H
+#ifndef UIM_DICT_WORD_H
+#define UIM_DICT_WORD_H
/*
* enum�ǤϤʤ�ʸ������ѹ�?
@@ -102,4 +102,4 @@
uim_word_type dict_identifier_to_word_type(char *identifier);
int dict_identifier_to_support_type(char *identifier);
-#endif /* DICT_WORD_H */
+#endif /* UIM_DICT_WORD_H */
Modified: trunk/helper/eggtrayicon.h
==============================================================================
--- trunk/helper/eggtrayicon.h (original)
+++ trunk/helper/eggtrayicon.h Sat Mar 29 01:44:36 2008
@@ -18,8 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#ifndef EGG_TRAY_ICON_H
-#define EGG_TRAY_ICON_H
+#ifndef UIM_EGG_TRAY_ICON_H
+#define UIM_EGG_TRAY_ICON_H
#include <gtk/gtkplug.h>
#ifdef GDK_WINDOWING_X11
@@ -77,4 +77,4 @@
G_END_DECLS
-#endif /* EGG_TRAY_ICON_H */
+#endif /* UIM_EGG_TRAY_ICON_H */
Modified: trunk/qt/immodule-plugin.h
==============================================================================
--- trunk/qt/immodule-plugin.h (original)
+++ trunk/qt/immodule-plugin.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef IMMODULE_PLUGIN_H
-#define IMMODULE_PLUGIN_H
+#ifndef UIM_QT_IMMODULE_PLUGIN_H
+#define UIM_QT_IMMODULE_PLUGIN_H
#include <qinputcontextplugin.h>
Modified: trunk/qt/immodule-qtextutil.h
==============================================================================
--- trunk/qt/immodule-qtextutil.h (original)
+++ trunk/qt/immodule-qtextutil.h Sat Mar 29 01:44:36 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef IMMODULE_QTEXT_UTIL_H
-#define IMMODULE_QTEXT_UTIL_H
+#ifndef UIM_QT_IMMODULE_QTEXT_UTIL_H
+#define UIM_QT_IMMODULE_QTEXT_UTIL_H
class QUimInputContext;
Modified: trunk/qt/switcher-qt.h
==============================================================================
--- trunk/qt/switcher-qt.h (original)
+++ trunk/qt/switcher-qt.h Sat Mar 29 01:44:36 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef IM_SWITCHER_QT_H
-#define IM_SWITCHER_QT_H
+#ifndef UIM_QT_IM_SWITCHER_QT_H
+#define UIM_QT_IM_SWITCHER_QT_H
#include <uim/uim.h>
#include <uim/uim-helper.h>
@@ -82,4 +82,4 @@
QPushButton *cancelButton;
};
-#endif /* Not def: IM_SWITCHER_QT_H */
+#endif /* Not def: UIM_QT_IM_SWITCHER_QT_H */
Modified: trunk/qt/toolbar-applet-kde.h
==============================================================================
--- trunk/qt/toolbar-applet-kde.h (original)
+++ trunk/qt/toolbar-applet-kde.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
-#ifndef TOOLBAR_APPLET_KDE_H
-#define TOOLBAR_APPLET_KDE_H
+#ifndef UIM_QT_TOOLBAR_APPLET_KDE_H
+#define UIM_QT_TOOLBAR_APPLET_KDE_H
#include <kpanelapplet.h>
Modified: trunk/xim/canddisp.h
==============================================================================
--- trunk/xim/canddisp.h (original)
+++ trunk/xim/canddisp.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef CANDDISP_H
-#define CANDDISP_H
+#ifndef UIM_XIM_CANDDISP_H
+#define UIM_XIM_CANDDISP_H
#include <vector>
Modified: trunk/xim/compose.h
==============================================================================
--- trunk/xim/compose.h (original)
+++ trunk/xim/compose.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef COMPOSE_H
-#define COMPOSE_H
+#ifndef UIM_XIM_COMPOSE_H
+#define UIM_XIM_COMPOSE_H
#include <X11/X.h>
Modified: trunk/xim/connection.h
==============================================================================
--- trunk/xim/connection.h (original)
+++ trunk/xim/connection.h Sat Mar 29 01:44:36 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef CONNECTION_H
-#define CONNECTION_H
+#ifndef UIM_XIM_CONNECTION_H
+#define UIM_XIM_CONNECTION_H
#include "xim.h"
#include "xdispatch.h"
Modified: trunk/xim/convdisp.h
==============================================================================
--- trunk/xim/convdisp.h (original)
+++ trunk/xim/convdisp.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef CONVDISP_H
-#define CONVDISP_H
+#ifndef UIM_XIM_CONVDISP_H
+#define UIM_XIM_CONVDISP_H
#include "ximserver.h"
#include <vector>
Modified: trunk/xim/helper.h
==============================================================================
--- trunk/xim/helper.h (original)
+++ trunk/xim/helper.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef HELPER_H
-#define HELPER_H
+#ifndef UIM_XIM_HELPER_H
+#define UIM_XIM_HELPER_H
void check_helper_connection();
void helper_disconnect_cb();
Modified: trunk/xim/util.h
==============================================================================
--- trunk/xim/util.h (original)
+++ trunk/xim/util.h Sat Mar 29 01:44:36 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef UIM_XIM_UTIL_H
+#define UIM_XIM_UTIL_H
// fd dispatch
#define READ_OK 1
Modified: trunk/xim/xdispatch.h
==============================================================================
--- trunk/xim/xdispatch.h (original)
+++ trunk/xim/xdispatch.h Sat Mar 29 01:44:36 2008
@@ -34,8 +34,8 @@
//
// dispatcher of Xlib events for window.
//
-#ifndef XDISPATCH_H
-#define XDISPATCH_H
+#ifndef UIM_XIM_XDISPATCH_H
+#define UIM_XIM_XDISPATCH_H
#include <X11/X.h>
Modified: trunk/xim/xim.h
==============================================================================
--- trunk/xim/xim.h (original)
+++ trunk/xim/xim.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef XIM_H
-#define XIM_H
+#ifndef UIM_XIM_XIM_H
+#define UIM_XIM_XIM_H
#include <X11/X.h>
#include <X11/Xlib.h>
Modified: trunk/xim/ximpn.h
==============================================================================
--- trunk/xim/ximpn.h (original)
+++ trunk/xim/ximpn.h Sat Mar 29 01:44:36 2008
@@ -32,8 +32,8 @@
// -*- C++ -*-
// XIM related constant numbers
-#ifndef XIMPN_H
-#define XIMPN_H
+#ifndef UIM_XIM_XIMPN_H
+#define UIM_XIM_XIMPN_H
// MAJOR number or XIM request
//
Modified: trunk/xim/ximserver.h
==============================================================================
--- trunk/xim/ximserver.h (original)
+++ trunk/xim/ximserver.h Sat Mar 29 01:44:36 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef XIMSERVER_H
-#define XIMSERVER_H
+#ifndef UIM_XIM_XIMSERVER_H
+#define UIM_XIM_XIMSERVER_H
#include <X11/X.h>
#include <X11/Xlib.h>
