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, 5 insertions, 5 deletions

diff --git a/kexi/3rdparty/kexisql/src/vdbe.c b/kexi/3rdparty/kexisql/src/vdbe.c
index fb52ef38..dcf56bf5 100644
--- a/kexi/3rdparty/kexisql/src/vdbe.c
+++ b/kexi/3rdparty/kexisql/src/vdbe.c
@@ -233,7 +233,7 @@ static int hardDynamicify(Mem *pStack){
 }
 
 /*
-** An ephemeral string value (signified by the MEM_Ephem flag) contains
+** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains
 ** a pointer to a dynamically allocated string where some other entity
 ** is responsible for deallocating that string.  Because the stack entry
 ** does not control the string, it might be deleted without the stack
@@ -309,7 +309,7 @@ static int toInt(const char *zNum, int *pNum){
 ** Convert the given stack entity into a integer if it isn't one
 ** already.
 **
-** Any prior string or real representation is invalidated.  
+** Any prior string or real representation is tqinvalidated.  
 ** NULLs are converted into 0.
 */
 #define Integerify(P) if(((P)->flags&MEM_Int)==0){ hardIntegerify(P); }
@@ -2741,7 +2741,7 @@ case OP_IsUnique: {
     /* The last four bytes of the key are different from R.  Convert the
     ** last four bytes of the key into an integer and push it onto the
     ** stack.  (These bytes are the record number of an entry that
-    ** violates a UNIQUE constraint.)
+    ** violates a UNITQUE constraint.)
     */
     pTos++;
     pTos->i = v;
@@ -4151,8 +4151,8 @@ case OP_FileOpen: {
 ** Read a single line of input from the open file (the file opened using
 ** FileOpen).  If we reach end-of-file, jump immediately to P2.  If
 ** we are able to get another line, split the line apart using P3 as
-** a delimiter.  There should be P1 fields.  If the input line contains
-** more than P1 fields, ignore the excess.  If the input line contains
+** a delimiter.  There should be P1 fields.  If the input line tqcontains
+** more than P1 fields, ignore the excess.  If the input line tqcontains
 ** fewer than P1 fields, assume the remaining fields contain NULLs.
 **
 ** Input ends if a line consists of just "\.".  A field containing only