Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

27 files changed, 152 insertions, 152 deletions

diff --git a/nsplugins/NSPluginCallbackIface.h b/nsplugins/NSPluginCallbackIface.h
index 6b23e87a9..33e9f85c3 100644
--- a/nsplugins/NSPluginCallbackIface.h
+++ b/nsplugins/NSPluginCallbackIface.h
@@ -37,7 +37,7 @@ k_dcop:
   virtual ASYNC requestURL(TQString url, TQString target) = 0;
   virtual ASYNC postURL(TQString url, TQString target, TQByteArray data, TQString mime) = 0;
   virtual ASYNC statusMessage( TQString msg ) = 0;
-  virtual ASYNC evalJavaScript( TQ_INT32 id, TQString script ) = 0;
+  virtual ASYNC evalJavaScript( Q_INT32 id, TQString script ) = 0;
 
 };
 
diff --git a/nsplugins/README b/nsplugins/README
index da6b9fd60..5b45594ab 100644
--- a/nsplugins/README
+++ b/nsplugins/README
@@ -1,7 +1,7 @@
 nsplugins
 =========
 
-The 'nsplugins' directory tqcontains various tools used to utilize Netscape(R)
+The 'nsplugins' directory contains various tools used to utilize Netscape(R)
 browser plugins in KDE applications.
 
  - ./       - common headers and utilities
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 09736870c..3824334c0 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -63,12 +63,12 @@ NSPluginInstance::NSPluginInstance(TQWidget *parent)
 void NSPluginInstance::init(const TQCString& app, const TQCString& obj)
 {
     stub = new NSPluginInstanceIface_stub( app, obj );
-    TQGridLayout *_tqlayout = new TQGridLayout(this, 1, 1);
+    TQGridLayout *_layout = new TQGridLayout(this, 1, 1);
     KConfig cfg("kcmnspluginrc", false);
     cfg.setGroup("Misc");
     if (cfg.readBoolEntry("demandLoad", false)) {
         _button = new TQPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
-        _tqlayout->addWidget(_button, 0, 0);
+        _layout->addWidget(_button, 0, 0);
         connect(_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadPlugin()));
         show();
     } else {
@@ -130,7 +130,7 @@ void NSPluginInstance::windowChanged(WId w)
     setBackgroundMode(w == 0 ? TQWidget::PaletteBackground : TQWidget::NoBackground);
     if (w == 0) {
         // FIXME: Put a notice here to tell the user that it crashed.
-        tqrepaint();
+        repaint();
     }
 }
 
@@ -174,13 +174,13 @@ void NSPluginInstance::focusOutEvent( TQFocusEvent* event )
 
 void NSPluginInstance::displayPlugin()
 {
-  tqApp->syncX(); // process pending X commands
+  qApp->syncX(); // process pending X commands
   stub->displayPlugin();
 }
 
 void NSPluginInstance::resizePlugin( int w, int h )
 {
-  tqApp->syncX();
+  qApp->syncX();
   stub->resizePlugin( w, h );
 }
 
diff --git a/nsplugins/nspluginloader.h b/nsplugins/nspluginloader.h
index 8561c6df2..1748bb504 100644
--- a/nsplugins/nspluginloader.h
+++ b/nsplugins/nspluginloader.h
@@ -69,7 +69,7 @@ protected:
     bool inited;
     int resize_count;
     TQPushButton *_button;
-    TQGridLayout *_tqlayout;
+    TQGridLayout *_layout;
     NSPluginInstanceIface_stub* stub;
 private: // wrappers
     void displayPlugin();
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 0996725ea..e7580db93 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -90,7 +90,7 @@ TQString PluginLiveConnectExtension::evalJavaScript( const TQString & script )
     kdDebug(1432) << "PLUGIN:LiveConnect::evalJavaScript " << script << endl;
     ArgList args;
     TQString jscode;
-    jscode.sprintf("this.__nsplugin=eval(\"%s\")",  TQString(script).tqreplace('\\', "\\\\").tqreplace('"', "\\\"").latin1());
+    jscode.sprintf("this.__nsplugin=eval(\"%s\")",  TQString(script).replace('\\', "\\\\").replace('"', "\\\"").latin1());
     //kdDebug(1432) << "String is [" << jscode << "]" << endl;
     args.push_back(qMakePair(KParts::LiveConnectExtension::TypeString, jscode));
     TQString nsplugin("Undefined");
@@ -171,13 +171,13 @@ PluginFactory::~PluginFactory()
    s_instance = 0;
 }
 
-KParts::Part * PluginFactory::createPartObject(TQWidget *tqparentWidget, const char *widgetName,
+KParts::Part * PluginFactory::createPartObject(TQWidget *parentWidget, const char *widgetName,
                                          TQObject *parent, const char *name,
                                          const char *classname, const TQStringList &args)
 {
     Q_UNUSED(classname)
     kdDebug(1432) << "PluginFactory::create" << endl;
-    KParts::Part *obj = new PluginPart(tqparentWidget, widgetName, parent, name, args);
+    KParts::Part *obj = new PluginPart(parentWidget, widgetName, parent, name, args);
     return obj;
 }
 
@@ -201,7 +201,7 @@ KAboutData *PluginFactory::aboutData()
 /**************************************************************************/
 
 
-PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent,
+PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
                        const char *name, const TQStringList &args)
     : KParts::ReadOnlyPart(parent, name), _widget(0), _args(args),
       _destructed(0L)
@@ -226,7 +226,7 @@ PluginPart::PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObjec
     _callback = new NSPluginCallback(this);
 
     // create a canvas to insert our widget
-    _canvas = new PluginCanvasWidget( tqparentWidget, widgetName );
+    _canvas = new PluginCanvasWidget( parentWidget, widgetName );
     //_canvas->setFocusPolicy( TQWidget::ClickFocus );
     _canvas->setFocusPolicy( TQWidget::WheelFocus );
     _canvas->setBackgroundMode( TQWidget::NoBackground );
@@ -307,7 +307,7 @@ bool PluginPart::openURL(const KURL &url)
         _widget = inst;
     } else {
         TQLabel *label = new TQLabel( i18n("Unable to load Netscape plugin for %1").arg(url.url()), _canvas );
-        label->tqsetAlignment( AlignCenter | WordBreak );
+        label->setAlignment( AlignCenter | WordBreak );
         _widget = label;
     }
 
diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h
index cd17d1431..012d5443f 100644
--- a/nsplugins/plugin_part.h
+++ b/nsplugins/plugin_part.h
@@ -67,7 +67,7 @@ public:
   PluginFactory();
   virtual ~PluginFactory();
 
-  virtual KParts::Part * createPartObject(TQWidget *tqparentWidget = 0, const char *widgetName = 0,
+  virtual KParts::Part * createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0,
   		            	    TQObject *parent = 0, const char *name = 0,
   			            const char *classname = "KParts::Part",
    			            const TQStringList &args = TQStringList());
@@ -102,7 +102,7 @@ class PluginPart: public KParts::ReadOnlyPart
 {
   Q_OBJECT
 public:
-  PluginPart(TQWidget *tqparentWidget, const char *widgetName, TQObject *parent,
+  PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
              const char *name, const TQStringList &args = TQStringList());
   virtual ~PluginPart();
 
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index fbe5f8da3..6914deb93 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -130,7 +130,7 @@ void deletePluginMimeTypes()
     }
 
     for ( unsigned int i=0; i<dirs.count(); i++ ) {
-        if ( !dirs[i].tqcontains(".") ) {
+        if ( !dirs[i].contains(".") ) {
 
             // check all mime types for X-KDE-nsplugin flag
             kdDebug(1433) << " - Looking in " << dirs[i] << endl;
@@ -251,14 +251,14 @@ int tryCheck(int write_fd, const TQString &absFile)
         NPError err = func_GetValue( 0, NPPVpluginNameString,
                                      (void*)&buf );
         if ( err==NPERR_NO_ERROR )
-            name = TQString::tqfromLatin1( buf );
+            name = TQString::fromLatin1( buf );
         kdDebug() << "name = " << name << endl;
 
         // get name
         NPError nperr = func_GetValue( 0, NPPVpluginDescriptionString,
                                      (void*)&buf );
         if ( nperr==NPERR_NO_ERROR )
-            description = TQString::tqfromLatin1( buf );
+            description = TQString::fromLatin1( buf );
         kdDebug() << "description = " << description << endl;
     }
     else
@@ -283,7 +283,7 @@ int tryCheck(int write_fd, const TQString &absFile)
 
     // remove version info, as it is not used at the moment
     TQRegExp versionRegExp(";version=[^:]*:");
-    mimeInfo.tqreplace( versionRegExp, ":");
+    mimeInfo.replace( versionRegExp, ":");
 
     // unload plugin lib
     kdDebug(1433) << " - unloading plugin" << endl;
@@ -404,10 +404,10 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
            for ( type=types.begin(); type!=types.end(); ++type ) {
 
               kdDebug(1433) << " - type=" << *type << endl;
-              name = name.tqreplace( ':', "%3A" );
+              name = name.replace( ':', "%3A" );
 
               TQString entry = name + ":" + *type;
-              if ( !mimeInfoList.tqcontains( entry ) ) {
+              if ( !mimeInfoList.contains( entry ) ) {
                   if (!actuallyUsing) {
                       // note the plugin name
                       cache << "[" << absFile << "]" << endl;
@@ -444,7 +444,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
     static int depth = 0; // avoid recursion because of symlink circles
     depth++;
     for ( unsigned int i=0; i<dirs.count(); i++ ) {
-        if ( depth<8 && !dirs[i].tqcontains(".") )
+        if ( depth<8 && !dirs[i].contains(".") )
             scanDirectory( dirs.absFilePath(dirs[i]), mimeInfoList, cache );
     }
     depth--;
@@ -620,7 +620,7 @@ int main( int argc, char **argv )
           TQString desc = info[3];
 
           // append to global mime type list
-          if ( !mimeTypes.tqcontains(type) ) {
+          if ( !mimeTypes.contains(type) ) {
               kdDebug(1433) << " - mimeType=" << type << endl;
               mimeTypes.append( type );
 
diff --git a/nsplugins/sdk/jni.h b/nsplugins/sdk/jni.h
index d77820edc..863075afa 100644
--- a/nsplugins/sdk/jni.h
+++ b/nsplugins/sdk/jni.h
@@ -27,7 +27,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-/* jni_md.h tqcontains the machine-dependent typedefs for jbyte, jint 
+/* jni_md.h contains the machine-dependent typedefs for jbyte, jint 
    and jlong */ 
 
 #include "jni_md.h"
@@ -580,7 +580,7 @@ struct JNINativeInterface_ {
       (JNIEnv *env, jclass clazz, jfieldID fieldID, jdouble value);
 
     jstring (JNICALL *NewString)
-      (JNIEnv *env, const jchar *tqunicode, jsize len);
+      (JNIEnv *env, const jchar *unicode, jsize len);
     jsize (JNICALL *GetStringLength)
       (JNIEnv *env, jstring str);
     const jchar *(JNICALL *GetStringChars)
@@ -1508,8 +1508,8 @@ struct JNIEnv_ {
       functions->SetStaticDoubleField(this,clazz,fieldID,value);
     }
 
-    jstring NewString(const jchar *tqunicode, jsize len) {
-        return functions->NewString(this,tqunicode,len);
+    jstring NewString(const jchar *unicode, jsize len) {
+        return functions->NewString(this,unicode,len);
     }
     jsize GetStringLength(jstring str) {
         return functions->GetStringLength(this,str);
diff --git a/nsplugins/sdk/jni_md.h b/nsplugins/sdk/jni_md.h
index 40517d20a..c0aa11159 100644
--- a/nsplugins/sdk/jni_md.h
+++ b/nsplugins/sdk/jni_md.h
@@ -29,7 +29,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
diff --git a/nsplugins/sdk/jri.h b/nsplugins/sdk/jri.h
index 8327a7dce..f29945b94 100644
--- a/nsplugins/sdk/jri.h
+++ b/nsplugins/sdk/jri.h
@@ -28,7 +28,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the NPL, the GPL or the LGPL.
@@ -341,8 +341,8 @@ typedef const JRIEnvInterface*	JRIEnv;
 #define JRI_SetStaticFieldDouble(env, clazz, fieldID, value)	\
 	(((*(env))->SetStaticFieldDouble)(env, JRI_SetStaticFieldDouble_op, clazz, fieldID, value))
 
-#define JRI_NewString(env, tqunicode, len)	\
-	(((*(env))->NewString)(env, JRI_NewString_op, tqunicode, len))
+#define JRI_NewString(env, unicode, len)	\
+	(((*(env))->NewString)(env, JRI_NewString_op, unicode, len))
 
 #define JRI_GetStringLength(env, string)	\
 	(((*(env))->GetStringLength)(env, JRI_GetStringLength_op, string))
diff --git a/nsplugins/sdk/jri_md.h b/nsplugins/sdk/jri_md.h
index 12111871b..5ae741ed3 100644
--- a/nsplugins/sdk/jri_md.h
+++ b/nsplugins/sdk/jri_md.h
@@ -28,7 +28,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the NPL, the GPL or the LGPL.
@@ -202,7 +202,7 @@ typedef long			jint;
  ******************************************************************************/
 
 /*
-** Bit tqmasking macros.  (n must be <= 31 to be portable)
+** Bit masking macros.  (n must be <= 31 to be portable)
 */
 #define JRI_BIT(n)			((juint)1 << (n))
 #define JRI_BITMASK(n)		(JRI_BIT(n) - 1)
diff --git a/nsplugins/sdk/jritypes.h b/nsplugins/sdk/jritypes.h
index e578c33ed..ddeb6331c 100644
--- a/nsplugins/sdk/jritypes.h
+++ b/nsplugins/sdk/jritypes.h
@@ -28,7 +28,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the NPL, the GPL or the LGPL.
diff --git a/nsplugins/sdk/npapi.h b/nsplugins/sdk/npapi.h
index 0f3b292a6..67b91b680 100644
--- a/nsplugins/sdk/npapi.h
+++ b/nsplugins/sdk/npapi.h
@@ -29,7 +29,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the NPL, the GPL or the LGPL.
@@ -329,14 +329,14 @@ typedef struct
 
 
 /*
- *   The following tqmasks are applied on certain platforms to NPNV and 
+ *   The following masks are applied on certain platforms to NPNV and 
  *   NPPV selectors that pass around pointers to COM interfaces. Newer 
  *   compilers on some platforms may generate vtables that are not 
  *   compatible with older compilers. To prevent older plugins from 
- *   not understanding a new browser's ABI, these tqmasks change the 
+ *   not understanding a new browser's ABI, these masks change the 
  *   values of those selectors on those platforms. To remain backwards
  *   compatible with differenet versions of the browser, plugins can 
- *   use these tqmasks to dynamically determine and use the correct C++
+ *   use these masks to dynamically determine and use the correct C++
  *   ABI that the browser is expecting. This does not apply to Windows 
  *   as Microsoft's COM ABI will likely not change.
  */
@@ -677,7 +677,7 @@ NPError NP_LOADDS NPN_NewStream(NPP instance, NPMIMEType type,
                                 const char* target, NPStream** stream);
 int32   NP_LOADDS NPN_Write(NPP instance, NPStream* stream, int32 len, void* buffer);
 NPError NP_LOADDS NPN_DestroyStream(NPP instance, NPStream* stream, NPReason reason);
-void    NP_LOADDS NPN_tqStatus(NPP instance, const char* message);
+void    NP_LOADDS NPN_Status(NPP instance, const char* message);
 const char* NP_LOADDS	NPN_UserAgent(NPP instance);
 void*   NP_LOADDS NPN_MemAlloc(uint32 size);
 void    NP_LOADDS NPN_MemFree(void* ptr);
diff --git a/nsplugins/sdk/npruntime.h b/nsplugins/sdk/npruntime.h
index 06a8e1ee6..5a8423390 100644
--- a/nsplugins/sdk/npruntime.h
+++ b/nsplugins/sdk/npruntime.h
@@ -66,7 +66,7 @@
 #define _NP_RUNTIME_H_
 
 #include <tqglobal.h>
-typedef TQ_UINT32 uint32_t;
+typedef Q_UINT32 uint32_t;
 
 #ifdef __cplusplus
 extern "C" {
@@ -306,7 +306,7 @@ typedef bool (*NPRemovePropertyFunctionPtr)(NPObject *npobj,
 
     NPInvalidateFunctionPtr is called by the scripting environment
     when the native code is shutdown.  Any attempt to message a
-    NPObject instance after the tqinvalidate callback has been
+    NPObject instance after the invalidate callback has been
     called will result in undefined behavior, even if the native code
     is still retaining those NPObject instances.  (The runtime
     will typically return immediately, with 0 or NULL, from an attempt
@@ -318,7 +318,7 @@ struct NPClass
     uint32_t structVersion;
     NPAllocateFunctionPtr allocate;
     NPDeallocateFunctionPtr deallocate;
-    NPInvalidateFunctionPtr tqinvalidate;
+    NPInvalidateFunctionPtr invalidate;
     NPHasMethodFunctionPtr hasMethod;
     NPInvokeFunctionPtr invoke;
     NPInvokeDefaultFunctionPtr invokeDefault;
diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h
index 01aef8ee9..dff545d9f 100644
--- a/nsplugins/sdk/npupp.h
+++ b/nsplugins/sdk/npupp.h
@@ -28,7 +28,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
@@ -770,28 +770,28 @@ typedef NPError (* NP_LOADDS NPN_DestroyStreamUPP)(NPP instance, NPStream* strea
 #endif
 
 
-/* NPN_tqStatus */
+/* NPN_Status */
 
 #if _NPUPP_USE_UPP_
 
-typedef UniversalProcPtr NPN_tqStatusUPP;
+typedef UniversalProcPtr NPN_StatusUPP;
 enum {
-	uppNPN_tqStatusProcInfo = kThinkCStackBased
+	uppNPN_StatusProcInfo = kThinkCStackBased
 		| STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
 		| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
 };
 
-#define NewNPN_tqStatusProc(FUNC)		\
-		(NPN_tqStatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_tqStatusProcInfo, GetCurrentArchitecture())
-#define CallNPN_tqStatusProc(FUNC, npp, msg)		\
-		(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_tqStatusProcInfo, (npp), (msg))	
+#define NewNPN_StatusProc(FUNC)		\
+		(NPN_StatusUPP) NewRoutineDescriptor((ProcPtr)(FUNC), uppNPN_StatusProcInfo, GetCurrentArchitecture())
+#define CallNPN_StatusProc(FUNC, npp, msg)		\
+		(void)CallUniversalProc((UniversalProcPtr)(FUNC), uppNPN_StatusProcInfo, (npp), (msg))	
 
 #else
 
-typedef void (* NP_LOADDS NPN_tqStatusUPP)(NPP instance, const char* message);
-#define NewNPN_tqStatusProc(FUNC)		\
-		((NPN_tqStatusUPP) (FUNC))
-#define CallNPN_tqStatusProc(FUNC, npp, msg)		\
+typedef void (* NP_LOADDS NPN_StatusUPP)(NPP instance, const char* message);
+#define NewNPN_StatusProc(FUNC)		\
+		((NPN_StatusUPP) (FUNC))
+#define CallNPN_StatusProc(FUNC, npp, msg)		\
 		(*(FUNC))((npp), (msg))	
 
 #endif
@@ -1678,7 +1678,7 @@ typedef struct _NPNetscapeFuncs {
     NPN_NewStreamUPP newstream;
     NPN_WriteUPP write;
     NPN_DestroyStreamUPP destroystream;
-    NPN_tqStatusUPP status;
+    NPN_StatusUPP status;
     NPN_UserAgentUPP uagent;
     NPN_MemAllocUPP memalloc;
     NPN_MemFreeUPP memfree;
@@ -1690,8 +1690,8 @@ typedef struct _NPNetscapeFuncs {
     NPN_PostURLNotifyUPP posturlnotify;
     NPN_GetValueUPP getvalue;
     NPN_SetValueUPP setvalue;
-    NPN_InvalidateRectUPP tqinvalidaterect;
-    NPN_InvalidateRegionUPP tqinvalidateregion;
+    NPN_InvalidateRectUPP invalidaterect;
+    NPN_InvalidateRegionUPP invalidateregion;
     NPN_ForceRedrawUPP forceredraw;
     NPN_GetStringIdentifierUPP getstringidentifier;
     NPN_GetStringIdentifiersUPP getstringidentifiers;
diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h
index 0d4c27705..e96cfcf67 100644
--- a/nsplugins/sdk/obsolete/protypes.h
+++ b/nsplugins/sdk/obsolete/protypes.h
@@ -26,7 +26,7 @@
  * version of this file only under the terms of the GPL and not to
  * allow others to use your version of this file under the MPL,
  * indicate your decision by deleting the provisions above and
- * tqreplace them with the notice and other provisions required by
+ * replace them with the notice and other provisions required by
  * the GPL.  If you do not delete the provisions above, a recipient
  * may use your version of this file under either the MPL or the
  * GPL.
diff --git a/nsplugins/sdk/prcpucfg.h b/nsplugins/sdk/prcpucfg.h
index b3b41df79..b2d1cebdb 100644
--- a/nsplugins/sdk/prcpucfg.h
+++ b/nsplugins/sdk/prcpucfg.h
@@ -28,7 +28,7 @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and tqreplace them with the notice
+ * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
diff --git a/nsplugins/sdk/prtypes.h b/nsplugins/sdk/prtypes.h
index 28944cd54..b68361082 100644
--- a/nsplugins/sdk/prtypes.h
+++ b/nsplugins/sdk/prtypes.h
@@ -26,7 +26,7 @@
  * version of this file only under the terms of the GPL and not to
  * allow others to use your version of this file under the MPL,
  * indicate your decision by deleting the provisions above and
- * tqreplace them with the notice and other provisions required by
+ * replace them with the notice and other provisions required by
  * the GPL.  If you do not delete the provisions above, a recipient
  * may use your version of this file under either the MPL or the
  * GPL.
@@ -231,7 +231,7 @@
 ** MACROS:      PR_BIT
 **              PR_BITMASK
 ** DESCRIPTION:
-** Bit tqmasking macros.  XXX n must be <= 31 to be portable
+** Bit masking macros.  XXX n must be <= 31 to be portable
 ***********************************************************************/
 #define PR_BIT(n)       ((PRUint32)1 << (n))
 #define PR_BITMASK(n)   (PR_BIT(n) - 1)
@@ -459,10 +459,10 @@ typedef PRIntn PRBool;
 typedef PRUint8 PRPackedBool;
 
 /*
-** tqStatus code used by some routines that have a single point of failure or 
+** Status code used by some routines that have a single point of failure or 
 ** special status return.
 */
-typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRtqStatus;
+typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
 
 #ifdef MOZ_UNICODE
 /*
diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp
index 5c3e1bb3d..0d9eadf29 100644
--- a/nsplugins/test/testnsplugin.cpp
+++ b/nsplugins/test/testnsplugin.cpp
@@ -41,7 +41,7 @@ TestNSPlugin::TestNSPlugin()
    m_client = new TQWidget( this, "m_client" );
    setCentralWidget( m_client );
    m_client->show();
-   m_tqlayout = new TQHBoxLayout( m_client );
+   m_layout = new TQHBoxLayout( m_client );
 
    // file menu
    KStdAction::openNew( this, TQT_SLOT(newView()), actionCollection());
@@ -90,7 +90,7 @@ void TestNSPlugin::newView()
       m_plugins.append( win );
       connect( win, TQT_SIGNAL(destroyed(NSPluginInstance *)),
                this, TQT_SLOT(viewDestroyed(NSPluginInstance *)) );
-      m_tqlayout->addWidget( win );
+      m_layout->addWidget( win );
       win->show();
    } else
    {
diff --git a/nsplugins/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index 944235996..949de2986 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -49,7 +49,7 @@ protected:
   NSPluginLoader *m_loader;
   TQPtrList<TQWidget> m_plugins;
   TQWidget *m_client;
-  TQBoxLayout *m_tqlayout;
+  TQBoxLayout *m_layout;
 };
 
 
diff --git a/nsplugins/viewer/NSPluginClassIface.h b/nsplugins/viewer/NSPluginClassIface.h
index c9051821d..7eb71f27d 100644
--- a/nsplugins/viewer/NSPluginClassIface.h
+++ b/nsplugins/viewer/NSPluginClassIface.h
@@ -47,10 +47,10 @@ class NSPluginClassIface : virtual public DCOPObject
 
 k_dcop:
 
-  virtual DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed,
+  virtual DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed,
                               TQStringList argn, TQStringList argv,
-                              TQString appId, TQString callbackId, TQ_INT8 reload,
-                              TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed) = 0;
+                              TQString appId, TQString callbackId, Q_INT8 reload,
+                              Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed) = 0;
   virtual TQString getMIMEDescription() = 0;
 
 };
@@ -66,11 +66,11 @@ k_dcop:
 
   virtual int winId() = 0;
 
-  virtual int setWindow(TQ_INT8 remove=0) = 0;
+  virtual int setWindow(Q_INT8 remove=0) = 0;
 
-  virtual void resizePlugin(TQ_INT32 w, TQ_INT32 h) = 0;
+  virtual void resizePlugin(Q_INT32 w, Q_INT32 h) = 0;
 
-  virtual void javascriptResult(TQ_INT32 id, TQString result) = 0;
+  virtual void javascriptResult(Q_INT32 id, TQString result) = 0;
 
   virtual void displayPlugin() = 0;
   
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index 2443ce739..9f5f43d51 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -159,11 +159,11 @@ void reparentChildrenOf(TQWidget* parent)
 
 void qwidget_realize(
         Widget                widget,
-        XtValueMask*          tqmask,
+        XtValueMask*          mask,
         XSetWindowAttributes* attributes
     )
 {
-    widgetClassRec.core_class.realize(widget, tqmask, attributes);
+    widgetClassRec.core_class.realize(widget, mask, attributes);
     KXtWidget* qxtw = ((QWidgetRec*)widget)->qwidget.qxtwidget;
     if (XtWindow(widget) != qxtw->winId()) {
         qxtw->create(XtWindow(widget), FALSE, FALSE);
@@ -205,7 +205,7 @@ QWidgetClassRec qwidgetClassRec = {
     /* version                  */      XtVersion,
     /* callback_private         */      0,
     /* tm_table                 */      XtInheritTranslations,
-    /* query_tqgeometry           */      XtInheritQueryGeometry,
+    /* query_geometry           */      XtInheritQueryGeometry,
     /* display_accelerator      */      XtInheritDisplayAccelerator,
     /* extension                */      0
   },
@@ -255,7 +255,7 @@ static
 void np_event_proc( XEvent* e )
 {
     Widget xtw = XtWindowToWidget( e->xany.display, e->xany.window );
-    if ( xtw && tqApp->loopLevel() > 0 ) {
+    if ( xtw && qApp->loopLevel() > 0 ) {
         // Allow Xt to process the event
         qt_np_cascade_event_handler[e->type]( e );
     }
@@ -442,7 +442,7 @@ void KXtWidget::init(const char* name, WidgetClass widget_class,
 
   Use this constructor to utilize Qt widgets in an Xt/Motif
   application.  The KXtWidget is a TQWidget, so you can create
-  subwidgets, tqlayouts, etc. using Qt functionality.
+  subwidgets, layouts, etc. using Qt functionality.
 */
 KXtWidget::KXtWidget(const char* name, Widget parent, bool managed) :
     TQWidget( 0, name, WResizeNoErase )
@@ -505,7 +505,7 @@ KXtWidget::~KXtWidget()
 
     if ( need_reroot ) {
         hide();
-        XReparentWindow(qt_xdisplay(), winId(), tqApp->desktop()->winId(),
+        XReparentWindow(qt_xdisplay(), winId(), qApp->desktop()->winId(),
             x(), y());
     }
 
@@ -567,7 +567,7 @@ bool KXtWidget::isActiveWindow() const
     TQWidget *w = find( (WId)win );
     if ( w ) {
         // We know that window
-        return w->tqtopLevelWidget() == tqtopLevelWidget();
+        return w->topLevelWidget() == topLevelWidget();
     } else {
         // Window still may be a parent (if top-level is foreign window)
         Window root, parent;
diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h
index 89b168069..44f05db19 100644
--- a/nsplugins/viewer/kxt.h
+++ b/nsplugins/viewer/kxt.h
@@ -75,7 +75,7 @@ class KXtWidget : public TQWidget {
 		    Widget parent, TQWidget* qparent,
 		    ArgList args, Cardinal num_args,
 		    bool managed);
-    friend void qwidget_realize( Widget widget, XtValueMask* tqmask,
+    friend void qwidget_realize( Widget widget, XtValueMask* mask,
 				 XSetWindowAttributes* attributes );
 
 public:
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index a32653039..be313b52b 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -138,7 +138,7 @@ void g_NPN_ForceRedraw(NPP /*instance*/)
 }
 
 
-// tqinvalidate rect
+// invalidate rect
 void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/)
 {
    // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api7.html#999503
@@ -147,7 +147,7 @@ void g_NPN_InvalidateRect(NPP /*instance*/, NPRect* /*invalidRect*/)
 }
 
 
-// tqinvalidate region
+// invalidate region
 void g_NPN_InvalidateRegion(NPP /*instance*/, NPRegion /*invalidRegion*/)
 {
    // http://devedge.netscape.com/library/manuals/2002/plugin/1.0/npn_api8.html#999528
@@ -252,8 +252,8 @@ NPError g_NPN_GetURL(NPP instance, const char *url, const char *target)
 
    NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
    if (inst) {
-      inst->requestURL( TQString::tqfromLatin1(url), TQString::null,
-                        TQString::tqfromLatin1(target), 0 );
+      inst->requestURL( TQString::fromLatin1(url), TQString::null,
+                        TQString::fromLatin1(target), 0 );
    }
 
    return NPERR_NO_ERROR;
@@ -267,8 +267,8 @@ NPError g_NPN_GetURLNotify(NPP instance, const char *url, const char *target,
    NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
    if (inst) {
       kdDebug(1431) << "g_NPN_GetURLNotify: ndata=" << (void*)inst << endl;
-      inst->requestURL( TQString::tqfromLatin1(url), TQString::null,
-                        TQString::tqfromLatin1(target), notifyData, true );
+      inst->requestURL( TQString::fromLatin1(url), TQString::null,
+                        TQString::fromLatin1(target), notifyData, true );
    }
 
    return NPERR_NO_ERROR;
@@ -318,7 +318,7 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
                break;
             }
 
-            TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
+            TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
 
             previousStart = &buf[l];
             previousCR = true;
@@ -360,9 +360,9 @@ NPError g_NPN_PostURLNotify(NPP instance, const char* url, const char* target,
    }
 
    NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
-   if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) {
-      inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(),
-                     TQString::tqfromLatin1(target), notifyData, args, true );
+   if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
+      inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
+                     TQString::fromLatin1(target), notifyData, args, true );
    } else {
       // Unsupported / insecure
       return NPERR_INVALID_URL;
@@ -415,7 +415,7 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
                break;
             }
 
-            TQString thisLine = TQString::tqfromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
+            TQString thisLine = TQString::fromLatin1(previousStart, &buf[l-1] - previousStart).stripWhiteSpace();
 
             previousStart = &buf[l];
             previousCR = true;
@@ -457,9 +457,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
    }
 
    NSPluginInstance *inst = static_cast<NSPluginInstance*>(instance->ndata);
-   if (inst && !inst->normalizedURL(TQString::tqfromLatin1(url)).isNull()) {
-      inst->postURL( TQString::tqfromLatin1(url), postdata, args.contentType(),
-                     TQString::tqfromLatin1(target), 0L, args, false );
+   if (inst && !inst->normalizedURL(TQString::fromLatin1(url)).isNull()) {
+      inst->postURL( TQString::fromLatin1(url), postdata, args.contentType(),
+                     TQString::fromLatin1(target), 0L, args, false );
    } else {
       // Unsupported / insecure
       return NPERR_INVALID_URL;
@@ -470,9 +470,9 @@ NPError g_NPN_PostURL(NPP instance, const char* url, const char* target,
 
 
 // display status message
-void g_NPN_tqStatus(NPP instance, const char *message)
+void g_NPN_Status(NPP instance, const char *message)
 {
-   kdDebug(1431) << "g_NPN_tqStatus(): " << message << endl;
+   kdDebug(1431) << "g_NPN_Status(): " << message << endl;
 
    if (!instance)
       return;
@@ -480,7 +480,7 @@ void g_NPN_tqStatus(NPP instance, const char *message)
    // turn into an instance signal
    NSPluginInstance *inst = (NSPluginInstance*) instance->ndata;
 
-   inst->emittqStatus(message);
+   inst->emitStatus(message);
 }
 
 
@@ -816,11 +816,11 @@ void NSPluginInstance::timer()
 
                     kdDebug() << "posting to " << url << endl;
 
-                    emittqStatus( i18n("Submitting data to %1").arg(url) );
+                    emitStatus( i18n("Submitting data to %1").arg(url) );
                     s->post( url, req.data, req.mime, req.notify, req.args );
                 } else if (url.lower().startsWith("javascript:")){
                     if (_callback) {
-                        static TQ_INT32 _jsrequestid = 0;
+                        static Q_INT32 _jsrequestid = 0;
 			_jsrequests.insert(_jsrequestid, new Request(req));
                         _callback->evalJavaScript(_jsrequestid++, url.mid(11));
                     } else {
@@ -835,7 +835,7 @@ void NSPluginInstance::timer()
 
                     kdDebug() << "getting " << url << endl;
 
-                    emittqStatus( i18n("Requesting %1").arg(url) );
+                    emitStatus( i18n("Requesting %1").arg(url) );
                     s->get( url, req.mime, req.notify, req.reload );
                 }
 
@@ -897,7 +897,7 @@ void NSPluginInstance::postURL( const TQString &url, const TQByteArray& data,
 }
 
 
-void NSPluginInstance::emittqStatus(const TQString &message)
+void NSPluginInstance::emitStatus(const TQString &message)
 {
     if( _callback )
       _callback->statusMessage( message );
@@ -907,7 +907,7 @@ void NSPluginInstance::emittqStatus(const TQString &message)
 void NSPluginInstance::streamFinished( NSPluginStreamBase* strm )
 {
    kdDebug(1431) << "-> NSPluginInstance::streamFinished" << endl;
-   emittqStatus( TQString::null );
+   emitStatus( TQString::null );
    _streams.setAutoDelete(false); // Don't delete it yet!!  we get called from
                                   // its slot!
    _streams.remove(strm);
@@ -916,7 +916,7 @@ void NSPluginInstance::streamFinished( NSPluginStreamBase* strm )
    _timer->start( 100, true );
 }
 
-int NSPluginInstance::setWindow(TQ_INT8 remove)
+int NSPluginInstance::setWindow(Q_INT8 remove)
 {
    if (remove)
    {
@@ -980,7 +980,7 @@ static void resizeWidgets(Window w, int width, int height) {
 }
 
 
-void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h)
+void NSPluginInstance::resizePlugin(Q_INT32 w, Q_INT32 h)
 {
    if (w == _width && h == _height)
       return;
@@ -1021,7 +1021,7 @@ void NSPluginInstance::resizePlugin(TQ_INT32 w, TQ_INT32 h)
 }
 
 
-void NSPluginInstance::javascriptResult(TQ_INT32 id, TQString result) {
+void NSPluginInstance::javascriptResult(Q_INT32 id, TQString result) {
     TQMap<int, Request*>::iterator i = _jsrequests.find( id );
     if (i != _jsrequests.end()) {
         Request *req = i.data();
@@ -1295,7 +1295,7 @@ void NSPluginViewer::shutdown()
 #if QT_VERSION < 0x030100
    quitXt();
 #else
-   tqApp->quit();
+   qApp->quit();
 #endif
 }
 
@@ -1422,7 +1422,7 @@ int NSPluginClass::initialize()
    _nsFuncs.newstream = g_NPN_NewStream;
    _nsFuncs.write = g_NPN_Write;
    _nsFuncs.destroystream = g_NPN_DestroyStream;
-   _nsFuncs.status = g_NPN_tqStatus;
+   _nsFuncs.status = g_NPN_Status;
    _nsFuncs.uagent = g_NPN_UserAgent;
    _nsFuncs.memalloc = g_NPN_MemAlloc;
    _nsFuncs.memfree = g_NPN_MemFree;
@@ -1434,8 +1434,8 @@ int NSPluginClass::initialize()
    _nsFuncs.posturlnotify = g_NPN_PostURLNotify;
    _nsFuncs.getvalue = g_NPN_GetValue;
    _nsFuncs.setvalue = g_NPN_SetValue;
-   _nsFuncs.tqinvalidaterect = g_NPN_InvalidateRect;
-   _nsFuncs.tqinvalidateregion = g_NPN_InvalidateRegion;
+   _nsFuncs.invalidaterect = g_NPN_InvalidateRect;
+   _nsFuncs.invalidateregion = g_NPN_InvalidateRegion;
    _nsFuncs.forceredraw = g_NPN_ForceRedraw;
 
    // initialize plugin
@@ -1458,10 +1458,10 @@ void NSPluginClass::shutdown()
 }
 
 
-DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, TQ_INT8 embed,
+DCOPRef NSPluginClass::newInstance( TQString url, TQString mimeType, Q_INT8 embed,
                                     TQStringList argn, TQStringList argv,
                                     TQString appId, TQString callbackId,
-                                    TQ_INT8 reload, TQ_INT8 doPost, TQByteArray postData, TQ_UINT32 xembed )
+                                    Q_INT8 reload, Q_INT8 doPost, TQByteArray postData, Q_UINT32 xembed )
 {
    kdDebug(1431) << "-> NSPluginClass::NewInstance" << endl;
 
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 893b1c292..da92edd76 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -172,9 +172,9 @@ public:
   // DCOP functions
   void shutdown();
   int winId() { return _form != 0 ? XtWindow(_form) : 0; }
-  int setWindow(TQ_INT8 remove=0);
-  void resizePlugin(TQ_INT32 w, TQ_INT32 h);
-  void javascriptResult(TQ_INT32 id, TQString result);
+  int setWindow(Q_INT8 remove=0);
+  void resizePlugin(Q_INT32 w, Q_INT32 h);
+  void javascriptResult(Q_INT32 id, TQString result);
   void displayPlugin();
   void gotFocusIn();
   void gotFocusOut();
@@ -200,7 +200,7 @@ public:
   uint16 HandleEvent(void *event);
 
   // signal emitters
-  void emittqStatus( const TQString &message);
+  void emitStatus( const TQString &message);
   void requestURL( const TQString &url, const TQString &mime,
 		   const TQString &target, void *notify, bool forceNotify = false, bool reload = false );
   void postURL( const TQString &url, const TQByteArray& data, const TQString &mime,
@@ -281,10 +281,10 @@ public:
   ~NSPluginClass();
 
   TQString getMIMEDescription();
-  DCOPRef newInstance(TQString url, TQString mimeType, TQ_INT8 embed,
+  DCOPRef newInstance(TQString url, TQString mimeType, Q_INT8 embed,
                       TQStringList argn, TQStringList argv,
-                      TQString appId, TQString callbackId, TQ_INT8 reload, TQ_INT8 post,
-                      TQByteArray postData, TQ_UINT32 xembed );
+                      TQString appId, TQString callbackId, Q_INT8 reload, Q_INT8 post,
+                      TQByteArray postData, Q_UINT32 xembed );
   void destroyInstance( NSPluginInstance* inst );
   bool error() { return _error; }
 
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index b6eac9a4c..b34c1e03c 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -174,7 +174,7 @@ Boolean qmotif_event_dispatcher( XEvent *event )
     }
 
     last_xevent = event;
-    bool delivered = ( tqApp->x11ProcessEvent( event ) != -1 );
+    bool delivered = ( qApp->x11ProcessEvent( event ) != -1 );
     last_xevent = 0;
     if ( qMotif ) {
 	switch ( event->type ) {
@@ -309,15 +309,15 @@ XtAppContext QXtEventLoop::applicationContext() const
 
 void QXtEventLoop::appStartingUp()
 {
-    int argc = tqApp->argc();
+    int argc = qApp->argc();
     XtDisplayInitialize( d->appContext,
 			 TQPaintDevice::x11AppDisplay(),
-			 tqApp->name(),
+			 qApp->name(),
 			 d->applicationClass,
 			 d->options,
 			 d->numOptions,
 			 &argc,
-			 tqApp->argv() );
+			 qApp->argv() );
     d->hookMeUp();
 }
 
@@ -362,18 +362,18 @@ void qmotif_socknot_handler( XtPointer pointer, int *, XtInputId *id )
  */
 void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
 {
-    XtInputMask tqmask;
+    XtInputMask mask;
     switch ( notifier->type() ) {
     case TQSocketNotifier::Read:
-	tqmask = XtInputReadMask;
+	mask = XtInputReadMask;
 	break;
 
     case TQSocketNotifier::Write:
-	tqmask = XtInputWriteMask;
+	mask = XtInputWriteMask;
 	break;
 
     case TQSocketNotifier::Exception:
-	tqmask = XtInputExceptMask;
+	mask = XtInputExceptMask;
 	break;
 
     default:
@@ -382,7 +382,7 @@ void QXtEventLoop::registerSocketNotifier( TQSocketNotifier *notifier )
     }
 
     XtInputId id = XtAppAddInput( d->appContext,
-				  notifier->socket(), (XtPointer) tqmask,
+				  notifier->socket(), (XtPointer) mask,
 				  qmotif_socknot_handler, this );
     d->socknotDict.insert( id, notifier );
 
@@ -420,7 +420,7 @@ void qmotif_timeout_handler( XtPointer, XtIntervalId * )
  */
 bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
 {
-    // Qt uses posted events to do lots of delayed operations, like tqrepaints... these
+    // Qt uses posted events to do lots of delayed operations, like repaints... these
     // need to be delivered before we go to sleep
     TQApplication::sendPostedEvents();
 
@@ -436,23 +436,23 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
 			     qmotif_timeout_handler, 0 );
     }
 
-    // get the pending event tqmask from Xt and process the next event
-    XtInputMask pendingtqmask = XtAppPending( d->appContext );
-    XtInputMask tqmask = pendingtqmask;
-    if ( pendingtqmask & XtIMTimer ) {
-	tqmask &= ~XtIMTimer;
+    // get the pending event mask from Xt and process the next event
+    XtInputMask pendingmask = XtAppPending( d->appContext );
+    XtInputMask mask = pendingmask;
+    if ( pendingmask & XtIMTimer ) {
+	mask &= ~XtIMTimer;
 	// zero timers will starve the Xt X event dispatcher... so process
 	// something *instead* of a timer first...
-	if ( tqmask != 0 )
-	    XtAppProcessEvent( d->appContext, tqmask );
+	if ( mask != 0 )
+	    XtAppProcessEvent( d->appContext, mask );
 	// and process a timer afterwards
-	tqmask = pendingtqmask & XtIMTimer;
+	mask = pendingmask & XtIMTimer;
     }
 
     if ( ( flags & WaitForMore ) )
 	XtAppProcessEvent( d->appContext, XtIMAll );
     else
-	XtAppProcessEvent( d->appContext, tqmask );
+	XtAppProcessEvent( d->appContext, mask );
 
     int nevents = 0;
     if ( ! ( flags & ExcludeSocketNotifiers ) )
@@ -463,7 +463,7 @@ bool QXtEventLoop::processEvents( ProcessEventsFlags flags )
     }
     d->activate_timers = FALSE;
 
-    return ( (flags & WaitForMore) || ( pendingtqmask != 0 ) || nevents > 0 );
+    return ( (flags & WaitForMore) || ( pendingmask != 0 ) || nevents > 0 );
 }
 
 #include "qxteventloop.moc"
diff --git a/nsplugins/wrapper/wrapper.c b/nsplugins/wrapper/wrapper.c
index 734219413..965868426 100644
--- a/nsplugins/wrapper/wrapper.c
+++ b/nsplugins/wrapper/wrapper.c
@@ -439,11 +439,11 @@ NPError MyNPN_DestroyStream(NPP instance, NPStream* stream,
 }
 
 static
-void MyNPN_tqStatus(NPP instance, const char* message)
+void MyNPN_Status(NPP instance, const char* message)
 {	
-	DEB(ef, "-> NPN_tqStatus( %x, %s )\n", instance, message);	
+	DEB(ef, "-> NPN_Status( %x, %s )\n", instance, message);	
 	gNetscapeFuncs.status( instance, message );		
-	DEB(ef, "<- NPN_tqStatus\n");	
+	DEB(ef, "<- NPN_Status\n");	
 }
 
 static
@@ -544,7 +544,7 @@ static
 void MyNPN_InvalidateRect(NPP instance, NPRect *invalidRect)
 {
 	DEB(ef, "-> NPN_InvalidateRect( %x, 0x%x )\n", instance, invalidRect);	
-	gNetscapeFuncs.tqinvalidaterect( instance, invalidRect );		
+	gNetscapeFuncs.invalidaterect( instance, invalidRect );		
 	DEB(ef, "<- NPN_InvalidateRect\n");	
 }
 
@@ -552,7 +552,7 @@ static
 void MyNPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
 {
 	DEB(ef, "-> NPN_InvalidateRegion( %x, 0x%x )\n", instance, invalidRegion);	
-	gNetscapeFuncs.tqinvalidateregion( instance, invalidRegion );		
+	gNetscapeFuncs.invalidateregion( instance, invalidRegion );		
 	DEB(ef, "<- NPN_InvalidateRegion\n");	
 }
 
@@ -605,8 +605,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 	DEB(ef, "nsTable->posturlnotify = 0x%x\n", nsTable->posturlnotify);
 	DEB(ef, "nsTable->getvalue = 0x%x\n", nsTable->getvalue);
 	DEB(ef, "nsTable->setvalue = 0x%x\n", nsTable->setvalue);
-	DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", nsTable->tqinvalidaterect);
-	DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", nsTable->tqinvalidateregion);
+	DEB(ef, "nsTable->invalidaterect = 0x%x\n", nsTable->invalidaterect);
+	DEB(ef, "nsTable->invalidateregion = 0x%x\n", nsTable->invalidateregion);
 	DEB(ef, "nsTable->forceredraw = 0x%x\n", nsTable->forceredraw);
 
 	DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);
@@ -647,7 +647,7 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 	gExtNetscapeFuncs.newstream = MyNPN_NewStream;
 	gExtNetscapeFuncs.write = MyNPN_Write;
 	gExtNetscapeFuncs.destroystream = MyNPN_DestroyStream;
-	gExtNetscapeFuncs.status = MyNPN_tqStatus;
+	gExtNetscapeFuncs.status = MyNPN_Status;
   	gExtNetscapeFuncs.uagent = MyNPN_UserAgent;
 	/*gExtNetscapeFuncs.memalloc = MyNPN_MemAlloc;
 	gExtNetscapeFuncs.memfree = MyNPN_MemFree;
@@ -659,8 +659,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 	gExtNetscapeFuncs.posturlnotify = MyNPN_PostURLNotify;
 	gExtNetscapeFuncs.getvalue = MyNPN_GetValue;
 	gExtNetscapeFuncs.setvalue = MyNPN_SetValue;
-	gExtNetscapeFuncs.tqinvalidaterect = MyNPN_InvalidateRect;
-	gExtNetscapeFuncs.tqinvalidateregion = MyNPN_InvalidateRegion;
+	gExtNetscapeFuncs.invalidaterect = MyNPN_InvalidateRect;
+	gExtNetscapeFuncs.invalidateregion = MyNPN_InvalidateRegion;
 	gExtNetscapeFuncs.forceredraw = MyNPN_ForceRedraw;	
 	
 	gPluginFuncs.size = sizeof( gPluginFuncs );
@@ -709,8 +709,8 @@ NPError NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs)
 		DEB(ef, "nsTable->posturlnotify = 0x%x\n", gExtNetscapeFuncs.posturlnotify);
 		DEB(ef, "nsTable->getvalue = 0x%x\n", gExtNetscapeFuncs.getvalue);
 		DEB(ef, "nsTable->setvalue = 0x%x\n", gExtNetscapeFuncs.setvalue);
-		DEB(ef, "nsTable->tqinvalidaterect = 0x%x\n", gExtNetscapeFuncs.tqinvalidaterect);
-		DEB(ef, "nsTable->tqinvalidateregion = 0x%x\n", gExtNetscapeFuncs.tqinvalidateregion);
+		DEB(ef, "nsTable->invalidaterect = 0x%x\n", gExtNetscapeFuncs.invalidaterect);
+		DEB(ef, "nsTable->invalidateregion = 0x%x\n", gExtNetscapeFuncs.invalidateregion);
 		DEB(ef, "nsTable->forceredraw = 0x%x\n", gExtNetscapeFuncs.forceredraw);
 
 		DEB(ef, "pluginFuncs->size = %d\n", pluginFuncs->size);