summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acinclude.m46
m---------admin0
-rw-r--r--src/libs/sqlite2/os.c430
-rw-r--r--src/libs/sqlite2/os.h46
-rw-r--r--src/libs/sqlite2/shell.c22
-rw-r--r--translations/messages/ka.po38
6 files changed, 27 insertions, 515 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 9f458907..d599831e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3437,9 +3437,9 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
AC_TRY_COMPILE(
[
#include <qglobal.h>
-#if Q_EXPORT - 0 != 0
-/* if this compiles, then Q_EXPORT is undefined */
-/* if Q_EXPORT is nonempty, this will break compilation */
+#if TQ_EXPORT - 0 != 0
+/* if this compiles, then TQ_EXPORT is undefined */
+/* if TQ_EXPORT is nonempty, this will break compilation */
#endif
], [/* elvis is alive */],
kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
diff --git a/admin b/admin
-Subproject afaec96a4101e0771fb9969690e20ce5f6df90e
+Subproject 09c83bda932a8ba3b215b852f199bc47f1ed965
diff --git a/src/libs/sqlite2/os.c b/src/libs/sqlite2/os.c
index dccd65f1..aaada0e3 100644
--- a/src/libs/sqlite2/os.c
+++ b/src/libs/sqlite2/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
}
#ifdef SQLITE_NOSYNC
@@ -1154,20 +900,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
}
/*
@@ -1186,17 +918,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
}
/*
@@ -1219,17 +940,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
@@ -1302,11 +1012,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.
@@ -1387,46 +1093,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
}
/*
@@ -1496,47 +1162,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
}
/*
@@ -1605,29 +1230,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
}
/*
@@ -1660,14 +1262,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;
}
@@ -1688,12 +1282,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
}
/*
@@ -1794,22 +1382,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/src/libs/sqlite2/os.h b/src/libs/sqlite2/os.h
index d11198c9..f56e4478 100644
--- a/src/libs/sqlite2/os.h
+++ b/src/libs/sqlite2/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/src/libs/sqlite2/shell.c b/src/libs/sqlite2/shell.c
index 89898ab4..2d99603a 100644
--- a/src/libs/sqlite2/shell.c
+++ b/src/libs/sqlite2/shell.c
@@ -20,22 +20,13 @@
#include "sqlite.h"
#include <ctype.h>
-#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__)
+#if !defined(_WIN32) && !defined(WIN32)
# include <signal.h>
# include <pwd.h>
# include <unistd.h>
# include <sys/types.h>
#endif
-#ifdef __MACOS__
-# include <console.h>
-# include <signal.h>
-# include <unistd.h>
-# include <extras.h>
-# include <Files.h>
-# include <Folders.h>
-#endif
-
#if defined(HAVE_READLINE) && HAVE_READLINE==1
# include <readline/readline.h>
# include <readline/history.h>
@@ -1089,7 +1080,7 @@ static void process_input(struct callback_data *p, FILE *in){
static char *find_home_dir(void){
char *home_dir = NULL;
-#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__)
+#if !defined(_WIN32) && !defined(WIN32)
struct passwd *pwent;
uid_t uid = getuid();
if( (pwent=getpwuid(uid)) != NULL) {
@@ -1097,11 +1088,6 @@ static char *find_home_dir(void){
}
#endif
-#ifdef __MACOS__
- char home_path[_MAX_PATH+1];
- home_dir = getcwd(home_path, _MAX_PATH);
-#endif
-
if (!home_dir) {
home_dir = getenv("HOME");
if (!home_dir) {
@@ -1212,10 +1198,6 @@ int main(int argc, char **argv){
int i;
extern int sqliteOsFileExists(const char*);
-#ifdef __MACOS__
- argc = ccommand(&argv);
-#endif
-
Argv0 = argv[0];
main_init(&data);
diff --git a/translations/messages/ka.po b/translations/messages/ka.po
index cb2a561e..3bcbe78c 100644
--- a/translations/messages/ka.po
+++ b/translations/messages/ka.po
@@ -4,13 +4,13 @@
#
# Georgian TDE Localization Team, 2006.
# George Machitidze <giomac@gmail.com>, 2006.
-# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024.
+# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024, 2025.
msgid ""
msgstr ""
"Project-Id-Version: digikam\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2024-12-26 18:13+0000\n"
-"PO-Revision-Date: 2024-12-29 19:21+0000\n"
+"PO-Revision-Date: 2025-01-01 08:37+0000\n"
"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n"
"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/"
"projects/applications/digikam/ka/>\n"
@@ -319,11 +319,12 @@ msgid "Uncategorized Albums"
msgstr "დაუხარისხებელი ალბომები"
#: digikam/albumicongroupitem.cpp:103
-#, fuzzy
msgid ""
"_n: %1 %2 - 1 Item\n"
"%1 %2 - %n Items"
-msgstr "%1 %2 - %n ელემენტები"
+msgstr ""
+"%1 %2 - 1 ელემენტი\n"
+"%1 %2 - %n ელემენტი"
#: digikam/albumiconitem.cpp:299
#, fuzzy, c-format
@@ -4737,9 +4738,8 @@ msgid "HSL Adjustments"
msgstr "HSL -ის სწორებები"
#: imageplugins/coreplugin/hsl/imageeffect_hsl.cpp:72
-#, fuzzy
msgid "Hue/Saturation/Lightness"
-msgstr "ტონი/ინტენსივობა/სინათლე..."
+msgstr "ტონი/ინტენსივობა/სინათლე"
#: imageplugins/coreplugin/iccprooftool.cpp:103
#: imageplugins/coreplugin/imageeffect_iccproof.cpp:93
@@ -6611,9 +6611,8 @@ msgstr ""
#: imageplugins/inpainting/imageeffect_inpainting.cpp:413
#: imageplugins/inpainting/inpaintingtool.cpp:378
-#, fuzzy
msgid "InPainting"
-msgstr "შეფასება"
+msgstr "გადაღებვა"
#: imageplugins/inpainting/imageeffect_inpainting.cpp:420
#: imageplugins/inpainting/inpaintingtool.cpp:385
@@ -6659,9 +6658,8 @@ msgstr ""
"გამოსაყენებლად მონიშნეთ არე თვალის ჩათვლით."
#: imageplugins/inpainting/inpaintingtool.cpp:89
-#, fuzzy
msgid "Inpainting"
-msgstr "შეფასება"
+msgstr "გადაღებვა"
#: imageplugins/inpainting/inpaintingtool.cpp:95
#, fuzzy
@@ -10702,9 +10700,8 @@ msgstr "yes"
#: utilities/cameragui/gpcamera.cpp:978 utilities/cameragui/gpcamera.cpp:979
#: utilities/cameragui/gpcamera.cpp:980 utilities/cameragui/gpcamera.cpp:981
#: utilities/cameragui/gpcamera.cpp:982
-#, fuzzy
msgid "no"
-msgstr "ინფორმაცია"
+msgstr "არა"
#: utilities/cameragui/gpcamera.cpp:1045
msgid ""
@@ -10975,7 +10972,6 @@ msgid "Flip Vertical"
msgstr "ვერტიკალურად გადაბრუნება"
#: utilities/imageeditor/canvas/undoaction.cpp:149
-#, fuzzy
msgid "Brightness,Contrast,Gamma"
msgstr "სიკაშკაშე,კონტრასტი,გამა"
@@ -11468,7 +11464,7 @@ msgstr "ზედა მარცხენა"
#: utilities/imageeditor/tools/imageprint.cpp:592
#: utilities/imageeditor/tools/imageprint.cpp:639
msgid "Top-Central"
-msgstr ""
+msgstr "ზედა-ცენტრალური"
#: utilities/imageeditor/tools/imageprint.cpp:388
#: utilities/imageeditor/tools/imageprint.cpp:580
@@ -11480,7 +11476,7 @@ msgstr "ზედა მარჯვენა"
#: utilities/imageeditor/tools/imageprint.cpp:568
#: utilities/imageeditor/tools/imageprint.cpp:615
msgid "Central-Left"
-msgstr ""
+msgstr "ცენტრალური-მარცხენა"
#: utilities/imageeditor/tools/imageprint.cpp:390
#: utilities/imageeditor/tools/imageprint.cpp:648
@@ -11491,7 +11487,7 @@ msgstr "ცენტრალური"
#: utilities/imageeditor/tools/imageprint.cpp:572
#: utilities/imageeditor/tools/imageprint.cpp:619
msgid "Central-Right"
-msgstr ""
+msgstr "ცენტრალური-მარჯვენა"
#: utilities/imageeditor/tools/imageprint.cpp:392
#: utilities/imageeditor/tools/imageprint.cpp:584
@@ -11503,7 +11499,7 @@ msgstr "ქვედა მარცხენა"
#: utilities/imageeditor/tools/imageprint.cpp:596
#: utilities/imageeditor/tools/imageprint.cpp:643
msgid "Bottom-Central"
-msgstr ""
+msgstr "ქვედა-ცენტრალური"
#: utilities/imageeditor/tools/imageprint.cpp:394
#: utilities/imageeditor/tools/imageprint.cpp:588
@@ -12008,7 +12004,6 @@ msgid "&Edit..."
msgstr "&გატანა..."
#: utilities/setup/setupcamera.cpp:109
-#, fuzzy
msgid "Auto-&Detect"
msgstr "ავტო&დადგენა"
@@ -12347,9 +12342,8 @@ msgstr ""
"ინფორმაციის მიღება.</p>"
#: utilities/setup/setupicc.cpp:244
-#, fuzzy
msgid "Workspace:"
-msgstr "სამუშაო გარემო"
+msgstr "სამუშაო სივრცე:"
#: utilities/setup/setupicc.cpp:247
#, fuzzy
@@ -13112,9 +13106,9 @@ msgid "Tra&nsform"
msgstr "გარდაქმ&ნა"
#: libs/dialogs/deletedialogbase.ui:16
-#, fuzzy, no-c-format
+#, no-c-format
msgid "DeleteDialogBase"
-msgstr "ფაილის წაშლა"
+msgstr "ფაილისწაშლისდიალოგი"
#: libs/dialogs/deletedialogbase.ui:60
#, no-c-format
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-05 20:45:45 +0000