Author: yamakenz
Date: Sat Sep 29 17:24:35 2007
New Revision: 5022
Added:
trunk/qt4/immodule/debug.h
Modified:
trunk/qt4/immodule/Makefile.am
trunk/qt4/immodule/candidatewindow.cpp
trunk/qt4/immodule/plugin.cpp
trunk/qt4/immodule/quiminputcontext.cpp
trunk/qt4/immodule/quiminputcontextplugin.pro.in
Log:
* qt4/immodule/debug.h
- New file
- (qDebug): Redefine as dummy macro if QT_NO_DEBUG. Thanks UTUMI
Hirosi for the report
* qt4/immodule/plugin.cpp
* qt4/immodule/quiminputcontext.cpp
* qt4/immodule/candidatewindow.cpp
- Include debug.h
* qt4/immodule/quiminputcontextplugin.pro.in
- (HEADERS): Add debug.h
* qt4/immodule/Makefile.am
- (EXTRA_DIST): Ditto
Modified: trunk/qt4/immodule/Makefile.am
==============================================================================
--- trunk/qt4/immodule/Makefile.am (original)
+++ trunk/qt4/immodule/Makefile.am Sat Sep 29 17:24:35 2007
@@ -19,7 +19,8 @@
quiminputcontext_with_slave.h \
quiminputcontext_with_slave.cpp
-EXTRA_DIST += qhelpermanager.h \
+EXTRA_DIST += debug.h \
+ qhelpermanager.h \
quiminputcontext.h \
quiminputcontext_compose.h \
plugin.h \
Modified: trunk/qt4/immodule/candidatewindow.cpp
==============================================================================
--- trunk/qt4/immodule/candidatewindow.cpp (original)
+++ trunk/qt4/immodule/candidatewindow.cpp Sat Sep 29 17:24:35 2007
@@ -42,6 +42,7 @@
#include "uim/uim.h"
+#include "debug.h"
#include "candidatewindow.h"
#include "subwindow.h"
#include "quiminputcontext.h"
Added: trunk/qt4/immodule/debug.h
==============================================================================
--- (empty file)
+++ trunk/qt4/immodule/debug.h Sat Sep 29 17:24:35 2007
@@ -0,0 +1,44 @@
+/*
+
+Copyright (c) 2007 uim Project http://code.google.com/p/uim/
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+3. Neither the name of authors nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+*/
+
+#ifndef _DEBUG_H_
+#define _DEBUG_H_
+
+#include <QtGlobal>
+
+#ifdef QT_NO_DEBUG
+#undef qDebug
+#define qDebug if (true) ; else qDebug
+#endif
+
+#endif /* !defined(_DEBUG_H_) */
Modified: trunk/qt4/immodule/plugin.cpp
==============================================================================
--- trunk/qt4/immodule/plugin.cpp (original)
+++ trunk/qt4/immodule/plugin.cpp Sat Sep 29 17:24:35 2007
@@ -11,6 +11,7 @@
#include "uim/uim.h"
#include "uim/uim-x-util.h"
+#include "debug.h"
#include "quiminfomanager.h"
#include "quiminputcontext_with_slave.h"
Modified: trunk/qt4/immodule/quiminputcontext.cpp
==============================================================================
--- trunk/qt4/immodule/quiminputcontext.cpp (original)
+++ trunk/qt4/immodule/quiminputcontext.cpp Sat Sep 29 17:24:35 2007
@@ -15,6 +15,7 @@
#include <ctype.h>
#include <string.h>
+#include "debug.h"
#include "quiminputcontext.h"
#include "quiminputcontext_compose.h"
#include "plugin.h"
Modified: trunk/qt4/immodule/quiminputcontextplugin.pro.in
==============================================================================
--- trunk/qt4/immodule/quiminputcontextplugin.pro.in (original)
+++ trunk/qt4/immodule/quiminputcontextplugin.pro.in Sat Sep 29 17:24:35 2007
@@ -22,7 +22,8 @@
# Input
-HEADERS += qhelpermanager.h \
+HEADERS += debug.h \
+ qhelpermanager.h \
quiminputcontext.h \
quiminputcontext_compose.h \
plugin.h \
