From 73c08b592db45af554b9f21029bc549d70f683ab Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:46:05 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 nsplugins/viewer/kxt.cpp      |  2 +-
 nsplugins/viewer/nsplugin.cpp | 28 ++++++++++++++--------------
 nsplugins/viewer/viewer.cpp   |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'nsplugins/viewer')

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 );
       }
-- 
cgit v1.2.1