summaryrefslogtreecommitdiffstats
path: root/plugins/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/src')
-rw-r--r--plugins/src/accessible/widgets/main.cpp4
-rw-r--r--plugins/src/accessible/widgets/qaccessiblewidget.cpp6
-rw-r--r--plugins/src/accessible/widgets/qaccessiblewidget.h4
-rw-r--r--plugins/src/imageformats/jpeg/main.cpp8
-rw-r--r--plugins/src/imageformats/mng/main.cpp8
-rw-r--r--plugins/src/imageformats/png/main.cpp8
-rw-r--r--plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp14
-rw-r--r--plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h2
-rw-r--r--plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp2
-rw-r--r--plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h2
-rw-r--r--plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp2
-rw-r--r--plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h2
-rw-r--r--plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp2
-rw-r--r--plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h2
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontext_x11.cpp68
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontextplugin.cpp2
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontextplugin.h2
-rw-r--r--plugins/src/inputmethods/xim/xim.pro2
18 files changed, 70 insertions, 70 deletions
diff --git a/plugins/src/accessible/widgets/main.cpp b/plugins/src/accessible/widgets/main.cpp
index e63219240..e96a836e4 100644
--- a/plugins/src/accessible/widgets/main.cpp
+++ b/plugins/src/accessible/widgets/main.cpp
@@ -60,7 +60,7 @@ TQStringList AccessibleFactory::featureList() const
list << "TQViewportWidget";
list << "TQClipperWidget";
list << "TQTextEdit";
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
list << "TQIconView";
#endif
list << "TQListView";
@@ -132,7 +132,7 @@ TQRESULT AccessibleFactory::createAccessibleInterface( const TQString &classname
*iface = new TQAccessibleViewport( object, object->parent()->parent() );
} else if ( classname == "TQTextEdit" ) {
*iface = new TQAccessibleTextEdit( object );
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
} else if ( classname == "TQIconView" ) {
*iface = new TQAccessibleIconView( object );
#endif
diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/plugins/src/accessible/widgets/qaccessiblewidget.cpp
index b40debbe7..319995655 100644
--- a/plugins/src/accessible/widgets/qaccessiblewidget.cpp
+++ b/plugins/src/accessible/widgets/qaccessiblewidget.cpp
@@ -1264,11 +1264,11 @@ TQAccessible::Role TQAccessibleDisplay::role( int control ) const
TQLabel *l = (TQLabel*)widget();
if ( l->pixmap() || l->picture() )
return Graphic;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
if ( l->picture() )
return Graphic;
#endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
if ( l->movie() )
return Animation;
#endif
@@ -2572,7 +2572,7 @@ TQMemArray<int> TQAccessibleListView::selection() const
return array;
}
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
/*!
\class TQAccessibleIconView qaccessiblewidget.h
\brief The TQAccessibleIconView class implements the TQAccessibleInterface for icon views.
diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.h b/plugins/src/accessible/widgets/qaccessiblewidget.h
index 903271747..8dc0db5db 100644
--- a/plugins/src/accessible/widgets/qaccessiblewidget.h
+++ b/plugins/src/accessible/widgets/qaccessiblewidget.h
@@ -17,7 +17,7 @@ class TQComboBox;
class TQTitleBar;
class TQWidgetStack;
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
class TQIconView;
#endif
@@ -368,7 +368,7 @@ protected:
TQListView *listView() const;
};
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
class TQAccessibleIconView : public TQAccessibleScrollView
{
public:
diff --git a/plugins/src/imageformats/jpeg/main.cpp b/plugins/src/imageformats/jpeg/main.cpp
index 516244c01..f329756f5 100644
--- a/plugins/src/imageformats/jpeg/main.cpp
+++ b/plugins/src/imageformats/jpeg/main.cpp
@@ -1,9 +1,9 @@
#include <ntqimageformatplugin.h>
-#ifndef QT_NO_IMAGEFORMATPLUGIN
+#ifndef TQT_NO_IMAGEFORMATPLUGIN
-#ifdef QT_NO_IMAGEIO_JPEG
-#undef QT_NO_IMAGEIO_JPEG
+#ifdef TQT_NO_IMAGEIO_JPEG
+#undef TQT_NO_IMAGEIO_JPEG
#endif
#include "../../../../src/kernel/qjpegio.cpp"
@@ -70,4 +70,4 @@ bool JPEGFormat::installIOHandler( const TQString &name )
Q_EXPORT_PLUGIN( JPEGFormat )
-#endif // QT_NO_IMAGEFORMATPLUGIN
+#endif // TQT_NO_IMAGEFORMATPLUGIN
diff --git a/plugins/src/imageformats/mng/main.cpp b/plugins/src/imageformats/mng/main.cpp
index 62e159a35..74aca8e76 100644
--- a/plugins/src/imageformats/mng/main.cpp
+++ b/plugins/src/imageformats/mng/main.cpp
@@ -1,9 +1,9 @@
#include <ntqimageformatplugin.h>
-#ifndef QT_NO_IMAGEFORMATPLUGIN
+#ifndef TQT_NO_IMAGEFORMATPLUGIN
-#ifdef QT_NO_IMAGEIO_MNG
-#undef QT_NO_IMAGEIO_MNG
+#ifdef TQT_NO_IMAGEIO_MNG
+#undef TQT_NO_IMAGEIO_MNG
#endif
#include "../../../../src/kernel/qmngio.cpp"
@@ -52,4 +52,4 @@ bool MNGFormat::installIOHandler( const TQString &name )
Q_EXPORT_PLUGIN( MNGFormat )
-#endif // QT_NO_IMAGEFORMATPLUGIN
+#endif // TQT_NO_IMAGEFORMATPLUGIN
diff --git a/plugins/src/imageformats/png/main.cpp b/plugins/src/imageformats/png/main.cpp
index fff207613..ce37abb44 100644
--- a/plugins/src/imageformats/png/main.cpp
+++ b/plugins/src/imageformats/png/main.cpp
@@ -1,9 +1,9 @@
#include <ntqimageformatplugin.h>
-#ifndef QT_NO_IMAGEFORMATPLUGIN
+#ifndef TQT_NO_IMAGEFORMATPLUGIN
-#ifdef QT_NO_IMAGEIO_PNG
-#undef QT_NO_IMAGEIO_PNG
+#ifdef TQT_NO_IMAGEIO_PNG
+#undef TQT_NO_IMAGEIO_PNG
#endif
#include "../../../../src/kernel/qpngio.cpp"
@@ -70,4 +70,4 @@ bool PNGFormat::installIOHandler( const TQString &name )
Q_EXPORT_PLUGIN( PNGFormat )
-#endif // QT_NO_IMAGEFORMATPLUGIN
+#endif // TQT_NO_IMAGEFORMATPLUGIN
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
index a721d9739..24259bd09 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -40,18 +40,18 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qmultiinputcontext.h"
#include <ntqinputcontextfactory.h>
#include <ntqstringlist.h>
#include <ntqpopupmenu.h>
-#ifndef QT_NO_IM_EXTENSIONS
+#ifndef TQT_NO_IM_EXTENSIONS
#include <ntqsettings.h>
#endif
#include <cstdlib>
-#define QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX
+#define TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX
TQMultiInputContext::TQMultiInputContext()
: TQInputContext(), _slave( 0 ), imIndex( 0 ), cachedFocus( FALSE ),
@@ -64,7 +64,7 @@ TQMultiInputContext::TQMultiInputContext()
if ( getenv( "QT_IM_MODULE" ) ) {
currentIMKey = getenv( "QT_IM_MODULE" );
} else {
-#ifndef QT_NO_IM_EXTENSIONS
+#ifndef TQT_NO_IM_EXTENSIONS
TQSettings settings;
currentIMKey = settings.readEntry( "/qt/DefaultInputMethod", "xim" );
#else
@@ -100,7 +100,7 @@ bool TQMultiInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event )
bool TQMultiInputContext::filterEvent( const TQEvent *event )
{
-#if !defined(QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX)
+#if !defined(TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX)
if ( event->type() == TQEvent::KeyPress ) {
TQKeyEvent *keyevent = (TQKeyEvent *)event;
@@ -236,7 +236,7 @@ bool TQMultiInputContext::isPreeditRelocationEnabled()
TQInputContext *TQMultiInputContext::slave()
{
if ( ! _slave ) {
-#if !defined(QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX)
+#if !defined(TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX)
changeInputMethod( imIndex );
#else
changeInputMethod( currentIMKey );
@@ -253,7 +253,7 @@ const TQInputContext *TQMultiInputContext::slave() const
void TQMultiInputContext::changeInputMethod( int newIndex )
{
-#if !defined(QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX)
+#if !defined(TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX)
TQStringList keys = TQInputContextFactory::keys();
if ( keys.size() == 0 )
return;
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
index 3ef3ba4d2..f6ae6bb84 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -43,7 +43,7 @@
#ifndef TQMULTIINPUTCONTEXT_H
#define TQMULTIINPUTCONTEXT_H
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include <ntqnamespace.h>
#include <ntqwidget.h>
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
index 08d0a1ddd..942ee0251 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qmultiinputcontext.h"
#include "qmultiinputcontextplugin.h"
#include <ntqinputcontextplugin.h>
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
index 95c987925..5a399412a 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qmultiinputcontext.h"
#include <ntqinputcontextplugin.h>
#include <ntqstringlist.h>
diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp
index 9f6014be5..f4d8e59ff 100644
--- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qnoneinputcontextplugin.h"
#include <ntqinputcontextfactory.h>
#include <ntqsettings.h>
diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
index 8b5fd2212..9c877e5c3 100644
--- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
+++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include <ntqinputcontextplugin.h>
#include <ntqstringlist.h>
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp
index a7d2bb320..539d35a6d 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qsimpleinputcontext.h"
#include "qsimpleinputcontextplugin.h"
#include <ntqinputcontextplugin.h>
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
index 84e23b312..c1988b5f3 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qsimpleinputcontext.h"
#include <ntqinputcontextplugin.h>
#include <ntqstringlist.h>
diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
index b631d1916..e9dbcdd29 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
+++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp
@@ -41,7 +41,7 @@ const int XKeyRelease = KeyRelease;
#undef KeyPress
#undef KeyRelease
-#if !defined(QT_NO_IM)
+#if !defined(TQT_NO_IM)
#include "qplatformdefs.h"
@@ -55,7 +55,7 @@ const int XKeyRelease = KeyRelease;
#include <stdlib.h>
#include <limits.h>
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
#define XK_MISCELLANY
#define XK_LATIN1
@@ -75,7 +75,7 @@ extern int qt_ximComposingKeycode;
extern TQTextCodec * qt_input_mapper;
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
#if defined(Q_C_CALLBACKS)
extern "C" {
@@ -107,9 +107,9 @@ extern "C" {
}
#endif // Q_C_CALLBACKS
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
/* The cache here is needed, as X11 leaks a few kb for every
XFreeFontSet call, so we avoid creating and deletion of fontsets as
@@ -334,7 +334,7 @@ extern "C" {
}
#endif // Q_C_CALLBACKS
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
@@ -353,7 +353,7 @@ void TQXIMInputContext::setHolderWidget( TQWidget *widget )
TQInputContext::setHolderWidget( widget );
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
fontsetRefCount++;
if (! qt_xim) {
tqWarning("TQInputContext: no input method context available");
@@ -428,14 +428,14 @@ void TQXIMInputContext::setHolderWidget( TQWidget *widget )
if( ! ximContextList )
ximContextList = new TQPtrList<TQXIMInputContext>;
ximContextList->append( this );
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
}
TQXIMInputContext::~TQXIMInputContext()
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if (ic)
XDestroyIC((XIC) ic);
@@ -464,14 +464,14 @@ TQXIMInputContext::~TQXIMInputContext()
ximContextList = 0;
}
}
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
ic = 0;
}
void TQXIMInputContext::init_xim()
{
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
if(!isInitXIM)
isInitXIM = TRUE;
@@ -503,7 +503,7 @@ void TQXIMInputContext::init_xim()
else
TQXIMInputContext::create_xim();
#endif // USE_X11R6_XIM
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
}
@@ -512,7 +512,7 @@ void TQXIMInputContext::init_xim()
*/
void TQXIMInputContext::create_xim()
{
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
Display *appDpy = TQPaintDevice::x11AppDisplay();
qt_xim = XOpenIM( appDpy, 0, 0, 0 );
if ( qt_xim ) {
@@ -571,7 +571,7 @@ void TQXIMInputContext::create_xim()
TQXIMInputContext::close_xim();
}
}
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
}
@@ -580,7 +580,7 @@ void TQXIMInputContext::create_xim()
*/
void TQXIMInputContext::close_xim()
{
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
TQString errMsg( "TQXIMInputContext::close_xim() has been called" );
// Calling XCloseIM gives a Purify FMR error
@@ -597,13 +597,13 @@ void TQXIMInputContext::close_xim()
}
// ximContextList will be deleted in ~TQXIMInputContext
}
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
}
bool TQXIMInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event )
{
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
int xkey_keycode = event->xkey.keycode;
if ( XFilterEvent( event, keywidget->topLevelWidget()->winId() ) ) {
qt_ximComposingKeycode = xkey_keycode; // ### not documented in xlib
@@ -694,7 +694,7 @@ bool TQXIMInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event )
return TRUE;
}
}
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
return FALSE;
}
@@ -711,7 +711,7 @@ void TQXIMInputContext::sendIMEvent( TQEvent::Type type, const TQString &text,
void TQXIMInputContext::reset()
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if ( focusWidget() && isComposing() && ! composingText.isNull() ) {
#ifdef QT_XIM_DEBUG
tqDebug("TQXIMInputContext::reset: composing - sending IMEnd (empty) to %p",
@@ -725,18 +725,18 @@ void TQXIMInputContext::reset()
if (mb)
XFree(mb);
}
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
}
void TQXIMInputContext::resetClientState()
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
composingText = TQString::null;
if ( selectedChars.size() < 128 )
selectedChars.resize( 128 );
selectedChars.fill( 0 );
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
}
@@ -785,7 +785,7 @@ void TQXIMInputContext::mouseHandler( int , TQEvent::Type type,
void TQXIMInputContext::setComposePosition(int x, int y)
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if (qt_xim && ic) {
XPoint point;
point.x = x;
@@ -799,13 +799,13 @@ void TQXIMInputContext::setComposePosition(int x, int y)
XSetICValues((XIC) ic, XNPreeditAttributes, preedit_attr, (char *) 0);
XFree(preedit_attr);
}
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
}
void TQXIMInputContext::setComposeArea(int x, int y, int w, int h)
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if (qt_xim && ic) {
XRectangle rect;
rect.x = x;
@@ -826,7 +826,7 @@ void TQXIMInputContext::setComposeArea(int x, int y, int w, int h)
void TQXIMInputContext::setXFontSet(const TQFont &f)
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if (font == f) return; // nothing to do
font = f;
@@ -848,7 +848,7 @@ int TQXIMInputContext::lookupString(XKeyEvent *event, TQCString &chars,
{
int count = 0;
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if (qt_xim && ic) {
count = XmbLookupString((XIC) ic, event, chars.data(),
chars.size(), key, status);
@@ -860,25 +860,25 @@ int TQXIMInputContext::lookupString(XKeyEvent *event, TQCString &chars,
}
}
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
return count;
}
void TQXIMInputContext::setFocus()
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if ( qt_xim && ic )
XSetICFocus((XIC) ic);
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
}
void TQXIMInputContext::unsetFocus()
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if (qt_xim && ic)
XUnsetICFocus((XIC) ic);
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
// Don't reset Japanese input context here. Japanese input context
// sometimes contains a whole paragraph and has minutes of
@@ -911,7 +911,7 @@ TQString TQXIMInputContext::identifierName()
TQString TQXIMInputContext::language()
{
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
if ( qt_xim ) {
TQString locale( XLocaleOfIM( qt_xim ) );
@@ -927,4 +927,4 @@ TQString TQXIMInputContext::language()
return _language;
}
-#endif //QT_NO_IM
+#endif //TQT_NO_IM
diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp
index 381b808a8..9b35ef9a0 100644
--- a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp
+++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qximinputcontext.h"
#include "qximinputcontextplugin.h"
#include <ntqinputcontextplugin.h>
diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.h b/plugins/src/inputmethods/xim/qximinputcontextplugin.h
index d930eeecd..6ba643352 100644
--- a/plugins/src/inputmethods/xim/qximinputcontextplugin.h
+++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.h
@@ -40,7 +40,7 @@
**
**********************************************************************/
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
#include "qximinputcontext.h"
#include <ntqinputcontextplugin.h>
#include <ntqstringlist.h>
diff --git a/plugins/src/inputmethods/xim/xim.pro b/plugins/src/inputmethods/xim/xim.pro
index 994f0d443..ae83967fb 100644
--- a/plugins/src/inputmethods/xim/xim.pro
+++ b/plugins/src/inputmethods/xim/xim.pro
@@ -6,7 +6,7 @@ INCLUDEPATH += .
CONFIG += qt warn_on debug plugin
target.path += $$plugins.path/inputmethods
INSTALLS += target
-DEFINES += QT_NO_XINERAMA
+DEFINES += TQT_NO_XINERAMA
# Input
HEADERS += qximinputcontext.h \