Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

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

11 files changed, 41 insertions, 41 deletions

diff --git a/nsplugins/sdk/jni.h b/nsplugins/sdk/jni.h
index 863075afa..d77820edc 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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 contains the machine-dependent typedefs for jbyte, jint 
+/* jni_md.h tqcontains 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 *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/jni_md.h b/nsplugins/sdk/jni_md.h
index c0aa11159..40517d20a 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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 f29945b94..8327a7dce 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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, 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/jri_md.h b/nsplugins/sdk/jri_md.h
index 5ae741ed3..12111871b 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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 masking macros.  (n must be <= 31 to be portable)
+** Bit tqmasking 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 ddeb6331c..e578c33ed 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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 67b91b680..0f3b292a6 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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 masks are applied on certain platforms to NPNV and 
+ *   The following tqmasks 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 masks change the 
+ *   not understanding a new browser's ABI, these tqmasks change the 
  *   values of those selectors on those platforms. To remain backwards
  *   compatible with differenet versions of the browser, plugins can 
- *   use these masks to dynamically determine and use the correct C++
+ *   use these tqmasks 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_Status(NPP instance, const char* message);
+void    NP_LOADDS NPN_tqStatus(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 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..01aef8ee9 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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_Status */
+/* NPN_tqStatus */
 
 #if _NPUPP_USE_UPP_
 
-typedef UniversalProcPtr NPN_StatusUPP;
+typedef UniversalProcPtr NPN_tqStatusUPP;
 enum {
-	uppNPN_StatusProcInfo = kThinkCStackBased
+	uppNPN_tqStatusProcInfo = kThinkCStackBased
 		| STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(NPP)))
 		| STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
 };
 
-#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))	
+#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))	
 
 #else
 
-typedef void (* NP_LOADDS NPN_StatusUPP)(NPP instance, const char* message);
-#define NewNPN_StatusProc(FUNC)		\
-		((NPN_StatusUPP) (FUNC))
-#define CallNPN_StatusProc(FUNC, npp, msg)		\
+typedef void (* NP_LOADDS NPN_tqStatusUPP)(NPP instance, const char* message);
+#define NewNPN_tqStatusProc(FUNC)		\
+		((NPN_tqStatusUPP) (FUNC))
+#define CallNPN_tqStatusProc(FUNC, npp, msg)		\
 		(*(FUNC))((npp), (msg))	
 
 #endif
@@ -1678,7 +1678,7 @@ typedef struct _NPNetscapeFuncs {
     NPN_NewStreamUPP newstream;
     NPN_WriteUPP write;
     NPN_DestroyStreamUPP destroystream;
-    NPN_StatusUPP status;
+    NPN_tqStatusUPP 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 invalidaterect;
-    NPN_InvalidateRegionUPP invalidateregion;
+    NPN_InvalidateRectUPP tqinvalidaterect;
+    NPN_InvalidateRegionUPP tqinvalidateregion;
     NPN_ForceRedrawUPP forceredraw;
     NPN_GetStringIdentifierUPP getstringidentifier;
     NPN_GetStringIdentifiersUPP getstringidentifiers;
diff --git a/nsplugins/sdk/obsolete/protypes.h b/nsplugins/sdk/obsolete/protypes.h
index e96cfcf67..0d4c27705 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
- * replace them with the notice and other provisions required by
+ * tqreplace 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 b2d1cebdb..b3b41df79 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 replace them with the notice
+ * decision by deleting the provisions above and tqreplace 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 b68361082..28944cd54 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
- * replace them with the notice and other provisions required by
+ * tqreplace 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 masking macros.  XXX n must be <= 31 to be portable
+** Bit tqmasking 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;
 
 /*
-** Status code used by some routines that have a single point of failure or 
+** tqStatus code used by some routines that have a single point of failure or 
 ** special status return.
 */
-typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRStatus;
+typedef enum { PR_FAILURE = -1, PR_SUCCESS = 0 } PRtqStatus;
 
 #ifdef MOZ_UNICODE
 /*