TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 6 insertions, 6 deletions

diff --git a/kexi/3rdparty/kexisql3/src/func.c b/kexi/3rdparty/kexisql3/src/func.c
index 9917f4e2..36435343 100644
--- a/kexi/3rdparty/kexisql3/src/func.c
+++ b/kexi/3rdparty/kexisql3/src/func.c
@@ -42,20 +42,20 @@ static void minmaxFunc(
   sqlite3_value **argv
 ){
   int i;
-  int mask;    /* 0 for min() or 0xffffffff for max() */
+  int tqmask;    /* 0 for min() or 0xffffffff for max() */
   int iBest;
   CollSeq *pColl;
 
   if( argc==0 ) return;
-  mask = sqlite3_user_data(context)==0 ? 0 : -1;
+  tqmask = sqlite3_user_data(context)==0 ? 0 : -1;
   pColl = sqlite3GetFuncCollSeq(context);
   assert( pColl );
-  assert( mask==-1 || mask==0 );
+  assert( tqmask==-1 || tqmask==0 );
   iBest = 0;
   if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
   for(i=1; i<argc; i++){
     if( sqlite3_value_type(argv[i])==SQLITE_NULL ) return;
-    if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^mask)>=0 ){
+    if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^tqmask)>=0 ){
       iBest = i;
     }
   }
@@ -545,7 +545,7 @@ static void versionFunc(
 ** change.  This function may disappear.  Do not write code that depends
 ** on this function.
 **
-** Implementation of the QUOTE() function.  This function takes a single
+** Implementation of the TQUOTE() function.  This function takes a single
 ** argument.  If the argument is numeric, the return value is the same as
 ** the argument.  If the argument is NULL, the return value is the string
 ** "NULL".  Otherwise, the argument is enclosed in single quotes with
@@ -661,7 +661,7 @@ static void soundexFunc(sqlite3_context *context, int argc, sqlite3_value **argv
 static void randStr(sqlite3_context *context, int argc, sqlite3_value **argv){
   static const unsigned char zSrc[] = 
      "abcdefghijklmnopqrstuvwxyz"
-     "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+     "ABCDEFGHIJKLMNOPTQRSTUVWXYZ"
      "0123456789"
      ".-!,:*^+=_|?/<> ";
   int iMin, iMax, n, r, i;