diff options
Diffstat (limited to 'src')
99 files changed, 340 insertions, 340 deletions
diff --git a/src/3rdparty/libmng/README.autoconf b/src/3rdparty/libmng/README.autoconf index ba4282ed..e52d84b5 100644 --- a/src/3rdparty/libmng/README.autoconf +++ b/src/3rdparty/libmng/README.autoconf @@ -177,7 +177,7 @@ operates. `--help' Print a summary of the options to `configure', and exit. -`--tquiet' +`--quiet' `--silent' `-q' Do not print messages saying which checks are being made. To diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index 15199022..e94a29ab 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -557,7 +557,7 @@ EOF # Now try to grab the symbols. nlist=conftest.nm if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" else @@ -1996,7 +1996,7 @@ else solaris*) # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, retquiring libgcc.a to resolve some of + # shared libraries reliably, requiring libgcc.a to resolve some of # the object symbols generated in some cases. Libraries that use # assert need libgcc.a to resolve __eprintf, for example. Linking # a copy of libgcc.a into every shared library to guarantee resolving diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index 9725a723..b204ca02 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -332,7 +332,7 @@ Configuration: --cache-file=FILE cache test results in FILE --help print this message --no-create do not create output files - --tquiet, --silent do not print \`checking...' messages + --quiet, --silent do not print \`checking...' messages --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -477,7 +477,7 @@ EOF | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name="$ac_optarg" ;; - -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \ + -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -2247,7 +2247,7 @@ EOF # Now try to grab the symbols. nlist=conftest.nm if { (eval echo configure:2250: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" else @@ -3822,7 +3822,7 @@ else solaris*) # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, retquiring libgcc.a to resolve some of + # shared libraries reliably, requiring libgcc.a to resolve some of # the object symbols generated in some cases. Libraries that use # assert need libgcc.a to resolve __eprintf, for example. Linking # a copy of libgcc.a into every shared library to guarantee resolving diff --git a/src/3rdparty/libmng/doc/libmng.txt b/src/3rdparty/libmng/doc/libmng.txt index a18940bb..9c76be53 100644 --- a/src/3rdparty/libmng/doc/libmng.txt +++ b/src/3rdparty/libmng/doc/libmng.txt @@ -829,7 +829,7 @@ callback! This method is preferred if you are reading from a slow input device (such as a dialup-line) and you wish to start displaying something -as tquickly as possible. This functionality is provided mainly for +as quickly as possible. This functionality is provided mainly for browser-type applications but may be appropriate for other applications as well. diff --git a/src/3rdparty/libmng/doc/man/libmng.3 b/src/3rdparty/libmng/doc/man/libmng.3 index bdc47457..54d6ad34 100644 --- a/src/3rdparty/libmng/doc/man/libmng.3 +++ b/src/3rdparty/libmng/doc/man/libmng.3 @@ -847,7 +847,7 @@ callback! This method is preferred if you are reading from a slow input device (such as a dialup-line) and you wish to start displaying something -as tquickly as possible. This functionality is provided mainly for +as quickly as possible. This functionality is provided mainly for browser-type applications but may be appropriate for other applications as well. diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h index f9e7d525..924f40db 100644 --- a/src/3rdparty/libmng/libmng.h +++ b/src/3rdparty/libmng/libmng.h @@ -2096,7 +2096,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_INVALIDSIG (mng_retcode)1025 /* invalid graphics file */ #define MNG_INVALIDCRC (mng_retcode)1027 /* crc check failed */ #define MNG_INVALIDLENGTH (mng_retcode)1028 /* chunklength mystifies me */ -#define MNG_SETQUENCEERROR (mng_retcode)1029 /* invalid chunk sequence */ +#define MNG_SEQUENCEERROR (mng_retcode)1029 /* invalid chunk sequence */ #define MNG_CHUNKNOTALLOWED (mng_retcode)1030 /* completely out-of-place */ #define MNG_MULTIPLEERROR (mng_retcode)1031 /* only one occurence allowed */ #define MNG_PLTEMISSING (mng_retcode)1032 /* indexed-color requires PLTE */ @@ -2461,7 +2461,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_COMPRESSION_BASELINEJPEG 8 /* JHDR */ -#define MNG_INTERLACE_SETQUENTIAL 0 /* JHDR */ +#define MNG_INTERLACE_SEQUENTIAL 0 /* JHDR */ #define MNG_INTERLACE_PROGRESSIVE 8 #endif /* MNG_INCLUDE_JNG */ diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c index f16ef91d..0f61a708 100644 --- a/src/3rdparty/libmng/libmng_chunk_io.c +++ b/src/3rdparty/libmng/libmng_chunk_io.c @@ -559,14 +559,14 @@ READ_CHUNK (read_ihdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) /* sequence checks */ if ((pData->eSigtype == mng_it_png) && (pData->iChunkseq > 1)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) pData->bHasIHDR = MNG_TRUE; /* indicate IHDR is present */ /* and store interesting fields */ @@ -711,14 +711,14 @@ READ_CHUNK (read_plte) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJHDR)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* multiple PLTE only inside BASI */ if ((pData->bHasPLTE) && (!pData->bHasBASI)) MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -884,15 +884,15 @@ READ_CHUNK (read_idat) #else if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasJHDR) && (pData->iJHDRalphacompression != MNG_COMPRESSION_DEFLATE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasJSEP) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #endif /* not allowed for for deltatype NO_CHANGE */ if ((pData->bHasDHDR) && ((pData->iDeltatype == MNG_DELTATYPE_NOCHANGE))) @@ -958,7 +958,7 @@ READ_CHUNK (read_iend) #else if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* IHDR-block requires IDAT */ if ((pData->bHasIHDR) && (!pData->bHasIDAT)) MNG_ERROR (pData, MNG_IDATMISSING) @@ -1032,14 +1032,14 @@ READ_CHUNK (read_trns) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJHDR)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* multiple tRNS only inside BASI */ if ((pData->bHasTRNS) && (!pData->bHasBASI)) MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -1280,14 +1280,14 @@ READ_CHUNK (read_gama) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1393,14 +1393,14 @@ READ_CHUNK (read_chrm) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1561,14 +1561,14 @@ READ_CHUNK (read_srgb) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1681,14 +1681,14 @@ READ_CHUNK (read_iccp) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1904,7 +1904,7 @@ READ_CHUNK (read_text) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 2) /* length must be at least 2 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2003,7 +2003,7 @@ READ_CHUNK (read_ztxt) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 3) /* length must be at least 3 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2145,7 +2145,7 @@ READ_CHUNK (read_itxt) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 6) /* length must be at least 6 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2174,7 +2174,7 @@ READ_CHUNK (read_itxt) iCompressedsize = (mng_uint32)(iRawlen - iKeywordlen - iLanguagelen - iTranslationlen - 5); iCompressionflag = *(pNull1+1); - zKeyword = 0; /* no buffers actquired yet */ + zKeyword = 0; /* no buffers acquired yet */ zLanguage = 0; zTranslation = 0; pBuf = 0; @@ -2348,14 +2348,14 @@ READ_CHUNK (read_bkgd) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 6) /* it just can't be bigger than that! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2529,14 +2529,14 @@ READ_CHUNK (read_phys) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* it's 9 bytes or empty; no more, no less! */ if ((iRawlen != 9) && (iRawlen != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2592,14 +2592,14 @@ READ_CHUNK (read_sbit) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasPLTE) || (pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasPLTE) || (pData->bHasIDAT)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 4) /* it just can't be bigger than that! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2711,10 +2711,10 @@ READ_CHUNK (read_splt) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasIDAT) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen) { @@ -2804,10 +2804,10 @@ READ_CHUNK (read_hist) #endif /* sequence checks */ if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((!pData->bHasPLTE) || (pData->bHasIDAT)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* length oke ? */ if ( ((iRawlen & 0x01) != 0) || ((iRawlen >> 1) != pData->iPLTEcount) ) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2864,7 +2864,7 @@ READ_CHUNK (read_time) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 7) /* length must be exactly 7 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2911,7 +2911,7 @@ READ_CHUNK (read_mhdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) if (pData->bHasheader) /* can only be the first chunk! */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* correct length ? */ if ((iRawlen != 28) && (iRawlen != 12)) MNG_ERROR (pData, MNG_INVALIDLENGTH); @@ -3003,7 +3003,7 @@ READ_CHUNK (read_mend) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 0) /* must not contain data! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3045,7 +3045,7 @@ READ_CHUNK (read_loop) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (!pData->bCacheplayback) /* must store playback info to work!! */ MNG_ERROR (pData, MNG_LOOPWITHCACHEOFF) @@ -3055,7 +3055,7 @@ READ_CHUNK (read_loop) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen >= 5) /* length checks */ { @@ -3199,14 +3199,14 @@ READ_CHUNK (read_endl) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 1) /* length must be exactly 1 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3268,14 +3268,14 @@ READ_CHUNK (read_defi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 2) && (iRawlen != 3) && (iRawlen != 4) && (iRawlen != 12) && (iRawlen != 28)) @@ -3415,14 +3415,14 @@ READ_CHUNK (read_basi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 13) && (iRawlen != 19) && (iRawlen != 21) && (iRawlen != 22)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3559,14 +3559,14 @@ READ_CHUNK (read_clon) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 4) && (iRawlen != 5) && (iRawlen != 6) && (iRawlen != 7) && (iRawlen != 16)) @@ -3677,14 +3677,14 @@ READ_CHUNK (read_past) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen < 41) || (((iRawlen - 11) % 30) != 0)) @@ -3763,14 +3763,14 @@ READ_CHUNK (read_disc) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((iRawlen % 2) != 0) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3832,14 +3832,14 @@ READ_CHUNK (read_back) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 6) && (iRawlen != 7) && (iRawlen != 9) && (iRawlen != 10)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3924,14 +3924,14 @@ READ_CHUNK (read_fram) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen <= 1) /* only framing-mode ? */ { @@ -4175,14 +4175,14 @@ READ_CHUNK (read_move) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 13) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4243,14 +4243,14 @@ READ_CHUNK (read_clip) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 21) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4317,14 +4317,14 @@ READ_CHUNK (read_show) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 0) && (iRawlen != 2) && (iRawlen != 4) && (iRawlen != 5)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4410,17 +4410,17 @@ READ_CHUNK (read_term) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasLOOP) /* no way, jose! */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasTERM) /* only 1 allowed! */ MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -4490,14 +4490,14 @@ READ_CHUNK (read_save) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (pData->bHasSAVE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) pData->bHasSAVE = MNG_TRUE; @@ -4701,14 +4701,14 @@ READ_CHUNK (read_seek) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasSAVE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->fProcessseek) /* inform the app ? */ { @@ -4782,14 +4782,14 @@ READ_CHUNK (read_expi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 3) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4841,14 +4841,14 @@ READ_CHUNK (read_fpri) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 2) /* must be two bytes long */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5022,14 +5022,14 @@ READ_CHUNK (read_need) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 1) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5097,14 +5097,14 @@ READ_CHUNK (read_phyg) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* it's 9 bytes or empty; no more, no less! */ if ((iRawlen != 9) && (iRawlen != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5158,10 +5158,10 @@ READ_CHUNK (read_jhdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) if ((pData->eSigtype == mng_it_jng) && (pData->iChunkseq > 1)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 16) /* length oke ? */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5193,7 +5193,7 @@ READ_CHUNK (read_jhdr) if (pData->iJHDRimgcompression != MNG_COMPRESSION_BASELINEJPEG) MNG_ERROR (pData, MNG_INVALIDCOMPRESS) - if ((pData->iJHDRimginterlace != MNG_INTERLACE_SETQUENTIAL ) && + if ((pData->iJHDRimginterlace != MNG_INTERLACE_SEQUENTIAL ) && (pData->iJHDRimginterlace != MNG_INTERLACE_PROGRESSIVE) ) MNG_ERROR (pData, MNG_INVALIDINTERLACE) @@ -5314,13 +5314,13 @@ READ_CHUNK (read_jdaa) #endif /* sequence checks */ if ((!pData->bHasJHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasJSEP) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->iJHDRalphacompression != MNG_COMPRESSION_BASELINEJPEG) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen == 0) /* can never be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5376,7 +5376,7 @@ READ_CHUNK (read_jdat) #endif /* sequence checks */ if ((!pData->bHasJHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen == 0) /* can never be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5432,7 +5432,7 @@ READ_CHUNK (read_jsep) #endif if (!pData->bHasJHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* must be empty ! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5470,14 +5470,14 @@ READ_CHUNK (read_dhdr) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check for valid length */ if ((iRawlen != 4) && (iRawlen != 12) && (iRawlen != 20)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5581,7 +5581,7 @@ READ_CHUNK (read_prom) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 3) /* gotta be exactly 3 bytes */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5652,7 +5652,7 @@ READ_CHUNK (read_ipng) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* gotta be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5706,7 +5706,7 @@ READ_CHUNK (read_pplt) #endif /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 1) /* must have at least 1 byte */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5880,7 +5880,7 @@ READ_CHUNK (read_ijng) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* gotta be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5924,7 +5924,7 @@ READ_CHUNK (read_drop) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen < 4) || ((iRawlen % 4) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5986,7 +5986,7 @@ READ_CHUNK (read_dbyk) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 6) /* must be at least 6 long */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6037,7 +6037,7 @@ READ_CHUNK (read_ordr) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen < 5) || ((iRawlen % 5) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6108,7 +6108,7 @@ READ_CHUNK (read_magn) #else if ((!pData->bHasMHDR) || (pData->bHasIHDR) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen > 20) || ((iRawlen & 0x01) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6226,7 +6226,7 @@ READ_CHUNK (read_unknown) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* critical chunk ? */ if (((mng_uint32)pData->iChunkname & 0x20000000) == 0) MNG_ERROR (pData, MNG_UNKNOWNCRITICAL) diff --git a/src/3rdparty/libmng/libmng_error.c b/src/3rdparty/libmng/libmng_error.c index b3e42180..237f4671 100644 --- a/src/3rdparty/libmng/libmng_error.c +++ b/src/3rdparty/libmng/libmng_error.c @@ -102,7 +102,7 @@ {MNG_INVALIDSIG, "The signature is invalid"}, {MNG_INVALIDCRC, "The CRC for this chunk is invalid"}, {MNG_INVALIDLENGTH, "Chunk-length is invalid"}, - {MNG_SETQUENCEERROR, "Chunk out of sequence"}, + {MNG_SEQUENCEERROR, "Chunk out of sequence"}, {MNG_CHUNKNOTALLOWED, "Chunk not allowed at this point"}, {MNG_MULTIPLEERROR, "Chunk cannot occur multiple times"}, {MNG_PLTEMISSING, "Missing PLTE chunk"}, diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 59b9650b..7b739c80 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -177,7 +177,7 @@ do --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --tquiet | --silent) + --quiet | --silent) show=: ;; @@ -263,7 +263,7 @@ if test -z "$show_help"; then generic_help="$help" help="Try \`$modename --help --mode=$mode' for more information." - # These modes are in order of execution frequency so that they run tquickly. + # These modes are in order of execution frequency so that they run quickly. case $mode in # libtool compile mode compile) @@ -3305,7 +3305,7 @@ extern \"C\" { $mv "$nlist"T "$nlist" fi - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then : else @@ -4805,7 +4805,7 @@ Provide generalized library-building support services. --finish same as \`--mode=finish' --help display this help message and exit --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --tquiet same as \`--silent' + --quiet same as \`--silent' --silent don't print informational messages --version print version information diff --git a/src/3rdparty/libpng/CHANGES b/src/3rdparty/libpng/CHANGES index 65d047b1..d151a41c 100644 --- a/src/3rdparty/libpng/CHANGES +++ b/src/3rdparty/libpng/CHANGES @@ -167,7 +167,7 @@ version 0.96 [May, 1997] fixed DOS medium model support (Tim Wegner) fixed png_check_keyword() for case with error in static string text added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul) - added typecasts to tquiet compiler errors + added typecasts to quiet compiler errors added more debugging info version 0.97 [January, 1998] removed PNG_USE_OWN_CRC capability @@ -935,7 +935,7 @@ version 1.0.11 [April 27, 2001] version 1.0.12beta1 [May 14, 2001] Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot) Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h - Added some never-to-be-executed code in pnggccrd.c to tquiet compiler warnings. + Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings. Eliminated the png_error about apps using png_read|write_init(). Instead, libpng will reallocate the png_struct and info_struct if they are too small. This retains future binary compatibility for old applications written for @@ -1055,7 +1055,7 @@ version 1.2.2beta5 [March 26, 2002] Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so version 1.2.2beta6 [March 31, 2002] version 1.0.13beta1 [March 31, 2002] - Prevent png_zalloc() from trying to memset memory that it failed to actquire. + Prevent png_zalloc() from trying to memset memory that it failed to acquire. Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate). Ensure that the right function (user or default) is used to free the png_struct after an error in png_create_read_struct_2(). diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL index d407c9e4..1d6dfc5f 100644 --- a/src/3rdparty/libpng/INSTALL +++ b/src/3rdparty/libpng/INSTALL @@ -132,7 +132,7 @@ Then read pngconf.h to see if you want to make any configuration changes. Then just run "make test" which will create the libpng library in -this directory and run a tquick test that reads the "pngtest.png" +this directory and run a quick test that reads the "pngtest.png" file and writes a "pngout.png" file that should be identical to it. Look for "9782 zero samples" in the output of the test. For more confidence, you can run another test by typing "pngtest pngnow.png" diff --git a/src/3rdparty/libpng/libpng.3 b/src/3rdparty/libpng/libpng.3 index 249fc095..b54b5479 100644 --- a/src/3rdparty/libpng/libpng.3 +++ b/src/3rdparty/libpng/libpng.3 @@ -957,7 +957,7 @@ pointers to error handling functions, and a pointer to a data struct for use by the error functions, if necessary (the pointer and functions can be NULL if the default error handlers are to be used). See the section on Changes to Libpng below regarding the old initialization functions. -The structure allocation functions tquietly return NULL if they fail to +The structure allocation functions quietly return NULL if they fail to create the structure, so your application should check for that. png_structp png_ptr = png_create_read_struct @@ -1470,7 +1470,7 @@ rowbytes, as some of the transformations could increase the space needed to hold a row (expand, filler, gray_to_rgb, etc.). See png_read_update_info(), below. -A tquick word about text_ptr and num_text. PNG stores comments in +A quick word about text_ptr and num_text. PNG stores comments in keyword/text pairs, one pair per chunk, with no limit on the number of text chunks, and a 2^31 byte limit on their size. While there are suggested keywords, there is no requirement to restrict the use to these @@ -2626,7 +2626,7 @@ structure (that is, the value of "i", which is the order in which the chunk was either read from the input file or defined with png_set_unknown_chunks). -A tquick word about text and num_text. text is an array of png_text +A quick word about text and num_text. text is an array of png_text structures. num_text is the number of valid structures in the array. Each png_text structure holds a language code, a keyword, a text value, and a compression type. @@ -3200,7 +3200,7 @@ library code itself needs to know about interactions between your chunk and existing `intrinsic' chunks. If you need to write a new intrinsic chunk, first read the PNG -specification. Actquire a first level of +specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the diff --git a/src/3rdparty/libpng/libpng.txt b/src/3rdparty/libpng/libpng.txt index c0892e50..689b5648 100644 --- a/src/3rdparty/libpng/libpng.txt +++ b/src/3rdparty/libpng/libpng.txt @@ -166,7 +166,7 @@ pointers to error handling functions, and a pointer to a data struct for use by the error functions, if necessary (the pointer and functions can be NULL if the default error handlers are to be used). See the section on Changes to Libpng below regarding the old initialization functions. -The structure allocation functions tquietly return NULL if they fail to +The structure allocation functions quietly return NULL if they fail to create the structure, so your application should check for that. png_structp png_ptr = png_create_read_struct @@ -679,7 +679,7 @@ rowbytes, as some of the transformations could increase the space needed to hold a row (expand, filler, gray_to_rgb, etc.). See png_read_update_info(), below. -A tquick word about text_ptr and num_text. PNG stores comments in +A quick word about text_ptr and num_text. PNG stores comments in keyword/text pairs, one pair per chunk, with no limit on the number of text chunks, and a 2^31 byte limit on their size. While there are suggested keywords, there is no requirement to restrict the use to these @@ -1835,7 +1835,7 @@ structure (that is, the value of "i", which is the order in which the chunk was either read from the input file or defined with png_set_unknown_chunks). -A tquick word about text and num_text. text is an array of png_text +A quick word about text and num_text. text is an array of png_text structures. num_text is the number of valid structures in the array. Each png_text structure holds a language code, a keyword, a text value, and a compression type. @@ -2409,7 +2409,7 @@ library code itself needs to know about interactions between your chunk and existing `intrinsic' chunks. If you need to write a new intrinsic chunk, first read the PNG -specification. Actquire a first level of +specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h index 98390e26..55f9b650 100644 --- a/src/3rdparty/libpng/png.h +++ b/src/3rdparty/libpng/png.h @@ -746,7 +746,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) * The integer range [0, 2^bit_depth - 1] maps to the floating-point * range given by [pcal_X0, pcal_X1], and are further transformed by a * (possibly non-linear) transformation function given by "pcal_type" - * and "pcal_params" into "pcal_units". Please see the PNG_ETQUATION_ + * and "pcal_params" into "pcal_units". Please see the PNG_EQUATION_ * defines below, and the PNG-Group's PNG extensions document for a * complete description of the transformations and how they should be * implemented, and for a description of the ASCII parameter strings. @@ -757,7 +757,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) png_int_32 pcal_X1; /* maximum value */ png_charp pcal_units; /* Latin-1 string giving physical units */ png_charpp pcal_params; /* ASCII strings containing parameter values */ - png_byte pcal_type; /* equation type (see PNG_ETQUATION_ below) */ + png_byte pcal_type; /* equation type (see PNG_EQUATION_ below) */ png_byte pcal_nparams; /* number of parameters given in pcal_params */ #endif @@ -875,11 +875,11 @@ typedef png_info FAR * FAR * png_infopp; #define PNG_OFFSET_LAST 2 /* Not a valid value */ /* These are for the pCAL chunk. These values should NOT be changed. */ -#define PNG_ETQUATION_LINEAR 0 /* Linear transformation */ -#define PNG_ETQUATION_BASE_E 1 /* Exponential base e transform */ -#define PNG_ETQUATION_ARBITRARY 2 /* Arbitrary base exponential transform */ -#define PNG_ETQUATION_HYPERBOLIC 3 /* Hyperbolic sine transformation */ -#define PNG_ETQUATION_LAST 4 /* Not a valid value */ +#define PNG_EQUATION_LINEAR 0 /* Linear transformation */ +#define PNG_EQUATION_BASE_E 1 /* Exponential base e transform */ +#define PNG_EQUATION_ARBITRARY 2 /* Arbitrary base exponential transform */ +#define PNG_EQUATION_HYPERBOLIC 3 /* Hyperbolic sine transformation */ +#define PNG_EQUATION_LAST 4 /* Not a valid value */ /* These are for the sCAL chunk. These values should NOT be changed. */ #define PNG_SCALE_UNKNOWN 0 /* unknown unit (image scale) */ @@ -1505,7 +1505,7 @@ extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr, #define PNG_BACKGROUND_GAMMA_UNKNOWN 0 #define PNG_BACKGROUND_GAMMA_SCREEN 1 #define PNG_BACKGROUND_GAMMA_FILE 2 -#define PNG_BACKGROUND_GAMMA_UNITQUE 3 +#define PNG_BACKGROUND_GAMMA_UNIQUE 3 #endif #if defined(PNG_READ_16_TO_8_SUPPORTED) @@ -1619,7 +1619,7 @@ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr, #define PNG_CRC_ERROR_QUIT 1 /* error/quit error/quit */ #define PNG_CRC_WARN_DISCARD 2 /* (INVALID) warn/discard data */ #define PNG_CRC_WARN_USE 3 /* warn/use data warn/use data */ -#define PNG_CRC_QUIET_USE 4 /* tquiet/use data tquiet/use data */ +#define PNG_CRC_QUIET_USE 4 /* quiet/use data quiet/use data */ #define PNG_CRC_NO_CHANGE 5 /* use current value use current value */ /* These functions give the user control over the scan-line filtering in diff --git a/src/3rdparty/libpng/pngpread.c b/src/3rdparty/libpng/pngpread.c index 5da819b4..36701f62 100644 --- a/src/3rdparty/libpng/pngpread.c +++ b/src/3rdparty/libpng/pngpread.c @@ -1031,7 +1031,7 @@ png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place tEXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1127,7 +1127,7 @@ png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place zTXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1319,7 +1319,7 @@ png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place iTXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1446,7 +1446,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 #endif png_chunk_error(png_ptr, "unknown critical chunk"); - /* to tquiet compiler warnings about unused info_ptr */ + /* to quiet compiler warnings about unused info_ptr */ if (info_ptr == NULL) return; } diff --git a/src/3rdparty/libpng/pngread.c b/src/3rdparty/libpng/pngread.c index 269a6be0..80d0ba04 100644 --- a/src/3rdparty/libpng/pngread.c +++ b/src/3rdparty/libpng/pngread.c @@ -1412,7 +1412,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, png_read_end(png_ptr, info_ptr); if(transforms == 0 || params == NULL) - /* tquiet compiler warnings */ return; + /* quiet compiler warnings */ return; } #endif diff --git a/src/3rdparty/libpng/pngrtran.c b/src/3rdparty/libpng/pngrtran.c index 4f002c80..a0a3994d 100644 --- a/src/3rdparty/libpng/pngrtran.c +++ b/src/3rdparty/libpng/pngrtran.c @@ -30,7 +30,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE; break; - case PNG_CRC_QUIET_USE: /* tquiet/use data */ + case PNG_CRC_QUIET_USE: /* quiet/use data */ png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE | PNG_FLAG_CRC_CRITICAL_IGNORE; @@ -52,7 +52,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE; break; - case PNG_CRC_QUIET_USE: /* tquiet/use data */ + case PNG_CRC_QUIET_USE: /* quiet/use data */ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN; @@ -281,7 +281,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, } else { - /* This is much harder to do simply (and tquickly). Perhaps + /* This is much harder to do simply (and quickly). Perhaps we need to go through a median cut routine, but those don't always behave themselves with only a few colors as input. So we will just find the closest two colors, @@ -813,7 +813,7 @@ png_init_read_transformations(png_structp png_ptr) g = 1.0 / (png_ptr->gamma); gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); break; - case PNG_BACKGROUND_GAMMA_UNITQUE: + case PNG_BACKGROUND_GAMMA_UNIQUE: g = 1.0 / (png_ptr->background_gamma); gs = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); @@ -897,7 +897,7 @@ png_init_read_transformations(png_structp png_ptr) g = 1.0 / (png_ptr->gamma); gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); break; - case PNG_BACKGROUND_GAMMA_UNITQUE: + case PNG_BACKGROUND_GAMMA_UNIQUE: g = 1.0 / (png_ptr->background_gamma); gs = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); diff --git a/src/3rdparty/libpng/pngrutil.c b/src/3rdparty/libpng/pngrutil.c index 798abd2f..13e08523 100644 --- a/src/3rdparty/libpng/pngrutil.c +++ b/src/3rdparty/libpng/pngrutil.c @@ -551,7 +551,7 @@ png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) { png_error(png_ptr, "No image in file"); - info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */ + info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */ } png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND); @@ -1624,16 +1624,16 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_debug(3, "Checking pCAL equation type and number of parameters\n"); /* Check that we have the right number of parameters for known equation types. */ - if ((type == PNG_ETQUATION_LINEAR && nparams != 2) || - (type == PNG_ETQUATION_BASE_E && nparams != 3) || - (type == PNG_ETQUATION_ARBITRARY && nparams != 3) || - (type == PNG_ETQUATION_HYPERBOLIC && nparams != 4)) + if ((type == PNG_EQUATION_LINEAR && nparams != 2) || + (type == PNG_EQUATION_BASE_E && nparams != 3) || + (type == PNG_EQUATION_ARBITRARY && nparams != 3) || + (type == PNG_EQUATION_HYPERBOLIC && nparams != 4)) { png_warning(png_ptr, "Invalid pCAL parameters for equation type"); png_free(png_ptr, purpose); return; } - else if (type >= PNG_ETQUATION_LAST) + else if (type >= PNG_EQUATION_LAST) { png_warning(png_ptr, "Unrecognized equation type for pCAL chunk"); } @@ -2211,7 +2211,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_crc_finish(png_ptr, skip); #if !defined(PNG_READ_USER_CHUNKS_SUPPORTED) - info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */ + info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */ #endif } diff --git a/src/3rdparty/libpng/pngwrite.c b/src/3rdparty/libpng/pngwrite.c index 1e98090a..10c9ea40 100644 --- a/src/3rdparty/libpng/pngwrite.c +++ b/src/3rdparty/libpng/pngwrite.c @@ -1444,7 +1444,7 @@ png_write_png(png_structp png_ptr, png_infop info_ptr, png_write_end(png_ptr, info_ptr); if(transforms == 0 || params == NULL) - /* tquiet compiler warnings */ return; + /* quiet compiler warnings */ return; } #endif #endif /* PNG_WRITE_SUPPORTED */ diff --git a/src/3rdparty/libpng/pngwutil.c b/src/3rdparty/libpng/pngwutil.c index d640179a..43d26c2a 100644 --- a/src/3rdparty/libpng/pngwutil.c +++ b/src/3rdparty/libpng/pngwutil.c @@ -1470,7 +1470,7 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0, int i; png_debug1(1, "in png_write_pCAL (%d parameters)\n", nparams); - if (type >= PNG_ETQUATION_LAST) + if (type >= PNG_EQUATION_LAST) png_warning(png_ptr, "Unrecognized equation type for pCAL chunk"); purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1; diff --git a/src/3rdparty/libpng/scripts/makefile.amiga b/src/3rdparty/libpng/scripts/makefile.amiga index 9e352507..79cb4249 100644 --- a/src/3rdparty/libpng/scripts/makefile.amiga +++ b/src/3rdparty/libpng/scripts/makefile.amiga @@ -22,7 +22,7 @@ LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib # linker LN= slink # file deletion command -RM= delete tquiet +RM= delete quiet # library (.lib) file creation command AR= oml # make directory command diff --git a/src/3rdparty/libpng/scripts/pngdef.pas b/src/3rdparty/libpng/scripts/pngdef.pas index ecfb8feb..6e206831 100644 --- a/src/3rdparty/libpng/scripts/pngdef.pas +++ b/src/3rdparty/libpng/scripts/pngdef.pas @@ -210,7 +210,7 @@ const PNG_CRC_ERROR_QUIT = 1; // error/quit error/quit PNG_CRC_WARN_DISCARD = 2; // (INVALID) warn/discard data PNG_CRC_WARN_USE = 3; // warn/use data warn/use data - PNG_CRC_QUIET_USE = 4; // tquiet/use data tquiet/use data + PNG_CRC_QUIET_USE = 4; // quiet/use data quiet/use data PNG_CRC_NO_CHANGE = 5; // use current value use current value // Flags for png_set_filter() to say which filters to use. The flags diff --git a/src/3rdparty/libpng/scripts/smakefile.ppc b/src/3rdparty/libpng/scripts/smakefile.ppc index 5406dbbb..e5c02784 100644 --- a/src/3rdparty/libpng/scripts/smakefile.ppc +++ b/src/3rdparty/libpng/scripts/smakefile.ppc @@ -13,7 +13,7 @@ RANLIB = ppc-amigaos-ranlib LDFLAGS = -r -o LDLIBS = ../zlib/libzip.a LIB:scppc.a LN = ppc-amigaos-ld -RM = delete tquiet +RM = delete quiet MKDIR = makedir OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \ diff --git a/src/3rdparty/sqlite/btree.c b/src/3rdparty/sqlite/btree.c index c5f077ab..6b9c6b02 100644 --- a/src/3rdparty/sqlite/btree.c +++ b/src/3rdparty/sqlite/btree.c @@ -308,7 +308,7 @@ struct FreelistInfo { ** than can possibly fit on one page. In the steady state, every apCell[] ** points to memory inside u.aDisk[]. But in the middle of an insert ** operation, some apCell[] entries may temporarily point to data space -** outside of u.aDisk[]. This is a transient situation that is tquickly +** outside of u.aDisk[]. This is a transient situation that is quickly ** resolved. But while it is happening, it is possible for a database ** page to hold as many as two more cells than it might otherwise hold. ** The extra two entries in apCell[] are an allowance for this situation. @@ -772,7 +772,7 @@ static int fileBtreeSetSafetyLevel(Btree *pBt, int level){ /* ** Get a reference to page1 of the database file. This will -** also actquire a readlock on that file. +** also acquire a readlock on that file. ** ** SQLITE_OK is returned on success. If the file is not a ** well-formed database file, then SQLITE_CORRUPT is returned. @@ -997,7 +997,7 @@ static int fileBtreeRollbackCkpt(Btree *pBt){ /* ** Create a new cursor for the BTree whose root is on the page -** iTable. The act of actquiring a cursor gets a read lock on +** iTable. The act of acquiring a cursor gets a read lock on ** the database file. ** ** If wrFlag==0, then the cursor can only be used for reading. @@ -1028,7 +1028,7 @@ static int fileBtreeRollbackCkpt(Btree *pBt){ ** to write. ** ** No checking is done to make sure that page iTable really is the -** root page of a b-tree. If it is not, then the cursor actquired +** root page of a b-tree. If it is not, then the cursor acquired ** will not work correctly. */ static int fileBtreeCursor(Btree *pBt, int iTable, int wrFlag, BtCursor **ppCur){ @@ -3423,7 +3423,7 @@ char *fileBtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){ nRef = *sqlitepager_stats(pBt->pPager); if( lockBtree(pBt)!=SQLITE_OK ){ - return sqliteStrDup("Unable to actquire a read lock on the database"); + return sqliteStrDup("Unable to acquire a read lock on the database"); } sCheck.pBt = pBt; sCheck.pPager = pBt->pPager; diff --git a/src/3rdparty/sqlite/build.c b/src/3rdparty/sqlite/build.c index 2639604b..87c88346 100644 --- a/src/3rdparty/sqlite/build.c +++ b/src/3rdparty/sqlite/build.c @@ -527,7 +527,7 @@ void sqliteStartTable( /* Begin generating the code that will insert the table record into ** the SQLITE_MASTER table. Note in particular that we must go ahead ** and allocate the record number for the table entry now. Before any - ** PRIMARY KEY or UNITQUE keywords are parsed. Those keywords will cause + ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause ** indices to be created and the table record must come before the ** indices. Hence, the record number for the table must be allocated ** now. @@ -1462,7 +1462,7 @@ void sqliteDeferForeignKey(Parse *pParse, int isDeferred){ ** Create a new index for an SQL table. pIndex is the name of the index ** and pTable is the name of the table that is to be indexed. Both will ** be NULL for a primary key or an index that is created to satisfy a -** UNITQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable ** as the table to be indexed. pParse->pNewTable is a table that is ** currently being constructed by a CREATE TABLE statement. ** @@ -1532,7 +1532,7 @@ void sqliteCreateIndex( ** index, then we will continue to process this index. ** ** If pName==0 it means that we are - ** dealing with a primary key or UNITQUE constraint. We have to invent our + ** dealing with a primary key or UNIQUE constraint. We have to invent our ** own name. */ if( pName && !db->init.busy ){ @@ -1674,7 +1674,7 @@ void sqliteCreateIndex( ** we don't want to recreate it. ** ** If pTable==0 it means this index is generated as a primary key - ** or UNITQUE constraint of a CREATE TABLE statement. Since the table + ** or UNIQUE constraint of a CREATE TABLE statement. Since the table ** has just been created, it contains no data and the index initialization ** step can be skipped. */ @@ -1768,7 +1768,7 @@ void sqliteDropIndex(Parse *pParse, SrcList *pName){ goto exit_drop_index; } if( pIndex->autoIndex ){ - sqliteErrorMsg(pParse, "index associated with UNITQUE " + sqliteErrorMsg(pParse, "index associated with UNIQUE " "or PRIMARY KEY constraint cannot be dropped", 0); goto exit_drop_index; } diff --git a/src/3rdparty/sqlite/insert.c b/src/3rdparty/sqlite/insert.c index 5957f300..64e18ba0 100644 --- a/src/3rdparty/sqlite/insert.c +++ b/src/3rdparty/sqlite/insert.c @@ -567,7 +567,7 @@ insert_cleanup: ** aIdxUsed!=0 and aIdxUsed[i]!=0. ** ** This routine also generates code to check constraints. NOT NULL, -** CHECK, and UNITQUE constraints are all checked. If a constraint fails, +** CHECK, and UNIQUE constraints are all checked. If a constraint fails, ** then the appropriate action is performed. There are five possible ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. ** @@ -595,7 +595,7 @@ insert_cleanup: ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** -** UNITQUE REPLACE The other row that conflicts with the row +** UNIQUE REPLACE The other row that conflicts with the row ** being inserted is removed. ** ** CHECK REPLACE Illegal. The results in an exception. @@ -753,7 +753,7 @@ void sqliteGenerateConstraintChecks( } } - /* Test all UNITQUE constraints by creating entries for each UNITQUE + /* Test all UNIQUE constraints by creating entries for each UNIQUE ** index and making sure that duplicate entries do not already exist. ** Add the new records to the indices as we go. */ @@ -777,7 +777,7 @@ void sqliteGenerateConstraintChecks( /* Find out what action to take in case there is an indexing conflict */ onError = pIdx->onError; - if( onError==OE_None ) continue; /* pIdx is not a UNITQUE index */ + if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( pParse->db->onError!=OE_Default ){ @@ -843,7 +843,7 @@ void sqliteGenerateConstraintChecks( default: assert(0); } contAddr = sqliteVdbeCurrentAddr(v); -#if NULL_DISTINCT_FOR_UNITQUE +#if NULL_DISTINCT_FOR_UNIQUE sqliteVdbeChangeP2(v, jumpInst1, contAddr); #endif sqliteVdbeChangeP2(v, jumpInst2, contAddr); diff --git a/src/3rdparty/sqlite/main.c b/src/3rdparty/sqlite/main.c index 725b6503..6fa01410 100644 --- a/src/3rdparty/sqlite/main.c +++ b/src/3rdparty/sqlite/main.c @@ -90,7 +90,7 @@ int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){ db->init.iDb = 0; }else{ /* If the SQL column is blank it means this is an index that - ** was created to be the PRIMARY KEY or to fulfill a UNITQUE + ** was created to be the PRIMARY KEY or to fulfill a UNIQUE ** constraint for a CREATE TABLE. The index should have already ** been created when we processed the CREATE TABLE. All we have ** to do here is record the root page number for that index. diff --git a/src/3rdparty/sqlite/os.c b/src/3rdparty/sqlite/os.c index 3130bdee..b4ae7a10 100644 --- a/src/3rdparty/sqlite/os.c +++ b/src/3rdparty/sqlite/os.c @@ -1245,7 +1245,7 @@ int isNT(void){ ** A database write lock is obtained by locking all bytes in the range. ** There can only be one writer. ** -** A lock is obtained on the first byte of the lock range before actquiring +** A lock is obtained on the first byte of the lock range before acquiring ** either a read lock or a write lock. This prevents two processes from ** attempting to get a lock at a same time. The semantics of ** sqliteOsReadLock() require that if there is already a write lock, that @@ -1280,7 +1280,7 @@ int isNT(void){ /* ** Change the status of the lock on the file "id" to be a readlock. ** If the file was write locked, then this reduces the lock to a read. -** If the file was read locked, then this actquires a new read lock. +** If the file was read locked, then this acquires a new read lock. ** ** Return SQLITE_OK on success and SQLITE_BUSY on failure. If this ** library was compiled with large file support (LFS) but LFS is not @@ -1685,7 +1685,7 @@ static int inMutex = 0; ** executed code that is surrounded by EnterMutex() and LeaveMutex(). ** ** SQLite uses only a single Mutex. There is not much critical -** code and what little there is executes tquickly and without blocking. +** code and what little there is executes quickly and without blocking. */ void sqliteOsEnterMutex(){ #ifdef SQLITE_UNIX_THREADS diff --git a/src/3rdparty/sqlite/pager.c b/src/3rdparty/sqlite/pager.c index 32dcf19b..8b6a1546 100644 --- a/src/3rdparty/sqlite/pager.c +++ b/src/3rdparty/sqlite/pager.c @@ -463,7 +463,7 @@ static void pager_reset(Pager *pPager){ /* ** When this routine is called, the pager has the journal file open and ** a write lock on the database. This routine releases the database -** write lock and actquires a read lock in its place. The journal file +** write lock and acquires a read lock in its place. The journal file ** is deleted and closed. ** ** TODO: Consider keeping the journal file open for temporary databases. @@ -1286,9 +1286,9 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ } /* -** Actquire a page. +** Acquire a page. ** -** A read lock on the disk file is obtained when the first page is actquired. +** A read lock on the disk file is obtained when the first page is acquired. ** This read lock is dropped when the last page is released. ** ** A _get works for any page number greater than 0. If the database @@ -1297,13 +1297,13 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ ** all zeros. The extra data appended to a page is always initialized ** to zeros the first time a page is loaded into memory. ** -** The actquisition might fail for several reasons. In all cases, +** The acquisition might fail for several reasons. In all cases, ** an appropriate error code is returned and *ppPage is set to NULL. ** ** See also sqlitepager_lookup(). Both this routine and _lookup() attempt ** to find a page in the in-memory cache first. If the page is not already ** in memory, this routine goes to disk to read it in whereas _lookup() -** just returns 0. This routine actquires a read-lock the first time it +** just returns 0. This routine acquires a read-lock the first time it ** has to go to disk, and could also playback an old journal if necessary. ** Since _lookup() never goes to disk, it never has to deal with locks ** or journal files. @@ -1366,7 +1366,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ pPager->journalStarted = 0; /* Playback and delete the journal. Drop the database write - ** lock and reactquire the read lock. + ** lock and reacquire the read lock. */ rc = pager_playback(pPager, 0); if( rc!=SQLITE_OK ){ @@ -1544,7 +1544,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ } /* -** Actquire a page if it is already in the in-memory cache. Do +** Acquire a page if it is already in the in-memory cache. Do ** not read the page from disk. Return a pointer to the page, ** or 0 if the page is not in cache. ** @@ -1692,7 +1692,7 @@ static int pager_open_journal(Pager *pPager){ } /* -** Actquire a write-lock on the database. The lock is removed when +** Acquire a write-lock on the database. The lock is removed when ** the any of the following happen: ** ** * sqlitepager_commit() is called. @@ -1702,7 +1702,7 @@ static int pager_open_journal(Pager *pPager){ ** ** The parameter to this routine is a pointer to any open page of the ** database file. Nothing changes about the page - it is used merely -** to actquire a pointer to the Pager structure and as proof that there +** to acquire a pointer to the Pager structure and as proof that there ** is already a read-lock on the database. ** ** A journal file is opened if this is not a temporary file. For @@ -1739,8 +1739,8 @@ int sqlitepager_begin(void *pData){ ** changes to a page. ** ** The first time this routine is called, the pager creates a new -** journal and actquires a write lock on the database. If the write -** lock could not be actquired, this routine returns SQLITE_BUSY. The +** journal and acquires a write lock on the database. If the write +** lock could not be acquired, this routine returns SQLITE_BUSY. The ** calling routine must check for that return value and be careful not to ** change any page data until this routine returns SQLITE_OK. ** diff --git a/src/3rdparty/sqlite/parse.c b/src/3rdparty/sqlite/parse.c index 2fd6ae39..46353691 100644 --- a/src/3rdparty/sqlite/parse.c +++ b/src/3rdparty/sqlite/parse.c @@ -711,7 +711,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* FLOAT => nothing */ 0, /* NULL => nothing */ 0, /* PRIMARY => nothing */ - 0, /* UNITQUE => nothing */ + 0, /* UNIQUE => nothing */ 0, /* CHECK => nothing */ 0, /* REFERENCES => nothing */ 0, /* COLLATE => nothing */ @@ -840,7 +840,7 @@ static const char *yyTokenName[] = { "STAR", "SLASH", "REM", "CONCAT", "UMINUS", "UPLUS", "BITNOT", "STRING", "JOIN_KW", "INTEGER", "CONSTRAINT", "DEFAULT", - "FLOAT", "NULL", "PRIMARY", "UNITQUE", + "FLOAT", "NULL", "PRIMARY", "UNIQUE", "CHECK", "REFERENCES", "COLLATE", "ON", "DELETE", "UPDATE", "INSERT", "SET", "DEFERRABLE", "FOREIGN", "DROP", "UNION", @@ -935,7 +935,7 @@ static const char *yyRuleName[] = { /* 53 */ "ccons ::= NULL onconf", /* 54 */ "ccons ::= NOT NULL onconf", /* 55 */ "ccons ::= PRIMARY KEY sortorder onconf", - /* 56 */ "ccons ::= UNITQUE onconf", + /* 56 */ "ccons ::= UNIQUE onconf", /* 57 */ "ccons ::= CHECK LP expr RP onconf", /* 58 */ "ccons ::= REFERENCES nm idxlist_opt refargs", /* 59 */ "ccons ::= defer_subclause", @@ -962,7 +962,7 @@ static const char *yyRuleName[] = { /* 80 */ "conslist ::= tcons", /* 81 */ "tcons ::= CONSTRAINT nm", /* 82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf", - /* 83 */ "tcons ::= UNITQUE LP idxlist RP onconf", + /* 83 */ "tcons ::= UNIQUE LP idxlist RP onconf", /* 84 */ "tcons ::= CHECK expr onconf", /* 85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", /* 86 */ "defer_subclause_opt ::=", @@ -1115,7 +1115,7 @@ static const char *yyRuleName[] = { /* 233 */ "expritem ::= expr", /* 234 */ "expritem ::=", /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf", - /* 236 */ "uniqueflag ::= UNITQUE", + /* 236 */ "uniqueflag ::= UNIQUE", /* 237 */ "uniqueflag ::=", /* 238 */ "idxlist_opt ::=", /* 239 */ "idxlist_opt ::= LP idxlist RP", @@ -2183,7 +2183,7 @@ static void yy_reduce( #line 191 "parse.y" {sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);} #line 2185 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 57: /* No destructor defined for CHECK */ @@ -2342,7 +2342,7 @@ static void yy_reduce( #line 238 "parse.y" {sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);} #line 2344 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ /* No destructor defined for LP */ /* No destructor defined for RP */ break; @@ -3428,7 +3428,7 @@ static void yy_reduce( #line 740 "parse.y" { yygotominor.yy372 = OE_Abort; } #line 3430 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 237: #line 741 "parse.y" diff --git a/src/3rdparty/sqlite/parse.h b/src/3rdparty/sqlite/parse.h index 35949283..188a336c 100644 --- a/src/3rdparty/sqlite/parse.h +++ b/src/3rdparty/sqlite/parse.h @@ -92,7 +92,7 @@ #define TK_FLOAT 92 #define TK_NULL 93 #define TK_PRIMARY 94 -#define TK_UNITQUE 95 +#define TK_UNIQUE 95 #define TK_CHECK 96 #define TK_REFERENCES 97 #define TK_COLLATE 98 diff --git a/src/3rdparty/sqlite/sqliteInt.h b/src/3rdparty/sqlite/sqliteInt.h index 6fa4af40..4c2b6434 100644 --- a/src/3rdparty/sqlite/sqliteInt.h +++ b/src/3rdparty/sqlite/sqliteInt.h @@ -45,16 +45,16 @@ /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same -** in a UNITQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, ** OCELOT, and Firebird all work. The SQL92 spec explicitly says this ** is the way things are suppose to work. ** ** If the following macro is set to 0, the NULLs are indistinct for -** a UNITQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNITQUE. This is the way Informix and SQL Server +** a UNIQUE index. In this mode, you can only have a single NULL entry +** for a column declared UNIQUE. This is the way Informix and SQL Server ** work. */ -#define NULL_DISTINCT_FOR_UNITQUE 1 +#define NULL_DISTINCT_FOR_UNIQUE 1 /* ** The maximum number of attached databases. This must be at least 2 @@ -559,7 +559,7 @@ struct FKey { ** occurs. IGNORE means that the particular row that caused the constraint ** error is not inserted or updated. Processing continues and no error ** is returned. REPLACE means that preexisting database rows that caused -** a UNITQUE constraint violation are removed so that the new insert or +** a UNIQUE constraint violation are removed so that the new insert or ** update can proceed. Processing continues and no error is reported. ** ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. @@ -619,7 +619,7 @@ struct Index { Table *pTable; /* The SQL table being indexed */ int tnum; /* Page containing root of this index in database file */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ - u8 autoIndex; /* True if is automatically created (ex: by UNITQUE) */ + u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ u8 iDb; /* Index in sqlite.aDb[] of where this index is stored */ Index *pNext; /* The next index associated with the same table */ }; diff --git a/src/3rdparty/sqlite/tokenize.c b/src/3rdparty/sqlite/tokenize.c index 96dad9f4..d0a34fed 100644 --- a/src/3rdparty/sqlite/tokenize.c +++ b/src/3rdparty/sqlite/tokenize.c @@ -130,7 +130,7 @@ static Keyword aKeywordTable[] = { { "TRANSACTION", TK_TRANSACTION, }, { "TRIGGER", TK_TRIGGER, }, { "UNION", TK_UNION, }, - { "UNITQUE", TK_UNITQUE, }, + { "UNIQUE", TK_UNIQUE, }, { "UPDATE", TK_UPDATE, }, { "USING", TK_USING, }, { "VACUUM", TK_VACUUM, }, diff --git a/src/3rdparty/sqlite/util.c b/src/3rdparty/sqlite/util.c index 074afedf..16b3b46a 100644 --- a/src/3rdparty/sqlite/util.c +++ b/src/3rdparty/sqlite/util.c @@ -933,7 +933,7 @@ static int sqlite_utf8_to_int(const unsigned char *z){ ** "[a-z]" matches any single lower-case letter. To match a '-', make ** it the last character in the list. ** -** This routine is usually tquick, but can be N**2 in the worst case. +** This routine is usually quick, but can be N**2 in the worst case. ** ** Hints: to match '*' or '?', put them in "[]". Like this: ** diff --git a/src/3rdparty/sqlite/vdbe.c b/src/3rdparty/sqlite/vdbe.c index 3f0965a9..0d3fb43e 100644 --- a/src/3rdparty/sqlite/vdbe.c +++ b/src/3rdparty/sqlite/vdbe.c @@ -2348,7 +2348,7 @@ case OP_VerifyCookie: { ** ** There will be a read lock on the database whenever there is an ** open cursor. If the database was unlocked prior to this instruction -** then a read lock is actquired as part of this instruction. A read +** then a read lock is acquired as part of this instruction. A read ** lock allows other processes to read the database but prohibits ** any other process from modifying the database. The read lock is ** released when all cursors are closed. If this instruction attempts @@ -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 UNITQUE constraint.) + ** violates a UNIQUE constraint.) */ pTos++; pTos->i = v; diff --git a/src/3rdparty/sqlite/vdbeInt.h b/src/3rdparty/sqlite/vdbeInt.h index c5ac7495..79b6b51a 100644 --- a/src/3rdparty/sqlite/vdbeInt.h +++ b/src/3rdparty/sqlite/vdbeInt.h @@ -182,7 +182,7 @@ struct AggElem { }; /* -** A Set structure is used for tquick testing to see if a value +** A Set structure is used for quick testing to see if a value ** is part of a small set. Sets are used to implement code like ** this: ** x.y IN ('hi','hoo','hum') diff --git a/src/3rdparty/sqlite/where.c b/src/3rdparty/sqlite/where.c index ea713c33..34195c65 100644 --- a/src/3rdparty/sqlite/where.c +++ b/src/3rdparty/sqlite/where.c @@ -412,7 +412,7 @@ WhereInfo *sqliteWhereBegin( exprAnalyze(&maskSet, &aExpr[i]); /* If we are executing a trigger body, remove all references to - ** new.* and old.* tables from the preretquisite masks. + ** new.* and old.* tables from the prerequisite masks. */ if( pParse->trigStack ){ int x; diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c index c7f75a3e..0fc53bc1 100644 --- a/src/3rdparty/zlib/deflate.c +++ b/src/3rdparty/zlib/deflate.c @@ -154,7 +154,7 @@ local const config configuration_table[10] = { * meaning. */ -#define ETQUAL 0 +#define EQUAL 0 /* result of memcmp for equal strings */ #ifndef NO_DUMMY_DECL @@ -1064,7 +1064,7 @@ local void check_match(s, start, match, length) { /* check that the match is indeed a match */ if (zmemcmp(s->window + match, - s->window + start, length) != ETQUAL) { + s->window + start, length) != EQUAL) { fprintf(stderr, " start %u, match %u, length %d\n", start, match, length); do { diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 4c01661b..c563991e 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -590,7 +590,7 @@ ZEXTERN int Q_ZEXPORT deflateParams OF((z_streamp strm, Dynamically update the compression level and compression strategy. The interpretation of level and strategy is as in deflateInit2. This can be used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data retquiring a different + to switch to a different kind of input data requiring a different strategy. If the compression level is changed, the input available so far is compressed with the old level (and may be flushed); the new level will take effect only at the next call of deflate(). diff --git a/src/attic/qtmultilineedit.cpp b/src/attic/qtmultilineedit.cpp index 1a93c8b2..8361bedc 100644 --- a/src/attic/qtmultilineedit.cpp +++ b/src/attic/qtmultilineedit.cpp @@ -1454,7 +1454,7 @@ void TQtMultiLineEdit::pageDown( bool mark ) int pageSize = viewHeight() / cellHeight(); int newTopCell = TQMIN( topCell() + pageSize, numLines() - 1 - pageSize ); - if ( pageSize >= numLines() ) { // tquick fix to handle small texts + if ( pageSize >= numLines() ) { // quick fix to handle small texts newTopCell = topCell(); } if ( !curXPos ) @@ -1506,7 +1506,7 @@ void TQtMultiLineEdit::pageUp( bool mark ) int pageSize = viewHeight() / cellHeight(); bool partial = delta == pageSize && viewHeight() != pageSize * cellHeight(); int newTopCell = TQMAX( topCell() - pageSize, 0 ); - if ( pageSize > numLines() ) { // tquick fix to handle small texts + if ( pageSize > numLines() ) { // quick fix to handle small texts newTopCell = 0; delta = 0; } diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp index a8b348b9..d5eceae9 100644 --- a/src/canvas/qcanvas.cpp +++ b/src/canvas/qcanvas.cpp @@ -2522,7 +2522,7 @@ static bool collision_double_dispatch( const TQCanvasSprite* s1, which will accept an integer frame number to retrieve the coordinates of a particular frame. - TQCanvasSprite draws very tquickly, at the expense of memory. + TQCanvasSprite draws very quickly, at the expense of memory. The current frame's image can be drawn on a painter with draw(). @@ -3749,7 +3749,7 @@ TQSize TQCanvasView::sizeHint() const to maximize efficiency, but the polygon must \e definitely be contained completely within the polygonal area. Calculating the exact requirements is usually difficult, but if you allow a small - overestimate it can be easy and tquick, while still getting almost + overestimate it can be easy and quick, while still getting almost all of TQCanvasPolygonalItem's speed. Note that all subclasses \e must call hide() in their destructor diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/ntqeucjpcodec.h index b5d6e7d8..e0f2edcf 100644 --- a/src/codecs/ntqeucjpcodec.h +++ b/src/codecs/ntqeucjpcodec.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/ntqeuckrcodec.h index 7235ca31..216cce61 100644 --- a/src/codecs/ntqeuckrcodec.h +++ b/src/codecs/ntqeuckrcodec.h @@ -54,7 +54,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/ntqjiscodec.h index 00cbf7cd..6a34cb7d 100644 --- a/src/codecs/ntqjiscodec.h +++ b/src/codecs/ntqjiscodec.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqjpunicode.h b/src/codecs/ntqjpunicode.h index 37f6f242..8d19960f 100644 --- a/src/codecs/ntqjpunicode.h +++ b/src/codecs/ntqjpunicode.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/ntqsjiscodec.h index 9bac66ca..46fbc918 100644 --- a/src/codecs/ntqsjiscodec.h +++ b/src/codecs/ntqsjiscodec.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqtsciicodec.h b/src/codecs/ntqtsciicodec.h index 4b881b13..ad04e2f7 100644 --- a/src/codecs/ntqtsciicodec.h +++ b/src/codecs/ntqtsciicodec.h @@ -56,7 +56,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp index 49ebce4e..ddf6a2a2 100644 --- a/src/codecs/qbig5codec.cpp +++ b/src/codecs/qbig5codec.cpp @@ -89,7 +89,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -802,7 +802,7 @@ int TQBig5Codec::heuristicNameMatch(const char* hint) const ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp index 52ce9592..6230559d 100644 --- a/src/codecs/qeucjpcodec.cpp +++ b/src/codecs/qeucjpcodec.cpp @@ -80,7 +80,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -105,7 +105,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -157,10 +157,10 @@ int TQEucJpCodec::mibEnum() const code set 1: JIS X0208-1990 (a double 8-bit byte set) restricted to A0-FF in both bytes code set 2: Half Width Katakana (a single 7-bit byte set) - retquiring SS2 as the character prefix + requiring SS2 as the character prefix code set 3: JIS X0212-1990 (a double 7-bit byte set) restricted to A0-FF in both bytes - retquiring SS3 as the character prefix + requiring SS3 as the character prefix Alias: csEUCPkdFmtJapanese Alias: EUC-JP (preferred MIME name) */ diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp index 433f4b8b..1b325ce6 100644 --- a/src/codecs/qeuckrcodec.cpp +++ b/src/codecs/qeuckrcodec.cpp @@ -70,7 +70,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp index e6aca796..db2a76fd 100644 --- a/src/codecs/qgb18030codec.cpp +++ b/src/codecs/qgb18030codec.cpp @@ -106,7 +106,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp index 9f125a33..366a19f5 100644 --- a/src/codecs/qjiscodec.cpp +++ b/src/codecs/qjiscodec.cpp @@ -123,7 +123,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp index 500dab38..ea0ca2ba 100644 --- a/src/codecs/qjpunicode.cpp +++ b/src/codecs/qjpunicode.cpp @@ -73,7 +73,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp index bf2a94be..c03506b6 100644 --- a/src/codecs/qrtlcodec.cpp +++ b/src/codecs/qrtlcodec.cpp @@ -45,7 +45,7 @@ // NOT REVISED -static const uchar unkn = '?'; // BLACK STQUARE (94) would be better +static const uchar unkn = '?'; // BLACK SQUARE (94) would be better static const ushort heb_to_unicode[128] = { 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp index 7a2e0c49..33aee755 100644 --- a/src/codecs/qsjiscodec.cpp +++ b/src/codecs/qsjiscodec.cpp @@ -81,7 +81,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp index e57f4fd7..5a615e74 100644 --- a/src/codecs/qtsciicodec.cpp +++ b/src/codecs/qtsciicodec.cpp @@ -83,7 +83,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index e883fdc6..cbeeac68 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -141,7 +141,7 @@ void jump( TQtMsgType t, const char * m ) rich += TQStyleSheet::convertFromPlainText( m, TQStyleSheetItem::WhiteSpaceNormal ); - // ### work around text engine tquirk + // ### work around text engine quirk if ( rich.endsWith("</p>") ) rich.truncate( rich.length() - 4 ); diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index eeaf54dc..d0320af6 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -722,7 +722,7 @@ void TQProgressDialog::layout() If the expected duration of the task is less than the minimumDuration, the dialog will not appear at all. This prevents - the dialog popping up for tasks that are tquickly over. For tasks + the dialog popping up for tasks that are quickly over. For tasks that are expected to exceed the minimumDuration, the dialog will pop up after the minimumDuration time or as soon as any progress is set. diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/ntqkeysequence.h index f77bebc5..e326570c 100644 --- a/src/kernel/ntqkeysequence.h +++ b/src/kernel/ntqkeysequence.h @@ -38,8 +38,8 @@ ** **********************************************************************/ -#ifndef TQKEYSETQUENCE_H -#define TQKEYSETQUENCE_H +#ifndef TQKEYSEQUENCE_H +#define TQKEYSEQUENCE_H #ifndef QT_H #ifndef QT_H diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h index 5638517e..6dfba30f 100644 --- a/src/kernel/ntqprocess.h +++ b/src/kernel/ntqprocess.h @@ -82,7 +82,7 @@ public: virtual bool launch( const TQString& buf, TQStringList *env=0 ); virtual bool launch( const TQByteArray& buf, TQStringList *env=0 ); - // intquire the status + // inquire the status bool isRunning() const; bool normalExit() const; int exitStatus() const; diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index e9fee790..847d713a 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -829,7 +829,7 @@ static bool create_atoms_now = 0; If the application is being initialized, this function stores the adddress of the atom and tqt_init_internal will do the actual work - tquickly. If the application is running, the atom is created here. + quickly. If the application is running, the atom is created here. Neither argument may point to temporary variables. *****************************************************************************/ @@ -1129,7 +1129,7 @@ bool TQApplication::x11_apply_settings() #ifndef QT_NO_IM /* - The identifier name of an input method is actquired from the + The identifier name of an input method is acquired from the configuration file as a default. If a environment variable "QT_IM_SWITCHER" is not empty it will overwrite the configuration file. The "imsw-multi" becomes the default if the entry diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp index ac8deedd..7179cc1f 100644 --- a/src/kernel/qdnd_x11.cpp +++ b/src/kernel/qdnd_x11.cpp @@ -779,7 +779,7 @@ void qt_handle_xdnd_leave( TQWidget *w, const XEvent * xe, bool /*passive*/ ) TQApplication::sendEvent( qt_xdnd_current_widget, &e ); if ( l[0] != qt_xdnd_dragsource_xid ) { - // This often happens - leave other-process window tquickly + // This often happens - leave other-process window quickly //tqDebug( "xdnd drag leave from unexpected source (%08lx not %08lx", //l[0], qt_xdnd_dragsource_xid ); qt_xdnd_current_widget = 0; diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 0b7b862a..059b5baf 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -6235,7 +6235,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, Returns TRUE if this image and image \a i have the same contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which - case the function will return tquickly. + case the function will return quickly. \sa operator=() */ @@ -6284,7 +6284,7 @@ bool TQImage::operator==( const TQImage & i ) const Returns TRUE if this image and image \a i have different contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which - case the function will return tquickly. + case the function will return quickly. \sa operator=() */ diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp index 453ff05b..8281e70b 100644 --- a/src/kernel/qinternal.cpp +++ b/src/kernel/qinternal.cpp @@ -497,7 +497,7 @@ void TQSharedDoubleBuffer::flush() } /* \internal - Atquire ownership of the shared double buffer pixmap, subject to the + Acquire ownership of the shared double buffer pixmap, subject to the following conditions: \list 1 @@ -510,7 +510,7 @@ void TQSharedDoubleBuffer::flush() object becomes the owner of the shared double buffer pixmap. The shared double buffer pixmap is resize if necessary, and this function returns a pointer to the pixmap. Ownership must later be - relintquished by calling releasePixmap(). + relinquished by calling releasePixmap(). If none of the above conditions are met, this function returns zero. diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp index fc97c3d6..58f87e78 100644 --- a/src/kernel/qmotifdnd_x11.cpp +++ b/src/kernel/qmotifdnd_x11.cpp @@ -405,9 +405,9 @@ static void DndWriteReceiverProperty(Display * dpy, Window window, /* protocol style equiv (preregister stuff really) */ -#define DND_DRAG_DROP_ONLY_ETQUIV 3 -#define DND_DRAG_DYNAMIC_ETQUIV1 2 -#define DND_DRAG_DYNAMIC_ETQUIV2 4 +#define DND_DRAG_DROP_ONLY_EQUIV 3 +#define DND_DRAG_DYNAMIC_EQUIV1 2 +#define DND_DRAG_DYNAMIC_EQUIV2 4 /* Produce a client message to be sent by the caller */ diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp index 7f0cabe4..add847a1 100644 --- a/src/kernel/qpalette.cpp +++ b/src/kernel/qpalette.cpp @@ -908,11 +908,11 @@ void TQPalette::setInactive( const TQColorGroup &g ) \fn bool TQPalette::operator!=( const TQPalette &p ) const Returns TRUE (slowly) if this palette is different from \a p; - otherwise returns FALSE (usually tquickly). + otherwise returns FALSE (usually quickly). */ /*! - Returns TRUE (usually tquickly) if this palette is equal to \a p; + Returns TRUE (usually quickly) if this palette is equal to \a p; otherwise returns FALSE (slowly). */ diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp index 95fbed5a..7dd6c0d7 100644 --- a/src/kernel/qpixmap.cpp +++ b/src/kernel/qpixmap.cpp @@ -107,7 +107,7 @@ if you create more than about 1000 pixmaps, independent of the size of the pixmaps or installed RAM. Windows NT-systems (including 2000, XP and following versions) do not have the same limitation, - but depending on the graphics etquipment the system will fail to + but depending on the graphics equipment the system will fail to allocate pixmap objects at some point (due to system running out of GDI resources). diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index 06fcaabf..cc9c211c 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -1877,11 +1877,11 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if( axi->bytes_per_line == (int)w ) { int max = w * h; while (max--) - *aptr++ = *iptr++ >> 24; // stquirt + *aptr++ = *iptr++ >> 24; // squirt } else { for (uint i = 0; i < h; ++i ) { for (uint j = 0; j < w; ++j ) - *aptr++ = *iptr++ >> 24; // stquirt + *aptr++ = *iptr++ >> 24; // squirt aptr += ( axi->bytes_per_line - w ); } } diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp index b3a634ab..d391d5c4 100644 --- a/src/kernel/qpngio.cpp +++ b/src/kernel/qpngio.cpp @@ -425,7 +425,7 @@ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) if ( image.hasAlphaBuffer() ) { // Many PNG files lie (eg. from PhotoShop). Fortunately this loop will - // usually be tquick to find those that tell the truth. + // usually be quick to find those that tell the truth. TQRgb* c; int n; if (image.depth()==32) { diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp index 98dc7257..d073ab1d 100644 --- a/src/kernel/qpoint.cpp +++ b/src/kernel/qpoint.cpp @@ -434,7 +434,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPoint &p ) distances apply to travelers who can only travel on a rectangular grid, like the streets of Manhattan. - This is a useful, and tquick to calculate, approximation to the + This is a useful, and quick to calculate, approximation to the true length: sqrt(pow(x(),2)+pow(y(),2)). */ int TQPoint::manhattanLength() const diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/qpolygonscanner.cpp index 92f36f3e..ef772bc1 100644 --- a/src/kernel/qpolygonscanner.cpp +++ b/src/kernel/qpolygonscanner.cpp @@ -360,7 +360,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -374,7 +374,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index 80b91d8c..c1d234df 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -369,7 +369,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) #else pid = fork(); if ( pid == 0 ) { // child process - // if possible, exit tquickly, so the actual lp/lpr + // if possible, exit quickly, so the actual lp/lpr // becomes a child of init, and ::waitpid() is // guaranteed not to wait. if ( fork() > 0 ) { diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp index 39027459..3bba1bca 100644 --- a/src/kernel/qprocess_unix.cpp +++ b/src/kernel/qprocess_unix.cpp @@ -789,7 +789,7 @@ bool TQProcess::start( TQStringList *env ) arglist[i] = 0; // Must make sure signal handlers are installed before exec'ing - // in case the process exits tquickly. + // in case the process exits quickly. if ( d->procManager == 0 ) { d->procManager = new TQProcessManager; tqAddPostRoutine(qprocess_cleanup); diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index 1b4553b6..90d81223 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -221,7 +221,7 @@ static const struct { { 0x0000, ".notdef" }, { 0x0020, "space" }, // SPACE { 0x0021, "exclam" }, // EXCLAMATION MARK - { 0x0022, "quotedbl" }, // TQUOTATION MARK + { 0x0022, "quotedbl" }, // QUOTATION MARK { 0x0023, "numbersign" }, // NUMBER SIGN { 0x0024, "dollar" }, // DOLLAR SIGN { 0x0025, "percent" }, // PERCENT SIGN @@ -248,9 +248,9 @@ static const struct { { 0x003A, "colon" }, // COLON { 0x003B, "semicolon" }, // SEMICOLON { 0x003C, "less" }, // LESS-THAN SIGN - { 0x003D, "equal" }, // ETQUALS SIGN + { 0x003D, "equal" }, // EQUALS SIGN { 0x003E, "greater" }, // GREATER-THAN SIGN - { 0x003F, "question" }, // TQUESTION MARK + { 0x003F, "question" }, // QUESTION MARK { 0x0040, "at" }, // COMMERCIAL AT { 0x0041, "A" }, // LATIN CAPITAL LETTER A { 0x0042, "B" }, // LATIN CAPITAL LETTER B @@ -278,9 +278,9 @@ static const struct { { 0x0058, "X" }, // LATIN CAPITAL LETTER X { 0x0059, "Y" }, // LATIN CAPITAL LETTER Y { 0x005A, "Z" }, // LATIN CAPITAL LETTER Z - { 0x005B, "bracketleft" }, // LEFT STQUARE BRACKET + { 0x005B, "bracketleft" }, // LEFT SQUARE BRACKET { 0x005C, "backslash" }, // REVERSE SOLIDUS - { 0x005D, "bracketright" }, // RIGHT STQUARE BRACKET + { 0x005D, "bracketright" }, // RIGHT SQUARE BRACKET { 0x005E, "asciicircum" }, // CIRCUMFLEX ACCENT { 0x005F, "underscore" }, // LOW LINE { 0x0060, "grave" }, // GRAVE ACCENT @@ -325,7 +325,7 @@ static const struct { { 0x00A8, "dieresis" }, // DIAERESIS { 0x00A9, "copyright" }, // COPYRIGHT SIGN { 0x00AA, "ordfeminine" }, // FEMININE ORDINAL INDICATOR - { 0x00AB, "guillemotleft" }, // LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK + { 0x00AB, "guillemotleft" }, // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK { 0x00AC, "logicalnot" }, // NOT SIGN { 0x00AD, "hyphen" }, // SOFT HYPHEN;Duplicate { 0x00AE, "registered" }, // REGISTERED SIGN @@ -341,11 +341,11 @@ static const struct { { 0x00B8, "cedilla" }, // CEDILLA { 0x00B9, "onesuperior" }, // SUPERSCRIPT ONE { 0x00BA, "ordmasculine" }, // MASCULINE ORDINAL INDICATOR - { 0x00BB, "guillemotright" }, // RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK - { 0x00BC, "onequarter" }, // VULGAR FRACTION ONE TQUARTER + { 0x00BB, "guillemotright" }, // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + { 0x00BC, "onequarter" }, // VULGAR FRACTION ONE QUARTER { 0x00BD, "onehalf" }, // VULGAR FRACTION ONE HALF - { 0x00BE, "threequarters" }, // VULGAR FRACTION THREE TQUARTERS - { 0x00BF, "questiondown" }, // INVERTED TQUESTION MARK + { 0x00BE, "threequarters" }, // VULGAR FRACTION THREE QUARTERS + { 0x00BF, "questiondown" }, // INVERTED QUESTION MARK { 0x00C0, "Agrave" }, // LATIN CAPITAL LETTER A WITH GRAVE { 0x00C1, "Aacute" }, // LATIN CAPITAL LETTER A WITH ACUTE { 0x00C2, "Acircumflex" }, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX @@ -799,7 +799,7 @@ static const struct { { 0x05F2, "afii57718" }, // HEBREW LIGATURE YIDDISH DOUBLE YOD { 0x060C, "afii57388" }, // ARABIC COMMA { 0x061B, "afii57403" }, // ARABIC SEMICOLON - { 0x061F, "afii57407" }, // ARABIC TQUESTION MARK + { 0x061F, "afii57407" }, // ARABIC QUESTION MARK { 0x0621, "afii57409" }, // ARABIC LETTER HAMZA { 0x0622, "afii57410" }, // ARABIC LETTER ALEF WITH MADDA ABOVE { 0x0623, "afii57411" }, // ARABIC LETTER ALEF WITH HAMZA ABOVE @@ -885,13 +885,13 @@ static const struct { { 0x2014, "emdash" }, // EM DASH { 0x2015, "afii00208" }, // HORIZONTAL BAR { 0x2017, "underscoredbl" }, // DOUBLE LOW LINE - { 0x2018, "quoteleft" }, // LEFT SINGLE TQUOTATION MARK - { 0x2019, "quoteright" }, // RIGHT SINGLE TQUOTATION MARK - { 0x201A, "quotesinglbase" }, // SINGLE LOW-9 TQUOTATION MARK - { 0x201B, "quotereversed" }, // SINGLE HIGH-REVERSED-9 TQUOTATION MARK - { 0x201C, "quotedblleft" }, // LEFT DOUBLE TQUOTATION MARK - { 0x201D, "quotedblright" }, // RIGHT DOUBLE TQUOTATION MARK - { 0x201E, "quotedblbase" }, // DOUBLE LOW-9 TQUOTATION MARK + { 0x2018, "quoteleft" }, // LEFT SINGLE QUOTATION MARK + { 0x2019, "quoteright" }, // RIGHT SINGLE QUOTATION MARK + { 0x201A, "quotesinglbase" }, // SINGLE LOW-9 QUOTATION MARK + { 0x201B, "quotereversed" }, // SINGLE HIGH-REVERSED-9 QUOTATION MARK + { 0x201C, "quotedblleft" }, // LEFT DOUBLE QUOTATION MARK + { 0x201D, "quotedblright" }, // RIGHT DOUBLE QUOTATION MARK + { 0x201E, "quotedblbase" }, // DOUBLE LOW-9 QUOTATION MARK { 0x2020, "dagger" }, // DAGGER { 0x2021, "daggerdbl" }, // DOUBLE DAGGER { 0x2022, "bullet" }, // BULLET @@ -904,8 +904,8 @@ static const struct { { 0x2030, "perthousand" }, // PER MILLE SIGN { 0x2032, "minute" }, // PRIME { 0x2033, "second" }, // DOUBLE PRIME - { 0x2039, "guilsinglleft" }, // SINGLE LEFT-POINTING ANGLE TQUOTATION MARK - { 0x203A, "guilsinglright" }, // SINGLE RIGHT-POINTING ANGLE TQUOTATION MARK + { 0x2039, "guilsinglleft" }, // SINGLE LEFT-POINTING ANGLE QUOTATION MARK + { 0x203A, "guilsinglright" }, // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK { 0x203C, "exclamdbl" }, // DOUBLE EXCLAMATION MARK { 0x2044, "fraction" }, // FRACTION SLASH { 0x2070, "zerosuperior" }, // SUPERSCRIPT ZERO @@ -982,7 +982,7 @@ static const struct { { 0x2215, "fraction" }, // DIVISION SLASH;Duplicate { 0x2217, "asteriskmath" }, // ASTERISK OPERATOR { 0x2219, "periodcentered" }, // BULLET OPERATOR;Duplicate - { 0x221A, "radical" }, // STQUARE ROOT + { 0x221A, "radical" }, // SQUARE ROOT { 0x221D, "proportional" }, // PROPORTIONAL TO { 0x221E, "infinity" }, // INFINITY { 0x221F, "orthogonal" }, // RIGHT ANGLE @@ -994,17 +994,17 @@ static const struct { { 0x222B, "integral" }, // INTEGRAL { 0x2234, "therefore" }, // THEREFORE { 0x223C, "similar" }, // TILDE OPERATOR - { 0x2245, "congruent" }, // APPROXIMATELY ETQUAL TO - { 0x2248, "approxequal" }, // ALMOST ETQUAL TO - { 0x2260, "notequal" }, // NOT ETQUAL TO + { 0x2245, "congruent" }, // APPROXIMATELY EQUAL TO + { 0x2248, "approxequal" }, // ALMOST EQUAL TO + { 0x2260, "notequal" }, // NOT EQUAL TO { 0x2261, "equivalence" }, // IDENTICAL TO - { 0x2264, "lessequal" }, // LESS-THAN OR ETQUAL TO - { 0x2265, "greaterequal" }, // GREATER-THAN OR ETQUAL TO + { 0x2264, "lessequal" }, // LESS-THAN OR EQUAL TO + { 0x2265, "greaterequal" }, // GREATER-THAN OR EQUAL TO { 0x2282, "propersubset" }, // SUBSET OF { 0x2283, "propersuperset" }, // SUPERSET OF { 0x2284, "notsubset" }, // NOT A SUBSET OF - { 0x2286, "reflexsubset" }, // SUBSET OF OR ETQUAL TO - { 0x2287, "reflexsuperset" }, // SUPERSET OF OR ETQUAL TO + { 0x2286, "reflexsubset" }, // SUBSET OF OR EQUAL TO + { 0x2287, "reflexsuperset" }, // SUPERSET OF OR EQUAL TO { 0x2295, "circleplus" }, // CIRCLED PLUS { 0x2297, "circlemultiply" }, // CIRCLED TIMES { 0x22A5, "perpendicular" }, // UP TACK @@ -1063,10 +1063,10 @@ static const struct { { 0x2591, "ltshade" }, // LIGHT SHADE { 0x2592, "shade" }, // MEDIUM SHADE { 0x2593, "dkshade" }, // DARK SHADE - { 0x25A0, "filledbox" }, // BLACK STQUARE - { 0x25A1, "H22073" }, // WHITE STQUARE - { 0x25AA, "H18543" }, // BLACK SMALL STQUARE - { 0x25AB, "H18551" }, // WHITE SMALL STQUARE + { 0x25A0, "filledbox" }, // BLACK SQUARE + { 0x25A1, "H22073" }, // WHITE SQUARE + { 0x25AA, "H18543" }, // BLACK SMALL SQUARE + { 0x25AB, "H18551" }, // WHITE SMALL SQUARE { 0x25AC, "filledrect" }, // BLACK RECTANGLE { 0x25B2, "triagup" }, // BLACK UP-POINTING TRIANGLE { 0x25BA, "triagrt" }, // BLACK RIGHT-POINTING POINTER diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp index ccf40672..51ef757a 100644 --- a/src/kernel/qregion_x11.cpp +++ b/src/kernel/qregion_x11.cpp @@ -128,7 +128,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -142,7 +142,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS @@ -248,7 +248,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987, 1988 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -262,7 +262,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS @@ -1463,7 +1463,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -1477,7 +1477,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS @@ -1761,7 +1761,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -1775,7 +1775,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp index 604bf130..dd46cc74 100644 --- a/src/kernel/qsound.cpp +++ b/src/kernel/qsound.cpp @@ -131,7 +131,7 @@ public: silently. NAS supports WAVE and AU files. On Macintosh, ironically, we use QT (\link - http://tquicktime.apple.com QuickTime\endlink) for sound, this + http://quicktime.apple.com QuickTime\endlink) for sound, this means all QuickTime formats are supported by TQt/Mac. On TQt/Embedded, a built-in mixing sound server is used, which @@ -156,7 +156,7 @@ void TQSound::play(const TQString& filename) } /*! - Constructs a TQSound that can tquickly play the sound in a file + Constructs a TQSound that can quickly play the sound in a file named \a filename. This may use more memory than the static \c play function. @@ -266,7 +266,7 @@ void TQSound::stop() without bothering the user. If no sound is available, all TQSound operations work silently and - tquickly. + quickly. */ bool TQSound::isAvailable() { diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp index 95dcef20..dbed45c3 100644 --- a/src/kernel/qtaddons_x11.cpp +++ b/src/kernel/qtaddons_x11.cpp @@ -16,7 +16,7 @@ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSETQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp index a99a49c1..0c70113f 100644 --- a/src/kernel/qtimer.cpp +++ b/src/kernel/qtimer.cpp @@ -82,7 +82,7 @@ \endcode myObject->processOneThing() will be called repeatedly and should - return tquickly (typically after processing one data item) so that + return quickly (typically after processing one data item) so that TQt can deliver events to widgets and stop the timer as soon as it has done all its work. This is the traditional way of implementing heavy work in GUI applications; multi-threading is diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index f0ff3ed5..ba615afa 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -2609,7 +2609,7 @@ void TQWidget::setBackgroundFromMode() Although \c FixedColor and \c FixedPixmap are sometimes just right, if you use them, make sure that you test your application - when the desktop color scheme has been changed. (On X11, a tquick + when the desktop color scheme has been changed. (On X11, a quick way to test this is e.g. "./myapp -bg paleblue". On Windows, you must use the control panel.) @@ -3877,7 +3877,7 @@ void TQWidget::setGeometry( int x, int y, int w, int h ) \enum TQWidget::FocusPolicy This enum type defines the various policies a widget can have with - respect to actquiring keyboard focus. + respect to acquiring keyboard focus. \value TabFocus the widget accepts focus by tabbing. \value ClickFocus the widget accepts focus by clicking. diff --git a/src/moc/moc.y b/src/moc/moc.y index 6f773449..faa4c524 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -895,7 +895,7 @@ const_expression: /* empty */ { initExpression(); ; /* def_argument is just like const expression but handles the "," - slightly differently. It was added for 3.0 as tquick solution. TODO: + slightly differently. It was added for 3.0 as quick solution. TODO: merge with const_expression. */ diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index 616b3dfd..9f370a8e 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -1476,7 +1476,7 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) d->rrs->next(); } } - // if we found a positive result, return tquickly + // if we found a positive result, return quickly if ( answer && l->count() ) { #if defined(TQDNS_DEBUG) tqDebug( "found %d records for %s", diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index 222c2a59..31f07de3 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -1502,7 +1502,7 @@ int TQFtp::login( const TQString &user, const TQString &password ) */ int TQFtp::close() { - return addCommand( new TQFtpCommand( Close, TQStringList("TQUIT\r\n") ) ); + return addCommand( new TQFtpCommand( Close, TQStringList("QUIT\r\n") ) ); } /*! diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp index 827cc349..565ab7d3 100644 --- a/src/network/qsocketdevice_unix.cpp +++ b/src/network/qsocketdevice_unix.cpp @@ -625,10 +625,10 @@ int TQSocketDevice::accept() case ETIMEDOUT: // in all these cases, an error happened during connection // setup. we're not interested in what happened, so we - // just treat it like the client-closed-tquickly case. + // just treat it like the client-closed-quickly case. case EPERM: // firewalling wouldn't let us accept. we treat it like - // the client-closed-tquickly case. + // the client-closed-quickly case. case EAGAIN: #if EAGAIN != EWOULDBLOCK case EWOULDBLOCK: diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 35033667..ece3b9ee 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -450,7 +450,7 @@ TQSqlIndex TQSQLiteDriver::primaryIndex(const TQString &tblname) const TQSqlQuery q = createQuery(); q.setForwardOnly(TRUE); - // finrst find a UNITQUE INDEX + // finrst find a UNIQUE INDEX q.exec("PRAGMA index_list('" + tblname + "');"); TQString indexname; while(q.next()) { diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h index 4852e78e..718886c2 100644 --- a/src/sql/ntqsqlquery.h +++ b/src/sql/ntqsqlquery.h @@ -38,8 +38,8 @@ ** **********************************************************************/ -#ifndef TQSQLTQUERY_H -#define TQSQLTQUERY_H +#ifndef TQSQLQUERY_H +#define TQSQLQUERY_H #ifndef QT_H #include "ntqobject.h" diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp index 3fbdc326..3a901a86 100644 --- a/src/sql/qdatatable.cpp +++ b/src/sql/qdatatable.cpp @@ -154,7 +154,7 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor ) fetched from the database on an as-needed basis with the scrollbar becoming more accurate as the user scrolls down through the records. This allows extremely large queries to be displayed as - tquickly as possible, with minimum memory usage. + quickly as possible, with minimum memory usage. TQDataTable inherits TQTable's API and extends it with functions to sort and filter the data and sort columns. See setSqlCursor(), diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp index b2a53dbd..3e462480 100644 --- a/src/sql/qsqlcursor.cpp +++ b/src/sql/qsqlcursor.cpp @@ -1007,7 +1007,7 @@ TQString TQSqlCursor::toString( const TQSqlIndex& i, TQSqlRecord* rec, const TQS \printuntil insert In the above example, a cursor is created on the 'prices' table - and a pointer to the insert buffer is atquired using primeInsert(). + and a pointer to the insert buffer is acquired using primeInsert(). Each field's value is set to the desired value and then insert() is called to insert the data into the database. Remember: all edit operations (insert(), update() and delete()) operate on the @@ -1175,7 +1175,7 @@ TQSqlRecord* TQSqlCursor::primeInsert() In the above example, a cursor is created on the 'prices' table and is positioned on the record to be updated. Then a pointer to - the cursor's edit buffer is actquired using primeUpdate(). A new + the cursor's edit buffer is acquired using primeUpdate(). A new value is calculated and placed into the edit buffer with the setValue() call. Finally, an update() call is made on the cursor which uses the tables's primary index to update the record in the diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index 45f4323b..798e7948 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -773,7 +773,7 @@ bool TQSqlDatabase::open( const TQString& user, const TQString& password ) } /*! - Closes the database connection, freeing any resources actquired. + Closes the database connection, freeing any resources acquired. \sa removeDatabase() */ diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp index 173d3003..09f67db2 100644 --- a/src/styles/qplatinumstyle.cpp +++ b/src/styles/qplatinumstyle.cpp @@ -110,7 +110,7 @@ void TQPlatinumStyle::drawPrimitive( PrimitiveElement pe, TQColorGroup myCG = cg; TQBrush fill; - // tquick trick to make sure toolbuttons drawn sunken + // quick trick to make sure toolbuttons drawn sunken // when they are activated... if ( flags & Style_On ) flags |= Style_Sunken; diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index bc8cb99d..7b54c340 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -147,7 +147,7 @@ # define Q_OS_QNX6 #elif defined(__QNX__) # define Q_OS_QNX -#elif defined(_SETQUENT_) +#elif defined(_SEQUENT_) # define Q_OS_DYNIX #elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ # define Q_OS_SCO diff --git a/src/tools/ntqptrqueue.h b/src/tools/ntqptrqueue.h index 0c1bd5e6..0f3cbbd3 100644 --- a/src/tools/ntqptrqueue.h +++ b/src/tools/ntqptrqueue.h @@ -38,8 +38,8 @@ ** **********************************************************************/ -#ifndef TQPTRTQUEUE_H -#define TQPTRTQUEUE_H +#ifndef TQPTRQUEUE_H +#define TQPTRQUEUE_H #ifndef QT_H #include "ntqglist.h" @@ -91,4 +91,4 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtrCollection:: #define TQQueue TQPtrQueue #endif -#endif // TQPTRTQUEUE_H +#endif // TQPTRQUEUE_H diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp index 2b9a10bc..22c20cae 100644 --- a/src/tools/qlocale.cpp +++ b/src/tools/qlocale.cpp @@ -3285,7 +3285,7 @@ TQString TQLocalePrivate::doubleToString(double d, else mode = 2; - /* This next bit is a bit tquirky. In DFExponent form, the precision + /* This next bit is a bit quirky. In DFExponent form, the precision is the number of digits after decpt. So that would suggest using mode=3 for qdtoa. But qdtoa behaves strangely when mode=3 and precision=0. So we get around this by using mode=2 and reasoning @@ -3779,7 +3779,7 @@ TQ_ULLONG TQLocalePrivate::stringToUnsLongLong(TQString num, int base, * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -4027,7 +4027,7 @@ static TQ_LLONG qstrtoll(const char *nptr, const char **endptr, register int bas * #define No_leftright to omit left-right logic in fast floating-point * computation of dtoa. * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3. - * #define RND_PRODTQUOT to use rnd_prod and rnd_quot (assembly routines + * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines * that use extended-precision instructions to compute rounded * products and quotients) with IBM. * #define ROUND_BIASED for IEEE-format with biased rounding. @@ -4245,7 +4245,7 @@ static inline void Storeinc(ULong *&a, const ULong &b, const ULong &c) #define ROUND_BIASED #endif -#ifdef RND_PRODTQUOT +#ifdef RND_PRODQUOT #define rounded_product(a,b) a = rnd_prod(a, b) #define rounded_quotient(a,b) a = rnd_quot(a, b) extern double rnd_prod(double, double), rnd_quot(double, double); @@ -5139,7 +5139,7 @@ static double qstrtod(CONST char *s00, CONST char **se, bool *ok) rv = tens[k - 9] * rv + z; bd0 = 0; if (nd <= DBL_DIG -#ifndef RND_PRODTQUOT +#ifndef RND_PRODQUOT && FLT_ROUNDS == 1 #endif ) { @@ -5758,7 +5758,7 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, int bbits, b2, b5, be, dig, i, ieps, ilim0, j, j1, k, k0, k_check, leftright, m2, m5, s2, s5, - try_tquick; + try_quick; int ilim = 0, ilim1 = 0, spec_case = 0; /* pacify gcc */ Long L; #ifndef Sudden_Underflow @@ -5901,10 +5901,10 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, } if (mode < 0 || mode > 9) mode = 0; - try_tquick = 1; + try_quick = 1; if (mode > 5) { mode -= 4; - try_tquick = 0; + try_quick = 0; } leftright = 1; switch(mode) { @@ -5935,7 +5935,7 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, *resultp = (char *) malloc(i + 1); s = s0 = *resultp; - if (ilim >= 0 && ilim <= Quick_max && try_tquick) { + if (ilim >= 0 && ilim <= Quick_max && try_quick) { /* Try to get by with floating-point arithmetic. */ diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp index ed3c328b..d4f240f7 100644 --- a/src/tools/qsemaphore.cpp +++ b/src/tools/qsemaphore.cpp @@ -83,7 +83,7 @@ accesses allowed is retrieved with available(), and the total number with total(). Note that the incrementing functions will block if there aren't enough available accesses. Use tryAccess() - if you want to actquire accesses without blocking. + if you want to acquire accesses without blocking. */ diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 878f3e60..a5408cac 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -6493,7 +6493,7 @@ int TQString::compare( const TQString& s ) const #if !defined(CSTR_LESS_THAN) #define CSTR_LESS_THAN 1 -#define CSTR_ETQUAL 2 +#define CSTR_EQUAL 2 #define CSTR_GREATER_THAN 3 #endif diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 111e6daf..42aebfbe 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -475,7 +475,7 @@ static TQString qEllipsisText( const TQString &org, const TQFontMetrics &fm, int Some subclasses call setExpandable(TRUE) even when they have no children, and populate themselves when setup() or setOpen(TRUE) is called. The \c dirview/dirview.cpp example program uses this - technique to start up tquickly: The files and subdirectories in a + technique to start up quickly: The files and subdirectories in a directory aren't inserted into the tree until they're actually needed. @@ -3093,7 +3093,7 @@ void TQListView::paintEmptyArea( TQPainter * p, const TQRect & rect ) /* Rebuilds the list of drawable TQListViewItems. This function is - const so that const functions can call it without retquiring + const so that const functions can call it without requiring d->drawables to be mutable. */ diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index 5bdf7924..9507d4f0 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -226,7 +226,7 @@ static bool block_set_alignment = FALSE; TQTextEdit is an advanced WYSIWYG viewer/editor supporting rich text formatting using HTML-style tags. It is optimized to handle - large documents and to respond tquickly to user input. + large documents and to respond quickly to user input. TQTextEdit has four modes of operation: \table diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index b465faff..518d81c4 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -219,7 +219,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * ) \mainclass A toolbar is a panel that contains a set of controls, usually - represented by small icons. It's purpose is to provide tquick + represented by small icons. It's purpose is to provide quick access to frequently used commands or options. Within a TQMainWindow the user can drag toolbars within and between the \link TQDockArea dock areas\endlink. Toolbars can also be dragged @@ -353,7 +353,7 @@ TQToolBar::TQToolBar( const TQString &label, TQMainWindow * mainWindow, Constructs an empty toolbar called \a name, with parent \a parent, in its \a parent's top dock area, without any label and without - retquiring a newline. + requiring a newline. */ TQToolBar::TQToolBar( TQMainWindow * parent, const char * name ) diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index 1912bebf..cb10ffba 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -77,13 +77,13 @@ public: /*! \class TQToolButton ntqtoolbutton.h - \brief The TQToolButton class provides a tquick-access button to + \brief The TQToolButton class provides a quick-access button to commands or options, usually used inside a TQToolBar. \ingroup basic \mainclass - A tool button is a special button that provides tquick-access to + A tool button is a special button that provides quick-access to specific commands or options. As opposed to a normal command button, a tool button usually doesn't show a text label, but shows an icon instead. Its classic usage is to select tools, for example diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp index b6826a81..93091437 100644 --- a/src/widgets/qtooltip.cpp +++ b/src/widgets/qtooltip.cpp @@ -370,7 +370,7 @@ void TQTipManager::removeFromGroup( TQToolTipGroup *g ) bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e ) { // avoid dumping core in case of application madness, and return - // tquickly for some common but irrelevant events + // quickly for some common but irrelevant events if ( e->type() == TQEvent::WindowDeactivate && tqApp && !tqApp->activeWindow() && label && label->isVisible() ) @@ -671,10 +671,10 @@ void TQTipManager::setWakeUpDelay ( int i ) The mode is global, not particular to any one widget. TQToolTip switches from dormant to active mode when the user hovers - the mouse on a tip-etquipped region for a second or so and remains + the mouse on a tip-equipped region for a second or so and remains active until the user either clicks a mouse button, presses a key, lets the mouse hover for five seconds or moves the mouse outside - \e all tip-etquipped regions for at least a second. + \e all tip-equipped regions for at least a second. The TQToolTip class can be used in three different ways: \list 1 |