4 files changed, 10 insertions, 10 deletions
diff --git a/nsplugins/sdk/jni.h b/nsplugins/sdk/jni.h
index 863075afa..7ef133a51 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 *unicode, jsize len);
+      (JNIEnv *env, const jchar *tqunicode, 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 *unicode, jsize len) {
-        return functions->NewString(this,unicode,len);
+    jstring NewString(const jchar *tqunicode, jsize len) {
+        return functions->NewString(this,tqunicode,len);
     }
     jsize GetStringLength(jstring str) {
         return functions->GetStringLength(this,str);
diff --git a/nsplugins/sdk/jri.h b/nsplugins/sdk/jri.h
index f29945b94..62d542a8b 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, unicode, len)	\
-	(((*(env))->NewString)(env, JRI_NewString_op, unicode, len))
+#define JRI_NewString(env, tqunicode, len)	\
+	(((*(env))->NewString)(env, JRI_NewString_op, tqunicode, 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 5a8423390..06a8e1ee6 100644
--- a/nsplugins/sdk/npruntime.h
+++ b/nsplugins/sdk/npruntime.h
@@ -66,7 +66,7 @@
 #define _NP_RUNTIME_H_
 
 #include <tqglobal.h>
-typedef Q_UINT32 uint32_t;
+typedef TQ_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 invalidate callback has been
+    NPObject instance after the tqinvalidate 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 invalidate;
+    NPInvalidateFunctionPtr tqinvalidate;
     NPHasMethodFunctionPtr hasMethod;
     NPInvokeFunctionPtr invoke;
     NPInvokeDefaultFunctionPtr invokeDefault;
diff --git a/nsplugins/sdk/npupp.h b/nsplugins/sdk/npupp.h
index dff545d9f..4ba50e5ae 100644
--- a/nsplugins/sdk/npupp.h
+++ b/nsplugins/sdk/npupp.h
@@ -1690,8 +1690,8 @@ typedef struct _NPNetscapeFuncs {
     NPN_PostURLNotifyUPP posturlnotify;
     NPN_GetValueUPP getvalue;
     NPN_SetValueUPP setvalue;
-    NPN_InvalidateRectUPP invalidaterect;
-    NPN_InvalidateRegionUPP invalidateregion;
+    NPN_InvalidateRectUPP tqinvalidaterect;
+    NPN_InvalidateRegionUPP tqinvalidateregion;
     NPN_ForceRedrawUPP forceredraw;
     NPN_GetStringIdentifierUPP getstringidentifier;
     NPN_GetStringIdentifiersUPP getstringidentifiers;