8 files changed, 20 insertions, 20 deletions
diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp
index 3a1f7c897..96d703833 100644
--- a/tdehtml/ecma/kjs_window.cpp
+++ b/tdehtml/ecma/kjs_window.cpp
@@ -42,7 +42,7 @@
 #include <tdeparts/browserinterface.h>
 #include <twin.h>
 
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
 #include <twinmodule.h> // schroder
 #endif
 
@@ -111,7 +111,7 @@ namespace KJS {
     TQGuardedPtr<TDEHTMLPart> part;
   };
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
   class KonquerorFunc : public DOMFunction {
   public:
     KonquerorFunc(ExecState *exec, const Konqueror* k, const char* name)
@@ -160,7 +160,7 @@ Value Screen::get(ExecState *exec, const Identifier &p) const
 
 Value Screen::getValueProperty(ExecState *exec, int token) const
 {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
   KWinModule info(0, KWinModule::INFO_DESKTOP);
 #endif
   TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget();
@@ -177,7 +177,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
     return Number(m.depth());
   }
   case AvailLeft: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.x()-sg.x());
 #else
@@ -185,7 +185,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
 #endif
   }
   case AvailTop: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.y()-sg.y());
 #else
@@ -193,7 +193,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
 #endif
   }
   case AvailHeight: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.height());
 #else
@@ -201,7 +201,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const
 #endif
   }
   case AvailWidth: {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
     TQRect clipped = info.workArea().intersect(sg);
     return Number(clipped.width());
 #else
@@ -848,7 +848,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
       const_cast<Window *>(this)->put(exec, "clientInformation", nav, DontDelete|ReadOnly|Internal);
       return nav;
     }
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
     case _Konqueror: {
       Value k( new Konqueror(part) );
       const_cast<Window *>(this)->put(exec, "konqueror", k, DontDelete|ReadOnly|Internal);
@@ -860,7 +860,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const
     case OuterHeight:
     case OuterWidth:
     {
-#if defined Q_WS_X11 && ! defined K_WS_QTONLY
+#if defined TQ_WS_X11 && ! defined K_WS_QTONLY
       if (!part->widget())
         return Number(0);
       KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId());
@@ -2865,7 +2865,7 @@ Value HistoryFunc::tryCall(ExecState *exec, Object &thisObj, const List &args)
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
 
 const ClassInfo Konqueror::info = { "Konqueror", 0, 0, 0 };
 
diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index 2fa2e2dda..539131fd5 100644
--- a/tdehtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -288,7 +288,7 @@ namespace KJS {
     TQGuardedPtr<tdehtml::ChildFrame> m_frame;
   };
 
-#ifdef Q_WS_QWS
+#ifdef TQ_WS_QWS
   class Konqueror : public ObjectImp {
     friend class KonquerorFunc;
   public:
diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp
index 0248b81b6..8c530af61 100644
--- a/tdehtml/html/html_objectimpl.cpp
+++ b/tdehtml/html/html_objectimpl.cpp
@@ -267,7 +267,7 @@ void HTMLAppletElementImpl::attach()
 {
     TDEHTMLView* w = getDocument()->view();
 
-#ifndef Q_WS_QWS // FIXME?
+#ifndef TQ_WS_QWS // FIXME?
     DOMString codeBase = getAttribute( ATTR_CODEBASE );
     DOMString code = getAttribute( ATTR_CODE );
     if ( !codeBase.isEmpty() )
diff --git a/tdehtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h
index 24db025b4..4912af125 100644
--- a/tdehtml/java/kjavaappletwidget.h
+++ b/tdehtml/java/kjavaappletwidget.h
@@ -23,7 +23,7 @@
 #define KJAVAAPPLETWIDGET_H
 
 #include <tqwidget.h>
-#ifndef Q_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded
+#ifndef TQ_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded
 #include "java/kjavaappletcontext.h"
 #include "java/kjavaapplet.h"
 #include <qxembed.h>
diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp
index eb9762897..6f60c90e6 100644
--- a/tdehtml/rendering/render_applet.cpp
+++ b/tdehtml/rendering/render_applet.cpp
@@ -32,7 +32,7 @@
 
 #include <tqlabel.h>
 
-#ifndef Q_WS_QWS // We don't have Java in Qt Embedded
+#ifndef TQ_WS_QWS // We don't have Java in Qt Embedded
 
 #include "java/kjavaappletwidget.h"
 #include "misc/htmltags.h"
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 31e49c53f..81c228e90 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -1251,7 +1251,7 @@ bool TDEHTMLPart::javaEnabled() const
 {
   if (onlyLocalReferences()) return false;
 
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
   if( d->m_bJavaOverride )
       return d->m_bJavaForce;
   return d->m_bJavaEnabled;
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index d81643556..132624fdd 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -220,7 +220,7 @@ public:
     m_jsedlg = 0;
     m_formNotification = TDEHTMLPart::NoNotification;
 
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
     m_javaContext = 0;
 #endif
     m_cacheId = 0;
@@ -298,7 +298,7 @@ public:
 #ifndef TDEHTML_NO_WALLET
     delete m_wallet;
 #endif
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
     //delete m_javaContext;
 #endif
   }
@@ -350,7 +350,7 @@ public:
   int m_dcop_counter;
   DCOPObject *m_dcopobject;
 
-#ifndef Q_WS_QWS
+#ifndef TQ_WS_QWS
   KJavaAppletContext *m_javaContext;
 #endif
 
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index eb8b6aac9..bbc45da95 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -94,7 +94,7 @@
 
 //#define DEBUG_PIXEL
 
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 #endif
@@ -1268,7 +1268,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse )
     }
 
     if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) {
-#ifdef Q_WS_X11
+#ifdef TQ_WS_X11
         TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window-new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true );
 
         if (d->cursor_icon_widget) {