Author: yamakenz
Date: Fri Mar 28 08:13:53 2008
New Revision: 5347
Modified:
trunk/fep/draw.h
trunk/fep/read.h
trunk/helper/dict-word-list-view-gtk.h
trunk/qt/candwin-qt.h
trunk/qt/chardict/chardict-bushuviewwidget.h
trunk/qt/chardict/chardict-chargridview.h
trunk/qt/chardict/chardict-qt.h
trunk/qt/chardict/chardict-unicodeviewwidget.h
trunk/qt/chardict/qtgettext.h
trunk/qt/immodule-candidatewindow.h
trunk/qt/immodule-qhelpermanager.h
trunk/qt/immodule-quiminfomanager.h
trunk/qt/immodule-quiminputcontext.h
trunk/qt/immodule-quiminputcontext_compose.h
trunk/qt/immodule-quiminputcontext_with_slave.h
trunk/qt/immodule-subwindow.h
trunk/qt/pref-customwidgets.h
trunk/qt/pref-qt.h
trunk/qt/qtgettext.h
trunk/qt/toolbar-common-quimhelpertoolbar.h
trunk/qt/toolbar-common-uimstateindicator.h
trunk/qt/toolbar-standalone-qt.h
trunk/qt4/immodule/candidatewindow.h
trunk/qt4/immodule/debug.h
trunk/qt4/immodule/qhelpermanager.h
trunk/qt4/immodule/qtextutil.h
trunk/qt4/immodule/quiminfomanager.h
trunk/qt4/immodule/quiminputcontext.h
trunk/qt4/immodule/quiminputcontext_compose.h
trunk/qt4/immodule/quiminputcontext_with_slave.h
trunk/qt4/immodule/subwindow.h
trunk/replace/os_dep.h
trunk/uim/bsdlook.h
Log:
* replace/os_dep.h
* uim/bsdlook.h
* gtk/caret-state-indicator.h
* helper/dict-word-list-view-gtk.h
* fep/draw.h
* fep/read.h
* fep/uim-fep.h
* qt/candwin-qt.h
* qt/chardict/chardict-bushuviewwidget.h
* qt/chardict/chardict-chargridview.h
* qt/chardict/chardict-qt.h
* qt/chardict/chardict-unicodeviewwidget.h
* qt/chardict/qtgettext.h
* qt/immodule-candidatewindow.h
* qt/immodule-qhelpermanager.h
* qt/immodule-quiminfomanager.h
* qt/immodule-quiminputcontext.h
* qt/immodule-quiminputcontext_compose.h
* qt/immodule-quiminputcontext_with_slave.h
* qt/immodule-subwindow.h
* qt/pref-customwidgets.h
* qt/pref-qt.h
* qt/qtgettext.h
* qt/toolbar-common-quimhelpertoolbar.h
* qt/toolbar-common-uimstateindicator.h
* qt/toolbar-standalone-qt.h
* qt4/immodule/candidatewindow.h
* qt4/immodule/debug.h
* qt4/immodule/qhelpermanager.h
* qt4/immodule/qtextutil.h
* qt4/immodule/quiminfomanager.h
* qt4/immodule/quiminputcontext.h
* qt4/immodule/quiminputcontext_compose.h
* qt4/immodule/quiminputcontext_with_slave.h
* qt4/immodule/subwindow.h
- Rename include guard macros to be having appropriate prefix
to avoid conflicting with system headers
Modified: trunk/fep/draw.h
==============================================================================
--- trunk/fep/draw.h (original)
+++ trunk/fep/draw.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
*/
-#ifndef DRAW_H
-#define DRAW_H
+#ifndef UIM_FEP_DRAW_H
+#define UIM_FEP_DRAW_H
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/fep/read.h
==============================================================================
--- trunk/fep/read.h (original)
+++ trunk/fep/read.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
*/
-#ifndef READ_H
-#define READ_H
+#ifndef UIM_FEP_READ_H
+#define UIM_FEP_READ_H
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: trunk/helper/dict-word-list-view-gtk.h
==============================================================================
--- trunk/helper/dict-word-list-view-gtk.h (original)
+++ trunk/helper/dict-word-list-view-gtk.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
* SUCH DAMAGE.
*/
-#ifndef WORD_LIST_VIEW_H
-#define WORD_LIST_VIEW_H
+#ifndef UIM_DICT_WORD_LIST_VIEW_H
+#define UIM_DICT_WORD_LIST_VIEW_H
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -127,4 +127,4 @@
#ifdef __cplusplus
}
#endif
-#endif /* WORD_LIST_VIEW_H */
+#endif /* UIM_DICT_WORD_LIST_VIEW_H */
Modified: trunk/qt/candwin-qt.h
==============================================================================
--- trunk/qt/candwin-qt.h (original)
+++ trunk/qt/candwin-qt.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UIM_CANDWIN_QT_H
-#define UIM_CANDWIN_QT_H
+#ifndef UIM_QT_CANDWIN_QT_H
+#define UIM_QT_CANDWIN_QT_H
#include <uim/uim.h>
#include <uim/uim-helper.h>
@@ -136,4 +136,4 @@
}
};
-#endif /* UIM_CANDWIN_QT_H */
+#endif /* UIM_QT_CANDWIN_QT_H */
Modified: trunk/qt/chardict/chardict-bushuviewwidget.h
==============================================================================
--- trunk/qt/chardict/chardict-bushuviewwidget.h (original)
+++ trunk/qt/chardict/chardict-bushuviewwidget.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef BUSHU_VIEW_WIDGET_H
-#define BUSHU_VIEW_WIDGET_H
+#ifndef UIM_QT_CHARDICT_BUSHU_VIEW_WIDGET_H
+#define UIM_QT_CHARDICT_BUSHU_VIEW_WIDGET_H
#include "chardict-qt.h"
@@ -68,4 +68,4 @@
CharGridView *m_charGridView;
};
-#endif /* Not def: BUSHU_VIEW_WIDGET_H */
+#endif /* Not def: UIM_QT_CHARDICT_BUSHU_VIEW_WIDGET_H */
Modified: trunk/qt/chardict/chardict-chargridview.h
==============================================================================
--- trunk/qt/chardict/chardict-chargridview.h (original)
+++ trunk/qt/chardict/chardict-chargridview.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef CHAR_GRID_VIEW_H
-#define CHAR_GRID_VIEW_H
+#ifndef UIM_QT_CHARDICT_CHAR_GRID_VIEW_H
+#define UIM_QT_CHARDICT_CHAR_GRID_VIEW_H
#include <qgridview.h>
#include <qstringlist.h>
@@ -71,4 +71,4 @@
QFont m_font;
};
-#endif /* Not def: CHAR_GRID_VIEW_H */
+#endif /* Not def: UIM_QT_CHARDICT_CHAR_GRID_VIEW_H */
Modified: trunk/qt/chardict/chardict-qt.h
==============================================================================
--- trunk/qt/chardict/chardict-qt.h (original)
+++ trunk/qt/chardict/chardict-qt.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UIM_CHARDICT_QT_H
-#define UIM_CHARDICT_QT_H
+#ifndef UIM_QT_CHARDICT_CHARDICT_QT_H
+#define UIM_QT_CHARDICT_CHARDICT_QT_H
#include <qstring.h>
#include <qwidget.h>
@@ -100,4 +100,4 @@
void charSelected( const QString & );
};
-#endif /* Not def: UIM_CHARDICT_QT_H */
+#endif /* Not def: UIM_QT_CHARDICT_CHARDICT_QT_H */
Modified: trunk/qt/chardict/chardict-unicodeviewwidget.h
==============================================================================
--- trunk/qt/chardict/chardict-unicodeviewwidget.h (original)
+++ trunk/qt/chardict/chardict-unicodeviewwidget.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UNICODE_VIEW_WIDGET_H
-#define UNICODE_VIEW_WIDGET_H
+#ifndef UIM_QT_CHARDICT_UNICODE_VIEW_WIDGET_H
+#define UIM_QT_CHARDICT_UNICODE_VIEW_WIDGET_H
#include "chardict-qt.h"
@@ -71,4 +71,4 @@
CharGridView *m_charGridView;
};
-#endif /* Not def: UNICODE_VIEW_WIDGET_H */
+#endif /* Not def: UIM_QT_CHARDICT_UNICODE_VIEW_WIDGET_H */
Modified: trunk/qt/chardict/qtgettext.h
==============================================================================
--- trunk/qt/chardict/qtgettext.h (original)
+++ trunk/qt/chardict/qtgettext.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef QT_GETTEXT_H
-#define QT_GETTEXT_H
+#ifndef UIM_QT_QTGETTEXT_H
+#define UIM_QT_QTGETTEXT_H
#include <config.h>
@@ -57,4 +57,4 @@
#endif /* ENABLE_NLS */
-#endif /* Not def: QT_GETTEXT_H */
+#endif /* Not def: UIM_QT_QTGETTEXT_H */
Modified: trunk/qt/immodule-candidatewindow.h
==============================================================================
--- trunk/qt/immodule-candidatewindow.h (original)
+++ trunk/qt/immodule-candidatewindow.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef CANDIDATE_WINDOW_H
-#define CANDIDATE_WINDOW_H
+#ifndef UIM_QT_IMMODULE_CANDIDATE_WINDOW_H
+#define UIM_QT_IMMODULE_CANDIDATE_WINDOW_H
#include <uim/uim.h>
@@ -146,4 +146,4 @@
QSize sizeHint( void ) const;
};
-#endif /* Not def: CANDIDATE_WINDOW_H */
+#endif /* Not def: UIM_QT_IMMODULE_CANDIDATE_WINDOW_H */
Modified: trunk/qt/immodule-qhelpermanager.h
==============================================================================
--- trunk/qt/immodule-qhelpermanager.h (original)
+++ trunk/qt/immodule-qhelpermanager.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UIM_HELPER_MANAGER_H
-#define UIM_HELPER_MANAGER_H
+#ifndef UIM_QT_IMMODULE_QHELPERMANAGER_H
+#define UIM_QT_IMMODULE_QHELPERMANAGER_H
#include <qobject.h>
@@ -61,4 +61,4 @@
void slotStdinActivated( int );
};
-#endif /* Not def: UIM_HELPER_MANAGER_H */
+#endif /* Not def: UIM_QT_IMMODULE_QHELPERMANAGER_H */
Modified: trunk/qt/immodule-quiminfomanager.h
==============================================================================
--- trunk/qt/immodule-quiminfomanager.h (original)
+++ trunk/qt/immodule-quiminfomanager.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef IMMODULE_QUIM_INFO_MANAGER_H
-#define IMMODULE_QUIM_INFO_MANAGER_H
+#ifndef UIM_QT_IMMODULE_QUIMINFOMANAGER_H
+#define UIM_QT_IMMODULE_QUIMINFOMANAGER_H
#include <qptrlist.h>
@@ -56,4 +56,4 @@
QValueList<uimInfo> info;
};
-#endif /* IMMODULE_QUIM_INFO_MANAGER_H */
+#endif /* UIM_QT_IMMODULE_QUIMINFOMANAGER_H */
Modified: trunk/qt/immodule-quiminputcontext.h
==============================================================================
--- trunk/qt/immodule-quiminputcontext.h (original)
+++ trunk/qt/immodule-quiminputcontext.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef QUIMINPUT_CONTEXT_H
-#define QUIMINPUT_CONTEXT_H
+#ifndef UIM_QT_IMMODULE_QUIMINPUTCONTEXT_H
+#define UIM_QT_IMMODULE_QUIMINPUTCONTEXT_H
#include <qinputcontext.h>
#include <qptrlist.h>
@@ -164,4 +164,4 @@
static QUimHelperManager *m_HelperManager;
};
-#endif /* Not def: QUIMINPUT_CONTEXT_H */
+#endif /* Not def: UIM_QT_IMMODULE_QUIMINPUTCONTEXT_H */
Modified: trunk/qt/immodule-quiminputcontext_compose.h
==============================================================================
--- trunk/qt/immodule-quiminputcontext_compose.h (original)
+++ trunk/qt/immodule-quiminputcontext_compose.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef QUIMINPUT_CONTEXT_COMPOSE_H
-#define QUIMINPUT_CONTEXT_COMPOSE_H
+#ifndef UIM_QT_IMMODULE_QUIMINPUTCONTEXT_COMPOSE_H
+#define UIM_QT_IMMODULE_QUIMINPUTCONTEXT_COMPOSE_H
#include <X11/X.h>
#undef KeyPress
Modified: trunk/qt/immodule-quiminputcontext_with_slave.h
==============================================================================
--- trunk/qt/immodule-quiminputcontext_with_slave.h (original)
+++ trunk/qt/immodule-quiminputcontext_with_slave.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef QUIMINPUT_CONTEXT_WITH_SLAVE_H
-#define QUIMINPUT_CONTEXT_WITH_SLAVE_H
+#ifndef UIM_QT_IMMODULE_QUIMINPUTCONTEXT_WITH_SLAVE_H
+#define UIM_QT_IMMODULE_QUIMINPUTCONTEXT_WITH_SLAVE_H
#include "immodule-quiminputcontext.h"
@@ -66,4 +66,4 @@
QInputContext *slave;
};
-#endif /* Not def: QUIMINPUT_CONTEXT_WITH_SLAVE_H */
+#endif /* Not def: UIM_QT_IMMODULE_QUIMINPUTCONTEXT_WITH_SLAVE_H */
Modified: trunk/qt/immodule-subwindow.h
==============================================================================
--- trunk/qt/immodule-subwindow.h (original)
+++ trunk/qt/immodule-subwindow.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef SUBWINDOW_H
-#define SUBWINDOW_H
+#ifndef UIM_QT_IMMODULE_SUBWINDOW_H
+#define UIM_QT_IMMODULE_SUBWINDOW_H
#include <qvbox.h>
#include <qtimer.h>
@@ -73,4 +73,4 @@
QTimer *m_hookTimer;
};
-#endif /* Not def: SUBWINDOW_H */
+#endif /* Not def: UIM_QT_IMMODULE_SUBWINDOW_H */
Modified: trunk/qt/pref-customwidgets.h
==============================================================================
--- trunk/qt/pref-customwidgets.h (original)
+++ trunk/qt/pref-customwidgets.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef CUSTOMWIDGETS_H
-#define CUSTOMWIDGETS_H
+#ifndef UIM_QT_PREF_CUSTOMWIDGETS_H
+#define UIM_QT_PREF_CUSTOMWIDGETS_H
#include <uim/uim.h>
#include <uim/uim-custom.h>
@@ -303,4 +303,4 @@
QString m_keystr;
};
-#endif /* Not def: CUSTOMWIDGETS_H */
+#endif /* Not def: UIM_QT_PREF_CUSTOMWIDGETS_H */
Modified: trunk/qt/pref-qt.h
==============================================================================
--- trunk/qt/pref-qt.h (original)
+++ trunk/qt/pref-qt.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UIM_PREF_QT_H
-#define UIM_PREF_QT_H
+#ifndef UIM_QT_PREF_QT_H
+#define UIM_QT_PREF_QT_H
#include <qdialog.h>
#include <qdict.h>
@@ -138,4 +138,4 @@
QPtrList<UimCustomItemIface> m_customIfaceList;
};
-#endif /* Not def: UIM_PREF_QT_H */
+#endif /* Not def: UIM_QT_PREF_QT_H */
Modified: trunk/qt/qtgettext.h
==============================================================================
--- trunk/qt/qtgettext.h (original)
+++ trunk/qt/qtgettext.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef QT_GETTEXT_H
-#define QT_GETTEXT_H
+#ifndef UIM_QT_QTGETTEXT_H
+#define UIM_QT_QTGETTEXT_H
#include <config.h>
#include "uim/gettext.h"
@@ -62,4 +62,4 @@
#define mygettext(String) QString::fromLocal8Bit( (const char
*)(String) )
#endif /* ENABLE_NLS */
-#endif /* Not def: QT_GETTEXT_H */
+#endif /* Not def: UIM_QT_QTGETTEXT_H */
Modified: trunk/qt/toolbar-common-quimhelpertoolbar.h
==============================================================================
--- trunk/qt/toolbar-common-quimhelpertoolbar.h (original)
+++ trunk/qt/toolbar-common-quimhelpertoolbar.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef QUIM_HELPER_TOOLBAR_H
-#define QUIM_HELPER_TOOLBAR_H
+#ifndef UIM_QT_TOOLBAR_COMMON_QUIMHELPERTOOLBAR_H
+#define UIM_QT_TOOLBAR_COMMON_QUIMHELPERTOOLBAR_H
#include <qhbox.h>
#include <qevent.h>
Modified: trunk/qt/toolbar-common-uimstateindicator.h
==============================================================================
--- trunk/qt/toolbar-common-uimstateindicator.h (original)
+++ trunk/qt/toolbar-common-uimstateindicator.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UIM_STATE_INDICATOR_H
-#define UIM_STATE_INDICATOR_H
+#ifndef UIM_QT_TOOLBAR_COMMON_UIM_STATE_INDICATOR_H
+#define UIM_QT_TOOLBAR_COMMON_UIM_STATE_INDICATOR_H
#include <qhbox.h>
#include <qintdict.h>
@@ -113,4 +113,4 @@
};
-#endif /* Not def: UIM_STATE_INDICATOR_H */
+#endif /* Not def: UIM_QT_TOOLBAR_COMMON_UIM_STATE_INDICATOR_H */
Modified: trunk/qt/toolbar-standalone-qt.h
==============================================================================
--- trunk/qt/toolbar-standalone-qt.h (original)
+++ trunk/qt/toolbar-standalone-qt.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UIM_TOOLBAR_DRAGGING_HANDLER_H
-#define UIM_TOOLBAR_DRAGGING_HANDLER_H
+#ifndef UIM_QT_TOOLBAR_DRAGGING_HANDLER_H
+#define UIM_QT_TOOLBAR_DRAGGING_HANDLER_H
#include <qframe.h>
#include <qevent.h>
@@ -83,4 +83,4 @@
int offsetY;
};
-#endif /* UIM_TOOLBAR_DRAGGING_HANDLER_H */
+#endif /* UIM_QT_TOOLBAR_DRAGGING_HANDLER_H */
Modified: trunk/qt4/immodule/candidatewindow.h
==============================================================================
--- trunk/qt4/immodule/candidatewindow.h (original)
+++ trunk/qt4/immodule/candidatewindow.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef CANDIDATE_WINDOW_H
-#define CANDIDATE_WINDOW_H
+#ifndef UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
+#define UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H
#include <uim/uim.h>
@@ -146,4 +146,4 @@
QSize sizeHint( void ) const;
};
-#endif /* Not def: CANDIDATE_WINDOW_H */
+#endif /* Not def: UIM_QT4_IMMODULE_CANDIDATE_WINDOW_H */
Modified: trunk/qt4/immodule/debug.h
==============================================================================
--- trunk/qt4/immodule/debug.h (original)
+++ trunk/qt4/immodule/debug.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
*/
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef UIM_QT4_IMMODULE_DEBUG_H
+#define UIM_QT4_IMMODULE_DEBUG_H
#include <QtGlobal>
@@ -41,4 +41,4 @@
#define qDebug if (true) ; else qDebug
#endif
-#endif /* !defined(DEBUG_H) */
+#endif /* !defined(UIM_QT4_IMMODULE_DEBUG_H) */
Modified: trunk/qt4/immodule/qhelpermanager.h
==============================================================================
--- trunk/qt4/immodule/qhelpermanager.h (original)
+++ trunk/qt4/immodule/qhelpermanager.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef UIM_HELPER_MANAGER_H
-#define UIM_HELPER_MANAGER_H
+#ifndef UIM_QT4_IMMODULE_QHELPERMANAGER_H
+#define UIM_QT4_IMMODULE_QHELPERMANAGER_H
#include <qobject.h>
@@ -61,4 +61,4 @@
void slotStdinActivated( int );
};
-#endif /* Not def: UIM_HELPER_MANAGER_H */
+#endif /* Not def: UIM_QT4_IMMODULE_QHELPERMANAGER_H */
Modified: trunk/qt4/immodule/qtextutil.h
==============================================================================
--- trunk/qt4/immodule/qtextutil.h (original)
+++ trunk/qt4/immodule/qtextutil.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef IMMODULE_QTEXT_UTIL_H
-#define IMMODULE_QTEXT_UTIL_H
+#ifndef UIM_QT4_IMMODULE_QTEXTUTIL_H
+#define UIM_QT4_IMMODULE_QTEXTUTIL_H
#include <QObject>
Modified: trunk/qt4/immodule/quiminfomanager.h
==============================================================================
--- trunk/qt4/immodule/quiminfomanager.h (original)
+++ trunk/qt4/immodule/quiminfomanager.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef IMMODULE_QUIM_INFO_MANAGER_H
-#define IMMODULE_QUIM_INFO_MANAGER_H
+#ifndef UIM_QT4_IMMODULE_QUIMINFOMANAGER_H
+#define UIM_QT4_IMMODULE_QUIMINFOMANAGER_H
#include <Q3ValueList>
@@ -56,4 +56,4 @@
Q3ValueList<uimInfo> info;
};
-#endif /* IMMODULE_QUIM_INFO_MANAGER_H */
+#endif /* UIM_QT4_IMMODULE_QUIMINFOMANAGER_H */
Modified: trunk/qt4/immodule/quiminputcontext.h
==============================================================================
--- trunk/qt4/immodule/quiminputcontext.h (original)
+++ trunk/qt4/immodule/quiminputcontext.h Fri Mar 28 08:13:53 2008
@@ -32,8 +32,8 @@
*/
-#ifndef QUIMINPUT_CONTEXT_H
-#define QUIMINPUT_CONTEXT_H
+#ifndef UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
+#define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H
#include <qinputcontext.h>
#include <qevent.h>
@@ -174,4 +174,4 @@
static QUimHelperManager *m_HelperManager;
};
-#endif /* Not def: QUIMINPUT_CONTEXT_H */
+#endif /* Not def: UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_H */
Modified: trunk/qt4/immodule/quiminputcontext_compose.h
==============================================================================
--- trunk/qt4/immodule/quiminputcontext_compose.h (original)
+++ trunk/qt4/immodule/quiminputcontext_compose.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
*/
// -*- C++ -*-
-#ifndef QUIMINPUT_CONTEXT_COMPOSE_H
-#define QUIMINPUT_CONTEXT_COMPOSE_H
+#ifndef UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_COMPOSE_H
+#define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_COMPOSE_H
#include <X11/X.h>
#undef KeyPress
Modified: trunk/qt4/immodule/quiminputcontext_with_slave.h
==============================================================================
--- trunk/qt4/immodule/quiminputcontext_with_slave.h (original)
+++ trunk/qt4/immodule/quiminputcontext_with_slave.h Fri Mar 28
08:13:53 2008
@@ -32,8 +32,8 @@
*/
-#ifndef QUIMINPUT_CONTEXT_WITH_SLAVE_H
-#define QUIMINPUT_CONTEXT_WITH_SLAVE_H
+#ifndef UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_WITH_SLAVE_H
+#define UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_WITH_SLAVE_H
#include "quiminputcontext.h"
@@ -70,4 +70,4 @@
QInputContext *slave;
};
-#endif /* Not def: QUIMINPUT_CONTEXT_WITH_SLAVE_H */
+#endif /* Not def: UIM_QT4_IMMODULE_QUIMINPUTCONTEXT_WITH_SLAVE_H */
Modified: trunk/qt4/immodule/subwindow.h
==============================================================================
--- trunk/qt4/immodule/subwindow.h (original)
+++ trunk/qt4/immodule/subwindow.h Fri Mar 28 08:13:53 2008
@@ -30,8 +30,8 @@
SUCH DAMAGE.
*/
-#ifndef SUBWINDOW_H
-#define SUBWINDOW_H
+#ifndef UIM_QT4_IMMODULE_SUBWINDOW_H
+#define UIM_QT4_IMMODULE_SUBWINDOW_H
#include <Q3VBox>
#include <QTimer>
@@ -73,4 +73,4 @@
QTimer *m_hookTimer;
};
-#endif /* Not def: SUBWINDOW_H */
+#endif /* Not def: UIM_QT4_IMMODULE_SUBWINDOW_H */
Modified: trunk/replace/os_dep.h
==============================================================================
--- trunk/replace/os_dep.h (original)
+++ trunk/replace/os_dep.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
*/
-#ifndef OS_DEP_H
-#define OS_DEP_H
+#ifndef UIM_REPLACE_OS_DEP_H
+#define UIM_REPLACE_OS_DEP_H
/* stdint.h compatible type definitions */
#if HAVE_STDINT_H
@@ -122,4 +122,4 @@
#ifdef __cplusplus
}
#endif
-#endif
+#endif /* UIM_REPLACE_OS_DEP_H */
Modified: trunk/uim/bsdlook.h
==============================================================================
--- trunk/uim/bsdlook.h (original)
+++ trunk/uim/bsdlook.h Fri Mar 28 08:13:53 2008
@@ -31,8 +31,8 @@
*/
-#ifndef BSDLOOK_H
-#define BSDLOOK_H
+#ifndef UIM_BSDLOOK_H
+#define UIM_BSDLOOK_H
#include <stdlib.h>
@@ -50,4 +50,4 @@
void uim_look_set_option_ignore_case(int, uim_look_ctx *);
-#endif /* BSDLOOK_H */
+#endif /* UIM_BSDLOOK_H */
