From f1ce972ed03ff76137fda623df7bb4336a8de7f0 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 16 Feb 2014 13:48:50 -0600 Subject: [PATCH] Fix unintended renaming --- kexi/3rdparty/kexisql/src/os.c | 20 ++++++++++---------- kexi/3rdparty/kexisql3/src/os_mac.c | 20 ++++++++++---------- kspread/kspread_numformat.cc | 12 ++++++------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/kexi/3rdparty/kexisql/src/os.c b/kexi/3rdparty/kexisql/src/os.c index b47fd961..16576924 100644 --- a/kexi/3rdparty/kexisql/src/os.c +++ b/kexi/3rdparty/kexisql/src/os.c @@ -1398,20 +1398,20 @@ int sqliteOsReadLock(OsFile *id){ params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ UInt32 finalTicks; Delay(1, &finalTicks); /* 1/60 sec */ } if( res == noErr ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioRetqCount = N_LOCKBYTE; + params.ioParam.ioReqCount = N_LOCKBYTE; PBUnlockRangeSync(¶ms); params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; res = PBLockRangeSync(¶ms); params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; PBUnlockRangeSync(¶ms); } if( res == noErr ){ @@ -1504,24 +1504,24 @@ int sqliteOsWriteLock(OsFile *id){ params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ UInt32 finalTicks; Delay(1, &finalTicks); /* 1/60 sec */ } if( res == noErr ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; if( id->locked==0 || PBUnlockRangeSync(¶ms)==noErr ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioRetqCount = N_LOCKBYTE; + params.ioParam.ioReqCount = N_LOCKBYTE; res = PBLockRangeSync(¶ms); }else{ res = afpRangeNotLocked; } params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; PBUnlockRangeSync(¶ms); } if( res == noErr ){ @@ -1611,13 +1611,13 @@ int sqliteOsUnlock(OsFile *id){ rc = SQLITE_OK; }else if( id->locked<0 ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioRetqCount = N_LOCKBYTE; + params.ioParam.ioReqCount = N_LOCKBYTE; PBUnlockRangeSync(¶ms); rc = SQLITE_OK; id->locked = 0; }else{ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; PBUnlockRangeSync(¶ms); rc = SQLITE_OK; id->locked = 0; diff --git a/kexi/3rdparty/kexisql3/src/os_mac.c b/kexi/3rdparty/kexisql3/src/os_mac.c index 45b1de47..15798b5d 100644 --- a/kexi/3rdparty/kexisql3/src/os_mac.c +++ b/kexi/3rdparty/kexisql3/src/os_mac.c @@ -506,20 +506,20 @@ int sqlite3OsReadLock(OsFile *id){ params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ UInt32 finalTicks; Delay(1, &finalTicks); /* 1/60 sec */ } if( res == noErr ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioRetqCount = N_LOCKBYTE; + params.ioParam.ioReqCount = N_LOCKBYTE; PBUnlockRangeSync(¶ms); params.ioParam.ioPosOffset = FIRST_LOCKBYTE+lk; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; res = PBLockRangeSync(¶ms); params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; PBUnlockRangeSync(¶ms); } if( res == noErr ){ @@ -550,24 +550,24 @@ int sqlite3OsWriteLock(OsFile *id){ params.ioParam.ioRefNum = id->refNumRF; params.ioParam.ioPosMode = fsFromStart; params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; while( cnt-->0 && (res = PBLockRangeSync(¶ms))!=noErr ){ UInt32 finalTicks; Delay(1, &finalTicks); /* 1/60 sec */ } if( res == noErr ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE + id->locked; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; if( id->locked==0 || PBUnlockRangeSync(¶ms)==noErr ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioRetqCount = N_LOCKBYTE; + params.ioParam.ioReqCount = N_LOCKBYTE; res = PBLockRangeSync(¶ms); }else{ res = afpRangeNotLocked; } params.ioParam.ioPosOffset = FIRST_LOCKBYTE; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; PBUnlockRangeSync(¶ms); } if( res == noErr ){ @@ -596,13 +596,13 @@ int sqlite3OsUnlock(OsFile *id){ rc = SQLITE_OK; }else if( id->locked<0 ){ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+1; - params.ioParam.ioRetqCount = N_LOCKBYTE; + params.ioParam.ioReqCount = N_LOCKBYTE; PBUnlockRangeSync(¶ms); rc = SQLITE_OK; id->locked = 0; }else{ params.ioParam.ioPosOffset = FIRST_LOCKBYTE+id->locked; - params.ioParam.ioRetqCount = 1; + params.ioParam.ioReqCount = 1; PBUnlockRangeSync(¶ms); rc = SQLITE_OK; id->locked = 0; diff --git a/kspread/kspread_numformat.cc b/kspread/kspread_numformat.cc index e0962b96..e3a0bee7 100644 --- a/kspread/kspread_numformat.cc +++ b/kspread/kspread_numformat.cc @@ -103,7 +103,7 @@ namespace NumFormat_Local int leftSpace; int upReq; - int retqCounter; + int reqCounter; int reqFirst; int optFirst; @@ -149,7 +149,7 @@ namespace NumFormat_Local bool negBr; int optFirst; int reqFirst; - int retqCounter; + int reqCounter; int fraction; int fractionDigists; }; @@ -239,7 +239,7 @@ void resetGlobals() g_convertionInfo.showMinus = true; g_convertionInfo.negRed = false; g_convertionInfo.negBr = false; - g_convertionInfo.retqCounter = 0; + g_convertionInfo.reqCounter = 0; g_convertionInfo.reqFirst = 0; g_convertionInfo.prefix = ""; g_convertionInfo.postfix = ""; @@ -575,7 +575,7 @@ int doPreScan( TQString & format, TQString const & formatBack, TDELocale const * case '0': if ( spaceInNum > 0 ) { // for fractions - ++g_convertionInfo.retqCounter; + ++g_convertionInfo.reqCounter; break; } type = Number; @@ -640,7 +640,7 @@ int doPreScan( TQString & format, TQString const & formatBack, TDELocale const * df->negRed = g_convertionInfo.negRed; df->negBr = g_convertionInfo.negBr; df->fractionDigists = d; - df->retqCounter = g_convertionInfo.retqCounter; + df->reqCounter = g_convertionInfo.reqCounter; df->reqFirst = g_convertionInfo.reqFirst; df->prefix = g_convertionInfo.prefix; df->postfix = g_convertionInfo.postfix; @@ -1096,7 +1096,7 @@ void createFraction( TQString & result, Value const & value, TQString denominator; numerator = TQString::number( index ); - int n = numerator.length() - data->retqCounter; + int n = numerator.length() - data->reqCounter; for ( int i = 0; i < n; ++i ) { numerator.prepend( '0' );