6 files changed, 13 insertions, 691 deletions

diff --git a/admin b/admin
-Subproject 85116532467b2bb4c73caf54c106c91a22dbe37
+Subproject 43b0c7bdb9af44dc13b0fd17b95ae172a4a382d
diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c
index 16576924..52b593d8 100644
--- a/kexi/3rdparty/kexisql/src/os.c
+++ b/kexi/3rdparty/kexisql/src/os.c
@@ -41,16 +41,6 @@
 # include <winbase.h>
 #endif
 
-#if OS_MAC
-# include <extras.h>
-# include <path2fss.h>
-# include <TextUtils.h>
-# include <FinderRegistry.h>
-# include <Folders.h>
-# include <Timer.h>
-# include <OSUtils.h>
-#endif
-
 /*
 ** The DJGPP compiler environment looks mostly like Unix, but it
 ** lacks the fcntl() system call.  So redefine fcntl() to be something
@@ -74,10 +64,6 @@
 #if OS_WIN && defined(THREADSAFE) && THREADSAFE
 # define SQLITE_W32_THREADS 1
 #endif
-#if OS_MAC && defined(THREADSAFE) && THREADSAFE
-# include <Multiprocessing.h>
-# define SQLITE_MACOS_MULTITASKING 1
-#endif
 
 /*
 ** Macros for performance tracing.  Normally turned off
@@ -394,9 +380,6 @@ int sqliteOsDelete(const char *zFilename){
 #if OS_WIN
   DeleteFile(zFilename);
 #endif
-#if OS_MAC
-  unlink(zFilename);
-#endif
   return SQLITE_OK;
 }
 
@@ -410,9 +393,6 @@ int sqliteOsFileExists(const char *zFilename){
 #if OS_WIN
   return GetFileAttributes(zFilename) != 0xffffffff;
 #endif
-#if OS_MAC
-  return access(zFilename, 0)==0;
-#endif
 }
 
 
@@ -434,10 +414,6 @@ int sqliteOsFileRename(const char *zOldName, const char *zNewName){
   }
   return SQLITE_OK;
 #endif
-#if OS_MAC
-  /**** FIX ME ***/
-  return SQLITE_ERROR;
-#endif
 }
 #endif /* NOT USED */
 
@@ -519,56 +495,6 @@ int sqliteOsOpenReadWrite(
   OpenCounter(+1);
   return SQLITE_OK;
 #endif
-#if OS_MAC
-  FSSpec fsSpec;
-# ifdef _LARGE_FILE
-  HFSUniStr255 dfName;
-  FSRef fsRef;
-  if( __path2fss(zFilename, &fsSpec) != noErr ){
-    if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
-      return SQLITE_CANTOPEN;
-  }
-  if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
-    return SQLITE_CANTOPEN;
-  FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
-                 fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
-                   fsRdWrPerm, &(id->refNum)) != noErr ){
-      if (FSOpenFork(&fsRef, dfName.length, dfName.unicode,
-                   fsRdPerm, &(id->refNum)) != noErr )
-        return SQLITE_CANTOPEN;
-      else
-        *pReadonly = 1;
-    } else
-      *pReadonly = 0;
-  } else
-    *pReadonly = 0;
-# else
-  __path2fss(zFilename, &fsSpec);
-  if( !sqliteOsFileExists(zFilename) ){
-    if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
-      return SQLITE_CANTOPEN;
-  }
-  if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNum)) != noErr ){
-    if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr ){
-      if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr )
-        return SQLITE_CANTOPEN;
-      else
-        *pReadonly = 1;
-    } else
-      *pReadonly = 0;
-  } else
-    *pReadonly = 0;
-# endif
-  if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){
-    id->refNumRF = -1;
-  }
-  id->locked = 0;
-  id->delOnClose = 0;
-  OpenCounter(+1);
-  return SQLITE_OK;
-#endif
 }
 
 
@@ -639,35 +565,6 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){
   OpenCounter(+1);
   return SQLITE_OK;
 #endif
-#if OS_MAC
-  FSSpec fsSpec;
-# ifdef _LARGE_FILE
-  HFSUniStr255 dfName;
-  FSRef fsRef;
-  __path2fss(zFilename, &fsSpec);
-  if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
-    return SQLITE_CANTOPEN;
-  if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
-    return SQLITE_CANTOPEN;
-  FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
-                 fsRdWrPerm, &(id->refNum)) != noErr )
-    return SQLITE_CANTOPEN;
-# else
-  __path2fss(zFilename, &fsSpec);
-  if( HCreate(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, 'SQLI', cDocumentFile) != noErr )
-    return SQLITE_CANTOPEN;
-  if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrPerm, &(id->refNum)) != noErr )
-    return SQLITE_CANTOPEN;
-# endif
-  id->refNumRF = -1;
-  id->locked = 0;
-  id->delOnClose = delFlag;
-  if (delFlag)
-    id->pathToDel = sqliteOsFullPathname(zFilename);
-  OpenCounter(+1);
-  return SQLITE_OK;
-#endif
 }
 
 /*
@@ -714,32 +611,6 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){
   OpenCounter(+1);
   return SQLITE_OK;
 #endif
-#if OS_MAC
-  FSSpec fsSpec;
-# ifdef _LARGE_FILE
-  HFSUniStr255 dfName;
-  FSRef fsRef;
-  if( __path2fss(zFilename, &fsSpec) != noErr )
-    return SQLITE_CANTOPEN;
-  if( FSpMakeFSRef(&fsSpec, &fsRef) != noErr )
-    return SQLITE_CANTOPEN;
-  FSGetDataForkName(&dfName);
-  if( FSOpenFork(&fsRef, dfName.length, dfName.unicode,
-                 fsRdPerm, &(id->refNum)) != noErr )
-    return SQLITE_CANTOPEN;
-# else
-  __path2fss(zFilename, &fsSpec);
-  if( HOpenDF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdPerm, &(id->refNum)) != noErr )
-    return SQLITE_CANTOPEN;
-# endif
-  if( HOpenRF(fsSpec.vRefNum, fsSpec.parID, fsSpec.name, fsRdWrShPerm, &(id->refNumRF)) != noErr){
-    id->refNumRF = -1;
-  }
-  id->locked = 0;
-  id->delOnClose = 0;
-  OpenCounter(+1);
-  return SQLITE_OK;
-#endif
 }
 
 /*
@@ -851,55 +722,6 @@ int sqliteOsTempFileName(char *zBuf){
     if( !sqliteOsFileExists(zBuf) ) break;
   }
 #endif
-#if OS_MAC
-  static char zChars[] =
-    "abcdefghijklmnopqrstuvwxyz"
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-    "0123456789";
-  int i, j;
-  char *zDir;
-  char zTempPath[SQLITE_TEMPNAME_SIZE];
-  char zdirName[32];
-  CInfoPBRec infoRec;
-  Str31 dirName;
-  memset(&infoRec, 0, sizeof(infoRec));
-  memset(zTempPath, 0, SQLITE_TEMPNAME_SIZE);
-  if( sqlite_temp_directory!=0 ){
-    zDir = sqlite_temp_directory;
-  }else if( FindFolder(kOnSystemDisk, kTemporaryFolderType,  kCreateFolder,
-       &(infoRec.dirInfo.ioVRefNum), &(infoRec.dirInfo.ioDrParID)) == noErr ){
-    infoRec.dirInfo.ioNamePtr = dirName;
-    do{
-      infoRec.dirInfo.ioFDirIndex = -1;
-      infoRec.dirInfo.ioDrDirID = infoRec.dirInfo.ioDrParID;
-      if( PBGetCatInfoSync(&infoRec) == noErr ){
-        CopyPascalStringToC(dirName, zdirName);
-        i = strlen(zdirName);
-        memmove(&(zTempPath[i+1]), zTempPath, strlen(zTempPath));
-        strcpy(zTempPath, zdirName);
-        zTempPath[i] = ':';
-      }else{
-        *zTempPath = 0;
-        break;
-      }
-    } while( infoRec.dirInfo.ioDrDirID != fsRtDirID );
-    zDir = zTempPath;
-  }
-  if( zDir[0]==0 ){
-    getcwd(zTempPath, SQLITE_TEMPNAME_SIZE-24);
-    zDir = zTempPath;
-  }
-  for(;;){
-    sprintf(zBuf, "%s"TEMP_FILE_PREFIX, zDir);
-    j = strlen(zBuf);
-    sqliteRandomness(15, &zBuf[j]);
-    for(i=0; i<15; i++, j++){
-      zBuf[j] = (char)zChars[ ((unsigned char)zBuf[j])%(sizeof(zChars)-1) ];
-    }
-    zBuf[j] = 0;
-    if( !sqliteOsFileExists(zBuf) ) break;
-  }
-#endif
   return SQLITE_OK; 
 }
 
@@ -944,21 +766,6 @@ int sqliteOsClose(OsFile *id){
   OpenCounter(-1);
   return SQLITE_OK;
 #endif
-#if OS_MAC
-  if( id->refNumRF!=-1 )
-    FSClose(id->refNumRF);
-# ifdef _LARGE_FILE
-  FSCloseFork(id->refNum);
-# else
-  FSClose(id->refNum);
-# endif
-  if( id->delOnClose ){
-    unlink(id->pathToDel);
-    sqliteFree(id->pathToDel);
-  }
-  OpenCounter(-1);
-  return SQLITE_OK;
-#endif
 }
 
 /*
@@ -995,22 +802,6 @@ int sqliteOsRead(OsFile *id, void *pBuf, int amt){
     return SQLITE_IOERR;
   }
 #endif
-#if OS_MAC
-  int got;
-  SimulateIOError(SQLITE_IOERR);
-  TRACE2("READ %d\n", last_page);
-# ifdef _LARGE_FILE
-  FSReadFork(id->refNum, fsAtMark, 0, (ByteCount)amt, pBuf, (ByteCount*)&got);
-# else
-  got = amt;
-  FSRead(id->refNum, &got, pBuf);
-# endif
-  if( got==amt ){
-    return SQLITE_OK;
-  }else{
-    return SQLITE_IOERR;
-  }
-#endif
 }
 
 /*
@@ -1048,29 +839,6 @@ int sqliteOsWrite(OsFile *id, const void *pBuf, int amt){
   }
   return SQLITE_OK;
 #endif
-#if OS_MAC
-  OSErr oserr;
-  int wrote = 0;
-  SimulateIOError(SQLITE_IOERR);
-  TRACE2("WRITE %d\n", last_page);
-  while( amt>0 ){
-# ifdef _LARGE_FILE
-    oserr = FSWriteFork(id->refNum, fsAtMark, 0,
-                        (ByteCount)amt, pBuf, (ByteCount*)&wrote);
-# else
-    wrote = amt;
-    oserr = FSWrite(id->refNum, &wrote, pBuf);
-# endif
-    if( wrote == 0 || oserr != noErr)
-      break;
-    amt -= wrote;
-    pBuf = &((char*)pBuf)[wrote];
-  }
-  if( oserr != noErr || amt>wrote ){
-    return SQLITE_FULL;
-  }
-  return SQLITE_OK;
-#endif
 }
 
 /*
@@ -1092,28 +860,6 @@ int sqliteOsSeek(OsFile *id, off_t offset){
   }
   return SQLITE_OK;
 #endif
-#if OS_MAC
-  {
-    off_t curSize;
-    if( sqliteOsFileSize(id, &curSize) != SQLITE_OK ){
-      return SQLITE_IOERR;
-    }
-    if( offset >= curSize ){
-      if( sqliteOsTruncate(id, offset+1) != SQLITE_OK ){
-        return SQLITE_IOERR;
-      }
-    }
-# ifdef _LARGE_FILE
-    if( FSSetForkPosition(id->refNum, fsFromStart, offset) != noErr ){
-# else
-    if( SetFPos(id->refNum, fsFromStart, offset) != noErr ){
-# endif
-      return SQLITE_IOERR;
-    }else{
-      return SQLITE_OK;
-    }
-  }
-#endif
 }
 
 /*
@@ -1150,20 +896,6 @@ int sqliteOsSync(OsFile *id){
     return SQLITE_IOERR;
   }
 #endif
-#if OS_MAC
-# ifdef _LARGE_FILE
-  if( FSFlushFork(id->refNum) != noErr ){
-# else
-  ParamBlockRec params;
-  memset(&params, 0, sizeof(ParamBlockRec));
-  params.ioParam.ioRefNum = id->refNum;
-  if( PBFlushFileSync(&params) != noErr ){
-# endif
-    return SQLITE_IOERR;
-  }else{
-    return SQLITE_OK;
-  }
-#endif
 }
 
 /*
@@ -1182,17 +914,6 @@ int sqliteOsTruncate(OsFile *id, off_t nByte){
   }
   return SQLITE_OK;
 #endif
-#if OS_MAC
-# ifdef _LARGE_FILE
-  if( FSSetForkSize(id->refNum, fsFromStart, nByte) != noErr){
-# else
-  if( SetEOF(id->refNum, nByte) != noErr ){
-# endif
-    return SQLITE_IOERR;
-  }else{
-    return SQLITE_OK;
-  }
-#endif
 }
 
 /*
@@ -1215,17 +936,6 @@ int sqliteOsFileSize(OsFile *id, off_t *pSize){
   *pSize = (((off_t)upperBits)<<32) + lowerBits;
   return SQLITE_OK;
 #endif
-#if OS_MAC
-# ifdef _LARGE_FILE
-  if( FSGetForkSize(id->refNum, pSize) != noErr){
-# else
-  if( GetEOF(id->refNum, pSize) != noErr ){
-# endif
-    return SQLITE_IOERR;
-  }else{
-    return SQLITE_OK;
-  }
-#endif
 }
 
 #if OS_WIN
@@ -1298,11 +1008,7 @@ int isNT(void){
 ** the first byte in the range of bytes used for locking.
 */
 #define N_LOCKBYTE       10239
-#if OS_MAC
-# define FIRST_LOCKBYTE   (0x000fffff - N_LOCKBYTE)
-#else
-# define FIRST_LOCKBYTE   (0xffffffff - N_LOCKBYTE)
-#endif
+#define FIRST_LOCKBYTE   (0xffffffff - N_LOCKBYTE)
 
 /*
 ** Change the status of the lock on the file "id" to be a readlock.
@@ -1383,46 +1089,6 @@ int sqliteOsReadLock(OsFile *id){
   }
   return rc;
 #endif
-#if OS_MAC
-  int rc;
-  if( id->locked>0 || id->refNumRF == -1 ){
-    rc = SQLITE_OK;
-  }else{
-    int lk;
-    OSErr res;
-    int cnt = 5;
-    ParamBlockRec params;
-    sqliteRandomness(sizeof(lk), &lk);
-    lk = (lk & 0x7fffffff)%N_LOCKBYTE + 1;
-    memset(&params, 0, sizeof(params));
-    params.ioParam.ioRefNum = id->refNumRF;
-    params.ioParam.ioPosMode = fsFromStart;
-    params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-    params.ioParam.ioReqCount = 1;
-    while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
-      UInt32 finalTicks;
-      Delay(1, &finalTicks); /* 1/60 sec */
-    }
-    if( res == noErr ){
-      params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
-      params.ioParam.ioReqCount = N_LOCKBYTE;
-      PBUnlockRangeSync(&params);
-      params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk;
-      params.ioParam.ioReqCount = 1;
-      res = PBLockRangeSync(&params);
-      params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-      params.ioParam.ioReqCount = 1;
-      PBUnlockRangeSync(&params);
-    }
-    if( res == noErr ){
-      id->locked = lk;
-      rc = SQLITE_OK;
-    }else{
-      rc = SQLITE_BUSY;
-    }
-  }
-  return rc;
-#endif
 }
 
 /*
@@ -1492,47 +1158,6 @@ int sqliteOsWriteLock(OsFile *id){
   }
   return rc;
 #endif
-#if OS_MAC
-  int rc;
-  if( id->locked<0 || id->refNumRF == -1 ){
-    rc = SQLITE_OK;
-  }else{
-    OSErr res;
-    int cnt = 5;
-    ParamBlockRec params;
-    memset(&params, 0, sizeof(params));
-    params.ioParam.ioRefNum = id->refNumRF;
-    params.ioParam.ioPosMode = fsFromStart;
-    params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-    params.ioParam.ioReqCount = 1;
-    while( cnt-->0 && (res = PBLockRangeSync(&params))!=noErr ){
-      UInt32 finalTicks;
-      Delay(1, &finalTicks); /* 1/60 sec */
-    }
-    if( res == noErr ){
-      params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked;
-      params.ioParam.ioReqCount = 1;
-      if( id->locked==0 
-            || PBUnlockRangeSync(&params)==noErr ){
-        params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
-        params.ioParam.ioReqCount = N_LOCKBYTE;
-        res = PBLockRangeSync(&params);
-      }else{
-        res = afpRangeNotLocked;
-      }
-      params.ioParam.ioPosOffset = FIRST_LOCKBYTE;
-      params.ioParam.ioReqCount = 1;
-      PBUnlockRangeSync(&params);
-    }
-    if( res == noErr ){
-      id->locked = -1;
-      rc = SQLITE_OK;
-    }else{
-      rc = SQLITE_BUSY;
-    }
-  }
-  return rc;
-#endif
 }
 
 /*
@@ -1601,29 +1226,6 @@ int sqliteOsUnlock(OsFile *id){
   }
   return rc;
 #endif
-#if OS_MAC
-  int rc;
-  ParamBlockRec params;
-  memset(&params, 0, sizeof(params));
-  params.ioParam.ioRefNum = id->refNumRF;
-  params.ioParam.ioPosMode = fsFromStart;
-  if( id->locked==0 || id->refNumRF == -1 ){
-    rc = SQLITE_OK;
-  }else if( id->locked<0 ){
-    params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1;
-    params.ioParam.ioReqCount = N_LOCKBYTE;
-    PBUnlockRangeSync(&params);
-    rc = SQLITE_OK;
-    id->locked = 0;
-  }else{
-    params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked;
-    params.ioParam.ioReqCount = 1;
-    PBUnlockRangeSync(&params);
-    rc = SQLITE_OK;
-    id->locked = 0;
-  }
-  return rc;
-#endif
 }
 
 /*
@@ -1656,14 +1258,6 @@ int sqliteOsRandomSeed(char *zBuf){
 #if OS_WIN && !defined(SQLITE_TEST)
   GetSystemTime((LPSYSTEMTIME)zBuf);
 #endif
-#if OS_MAC
-  {
-    int pid;
-    Microseconds((UnsignedWide*)zBuf);
-    pid = getpid();
-    memcpy(&zBuf[sizeof(UnsignedWide)], &pid, sizeof(pid));
-  }
-#endif
   return SQLITE_OK;
 }
 
@@ -1684,12 +1278,6 @@ int sqliteOsSleep(int ms){
   Sleep(ms);
   return ms;
 #endif
-#if OS_MAC
-  UInt32 finalTicks;
-  UInt32 ticks = (((UInt32)ms+16)*3)/50;  /* 1/60 sec per tick */
-  Delay(ticks, &finalTicks);
-  return (int)((ticks*50)/3);
-#endif
 }
 
 /*
@@ -1789,22 +1377,6 @@ char *sqliteOsFullPathname(const char *zRelative){
   GetFullPathName(zRelative, nByte, zFull, &zNotUsed);
   return zFull;
 #endif
-#if OS_MAC
-  char *zFull = 0;
-  if( zRelative[0]==':' ){
-    char zBuf[_MAX_PATH+1];
-    sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), &(zRelative[1]),
-                    (char*)0);
-  }else{
-    if( strchr(zRelative, ':') ){
-      sqliteSetString(&zFull, zRelative, (char*)0);
-    }else{
-    char zBuf[_MAX_PATH+1];
-      sqliteSetString(&zFull, getcwd(zBuf, sizeof(zBuf)), zRelative, (char*)0);
-    }
-  }
-  return zFull;
-#endif
 }
 
 /*
diff --git a/kexi/3rdparty/kexisql/src/os.h b/kexi/3rdparty/kexisql/src/os.h
index d11198c9..f56e4478 100644
--- a/kexi/3rdparty/kexisql/src/os.h
+++ b/kexi/3rdparty/kexisql/src/os.h
@@ -62,37 +62,21 @@
 ** Figure out if we are dealing with Unix, Windows or MacOS.
 **
 ** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix.
-**      The MacOS build is designed to use CodeWarrior (tested with v8)
 */
 #ifndef OS_UNIX
 # ifndef OS_WIN
-#  ifndef OS_MAC
-#    if defined(__MACOS__)
-#      define OS_MAC 1
-#      define OS_WIN 0
-#      define OS_UNIX 0
-#    elif defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#      define OS_MAC 0
-#      define OS_WIN 1
-#      define OS_UNIX 0
-#    else
-#      define OS_MAC 0
-#      define OS_WIN 0
-#      define OS_UNIX 1
-#    endif
+#  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#    define OS_WIN 1
+#    define OS_UNIX 0
 #  else
 #    define OS_WIN 0
-#    define OS_UNIX 0
+#    define OS_UNIX 1
 #  endif
 # else
-#  define OS_MAC 0
 #  define OS_UNIX 0
 # endif
 #else
-# define OS_MAC 0
-# ifndef OS_WIN
-#  define OS_WIN 0
-# endif
+# define OS_WIN 0
 #endif
 
 /*
@@ -141,26 +125,6 @@
 # define SQLITE_MIN_SLEEP_MS 1
 #endif
 
-#if OS_MAC
-# include <unistd.h>
-# include <Files.h>
-  typedef struct OsFile OsFile;
-  struct OsFile {
-    SInt16 refNum;           /* Data fork/file reference number */
-    SInt16 refNumRF;         /* Resource fork reference number (for locking) */
-    int locked;              /* 0: unlocked, <0: write lock, >0: read lock */
-    int delOnClose;          /* True if file is to be deleted on close */
-    char *pathToDel;         /* Name of file to delete on close */
-  };
-# ifdef _LARGE_FILE
-    typedef SInt64 off_t;
-# else
-    typedef SInt32 off_t;
-# endif
-# define SQLITE_TEMPNAME_SIZE _MAX_PATH
-# define SQLITE_MIN_SLEEP_MS 17
-#endif
-
 int sqliteOsDelete(const char*);
 int sqliteOsFileExists(const char*);
 int sqliteOsFileRename(const char*, const char*);
diff --git a/kexi/3rdparty/kexisql3/src/os.h b/kexi/3rdparty/kexisql3/src/os.h
index 95d7c60e..037273bb 100644
--- a/kexi/3rdparty/kexisql3/src/os.h
+++ b/kexi/3rdparty/kexisql3/src/os.h
@@ -21,25 +21,22 @@
 ** Figure out if we are dealing with Unix, Windows or MacOS.
 **
 ** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix.
-**      The MacOS build is designed to use CodeWarrior (tested with v8)
 */
 #if !defined(OS_UNIX) && !defined(OS_TEST) && !defined(OS_OTHER)
 # define OS_OTHER 0
 # ifndef OS_WIN
-#   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
-#     define OS_WIN 1
-#     define OS_UNIX 0
-#   else
-#     define OS_WIN 0
-#     define OS_UNIX 1
+#  if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#   define OS_WIN 1
+#   define OS_UNIX 0
+#  else
+#   define OS_WIN 0
+#   define OS_UNIX 1
 #  endif
 # else
 #  define OS_UNIX 0
 # endif
 #else
-# ifndef OS_WIN
-#  define OS_WIN 0
-# endif
+# define OS_WIN 0
 #endif
 
 /*
diff --git a/kivio/kivio.spec b/kivio/kivio.spec
deleted file mode 100644
index 09cc47a8..00000000
--- a/kivio/kivio.spec
+++ /dev/null
@@ -1,48 +0,0 @@
-%define name kivio
-%define version 0.9.1
-%define release 2tkc
-%define prefix /usr/local
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Summary: Kivio - Powerful Flowchart Program for KDE 2
-Prefix: %{prefix}
-Group: KDE/Office
-Copyright: GPL
-Vendor: theKompany.com
-Packager: Catalin Climov <[email protected]>
-#Distribution: theKompany.com
-Source: %{name}-%{version}.tar.gz
-URL: http://www.thekompany.com/projects/kivio/
-Buildroot: /var/tmp/%{name}-%{version}-buildroot
-
-%description
-Kivio on the surface is your everyday flowcharting program.
-Underneath this skin, however, lies much more. Kivio will offer basic
- flowcharting abilities, but with a twist. Objects are scriptable, and
- a backend plugin system will offer the ability to make objects do just
- about anything.
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-
-%setup -n %{name}-%{version}
-
-%build
-make -f Makefile.cvs
-./configure --with-install-root=$RPM_BUILD_ROOT
-make
-
-%install
-make prefix=$RPM_BUILD_ROOT%{prefix} install
-
-cd $RPM_BUILD_ROOT
-find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.%{name}
-find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
-find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f ../file.list.%{name}
diff --git a/kplato/kplato.tdevelop b/kplato/kplato.tdevelop
deleted file mode 100644
index 2be3b539..00000000
--- a/kplato/kplato.tdevelop
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
-  <general>
-    <author>Raphael Langerhorst</author>
-    <email>[email protected]</email>
-    <version>$VERSION$</version>
-    <projectmanagement>KDevKDEAutoProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>Qt</keyword>
-      <keyword>KDE</keyword>
-    </keywords>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <ignoreparts/>
-  </general>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*.po;*.ts" name="Translations" />
-      <group pattern="*" name="Others" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>opengl</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>stl</toc>
-      <toc>sw</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell>libtool</dbgshell>
-      <programargs/>
-      <gdbpath/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevfilecreate>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevautoproject>
-    <make>
-      <envvars>
-        <envvar value="1" name="WANT_AUTOCONF_2_5" />
-        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-      </envvars>
-      <abortonerror>true</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-    </make>
-    <run>
-      <directoryradio>executable</directoryradio>
-      <customdirectory>/</customdirectory>
-      <mainprogram/>
-      <programargs/>
-      <terminal>false</terminal>
-      <autocompile>true</autocompile>
-      <envvars/>
-    </run>
-    <general>
-      <useconfiguration>default</useconfiguration>
-    </general>
-    <configurations>
-      <default>
-        <envvars/>
-      </default>
-    </configurations>
-  </kdevautoproject>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevcppsupport>
-    <qt>
-      <used>true</used>
-      <version>3</version>
-      <root>/opt/qt33</root>
-    </qt>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-    <creategettersetter>
-      <prefixGet/>
-      <prefixSet>set</prefixSet>
-      <prefixVariable>m_,_</prefixVariable>
-      <parameterName>theValue</parameterName>
-      <inlineGet>true</inlineGet>
-      <inlineSet>true</inlineSet>
-    </creategettersetter>
-    <references>
-      <pcs>Qt</pcs>
-      <pcs>KDElibs</pcs>
-    </references>
-  </kdevcppsupport>
-</tdevelop>