Replace Q_WS_* defines with TQ_WS_* equivalents

This is the first part of the replacement process.
Usage of Q_WS_* has been replaced with the equivalent TQ_WS_*.
Definition of Q_WS_* has been mirrored into TQ_WS_* defines, to allow
TDE code to continue building till replacement is carried over to all
other modules.
Once that is completed, the original Q_WS_* defines will
be removed.

Signed-off-by: Michele Calgaro <[email protected]>

3 files changed, 9 insertions, 9 deletions

diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
index 4ff19772f..13ecf8112 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp
@@ -90,12 +90,12 @@ TQString TQMultiInputContext::language()
 }
 
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
 bool TQMultiInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event )
 {
     return ( slave() ) ? slave()->x11FilterEvent( keywidget, event ) : FALSE;
 }
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 
 
 bool TQMultiInputContext::filterEvent( const TQEvent *event )
@@ -189,7 +189,7 @@ void TQMultiInputContext::postIMEvent( TQObject *receiver, TQIMEvent *event )
 }
 
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
 TQWidget *TQMultiInputContext::focusWidget() const
 {
     return ( slave() ) ? slave()->focusWidget() : 0;
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
index fd10891fc..d64b54449 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -63,9 +63,9 @@ public:
     TQString identifierName();
     TQString language();
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
     bool x11FilterEvent( TQWidget *keywidget, XEvent *event );
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
     bool filterEvent( const TQEvent *event );
     void reset();
 
@@ -81,7 +81,7 @@ public:
     TQPtrList<TQInputContextMenu> *menus();
     TQPopupMenu *createImSelPopup();    
 
-#if defined(Q_WS_X11)
+#if defined(TQ_WS_X11)
     TQWidget *focusWidget() const;
     TQWidget *holderWidget() const;
 
diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h
index 243827355..d8b56a0b4 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext.h
+++ b/plugins/src/inputmethods/xim/qximinputcontext.h
@@ -62,7 +62,7 @@ class TQFont;
 class TQString;
 
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include "ntqmemarray.h"
 #include "ntqwindowdefs.h"
 #include <private/qt_x11_p.h>
@@ -72,7 +72,7 @@ class TQXIMInputContext : public TQInputContext
 {
     TQ_OBJECT
 public:
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
     TQXIMInputContext();
     ~TQXIMInputContext();
 
@@ -121,7 +121,7 @@ private:
 
     int lookupString(XKeyEvent *, TQCString &, KeySym *, Status *) const;
 
-#endif // Q_WS_X11
+#endif // TQ_WS_X11
 };