Rename a number of old tq methods that are no longer tq specific

11 files changed, 33 insertions, 33 deletions

diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index d5cd54347..88df852b4 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include <tqregexp.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kiconloader.h>
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index db7e214ec..347064fcc 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -36,11 +36,11 @@
 #include <kconfig.h>
 #include <dcopclient.h>
 #include <dcopstub.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobject.h>
 #include <tqpushbutton.h>
 #include <qxembed.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqtimer.h>
 #include <tqregexp.h>
 
@@ -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();
     }
 }
 
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 354cb1cf5..350da1098 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -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/pluginscan.cpp b/nsplugins/pluginscan.cpp
index ce2e238bc..a20ba6e8e 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -34,7 +34,7 @@
 
 #include <tqdir.h>
 #include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqregexp.h>
 #include <tqbuffer.h>
 
@@ -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
@@ -346,7 +346,7 @@ void scanDirectory( TQString dir, TQStringList &mimeInfoList,
         // open the library and ask for the mimetype
         kdDebug(1433) << " - opening " << absFile << endl;
 
-        cache.tqdevice()->flush();
+        cache.device()->flush();
         // fork, so that a crash in the plugin won't stop the scanning of other plugins
         int pipes[2];
         if (pipe(pipes) != 0) continue;
diff --git a/nsplugins/sdk/jni.h b/nsplugins/sdk/jni.h
index 7ef133a51..863075afa 100644
--- a/nsplugins/sdk/jni.h
+++ b/nsplugins/sdk/jni.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/jri.h b/nsplugins/sdk/jri.h
index 62d542a8b..f29945b94 100644
--- a/nsplugins/sdk/jri.h
+++ b/nsplugins/sdk/jri.h
@@ -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/npruntime.h b/nsplugins/sdk/npruntime.h
index 06a8e1ee6..45f3f0a9a 100644
--- a/nsplugins/sdk/npruntime.h
+++ b/nsplugins/sdk/npruntime.h
@@ -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/test/testnsplugin.h b/nsplugins/test/testnsplugin.h
index 949de2986..c34016ff8 100644
--- a/nsplugins/test/testnsplugin.h
+++ b/nsplugins/test/testnsplugin.h
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqwidget.h>
 #include <kmainwindow.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqptrlist.h>
 
 class NSPluginLoader;
diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp
index c9c535957..1d85f674a 100644
--- a/nsplugins/viewer/kxt.cpp
+++ b/nsplugins/viewer/kxt.cpp
@@ -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/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 0f56f055f..310210c66 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;
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index ba9a23886..e15b52eb0 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -190,7 +190,7 @@ bool qt_set_socket_handler( int sockfd, int type, TQObject *obj, bool enable )
           }
 #endif
           if ( p )
-              _notifiers[type].insert( _notifiers[type].tqat(), sn );
+              _notifiers[type].insert( _notifiers[type].at(), sn );
           else
               _notifiers[type].append( sn );
       }