From f64397c82fa94371ab4a64af28c4d0029f4cd93f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 19 Dec 2011 11:53:50 -0600
Subject: Remove additional unneeded tq method conversions

---
 nsplugins/nspluginloader.cpp  | 2 +-
 nsplugins/pluginscan.cpp      | 2 +-
 nsplugins/sdk/npruntime.h     | 4 ++--
 nsplugins/viewer/nsplugin.cpp | 4 ++--
 nsplugins/viewer/viewer.cpp   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'nsplugins')

diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index db7e214ec..5949fe461 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -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/pluginscan.cpp b/nsplugins/pluginscan.cpp
index b48d2a8b6..6914deb93 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -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/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/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 146604c22..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
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