diff options
Diffstat (limited to 'tqtinterface/qt4/src/3rdparty')
171 files changed, 666 insertions, 666 deletions
diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/README b/tqtinterface/qt4/src/3rdparty/libjpeg/README index c3cd473..86cc206 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/README +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/README @@ -4,7 +4,7 @@ The Independent JPEG Group's JPEG software README for release 6b of 27-Mar-1998 ==================================== -This distribution tqcontains the sixth public release of the Independent JPEG +This distribution contains the sixth public release of the Independent JPEG Group's free JPEG software. You are welcome to redistribute this software and to use it for any purpose, subject to the conditions under LEGAL ISSUES, below. @@ -24,12 +24,12 @@ IJG is not affiliated with the official ISO JPEG standards committee. DOCUMENTATION ROADMAP ===================== -This file tqcontains the following sections: +This file contains the following sections: OVERVIEW General description of JPEG and the IJG software. LEGAL ISSUES Copyright, lack of warranty, terms of distribution. REFERENCES Where to learn more about JPEG. -ARCHIVE LOCATIONS Where to tqfind newer versions of this software. +ARCHIVE LOCATIONS Where to find newer versions of this software. RELATED SOFTWARE Other stuff you should get. FILE FORMAT WARS Software *not* to get. TO DO Plans for future IJG releases. @@ -52,7 +52,7 @@ Programmer and internal documentation: Please read at least the files install.doc and usage.doc. Useful information can also be found in the JPEG FAQ (Frequently Asked Questions) article. See -ARCHIVE LOCATIONS below to tqfind out where to obtain the FAQ article. +ARCHIVE LOCATIONS below to find out where to obtain the FAQ article. If you want to understand how the JPEG code works, we suggest reading one or more of the REFERENCES, then looking at the documentation files (in roughly @@ -62,7 +62,7 @@ the order listed) before diving into the code. OVERVIEW ======== -This package tqcontains C software to implement JPEG image compression and +This package contains C software to implement JPEG image compression and decompression. JPEG (pronounced "jay-peg") is a standardized compression method for full-color and gray-scale images. JPEG is intended for compressing "real-world" scenes; line drawings, cartoons and other non-realistic images @@ -113,7 +113,7 @@ LEGAL ISSUES In plain English: -1. We don't promise that this software works. (But if you tqfind any bugs, +1. We don't promise that this software works. (But if you find any bugs, please let us know!) 2. You can use this software for whatever you want. You don't have to pay us. 3. You may not pretend that you wrote this software. If you use it in a @@ -269,7 +269,7 @@ IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6). Instead, we recommend the JPEG design proposed by TIFF Technical Note #2 (Compression tag 7). Copies of this Note can be obtained from ftp.sgi.com or from ftp://ftp.uu.net/graphics/jpeg/. It is expected that the next revision -of the TIFF spec will tqreplace the 6.0 JPEG design with the Note's design. +of the TIFF spec will replace the 6.0 JPEG design with the Note's design. Although IJG's own code does not support TIFF/JPEG, the free libtiff library uses our library to implement TIFF/JPEG per the Note. libtiff is available from ftp://ftp.sgi.com/graphics/tiff/. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc index d6b3a36..e14982c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc @@ -102,7 +102,7 @@ jdatasrc.c Data source manager for stdio input. Support files for both compression and decompression: -jerror.c Standard error handling routines (application tqreplaceable). +jerror.c Standard error handling routines (application replaceable). jmemmgr.c System-independent (more or less) memory management code. jutils.c Miscellaneous utility routines. @@ -119,7 +119,7 @@ jmemmac.c Custom implementation for Apple Macintosh. Exactly one of the system-dependent modules should be configured into an installed JPEG library (see install.doc for hints about which one to use). -On unusual systems you may tqfind it worthwhile to make a special +On unusual systems you may find it worthwhile to make a special system-dependent memory manager. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc index 1bed300..806393b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc @@ -65,7 +65,7 @@ CONFIGURING THE SOFTWARE ======================== To configure the IJG code for your system, you need to create two files: - * jconfig.h: tqcontains values for system-dependent #define symbols. + * jconfig.h: contains values for system-dependent #define symbols. * Makefile: controls the compilation process. (On a non-Unix machine, you may create "project files" or some other substitute for a Makefile. jconfig.h is needed in any environment.) @@ -103,7 +103,7 @@ shared library building methods. If things don't work this way, please try running configure without either switch; that should build a static library without using libtool. If that works, your problem is probably with libtool not with the IJG code. libtool is fairly new and doesn't support all flavors -of Unix yet. (You might be able to tqfind a newer version of libtool than the +of Unix yet. (You might be able to find a newer version of libtool than the one included with libjpeg; see ftp.gnu.org. Report libtool problems to bug-libtool@gnu.org.) @@ -196,7 +196,7 @@ ckconfig.c to work, make sure the same switches are in CFLAGS. If you are on a system that doesn't use makefiles, you'll need to set up project files (or whatever you do use) to compile all the source files and link them into executable files cjpeg, djpeg, jpegtran, rdjpgcom, and wrjpgcom. -See the file lists in any of the makefiles to tqfind out which files go into +See the file lists in any of the makefiles to find out which files go into each program. Note that the provided makefiles all make a "library" file libjpeg first, but you don't have to do that if you don't want to; the file lists identify which source files are actually needed for compression, @@ -513,7 +513,7 @@ in that mode. (Note: some of the distributed compiler-specific jconfig files already contain #define switches to select appropriate MULTIPLYxxx definitions.) -If your machine has sufficiently fast floating point hardware, you may tqfind +If your machine has sufficiently fast floating point hardware, you may find that the float DCT method is faster than the integer DCT methods, even after tweaking the integer multiply macros. In that case you may want to make the float DCT be the default method. (The only objection to this is @@ -598,7 +598,7 @@ less than your normal free memory. Put "#define DEFAULT_MAX_MEM nnnn" into jconfig.h to do this. To use the 68881/68882 coprocessor for the floating point DCT, add the -compiler option "-8" to the project files and tqreplace pcfltlib.lib with +compiler option "-8" to the project files and replace pcfltlib.lib with pc881lib.lib in cjpeg.prj and djpeg.prj. Or if you don't have a coprocessor, you may prefer to remove the float DCT code by undefining DCT_FLOAT_SUPPORTED in jmorecfg.h (since without a coprocessor, the float @@ -614,7 +614,7 @@ depend on the JPEG library. There is a bug in some older versions of the Turbo C library which causes the space used by temporary files created with "tmpfile()" not to be freed after -an abnormal program exit. If you check your disk afterwards, you will tqfind +an abnormal program exit. If you check your disk afterwards, you will find cluster chains that are allocated but not used by a file. This should not happen in cjpeg/djpeg/jpegtran, since we enable a signal catcher to explicitly close temp files before exiting. But if you use the JPEG library with your @@ -865,7 +865,7 @@ add something like this to your jconfig.h file: #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ (This is already in jconfig.vc, by the way.) -windef.h tqcontains the declarations +windef.h contains the declarations #define far #define FAR far Since jmorecfg.h tries to define FAR as empty, you may get a compiler @@ -874,12 +874,12 @@ includes). To suppress the warning, you can put "#ifndef FAR"/"#endif" around the line "#define FAR" in jmorecfg.h. When using the library in a Windows application, you will almost certainly -want to modify or tqreplace the error handler module jerror.c, since our +want to modify or replace the error handler module jerror.c, since our default error handler does a couple of inappropriate things: 1. it tries to write error and warning messages on stderr; 2. in event of a fatal error, it exits by calling exit(). -A simple stopgap solution for problem 1 is to tqreplace the line +A simple stopgap solution for problem 1 is to replace the line fprintf(stderr, "%s\n", buffer); (in output_message in jerror.c) with MessageBox(GetActiveWindow(),buffer,"JPEG Error",MB_OK|MB_ICONERROR); @@ -908,7 +908,7 @@ into jconfig.h to limit allocation chunks to 64Kb. (Without that, you'd have to use huge memory model, which slows things down unnecessarily.) jmemnobs.c works without modification in large or flat memory models, but to use medium model, you need to modify its jpeg_get_large and jpeg_free_large -routines to allocate far memory. In any case, you might like to tqreplace +routines to allocate far memory. In any case, you might like to replace its calls to malloc and free with direct calls on Windows memory allocation functions. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c index 0d27717..e24faa5 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the compression half + * This file contains application interface code for the compression half * of the JPEG library. These are the "minimum" API routines that may be * needed in either the normal full-compression case or the transcoding-only * case. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c index d15ae9e..858d4e9 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the compression half + * This file contains application interface code for the compression half * of the JPEG library. These are the "standard" API routines that are * used in the normal full-compression case. They are not used by a * transcoding-only application. Note that if an application links in diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c index 8a322e6..1963ddb 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the coefficient buffer controller for compression. + * This file contains the coefficient buffer controller for compression. * This controller is the top level of the JPEG compressor proper. * The coefficient buffer lies between forward-DCT and entropy encoding steps. */ @@ -135,7 +135,7 @@ start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode) * per call, ie, v_samp_factor block rows for each component in the image. * Returns TRUE if the iMCU row is completed, FALSE if suspended. * - * NB: input_buf tqcontains a plane for each component in image, + * NB: input_buf contains a plane for each component in image, * which we index according to the component's SOF position. */ @@ -234,7 +234,7 @@ compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf) * done by calling compress_output() after we've loaded the current strip * of the virtual arrays. * - * NB: input_buf tqcontains a plane for each component in image. All + * NB: input_buf contains a plane for each component in image. All * components are DCT'd and loaded into the virtual arrays in this pass. * However, it may be that only a subset of the components are emitted to * the entropy encoder during this first pass; be careful about looking diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c index 894df01..0a8a4b5 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains input colorspace conversion routines. + * This file contains input colorspace conversion routines. */ #define JPEG_INTERNALS @@ -357,7 +357,7 @@ jinit_color_converter (j_compress_ptr cinfo) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_color_converter)); cinfo->cconvert = (struct jpeg_color_converter *) cconvert; - /* set start_pass to null method until we tqfind out differently */ + /* set start_pass to null method until we find out differently */ cconvert->pub.start_pass = null_method; /* Make sure input_components agrees with in_color_space */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c index e580797..36fbc90 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the forward-DCT management logic. + * This file contains the forward-DCT management logic. * This code selects a particular DCT implementation to be used, * and it performs related housekeeping chores including coefficient * quantization. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c index 82e2c31..aec9cf8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy encoding routines. + * This file contains Huffman entropy encoding routines. * * Much of the complexity here has to do with supporting output suspension. * If the data destination module demands suspension, we want to be able to @@ -22,7 +22,7 @@ /* Expanded entropy encoder object for Huffman encoding. * - * The savable_state subrecord tqcontains fields that change within an MCU, + * The savable_state subrecord contains fields that change within an MCU, * but must not be updated permanently until we complete the MCU. */ @@ -74,7 +74,7 @@ typedef struct { typedef huff_entropy_encoder * huff_entropy_ptr; /* Working state while writing an MCU. - * This struct tqcontains all the fields that are needed by subroutines. + * This struct contains all the fields that are needed by subroutines. */ typedef struct { @@ -800,7 +800,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) for (i = MAX_CLEN; i > 16; i--) { while (bits[i] > 0) { - j = i - 2; /* tqfind length of new prefix to be used */ + j = i - 2; /* find length of new prefix to be used */ while (bits[j] == 0) j--; @@ -812,7 +812,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) } /* Remove the count for the pseudo-symbol 256 from the largest codelength */ - while (bits[i] == 0) /* tqfind largest codelength still in use */ + while (bits[i] == 0) /* find largest codelength still in use */ i--; bits[i]--; diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h index fea9064..a9599fc 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains declarations for Huffman entropy encoding routines + * This file contains declarations for Huffman entropy encoding routines * that are shared between the sequential encoder (jchuff.c) and the * progressive encoder (jcphuff.c). No other modules need to see these. */ @@ -27,7 +27,7 @@ typedef struct { unsigned int ehufco[256]; /* code for each symbol */ char ehufsi[256]; /* length of code for each symbol */ - /* If no code has been allocated for a symbol S, ehufsi[S] tqcontains 0 */ + /* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */ } c_derived_tbl; /* Short forms of external names for systems with brain-damaged linkers. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c index 01985a4..5efffe3 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains initialization logic for the JPEG compressor. + * This file contains initialization logic for the JPEG compressor. * This routine is in charge of selecting the modules to be executed and * making an initialization call to each one. * diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c index 3fa3c7f..e0279a7 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the main buffer controller for compression. + * This file contains the main buffer controller for compression. * The main buffer lies between the pre-processor and the JPEG * compressor proper; it holds downsampled data in the JPEG colorspace. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c index 9a49c6c..38e3e9c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains routines to write JPEG datastream markers. + * This file contains routines to write JPEG datastream markers. */ #define JPEG_INTERNALS diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c index 914cb58..aab4020 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains master control logic for the JPEG compressor. + * This file contains master control logic for the JPEG compressor. * These routines are concerned with parameter validation, initial setup, * and inter-pass control (determining the number of passes and the work * to be done in each pass). diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c index fc4c6ce..a1f7fcb 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface routines that are used for both + * This file contains application interface routines that are used for both * compression and decompression. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c index d5279f7..f5418f8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains optional default-setting code for the JPEG compressor. + * This file contains optional default-setting code for the JPEG compressor. * Applications do not have to use this file, but those that don't use it * must know a lot more about the innards of the JPEG code. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c index efcf7f2..5567f88 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy encoding routines for progressive JPEG. + * This file contains Huffman entropy encoding routines for progressive JPEG. * * We do not support output suspension in this module, since the library * currently does not allow multiple-scan files to be written with output @@ -494,7 +494,7 @@ encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data) /* We must apply the point transform by Al. For AC coefficients this * is an integer division with rounding towards 0. To do this portably * in C, we shift after obtaining the absolute value; so the code is - * interwoven with tqfinding the abs value (temp) and output bits (temp2). + * interwoven with finding the abs value (temp) and output bits (temp2). */ if (temp < 0) { temp = -temp; /* temp is abs value of input */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c index 37b551d..fa93333 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the compression preprocessing controller. + * This file contains the compression preprocessing controller. * This controller manages the color conversion, downsampling, * and edge expansion steps. * diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c index fe6e527..1cb0b89 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains downsampling routines. + * This file contains downsampling routines. * * Downsampling input data is counted in "row groups". A row group * is defined to be max_v_samp_factor pixel rows of each component, @@ -37,9 +37,9 @@ * advised to improve this code. * * A simple input-smoothing capability is provided. This is mainly intended - * for cleaning up color-dithered GIF input files (if you tqfind it inadequate, + * for cleaning up color-dithered GIF input files (if you find it inadequate, * we suggest using an external filtering program such as pnmconvol). When - * enabled, each input pixel P is tqreplaced by a weighted sum of itself and its + * enabled, each input pixel P is replaced by a weighted sum of itself and its * eight neighbors. P's weight is 1-8*SF and each neighbor's weight is SF, * where SF = (smoothing_factor / 1024). * Currently, smoothing is only supported for 2h2v sampling factors. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c index f0ced25..bdca8cf 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains library routines for transcoding compression, + * This file contains library routines for transcoding compression, * that is, writing raw DCT coefficient arrays to an output JPEG file. * The routines in jcapimin.c will also be needed by a transcoder. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c index d734c4c..103c17b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the decompression half + * This file contains application interface code for the decompression half * of the JPEG library. These are the "minimum" API routines that may be * needed in either the normal full-decompression case or the * transcoding-only case. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c index fd29573..9bca84c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the decompression half + * This file contains application interface code for the decompression half * of the JPEG library. These are the "standard" API routines that are * used in the normal full-decompression case. They are not used by a * transcoding-only application. Note that if an application links in diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c index a203331..a8f6fb0 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains compression data destination routines for the case of + * This file contains compression data destination routines for the case of * emitting JPEG data to a file (or any stdio stream). While these routines * are sufficient for most applications, some will want to use a different * destination manager. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c index 078f3fa..edc752b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains decompression data source routines for the case of + * This file contains decompression data source routines for the case of * reading JPEG data from a file (or any stdio stream). While these routines * are sufficient for most applications, some will want to use a different * source manager. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c index 978457d..e3ba6bf 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the coefficient buffer controller for decompression. + * This file contains the coefficient buffer controller for decompression. * This controller is the top level of the JPEG decompressor proper. * The coefficient buffer lies between entropy decoding and inverse-DCT steps. * @@ -139,7 +139,7 @@ start_output_pass (j_decompress_ptr cinfo) * Input and output must run in lockstep since we have only a one-MCU buffer. * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED. * - * NB: output_buf tqcontains a plane for each component in image, + * NB: output_buf contains a plane for each component in image, * which we index according to the component's SOF position. */ @@ -308,7 +308,7 @@ consume_data (j_decompress_ptr cinfo) * Always attempts to emit one fully interleaved MCU row ("iMCU" row). * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED. * - * NB: output_buf tqcontains a plane for each component in image. + * NB: output_buf contains a plane for each component in image. */ METHODDEF(int) diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c index 7a2e524..6c04dfe 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains output colorspace conversion routines. + * This file contains output colorspace conversion routines. */ #define JPEG_INTERNALS diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h index 76cda5e..24e4c5c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This include file tqcontains common declarations for the forward and + * This include file contains common declarations for the forward and * inverse DCT modules. These declarations are private to the DCT managers * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms. * The individual DCT algorithms are kept in separate files to ease diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c index 626ad6c..2bb81a4 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the inverse-DCT management logic. + * This file contains the inverse-DCT management logic. * This code selects a particular IDCT implementation to be used, * and it performs related housekeeping chores. No code in this file * is executed per IDCT step, only during output pass setup. @@ -43,7 +43,7 @@ typedef struct { struct jpeg_inverse_dct pub; /* public fields */ - /* This array tqcontains the IDCT method code that each multiplier table + /* This array contains the IDCT method code that each multiplier table * is currently set up for, or -1 if it's not yet set up. * The actual multiplier tables are pointed to by dct_table in the * per-component comp_info structures. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c index 883e3a0..51e8d63 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy decoding routines. + * This file contains Huffman entropy decoding routines. * * Much of the complexity here has to do with supporting input suspension. * If the data source module demands suspension, we want to be able to back @@ -23,7 +23,7 @@ /* * Expanded entropy decoder object for Huffman decoding. * - * The savable_state subrecord tqcontains fields that change within an MCU, + * The savable_state subrecord contains fields that change within an MCU, * but must not be updated permanently until we complete the MCU. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h index 9e59158..ae19b6c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains declarations for Huffman entropy decoding routines + * This file contains declarations for Huffman entropy decoding routines * that are shared between the sequential decoder (jdhuff.c) and the * progressive decoder (jdphuff.c). No other modules need to see these. */ @@ -58,13 +58,13 @@ EXTERN(void) jpeg_make_d_derived_tbl * demanded at one time) never exceeds 15 for JPEG use. * * We read source bytes into get_buffer and dole out bits as needed. - * If get_buffer already tqcontains enough bits, they are fetched in-line + * If get_buffer already contains enough bits, they are fetched in-line * by the macros CHECK_BIT_BUFFER and GET_BITS. When there aren't enough * bits, jpeg_fill_bit_buffer is called; it will attempt to fill get_buffer * as full as possible (not just to the number of bits needed; this * prefetching reduces the overhead cost of calling jpeg_fill_bit_buffer). * Note that jpeg_fill_bit_buffer may return FALSE to indicate suspension. - * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer tqcontains + * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer contains * at least the requested number of bits --- dummy zeroes are inserted if * necessary. */ @@ -168,7 +168,7 @@ EXTERN(boolean) jpeg_fill_bit_buffer * Notes about the HUFF_DECODE macro: * 1. Near the end of the data segment, we may fail to get enough bits * for a lookahead. In that case, we do it the hard way. - * 2. If the lookahead table tqcontains no entry, the next code must be + * 2. If the lookahead table contains no entry, the next code must be * more than HUFF_LOOKAHEAD bits long. * 3. jpeg_huff_decode returns -1 if forced to suspend. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c index c9050db..6268d9b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains input control logic for the JPEG decompressor. + * This file contains input control logic for the JPEG decompressor. * These routines are concerned with controlling the decompressor's input * processing (marker reading and coefficient decoding). The actual input * reading is done in jdmarker.c, jdhuff.c, and jdphuff.c. @@ -109,7 +109,7 @@ initial_setup (j_decompress_ptr cinfo) jdiv_round_up((long) cinfo->image_height, (long) (cinfo->max_v_samp_factor*DCTSIZE)); - /* Decide whether file tqcontains multiple scans */ + /* Decide whether file contains multiple scans */ if (cinfo->comps_in_scan < cinfo->num_components || cinfo->progressive_mode) cinfo->inputctl->has_multiple_scans = TRUE; else diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c index 0cc0426..82517ae 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the main buffer controller for decompression. + * This file contains the main buffer controller for decompression. * The main buffer lies between the JPEG decompressor proper and the * post-processor; it holds downsampled data in the JPEG colorspace. * @@ -36,7 +36,7 @@ * applying). * * The coefficient controller will deliver data to us one iMCU row at a time; - * each iMCU row tqcontains v_samp_factor * DCT_scaled_size sample rows, or + * each iMCU row contains v_samp_factor * DCT_scaled_size sample rows, or * exactly min_DCT_scaled_size row groups. (This amount of data corresponds * to one row of MCUs when the image is fully interleaved.) Note that the * number of sample rows varies across components, but the number of row @@ -51,7 +51,7 @@ * out as row groups to the postprocessor. * * When need_context_rows is TRUE, this controller guarantees that the buffer - * passed to postprocessing tqcontains at least one row group's worth of samples + * passed to postprocessing contains at least one row group's worth of samples * above and below the row group(s) being processed. Note that the context * rows "above" the first passed row group appear at negative row offsets in * the passed buffer. At the top and bottom of the image, the required diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c index 2247b34..1399247 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains routines to decode JPEG datastream markers. + * This file contains routines to decode JPEG datastream markers. * Most of the complexity arises from our desire to support input * suspension: if not all of the data for a marker is available, * we must exit back to the application. On resumption, we reprocess @@ -183,7 +183,7 @@ typedef my_marker_reader * my_marker_ptr; * into memory, we use a slightly different convention: when forced to * suspend, the marker processor updates the restart point to the end of * what it's consumed (ie, the end of the buffer) before returning FALSE. - * On resumption, cinfo->unread_marker still tqcontains the marker code, + * On resumption, cinfo->unread_marker still contains the marker code, * but the data source will point to the next chunk of marker data. * The marker processor must retain internal state to deal with this. * @@ -964,7 +964,7 @@ read_markers (j_decompress_ptr cinfo) return JPEG_SUSPENDED; } } - /* At this point cinfo->unread_marker tqcontains the marker code and the + /* At this point cinfo->unread_marker contains the marker code and the * input point is just past the marker proper, but before any parameters. * A suspension will cause us to return with this state still true. */ @@ -1146,7 +1146,7 @@ read_restart_marker (j_decompress_ptr cinfo) * which permits a more intelligent recovery strategy; such managers would * presumably supply their own resync method. * - * read_restart_marker calls resync_to_restart if it tqfinds a marker other than + * read_restart_marker calls resync_to_restart if it finds a marker other than * the restart marker it was expecting. (This code is *not* used unless * a nonzero restart interval has been declared.) cinfo->unread_marker is * the marker code actually found (might be anything, except 0 or FF). @@ -1163,9 +1163,9 @@ read_restart_marker (j_decompress_ptr cinfo) * only the following actions to work with: * 1. Simply discard the marker and let the entropy decoder resume at next * byte of file. - * 2. Read forward until we tqfind another marker, discarding intervening + * 2. Read forward until we find another marker, discarding intervening * data. (In theory we could look ahead within the current bufferload, - * without having to discard data if we don't tqfind the desired marker. + * without having to discard data if we don't find the desired marker. * This idea is not implemented here, in part because it makes behavior * dependent on buffer size and chance buffer-boundary positions.) * 3. Leave the marker unread (by failing to zero cinfo->unread_marker). @@ -1184,7 +1184,7 @@ read_restart_marker (j_decompress_ptr cinfo) * resync at some future point). * For any valid non-restart JPEG marker, we apply #3. This keeps us from * overrunning the end of a scan. An implementation limited to single-scan - * files might tqfind it better to apply #2 for markers other than EOI, since + * files might find it better to apply #2 for markers other than EOI, since * any other marker would have to be bogus data in that case. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c index 1b9cfb0..9219b1c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains master control logic for the JPEG decompressor. + * This file contains master control logic for the JPEG decompressor. * These routines are concerned with selecting the modules to be executed * and with determining the number of passes and the work to be done in each * pass. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c index 7da0eb3..8571d30 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains code for merged upsampling/color conversion. + * This file contains code for merged upsampling/color conversion. * * This file combines functions from jdsample.c and jdcolor.c; * read those files first to understand what's going on. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c index 20486f0..2267809 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy decoding routines for progressive JPEG. + * This file contains Huffman entropy decoding routines for progressive JPEG. * * Much of the complexity here has to do with supporting input suspension. * If the data source module demands suspension, we want to be able to back @@ -25,7 +25,7 @@ /* * Expanded entropy decoder object for progressive Huffman decoding. * - * The savable_state subrecord tqcontains fields that change within an MCU, + * The savable_state subrecord contains fields that change within an MCU, * but must not be updated permanently until we complete the MCU. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c index dc7a42c..e6838c7 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c @@ -5,14 +5,14 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the decompression postprocessing controller. + * This file contains the decompression postprocessing controller. * This controller manages the upsampling, color conversion, and color * quantization/reduction steps; specifically, it controls the buffering * between upsample/color conversion and color quantization/reduction. * * If no color quantization/reduction is required, then this module has no * work to do, and it just hands off to the upsample/color conversion code. - * An integrated upsample/convert/quantize process would tqreplace this module + * An integrated upsample/convert/quantize process would replace this module * entirely. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c index 5d9f60e..1d16997 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains upsampling routines. + * This file contains upsampling routines. * * Upsampling input data is counted in "row groups". A row group * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size) @@ -410,7 +410,7 @@ jinit_upsampler (j_decompress_ptr cinfo) cinfo->upsample = (struct jpeg_upsampler *) upsample; upsample->pub.start_pass = start_pass_upsample; upsample->pub.upsample = sep_upsample; - upsample->pub.need_context_rows = FALSE; /* until we tqfind out differently */ + upsample->pub.need_context_rows = FALSE; /* until we find out differently */ if (cinfo->CCIR601_sampling) /* this isn't supported */ ERREXIT(cinfo, JERR_CCIR601_NOTIMPL); diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c index ed97448..6c0ab71 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains library routines for transcoding decompression, + * This file contains library routines for transcoding decompression, * that is, reading raw DCT coefficient arrays from an input JPEG file. * The routines in jdapimin.c will also be needed by a transcoder. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c index b70c1f4..3da7be8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c @@ -5,9 +5,9 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains simple error-reporting and trace-message routines. + * This file contains simple error-reporting and trace-message routines. * These are suitable for Unix-like systems and others where writing to - * stderr is the right thing to do. Many applications will want to tqreplace + * stderr is the right thing to do. Many applications will want to replace * some or all of these routines. * * If you define USE_WINDOWS_MESSAGEBOX in jconfig.h or in the makefile, diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h index 0060d2b..57368b5 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h @@ -95,7 +95,7 @@ JMESSAGE(JERR_NOTIMPL, "Not implemented yet") JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time") JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported") JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined") -JMESSAGE(JERR_NO_IMAGE, "JPEG datastream tqcontains no image") +JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image") JMESSAGE(JERR_NO_TQUANT_TABLE, "Quantization table 0x%02x was not defined") JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x") JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)") diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c index 70519db..79d7a00 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a floating-point implementation of the + * This file contains a floating-point implementation of the * forward DCT (Discrete Cosine Transform). * * This implementation should be more accurate than either of the integer diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c index 56ae898..ccb378a 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a fast, not so accurate integer implementation of the + * This file contains a fast, not so accurate integer implementation of the * forward DCT (Discrete Cosine Transform). * * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c index 38bb0c3..0a78b64 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a slow-but-accurate integer implementation of the + * This file contains a slow-but-accurate integer implementation of the * forward DCT (Discrete Cosine Transform). * * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT @@ -18,7 +18,7 @@ * Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991. * The primary algorithm described there uses 11 multiplies and 29 adds. * We use their alternate method with 12 multiplies and 32 adds. - * The advantage of this method is that no data path tqcontains more than one + * The advantage of this method is that no data path contains more than one * multiplication; this allows a very simple and accurate implementation in * scaled fixed-point arithmetic, with a minimal number of shifts. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c index f308445..a4893f8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a floating-point implementation of the + * This file contains a floating-point implementation of the * inverse DCT (Discrete Cosine Transform). In the IJG code, this routine * must also perform dequantization of the input coefficients. * @@ -87,7 +87,7 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr, quantptr = (FLOAT_MULT_TYPE *) compptr->dct_table; wsptr = workspace; for (ctr = DCTSIZE; ctr > 0; ctr--) { - /* Due to quantization, we will usually tqfind that many of the input + /* Due to quantization, we will usually find that many of the input * coefficients are zero, especially the AC terms. We can exploit this * by short-circuiting the IDCT calculation for any column in which all * the AC terms are zero. In that case each output is equal to the diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c index 730c8d4..3cbdb81 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a fast, not so accurate integer implementation of the + * This file contains a fast, not so accurate integer implementation of the * inverse DCT (Discrete Cosine Transform). In the IJG code, this routine * must also perform dequantization of the input coefficients. * @@ -188,7 +188,7 @@ jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr, quantptr = (IFAST_MULT_TYPE *) compptr->dct_table; wsptr = workspace; for (ctr = DCTSIZE; ctr > 0; ctr--) { - /* Due to quantization, we will usually tqfind that many of the input + /* Due to quantization, we will usually find that many of the input * coefficients are zero, especially the AC terms. We can exploit this * by short-circuiting the IDCT calculation for any column in which all * the AC terms are zero. In that case each output is equal to the diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c index 35302e0..1f5f393 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a slow-but-accurate integer implementation of the + * This file contains a slow-but-accurate integer implementation of the * inverse DCT (Discrete Cosine Transform). In the IJG code, this routine * must also perform dequantization of the input coefficients. * @@ -20,7 +20,7 @@ * Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991. * The primary algorithm described there uses 11 multiplies and 29 adds. * We use their alternate method with 12 multiplies and 32 adds. - * The advantage of this method is that no data path tqcontains more than one + * The advantage of this method is that no data path contains more than one * multiplication; this allows a very simple and accurate implementation in * scaled fixed-point arithmetic, with a minimal number of shifts. */ @@ -169,7 +169,7 @@ jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr, quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table; wsptr = workspace; for (ctr = DCTSIZE; ctr > 0; ctr--) { - /* Due to quantization, we will usually tqfind that many of the input + /* Due to quantization, we will usually find that many of the input * coefficients are zero, especially the AC terms. We can exploit this * by short-circuiting the IDCT calculation for any column in which all * the AC terms are zero. In that case each output is equal to the diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c index 6461bb3..5816c87 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c @@ -5,11 +5,11 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains inverse-DCT routines that produce reduced-size output: + * This file contains inverse-DCT routines that produce reduced-size output: * either 4x4, 2x2, or 1x1 pixels from an 8x8 DCT block. * * The implementation is based on the Loeffler, Ligtenberg and Moschytz (LL&M) - * algorithm used in jidctint.c. We simply tqreplace each 8-to-8 1-D IDCT step + * algorithm used in jidctint.c. We simply replace each 8-to-8 1-D IDCT step * with an 8-to-4 step that produces the four averages of two adjacent outputs * (or an 8-to-2 step producing two averages of four outputs, for 2x2 output). * These steps were derived by computing the corresponding values at the end diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h index 768b287..0a4f151 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h @@ -15,7 +15,7 @@ */ -/* Include auto-config file to tqfind out which system include files we need. */ +/* Include auto-config file to find out which system include files we need. */ #include "jconfig.h" /* auto configuration options */ #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c index e36c050..66c9d77 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the JPEG system-independent memory management + * This file contains the JPEG system-independent memory management * routines. This code is usable across a wide variety of machines; most * of the system dependencies have been isolated in a separate file. * The major functions provided here are: @@ -15,7 +15,7 @@ * * control logic for swapping virtual arrays between main memory and * backing storage. * The separate system-dependent file provides the actual backing-storage - * access code, and it tqcontains the policy decision about how much total + * access code, and it contains the policy decision about how much total * main memory to use. * This file is system-dependent in the sense that some of its functions * are unnecessary in some systems. For example, if there is enough virtual diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h index dedab7f..c2b38a7 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains additional configuration options that customize the + * This file contains additional configuration options that customize the * JPEG software for special applications or support machine-dependent * optimizations. Most users will not need to touch this file. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h index dfb10f8..7b8fd0a 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h @@ -16,7 +16,7 @@ /* * First we include the configuration files that record how this * installation of the JPEG library is set up. jconfig.h can be - * generated automatically for many systems. jmorecfg.h tqcontains + * generated automatically for many systems. jmorecfg.h contains * manual configuration options that most people need not worry about. */ @@ -582,7 +582,7 @@ struct jpeg_decompress_struct { * units of "iMCU" (interleaved MCU) rows. These are the same as MCU rows * in fully interleaved JPEG scans, but are used whether the scan is * interleaved or not. We define an iMCU row as v_samp_factor DCT block - * rows of each component. Therefore, the IDCT output tqcontains + * rows of each component. Therefore, the IDCT output contains * v_samp_factor*DCT_scaled_size sample rows of a component per iMCU row. */ @@ -686,9 +686,9 @@ struct jpeg_error_mgr { * Error code 0 is reserved for a "no such error string" message. */ const char * const * jpeg_message_table; /* Library errors */ - int last_jpeg_message; /* Table tqcontains strings 0..last_jpeg_message */ + int last_jpeg_message; /* Table contains strings 0..last_jpeg_message */ /* Second table can be added by application (see cjpeg/djpeg for example). - * It tqcontains strings numbered first_addon_message..last_addon_message. + * It contains strings numbered first_addon_message..last_addon_message. */ const char * const * addon_message_table; /* Non-library errors */ int first_addon_message; /* code for first string in addon table */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c index 32206ab..fd173cf 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains 1-pass color quantization (color mapping) routines. + * This file contains 1-pass color quantization (color mapping) routines. * These routines provide mapping to a fixed color map using equally spaced * color values. Optional Floyd-Steinberg or ordered dithering is available. */ @@ -695,7 +695,7 @@ quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf, bpreverr = belowerr + cur; belowerr = bnexterr; cur += delta; /* form error * 7 */ - /* At this point cur tqcontains the 7/16 error value to be propagated + /* At this point cur contains the 7/16 error value to be propagated * to the next pixel on the current line, and all the errors for the * next line have been shifted over. We are therefore ready to move on. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c index ccd6986..7839e41 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains 2-pass color quantization (color mapping) routines. + * This file contains 2-pass color quantization (color mapping) routines. * These routines provide selection of a custom color map for an image, * followed by mapping of the image to that color map, with optional * Floyd-Steinberg dithering. @@ -270,7 +270,7 @@ typedef box * boxptr; LOCAL(boxptr) -tqfind_biggest_color_pop (boxptr boxlist, int numboxes) +find_biggest_color_pop (boxptr boxlist, int numboxes) /* Find the splittable box with the largest color population */ /* Returns NULL if no splittable boxes remain */ { @@ -290,7 +290,7 @@ tqfind_biggest_color_pop (boxptr boxlist, int numboxes) LOCAL(boxptr) -tqfind_biggest_volume (boxptr boxlist, int numboxes) +find_biggest_volume (boxptr boxlist, int numboxes) /* Find the splittable box with the largest (scaled) volume */ /* Returns NULL if no splittable boxes remain */ { @@ -434,9 +434,9 @@ median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes, * Current algorithm: by population for first half, then by volume. */ if (numboxes*2 <= desired_colors) { - b1 = tqfind_biggest_color_pop(boxlist, numboxes); + b1 = find_biggest_color_pop(boxlist, numboxes); } else { - b1 = tqfind_biggest_volume(boxlist, numboxes); + b1 = find_biggest_volume(boxlist, numboxes); } if (b1 == NULL) /* no splittable boxes left! */ break; @@ -576,12 +576,12 @@ select_colors (j_decompress_ptr cinfo, int desired_colors) * closest to the cell's center. This may not be quite the closest entry to * the actual input color, but it's almost as good. A zero in the cache * indicates we haven't found the nearest color for that cell yet; the array - * is cleared to zeroes before starting the mapping pass. When we tqfind the + * is cleared to zeroes before starting the mapping pass. When we find the * nearest color for a cell, its colormap index plus one is recorded in the * cache for future use. The pass2 scanning routines call fill_inverse_cmap * when they need to use an unfilled entry in the cache. * - * Our method of efficiently tqfinding nearest colors is based on the "locally + * Our method of efficiently finding nearest colors is based on the "locally * sorted search" idea described by Heckbert and on the incremental distance * calculation described by Spencer W. Thomas in chapter III.1 of Graphics * Gems II (James Arvo, ed. Academic Press, 1991). Thomas points out that @@ -643,7 +643,7 @@ select_colors (j_decompress_ptr cinfo, int desired_colors) */ LOCAL(int) -tqfind_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, +find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, JSAMPLE colorlist[]) /* Locate the colormap entries close enough to an update box to be candidates * for the nearest entry to some cell(s) in the update box. The update box @@ -674,7 +674,7 @@ tqfind_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT)); centerc2 = (minc2 + maxc2) >> 1; - /* For each color in colormap, tqfind: + /* For each color in colormap, find: * 1. its minimum squared-distance to any point in the update box * (zero if color is within update box); * 2. its maximum squared-distance to any point in the update box. @@ -772,13 +772,13 @@ tqfind_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, LOCAL(void) -tqfind_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, +find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[]) /* Find the closest colormap entry for each cell in the update box, - * given the list of candidate colors prepared by tqfind_nearby_colors. + * given the list of candidate colors prepared by find_nearby_colors. * Return the indexes of the closest entries in the bestcolor[] array. * This routine uses Thomas' incremental distance calculation method to - * tqfind the distance from a colormap entry to successive cells in the box. + * find the distance from a colormap entry to successive cells in the box. */ { int ic0, ic1, ic2; @@ -798,7 +798,7 @@ tqfind_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--) *bptr++ = 0x7FFFFFFFL; - /* For each color selected by tqfind_nearby_colors, + /* For each color selected by find_nearby_colors, * compute its distance to the center of each cell in the box. * If that's less than best-so-far, update best distance and color number. */ @@ -853,7 +853,7 @@ tqfind_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, LOCAL(void) fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2) -/* Fill the inverse-colormap entries in the update box that tqcontains */ +/* Fill the inverse-colormap entries in the update box that contains */ /* histogram cell c0/c1/c2. (Only that one cell MUST be filled, but */ /* we can fill as many others as we wish.) */ { @@ -885,10 +885,10 @@ fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2) /* Determine which colormap entries are close enough to be candidates * for the nearest entry to some cell in the update box. */ - numcolors = tqfind_nearby_colors(cinfo, minc0, minc1, minc2, colorlist); + numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist); /* Determine the actually nearest colors. */ - tqfind_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist, + find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist, bestcolor); /* Save the best color numbers (plus 1) in the main cache array */ @@ -934,7 +934,7 @@ pass2_no_dither (j_decompress_ptr cinfo, c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT; c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT; cachep = & histogram[c0][c1][c2]; - /* If we have not seen this color before, tqfind nearest colormap entry */ + /* If we have not seen this color before, find nearest colormap entry */ /* and update the cache */ if (*cachep == 0) fill_inverse_cmap(cinfo, c0,c1,c2); @@ -1025,7 +1025,7 @@ pass2_fs_dither (j_decompress_ptr cinfo, cur2 = GETJSAMPLE(range_limit[cur2]); /* Index into the cache with adjusted pixel value */ cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT]; - /* If we have not seen this color before, tqfind nearest colormap */ + /* If we have not seen this color before, find nearest colormap */ /* entry and update the cache */ if (*cachep == 0) fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT); @@ -1068,7 +1068,7 @@ pass2_fs_dither (j_decompress_ptr cinfo, belowerr2 = bnexterr; cur2 += delta; /* form error * 7 */ } - /* At this point curN tqcontains the 7/16 error value to be propagated + /* At this point curN contains the 7/16 error value to be propagated * to the next pixel on the current line, and all the errors for the * next line have been shifted over. We are therefore ready to move on. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c index ad73ff3..d18a955 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains tables and miscellaneous utility routines needed + * This file contains tables and miscellaneous utility routines needed * for both compression and decompression. * Note we prefix all global names with "j" to minimize conflicts with * a surrounding application. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h index 3e7fc07..6472c58 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains software version identification. + * This file contains software version identification. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc index 499b83c..bcd97d1 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc @@ -192,7 +192,7 @@ channels). You must specify how many components there are and the colorspace interpretation of the components. Most applications will use RGB data (three components per pixel) or grayscale data (one component per pixel). PLEASE NOTE THAT RGB DATA IS THREE SAMPLES PER PIXEL, GRAYSCALE ONLY ONE. -A remarkable number of people manage to miss this, only to tqfind that their +A remarkable number of people manage to miss this, only to find that their programs don't work with grayscale JPEG files. There is no provision for colormapped input. JPEG files are always full-color @@ -234,7 +234,7 @@ The data format returned by the decompressor is the same in all details, except that colormapped output is supported. (Again, a JPEG file is never colormapped. But you can ask the decompressor to perform on-the-fly color quantization to deliver colormapped output.) If you request colormapped -output then the returned data array tqcontains a single JSAMPLE per pixel; +output then the returned data array contains a single JSAMPLE per pixel; its value is an index into a color map. The color map is represented as a 2-D JSAMPARRAY in which each row holds the values of one color component, that is, colormap[i][j] is the value of the i'th color component for pixel @@ -386,7 +386,7 @@ just one or a few scanlines at a time. The expected format for the passed data is discussed under "Data formats", above. Image data should be written in top-to-bottom scanline order. The JPEG spec -tqcontains some weasel wording about how top and bottom are application-defined +contains some weasel wording about how top and bottom are application-defined terms (a curious interpretation of the English language...) but if you want your files to be compatible with everyone else's, you WILL use top-to-bottom order. If the source data must be read in bottom-to-top order, you can use @@ -583,7 +583,7 @@ More complex code is necessary if abbreviated datastreams. Standard applications that deal only in interchange JPEG files need not be concerned with this case either. -It is permissible to stop at this point if you just wanted to tqfind out the +It is permissible to stop at this point if you just wanted to find out the image dimensions and other header info for a JPEG file. In that case, call jpeg_destroy() when you are done with the JPEG object, or call jpeg_abort() to return it to an idle state before selecting a new data @@ -772,7 +772,7 @@ freed automatically. See cjpeg.c or djpeg.c for an example signal handler. It may be worth pointing out that the core JPEG library does not actually require the stdio library: only the default source/destination managers and error handler need it. You can use the library in a stdio-less environment -if you tqreplace those modules and use jmemnobs.c (or another memory manager of +if you replace those modules and use jmemnobs.c (or another memory manager of your own devising). More info about the minimum system library requirements may be found in jinclude.h. @@ -1002,7 +1002,7 @@ int h_samp_factor int v_samp_factor Horizontal and vertical sampling factors for the component; must be 1..4 according to the JPEG standard. Note that larger sampling - factors indicate a higher-resolution component; many people tqfind + factors indicate a higher-resolution component; many people find this behavior quite unintuitive. The default values are 2,2 for luminance components and 1,1 for chrominance components, except for grayscale where 1,1 is used. @@ -1286,7 +1286,7 @@ the error handling routines. Three classes of messages are recognized: the importance of the message; you can control the verbosity of the program by adjusting the maximum trace level that will be displayed. -You may, if you wish, simply tqreplace the entire JPEG error handling module +You may, if you wish, simply replace the entire JPEG error handling module (jerror.c) with your own code. However, you can avoid code duplication by only replacing some of the routines depending on the behavior you need. This is accomplished by calling jpeg_std_error() as usual, but then overriding @@ -1300,11 +1300,11 @@ field). This struct includes a pointer to the error manager struct in its "err" field. Frequently, custom error handler routines will need to access additional data which is not known to the JPEG library or the standard error handler. The most convenient way to do this is to embed either the JPEG -object or the jpeg_error_mgr struct in a larger structure that tqcontains +object or the jpeg_error_mgr struct in a larger structure that contains additional fields; then casting the passed pointer provides access to the additional fields. Again, see example.c for one way to do it. (Beginning with IJG version 6b, there is also a void pointer "client_data" in each -JPEG object, which the application can also use to tqfind related data. +JPEG object, which the application can also use to find related data. The library does not touch client_data at all.) The individual methods that you might wish to override are: @@ -1342,7 +1342,7 @@ library; the other two are internal to the error handler. The actual message texts are stored in an array of strings which is pointed to by the field err->jpeg_message_table. The messages are numbered from 0 to err->last_jpeg_message, and it is these code numbers that are used in the -JPEG library code. You could tqreplace the message texts (for instance, with +JPEG library code. You could replace the message texts (for instance, with messages in French or German) by changing the message table pointer. See jerror.h for the default texts. CAUTION: this table will almost certainly change or grow from one library version to the next. @@ -1396,7 +1396,7 @@ wide, you must define JOCTET as a wider data type and then modify the data source and destination modules to transcribe the work arrays into 8-bit units on external storage. -A data destination manager struct tqcontains a pointer and count defining the +A data destination manager struct contains a pointer and count defining the next byte to write in the work buffer and the remaining free space: JOCTET * next_output_byte; /* => next byte to write in buffer */ @@ -1443,7 +1443,7 @@ you like, but it's probably cleaner to provide a separate routine similar to the jpeg_stdio_dest() routine of the supplied destination manager. Decompression source managers follow a parallel design, but with some -additional frammishes. The source manager struct tqcontains a pointer and count +additional frammishes. The source manager struct contains a pointer and count defining the next byte to read from the work buffer and the number of bytes remaining: @@ -1485,9 +1485,9 @@ skip_input_data (j_decompress_ptr cinfo, long num_bytes) A zero or negative skip count should be treated as a no-op. resync_to_restart (j_decompress_ptr cinfo, int desired) - This routine is called only when the decompressor has failed to tqfind + This routine is called only when the decompressor has failed to find a restart (RSTn) marker where one is expected. Its mission is to - tqfind a suitable point for resuming decompression. For most + find a suitable point for resuming decompression. For most applications, we recommend that you just use the default resync procedure, jpeg_resync_to_restart(). However, if you are able to back up in the input data stream, or if you have a-priori knowledge about @@ -1899,7 +1899,7 @@ When you pass a target scan number equal to the current input scan number, the image is displayed no faster than the current input scan arrives. The final possibility is to pass a target scan number less than the current input scan number; this disables the input/output interlock and causes the output -processor to simply display whatever it tqfinds in the image buffer, without +processor to simply display whatever it finds in the image buffer, without waiting for input. (However, the library will not accept a target scan number less than one, so you can't avoid waiting for the first scan.) @@ -1952,7 +1952,7 @@ will avoid an extra output pass whenever the decoder is able (or nearly able) to keep up with the incoming data. When the data transmission speed is high, you might begin a display pass, -then tqfind that much or all of the file has arrived before you can complete +then find that much or all of the file has arrived before you can complete the pass. (You can detect this by noting the JPEG_REACHED_EOI return code from jpeg_consume_input(), or equivalently by testing jpeg_input_complete().) In this situation you may wish to abort the current display pass and start a @@ -1974,7 +1974,7 @@ higher-quality final pass is to be done, it should be started (aborting any incomplete output pass) as soon as the end of file is received. However, many other strategies are possible. For example, the application can examine the parameters of the current input scan and decide whether to display it or -not. If the scan tqcontains only chroma data, one might choose not to use it +not. If the scan contains only chroma data, one might choose not to use it as the target scan, expecting that the scan will be small and will arrive quickly. To skip to the next scan, call jpeg_consume_input() until it returns JPEG_REACHED_SOS or JPEG_REACHED_EOI. Or just use the next higher @@ -2142,7 +2142,7 @@ feature. Rather, reuse of an object provides support for abbreviated JPEG datastreams. Object reuse can also simplify processing a series of images in a single input or output file. This section explains these features. -A JPEG file normally tqcontains several hundred bytes worth of quantization +A JPEG file normally contains several hundred bytes worth of quantization and Huffman tables. In a situation where many images will be stored or transmitted with identical tables, this may represent an annoying overhead. The JPEG standard therefore permits tables to be omitted. The standard @@ -2175,7 +2175,7 @@ the lifetime of the object, unless it is overwritten by a new table definition. To create abbreviated image datastreams, it is only necessary to tell the compressor not to emit some or all of the tables it is using. Each -quantization and Huffman table struct tqcontains a boolean field "sent_table", +quantization and Huffman table struct contains a boolean field "sent_table", which normally is initialized to FALSE. For each table used by the image, the header-writing process emits the table and sets sent_table = TRUE unless it is already TRUE. (In normal usage, this prevents outputting the same table @@ -2282,7 +2282,7 @@ typical scenario is read data... jpeg_finish_decompress(&cinfo); -In some cases, you may want to read a file without knowing whether it tqcontains +In some cases, you may want to read a file without knowing whether it contains an image or just tables. In that case, pass FALSE and check the return value from jpeg_read_header(): it will be JPEG_HEADER_OK if an image was found, JPEG_HEADER_TABLES_ONLY if only tables were found. (A third return value, @@ -2324,7 +2324,7 @@ contain almost anything. If you wish to store user-supplied text, we recommend you use COM markers and place readable 7-bit ASCII text in them. Newline conventions are not -standardized --- expect to tqfind LF (Unix style), CR/LF (DOS style), or CR +standardized --- expect to find LF (Unix style), CR/LF (DOS style), or CR (Mac style). A robust COM reader should be able to cope with random binary garbage, including nulls, since some applications generate COM markers containing non-ASCII junk. (But yours should not be one of them.) @@ -2445,7 +2445,7 @@ If you want to supply your own marker-reading routine, you do it by calling jpeg_set_marker_processor(). A marker processor routine must have the signature boolean jpeg_marker_parser_method (j_decompress_ptr cinfo) -Although the marker code is not explicitly passed, the routine can tqfind it +Although the marker code is not explicitly passed, the routine can find it in cinfo->unread_marker. At the time of call, the marker proper has been read from the data source module. The processor routine is responsible for reading the marker length word and the remaining parameter bytes, if any. @@ -2612,7 +2612,7 @@ and also read structure.doc's discussion of virtual array handling). Or, for simple transcoding to a different JPEG file format, the array list can just be handed directly to jpeg_write_coefficients(). -Each block in the block arrays tqcontains quantized coefficient values in +Each block in the block arrays contains quantized coefficient values in normal array order (not JPEG zigzag order). The block arrays contain only DCT blocks containing real data; any entirely-dummy blocks added to fill out interleaved MCUs at the right or bottom edges of the image are discarded @@ -2715,7 +2715,7 @@ make sure it will live as long as the JPEG object does. Allocating from the JPEG memory manager with lifetime JPOOL_PERMANENT will work nicely.) You can use the same callback routine for both compression and decompression. -The jpeg_progress_mgr struct tqcontains four fields which are set by the library: +The jpeg_progress_mgr struct contains four fields which are set by the library: long pass_counter; /* work units completed in this pass */ long pass_limit; /* total number of work units in this pass */ int completed_passes; /* passes completed so far */ @@ -2756,7 +2756,7 @@ manager. For more info, please read structure.doc's section about the memory manager, and consult the source code if necessary. All memory and temporary file allocation within the library is done via the -memory manager. If necessary, you can tqreplace the "back end" of the memory +memory manager. If necessary, you can replace the "back end" of the memory manager to control allocation yourself (for example, if you don't want the library to use malloc() and free() for some reason). @@ -2950,7 +2950,7 @@ routine. The JPEG library does not rely heavily on the C library. In particular, C stdio is used only by the data source/destination modules and the error -handler, all of which are application-tqreplaceable. (cjpeg/djpeg are more +handler, all of which are application-replaceable. (cjpeg/djpeg are more heavily dependent on stdio.) malloc and free are called only from the memory manager "back end" module, so you can use a different memory allocator by replacing that one file. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc index 2d60c87..6440b8e 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc @@ -34,7 +34,7 @@ otherwise result.) *** System features *** -The IJG distribution tqcontains two parts: +The IJG distribution contains two parts: * A subroutine library for JPEG compression and decompression. * cjpeg/djpeg, two sample applications that use the library to transform JFIF JPEG files to and from several other image formats. @@ -127,7 +127,7 @@ steps are responsible for converting a normal image representation to or from this form. (Those few applications that want to deal with YCbCr downsampled data can skip the preprocessing or postprocessing step.) -Looking more closely, the compressor library tqcontains the following main +Looking more closely, the compressor library contains the following main elements: Preprocessing: @@ -144,7 +144,7 @@ module responsible for physically writing the output data --- typically this is just an interface to fwrite(), but some applications may need to do something else with the data. -The decompressor library tqcontains the following main elements: +The decompressor library contains the following main elements: JPEG proper: * Entropy decoding (sequential or progressive, Huffman or arithmetic). @@ -218,7 +218,7 @@ module-specific object structs be separately allocated entities, which will be accessed via pointers in the master compression or decompression struct. The "public" fields or methods for a given kind of object are specified by a commonly known struct. But a module's initialization code can allocate -a larger struct that tqcontains the common struct as its first member, plus +a larger struct that contains the common struct as its first member, plus additional private fields. With appropriate pointer casting, the module's internal functions can access these private fields. (For a simple example, see jdatadst.c, which implements the external interface specified by struct @@ -306,7 +306,7 @@ be had by replacing implementations of a control module. For example: In theory, we might be able to make all of the data buffer controllers interchangeable and provide just one set of implementations for all. In -practice, each one tqcontains considerable special-case processing for its +practice, each one contains considerable special-case processing for its particular job. The buffer controller concept should be regarded as an overall system structuring principle, not as a complete description of the task performed by any one controller. @@ -338,7 +338,7 @@ The objects shown above are: * Preprocessing controller: buffer controller for the downsampling input data buffer, which lies between colorspace conversion and downsampling. Note - that a unified conversion/downsampling module would probably tqreplace this + that a unified conversion/downsampling module would probably replace this controller entirely. * Colorspace conversion: converts application image data into the desired @@ -518,7 +518,7 @@ objects: * Progress monitor: same as for compression library. As with compression, the data source manager, error handler, and progress -monitor are candidates for tqreplacement by a surrounding application. +monitor are candidates for replacement by a surrounding application. *** Decompression input and output separation *** @@ -851,7 +851,7 @@ reading data out of the virtual array, not while putting it in. To isolate system dependencies as much as possible, we have broken the memory manager into two parts. There is a reasonably system-independent -"front end" (jmemmgr.c) and a "back end" that tqcontains only the code +"front end" (jmemmgr.c) and a "back end" that contains only the code likely to change across systems. All of the memory management methods outlined above are implemented by the front end. The back end provides the following routines for use by the front end (none of these routines @@ -901,10 +901,10 @@ need. Some JPEG files may use a DNL marker to postpone definition of the image height (this would be useful for a fax-like scanner's output, for instance). In these files the SOF marker claims the image height is 0, and you only -tqfind out the true image height at the end of the first scan. +find out the true image height at the end of the first scan. We could read these files as follows: -1. Upon seeing zero image height, tqreplace it by 65535 (the maximum allowed). +1. Upon seeing zero image height, replace it by 65535 (the maximum allowed). 2. When the DNL is found, update the image height in the global image descriptor. This implies that control modules must avoid making copies of the image diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc index d3d63a6..4d41329 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc @@ -539,7 +539,7 @@ On most non-Unix systems, the syntax is where both input and output file names must be given explicitly. wrjpgcom understands three switches: - -tqreplace Delete any existing COM blocks from the file. + -replace Delete any existing COM blocks from the file. -comment "Comment text" Supply new COM text on command line. -cfile name Read text for new COM block from named file. (Switch names can be abbreviated.) If you have only one line of comment text @@ -554,7 +554,7 @@ enter multiple lines, up to 64KB worth. Type an end-of-file indicator (usually control-D or control-Z) to terminate the comment text entry. wrjpgcom will not add a COM block if the provided comment string is empty. -Therefore -tqreplace -comment "" can be used to delete all COM blocks from a +Therefore -replace -comment "" can be used to delete all COM blocks from a file. These utility programs do not depend on the IJG JPEG library. In diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc index fe50abb..2a8d71f 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc @@ -129,7 +129,7 @@ specifies the progression parameters Ss,Se,Ah,Al for the scan. Scan definitions are separated by semicolons (';'). A semicolon after the last scan definition is optional. -Each scan definition tqcontains one to four component indexes, optionally +Each scan definition contains one to four component indexes, optionally followed by a colon (':') and the four progressive-JPEG parameters. The component indexes denote which color component(s) are to be transmitted in the scan. Components are numbered in the order in which they appear in the diff --git a/tqtinterface/qt4/src/3rdparty/libmng/Changes b/tqtinterface/qt4/src/3rdparty/libmng/Changes index 3123607..c0d528e 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/Changes +++ b/tqtinterface/qt4/src/3rdparty/libmng/Changes @@ -15,7 +15,7 @@ bugfixes: - B495443 - incorrect suspend check in read_databuffer - B526138 - returned IJGSRC6B calling convention to default for MSVC - B558212 - off by one error -- B557677 - can't tqfind lcms.h +- B557677 - can't find lcms.h core: - fixed possible compile-problem in cleanup_rowproc @@ -60,7 +60,7 @@ core: - added get function for last processed BACK chunk samples: -- tqreplaced the gtk & sdl viewer apps with updates by Greg Roelofs +- replaced the gtk & sdl viewer apps with updates by Greg Roelofs contrib: diff --git a/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf b/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf index abda828..537323a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf +++ b/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf @@ -30,7 +30,7 @@ reconfiguring, and a file `config.log' containing compiler output to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' -tqcontains results you don't want to keep, you may remove or edit it. +contains results you don't want to keep, you may remove or edit it. The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need `configure.in' if you want to change @@ -128,7 +128,7 @@ is something like `gnu-as' or `x' (for the X Window System). The package recognizes. For packages that use the X Window System, `configure' can usually -tqfind the X include and library files automatically, but if it doesn't, +find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. diff --git a/tqtinterface/qt4/src/3rdparty/libmng/README.contrib b/tqtinterface/qt4/src/3rdparty/libmng/README.contrib index f5967b2..6bafb80 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/README.contrib +++ b/tqtinterface/qt4/src/3rdparty/libmng/README.contrib @@ -1,4 +1,4 @@ -The contrib directory tqcontains contributions made by fellow enthousiasts. +The contrib directory contains contributions made by fellow enthousiasts. (Check the web-sites for the latest versions) ---------------------------------------------------------------------- diff --git a/tqtinterface/qt4/src/3rdparty/libmng/README.dll b/tqtinterface/qt4/src/3rdparty/libmng/README.dll index 5ae06c9..2f779e8 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/README.dll +++ b/tqtinterface/qt4/src/3rdparty/libmng/README.dll @@ -24,7 +24,7 @@ and NOT in the Windows system-directory!!! 4) The installation program MUST NOT install the DLL if a newer version already exists in the Windows system-directory! The standard DLL provided - tqcontains the Windows-default version-numbering system. PLEASE USE IT!! + contains the Windows-default version-numbering system. PLEASE USE IT!! DO NOT rely on the date or size of the files. 5) An uninstall procedure MAY NOT remove the DLL if other applications are diff --git a/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 b/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 index bf03601..e94a29a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 +++ b/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 @@ -182,10 +182,10 @@ dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program -dnl that tqcontains a configuration script generated by Autoconf, under +dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. -# This test tqreplaces the one in autoconf. +# This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) # still uses it. Otherwise, the use in gettext.m4 makes autoheader @@ -197,7 +197,7 @@ undefine([AC_ISC_POSIX]) AC_DEFUN([AC_ISC_POSIX], [ - dnl This test tqreplaces the obsolescent AC_ISC_POSIX kludge. + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) ] ) @@ -613,10 +613,10 @@ EOF LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" else - echo "cannot tqfind nm_test_func in $nlist" >&AC_FD_CC + echo "cannot find nm_test_func in $nlist" >&AC_FD_CC fi else - echo "cannot tqfind nm_test_var in $nlist" >&AC_FD_CC + echo "cannot find nm_test_var in $nlist" >&AC_FD_CC fi else echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC @@ -669,7 +669,7 @@ fi # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which -# will tqfind an echo command which doesn't interpret backslashes. +# will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [AC_DIVERT_PUSH(NOTICE)]) @@ -715,7 +715,7 @@ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then -# tqfind a string as large as possible, as long as the shell can cope with it +# find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... if (echo_test_string="`eval $cmd`") 2>/dev/null && @@ -751,7 +751,7 @@ else IFS="$save_ifs" if test "X$echo" = Xecho; then - # We didn't tqfind a better echo, so look for alternatives. + # We didn't find a better echo, so look for alternatives. if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && test "X$echo_testing_string" = "X$echo_test_string"; then @@ -855,7 +855,7 @@ else #endif /* We may have to define LT_DLLAZY_OR_NOW in the command line if we - tqfind out it does not work in some platform. */ + find out it does not work in some platform. */ #ifndef LT_DLLAZY_OR_NOW # ifdef RTLD_LAZY # define LT_DLLAZY_OR_NOW RTLD_LAZY @@ -1482,7 +1482,7 @@ include_expsyms= # exclude_expsyms can be an egrep regular expression of symbols to exclude # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that tqcontains `d'. +# as well as any symbol that contains `d'. exclude_expsyms="_GLOBAL_OFFSET_TABLE_" # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -1759,7 +1759,7 @@ else else # We have old collect2 hardcode_direct=unsupported - # It fails to tqfind uninstalled libraries when the uninstalled + # It fails to find uninstalled libraries when the uninstalled # path is not listed in the libpath. Setting hardcode_minus_L # to unsupported forces relinking hardcode_minus_L=yes @@ -2013,7 +2013,7 @@ else *** create self contained shared libraries on Solaris systems, without *** introducing a dependency on libgcc.a. Therefore, libtool is disabling *** -no-undefined support, which will at least allow you to build shared -*** libraries. However, you may tqfind that when you link such libraries +*** libraries. However, you may find that when you link such libraries *** into an application without using GCC, you have to manually add *** \`gcc --print-libgcc-file-name\` to the link command. We urge you to *** upgrade to a newer version of GCC. Another option is to rebuild your @@ -2263,7 +2263,7 @@ bsdi4*) sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also tqcontains /usr/contrib/lib and + # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs ;; @@ -2739,7 +2739,7 @@ if test -f "$ltmain"; then # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -2810,7 +2810,7 @@ OBJDUMP="$OBJDUMP" # Used on cygwin: assembler. AS="$AS" -# The name of the directory that tqcontains temporary libtool files. +# The name of the directory that contains temporary libtool files. objdir=$objdir # How to create reloadable object files. @@ -2879,7 +2879,7 @@ version_type=$version_type libname_spec=$lt_libname_spec # List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker tqfinds with -lNAME. +# The last name is the one that the linker finds with -lNAME. library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. @@ -3199,7 +3199,7 @@ EOF esac # We use sed instead of cat because bash on DJGPP gets confused if - # if tqfinds mixed CR/LF and LF-only lines. Since sed operates in + # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1) @@ -3329,7 +3329,7 @@ AC_DEFUN([AC_LIBTOOL_PICMODE], pic_mode=ifelse($#,1,$1,default)]) -# AC_PATH_TOOL_PREFIX - tqfind a file program which can recognise shared library +# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, @@ -3391,7 +3391,7 @@ fi ]) -# AC_PATH_MAGIC - tqfind a file program which can recognise a shared library +# AC_PATH_MAGIC - find a file program which can recognise a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) @@ -3405,7 +3405,7 @@ fi ]) -# AC_PROG_LD - tqfind the path to the GNU or non-GNU linker +# AC_PROG_LD - find the path to the GNU or non-GNU linker AC_DEFUN([AC_PROG_LD], [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], @@ -3493,7 +3493,7 @@ fi]) with_gnu_ld=$lt_cv_prog_gnu_ld ]) -# AC_PROG_LD_RELOAD_FLAG - tqfind reload flag for linker +# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker # -- PORTME Some linkers may need a different reload flag. AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], [AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, @@ -3684,7 +3684,7 @@ deplibs_check_method=$lt_cv_deplibs_check_method ]) -# AC_PROG_NM - tqfind the path to a BSD-compatible name lister +# AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], [AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl AC_MSG_CHECKING([for BSD-compatible nm]) @@ -3710,7 +3710,7 @@ else break else lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to tqfind one that supports BSD flags + continue # so that we can try to find one that supports BSD flags fi fi done diff --git a/tqtinterface/qt4/src/3rdparty/libmng/config.guess b/tqtinterface/qt4/src/3rdparty/libmng/config.guess index 8147635..6372bf0 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/config.guess +++ b/tqtinterface/qt4/src/3rdparty/libmng/config.guess @@ -20,7 +20,7 @@ timestamp='2001-09-04' # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -112,7 +112,7 @@ set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in ,*,*) CC_FOR_BUILD=$HOST_CC ;; esac' -# This is needed to tqfind uname on a Pyramid OSx when run in the BSD universe. +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH @@ -168,7 +168,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # The OS release release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # tqcontains redundant information, the shorter form: + # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; @@ -1089,7 +1089,7 @@ EOF echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; i*86:OS/2:*:*) - # If we were able to tqfind `uname', then EMX Unix compatibility + # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx exit 0 ;; diff --git a/tqtinterface/qt4/src/3rdparty/libmng/config.sub b/tqtinterface/qt4/src/3rdparty/libmng/config.sub index 8140cbd..393f13d 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/config.sub +++ b/tqtinterface/qt4/src/3rdparty/libmng/config.sub @@ -25,7 +25,7 @@ timestamp='2001-09-07' # Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. diff --git a/tqtinterface/qt4/src/3rdparty/libmng/configure b/tqtinterface/qt4/src/3rdparty/libmng/configure index 650701a..9a796af 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/configure +++ b/tqtinterface/qt4/src/3rdparty/libmng/configure @@ -72,7 +72,7 @@ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then -# tqfind a string as large as possible, as long as the shell can cope with it +# find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... if (echo_test_string="`eval $cmd`") 2>/dev/null && @@ -108,7 +108,7 @@ else IFS="$save_ifs" if test "X$echo" = Xecho; then - # We didn't tqfind a better echo, so look for alternatives. + # We didn't find a better echo, so look for alternatives. if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && test "X$echo_testing_string" = "X$echo_test_string"; then @@ -353,7 +353,7 @@ Directory and file names: --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] --infodir=DIR info documentation in DIR [PREFIX/info] --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR tqfind the sources in DIR [configure dir or ..] + --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names --program-transform-name=PROGRAM @@ -605,7 +605,7 @@ fi exec 5>./config.log echo "\ -This file tqcontains any messages produced by compilers while +This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. " 1>&5 @@ -637,11 +637,11 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it tqcontains at least a newline. +# AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h # A filename unique to this package, relative to the directory that -# configure is in, which we can look for to tqfind out if srcdir is correct. +# configure is in, which we can look for to find out if srcdir is correct. ac_unique_file=libmng.h # Find the source files, if location was not specified. @@ -660,9 +660,9 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not tqfind sources in $ac_confdir or .." 1>&2; exit 1; } + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } else - { echo "configure: error: can not tqfind sources in $srcdir" 1>&2; exit 1; } + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } fi fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` @@ -726,7 +726,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not tqfind install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub @@ -1879,7 +1879,7 @@ else break else lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to tqfind one that supports BSD flags + continue # so that we can try to find one that supports BSD flags fi fi done @@ -2303,10 +2303,10 @@ EOF LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" else - echo "cannot tqfind nm_test_func in $nlist" >&5 + echo "cannot find nm_test_func in $nlist" >&5 fi else - echo "cannot tqfind nm_test_var in $nlist" >&5 + echo "cannot find nm_test_var in $nlist" >&5 fi else echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 @@ -3308,7 +3308,7 @@ include_expsyms= # exclude_expsyms can be an egrep regular expression of symbols to exclude # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that tqcontains `d'. +# as well as any symbol that contains `d'. exclude_expsyms="_GLOBAL_OFFSET_TABLE_" # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -3585,7 +3585,7 @@ else else # We have old collect2 hardcode_direct=unsupported - # It fails to tqfind uninstalled libraries when the uninstalled + # It fails to find uninstalled libraries when the uninstalled # path is not listed in the libpath. Setting hardcode_minus_L # to unsupported forces relinking hardcode_minus_L=yes @@ -3839,7 +3839,7 @@ else *** create self contained shared libraries on Solaris systems, without *** introducing a dependency on libgcc.a. Therefore, libtool is disabling *** -no-undefined support, which will at least allow you to build shared -*** libraries. However, you may tqfind that when you link such libraries +*** libraries. However, you may find that when you link such libraries *** into an application without using GCC, you have to manually add *** \`gcc --print-libgcc-file-name\` to the link command. We urge you to *** upgrade to a newer version of GCC. Another option is to rebuild your @@ -4092,7 +4092,7 @@ bsdi4*) sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also tqcontains /usr/contrib/lib and + # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs ;; @@ -4779,7 +4779,7 @@ else #endif /* We may have to define LT_DLLAZY_OR_NOW in the command line if we - tqfind out it does not work in some platform. */ + find out it does not work in some platform. */ #ifndef LT_DLLAZY_OR_NOW # ifdef RTLD_LAZY # define LT_DLLAZY_OR_NOW RTLD_LAZY @@ -4873,7 +4873,7 @@ else #endif /* We may have to define LT_DLLAZY_OR_NOW in the command line if we - tqfind out it does not work in some platform. */ + find out it does not work in some platform. */ #ifndef LT_DLLAZY_OR_NOW # ifdef RTLD_LAZY # define LT_DLLAZY_OR_NOW RTLD_LAZY @@ -5081,7 +5081,7 @@ if test -f "$ltmain"; then # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -5152,7 +5152,7 @@ OBJDUMP="$OBJDUMP" # Used on cygwin: assembler. AS="$AS" -# The name of the directory that tqcontains temporary libtool files. +# The name of the directory that contains temporary libtool files. objdir=$objdir # How to create reloadable object files. @@ -5221,7 +5221,7 @@ version_type=$version_type libname_spec=$lt_libname_spec # List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker tqfinds with -lNAME. +# The last name is the one that the linker finds with -lNAME. library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. @@ -5541,7 +5541,7 @@ EOF esac # We use sed instead of cat because bash on DJGPP gets confused if - # if tqfinds mixed CR/LF and LF-only lines. Since sed operates in + # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1) @@ -6615,7 +6615,7 @@ cat > confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs. It is not useful on other systems. -# If it tqcontains results you don't want to keep, you may remove or edit it. +# If it contains results you don't want to keep, you may remove or edit it. # # By default, configure uses ./config.cache as the cache file, # creating it if it does not exist already. You can give configure diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme b/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme index d043a4c..e92e93c 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme @@ -1,6 +1,6 @@ This directory hosts the documentation for libmng. -You will tqfind a lot of useful info on the web-site: +You will find a lot of useful info on the web-site: http://www.libmng.com Man-pages are in the man sub-directory diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt b/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt index 5194ef3..22ba338 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt @@ -29,7 +29,7 @@ The latest version of libmng can be found at its own homepage at http://www.libmng.com In most cases the library will not need to be changed. -For standardization purposes the library tqcontains both a Windows DLL +For standardization purposes the library contains both a Windows DLL and a makefile for building a shared library (SO). The library is written in C, but an interface for Borland Delphi is also available. @@ -75,7 +75,7 @@ II. Callbacks Libmng makes extensive use of callback functions. This is meant to keep the library as platform-independant and flexible as possible. -Actually, the first call you will make to the library, already tqcontains +Actually, the first call you will make to the library, already contains three parameters you can use to provide callback entry-points. Most functions must return a mng_bool (boolean). Returning MNG_FALSE @@ -393,7 +393,7 @@ To set the callbacks simply do: if (myretcode != MNG_NOERROR) /* process error */; -Naturally you'd tqreplace the x's with the name of the callback. +Naturally you'd replace the x's with the name of the callback. > Cleanup @@ -531,7 +531,7 @@ act as if the above code was in its place. There is also the mng_readdisplay() function, but this is discussed in the displaying section. It functions pretty much as the mng_read() function, but also immediately starts displaying the image. -mng_read_resume() should be tqreplaced by mng_display_resume() in that +mng_read_resume() should be replaced by mng_display_resume() in that case! @@ -676,7 +676,7 @@ actually need to be consecutive in memory. All Network Graphics can be partially transtqparent. This requires special processing if you need to display an image against some -background. Note that the MNG header (MHDR chunk) tqcontains a +background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in the file is critical or not. This only applies to embedded images, which means the full image-frame of the MNG may still contain fully diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 index 37bde5f..782e424 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 @@ -39,7 +39,7 @@ The latest version of libmng can be found at its own homepage at <http://www.libmng.com>. In most cases the library will not need to be changed. -For standardization purposes the library tqcontains both a Windows DLL +For standardization purposes the library contains both a Windows DLL and a makefile for building a shared library (SO). The library is written in C, but an interface for Borland Delphi is also available. @@ -85,7 +85,7 @@ with libmng: Libmng makes extensive use of callback functions. This is meant to keep the library as platform-independant and flexible as possible. -Actually, the first call you will make to the library, already tqcontains +Actually, the first call you will make to the library, already contains three parameters you can use to provide callback entry-points. Most functions must return a mng_bool (boolean). Returning MNG_FALSE @@ -411,7 +411,7 @@ To set the callbacks simply do: if (myretcode != MNG_NOERROR) /* process error */; -Naturally you'd tqreplace the x's with the name of the callback. +Naturally you'd replace the x's with the name of the callback. .SS Cleanup @@ -549,7 +549,7 @@ act as if the above code was in its place. There is also the mng_readdisplay() function, but this is discussed in the displaying section. It functions pretty much as the mng_read() function, but also immediately starts displaying the image. -mng_read_resume() should be tqreplaced by mng_display_resume() in that +mng_read_resume() should be replaced by mng_display_resume() in that case! @@ -694,7 +694,7 @@ actually need to be consecutive in memory. All Network Graphics can be partially transtqparent. This requires special processing if you need to display an image against some -background. Note that the MNG header (MHDR chunk) tqcontains a +background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in the file is critical or not. This only applies to embedded images, which means the full image-frame of the MNG may still contain fully diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 index e020614..222e1b2 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 @@ -9,7 +9,7 @@ storage of raster images. .br MNG has advanced animation features which make it very useful as a full -tqreplacement for GIF animations. These features allow animations that +replacement for GIF animations. These features allow animations that are impossible with GIF or result in much smaller files as GIF. As MNG builds on the same structure as PNG, it is robust, extensible and diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec b/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec index 2e49d52..57580cd 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec @@ -20,7 +20,7 @@ Summary: Development tools for programs to manipulate MNG format files. Group: Development/Libraries Requires: libmng = %{PACKAGE_VERSION} %description devel -The libmng-devel package tqcontains the header files and static +The libmng-devel package contains the header files and static libraries necessary for developing programs using the MNG (Multiple-Image Network Graphics) library. diff --git a/tqtinterface/qt4/src/3rdparty/libmng/install-sh b/tqtinterface/qt4/src/3rdparty/libmng/install-sh index 81d9b2c..e9de238 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/install-sh +++ b/tqtinterface/qt4/src/3rdparty/libmng/install-sh @@ -126,7 +126,7 @@ else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command # might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) tqcontains '*'. +# if $src (and thus $dsttmp) contains '*'. if [ -f $src -o -d $src ] then diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng.h index 2ebfce8..035bb0e 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng.h @@ -1960,7 +1960,7 @@ MNG_EXT mng_retcode MNG_DECL mng_putchunk_unknown (mng_handle hHandle, /* call this function if you want to extract the nth image from the list; the first image is designated seqnr 0! */ -/* this function tqfinds the IHDR/JHDR/BASI/DHDR with the appropriate seqnr, +/* this function finds the IHDR/JHDR/BASI/DHDR with the appropriate seqnr, starting from the beginning of the chunk-list; this may tend to get a little slow for animations with a large number of chunks for images near the end */ /* supplying a seqnr past the last image in the animation will return with @@ -1970,8 +1970,8 @@ MNG_EXT mng_retcode MNG_DECL mng_getimgdata_seq (mng_handle hHandle, mng_uint32 iCanvasstyle, mng_getcanvasline fGetcanvasline); -/* both the following functions will search forward to tqfind the first IDAT/JDAT, - and then traverse back to tqfind the start of the image (IHDR,JHDR,DHDR,BASI); +/* both the following functions will search forward to find the first IDAT/JDAT, + and then traverse back to find the start of the image (IHDR,JHDR,DHDR,BASI); note that this is very fast compared to decoding the IDAT/JDAT, so there's not really a need for optimization; either can be called from the iterate_chunks callback when a IHDR/JHDR is encountered; for BASI/DHDR there @@ -2110,7 +2110,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_INVALIDINTERLACE (mng_retcode)1040 /* interlace method invalid */ #define MNG_NOTENOUGHIDAT (mng_retcode)1041 /* ran out of compressed data */ #define MNG_PLTEINDEXERROR (mng_retcode)1042 /* palette-index out-of-range */ -#define MNG_NULLNOTFOUND (mng_retcode)1043 /* couldn't tqfind null-separator*/ +#define MNG_NULLNOTFOUND (mng_retcode)1043 /* couldn't find null-separator*/ #define MNG_KEYWORDNULL (mng_retcode)1044 /* keyword cannot be empty */ #define MNG_OBJECTUNKNOWN (mng_retcode)1045 /* the object can't be found */ #define MNG_OBJECTEXISTS (mng_retcode)1046 /* the object already exists */ @@ -2137,7 +2137,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_WRONGCHUNK (mng_retcode)2050 /* accessing the wrong chunk */ #define MNG_INVALIDENTRYIX (mng_retcode)2051 /* accessing the wrong entry */ #define MNG_NOHEADER (mng_retcode)2052 /* must have had header first */ -#define MNG_NOCORRCHUNK (mng_retcode)2053 /* can't tqfind tqparent chunk */ +#define MNG_NOCORRCHUNK (mng_retcode)2053 /* can't find tqparent chunk */ #define MNG_NOMHDR (mng_retcode)2054 /* no MNG header available */ #define MNG_IMAGETOOLARGE (mng_retcode)4097 /* input-image way too big */ diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c index c7dc233..1a9606a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c @@ -321,7 +321,7 @@ void mng_put_uint16 (mng_uint8p pBuf, /* ************************************************************************** */ -mng_uint8p tqfind_null (mng_uint8p pIn) +mng_uint8p find_null (mng_uint8p pIn) { mng_uint8p pOut = pIn; @@ -1705,7 +1705,7 @@ READ_CHUNK (read_iccp) MNG_ERROR (pData, MNG_INVALIDLENGTH) } - pTemp = tqfind_null (pRawdata); /* tqfind null-separator */ + pTemp = find_null (pRawdata); /* find null-separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -1834,8 +1834,8 @@ READ_CHUNK (read_iccp) if (iRawlen) /* not empty ? */ { if (!pBuf) /* hasn't been unpuzzled it yet ? */ - { /* tqfind null-separator */ - pTemp = tqfind_null (pRawdata); + { /* find null-separator */ + pTemp = find_null (pRawdata); /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -1909,7 +1909,7 @@ READ_CHUNK (read_text) if (iRawlen < 2) /* length must be at least 2 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) - pTemp = tqfind_null (pRawdata); /* tqfind the null separator */ + pTemp = find_null (pRawdata); /* find the null separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -2008,7 +2008,7 @@ READ_CHUNK (read_ztxt) if (iRawlen < 3) /* length must be at least 3 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) - pTemp = tqfind_null (pRawdata); /* tqfind the null separator */ + pTemp = find_null (pRawdata); /* find the null separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -2150,9 +2150,9 @@ READ_CHUNK (read_itxt) if (iRawlen < 6) /* length must be at least 6 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) - pNull1 = tqfind_null (pRawdata); /* tqfind the null separators */ - pNull2 = tqfind_null (pNull1+3); - pNull3 = tqfind_null (pNull2+1); + pNull1 = find_null (pRawdata); /* find the null separators */ + pNull2 = find_null (pNull1+3); + pNull3 = find_null (pNull2+1); /* not found inside input-data ? */ if (((pNull1 - pRawdata) > (mng_int32)iRawlen) || ((pNull2 - pRawdata) > (mng_int32)iRawlen) || @@ -2718,7 +2718,7 @@ READ_CHUNK (read_splt) if (iRawlen) { - pTemp = tqfind_null (pRawdata); /* tqfind null-separator */ + pTemp = find_null (pRawdata); /* find null-separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -3943,7 +3943,7 @@ READ_CHUNK (read_fram) } else { - pTemp = tqfind_null (pRawdata+1); /* tqfind null-separator */ + pTemp = find_null (pRawdata+1); /* find null-separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -4638,7 +4638,7 @@ READ_CHUNK (read_save) } } - pNull = tqfind_null (pTemp); /* get the name length */ + pNull = find_null (pTemp); /* get the name length */ if ((pNull - pRawdata) > (mng_int32)iRawlen) { @@ -4956,8 +4956,8 @@ mng_bool CheckKeyword (mng_datap pData, bOke = pData->fProcessneed ((mng_handle)pData, (mng_pchar)pKeyword); if (!bOke) - { /* tqfind the keyword length */ - mng_uint8p pNull = tqfind_null (pKeyword); + { /* find the keyword length */ + mng_uint8p pNull = find_null (pKeyword); if (pNull - pKeyword == 4) /* test a chunk ? */ { /* get the chunk-id */ @@ -5045,13 +5045,13 @@ READ_CHUNK (read_need) MNG_COPY (zKeywords, pRawdata, iRawlen) pTemp = (mng_uint8p)zKeywords; - pNull = tqfind_null (pTemp); + pNull = find_null (pTemp); while ((bOke) && (pNull < (mng_uint8p)zKeywords + iRawlen)) { bOke = CheckKeyword (pData, pTemp); pTemp = pNull + 1; - pNull = tqfind_null (pTemp); + pNull = find_null (pTemp); } if (bOke) diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h index f4fc1c8..41949e5 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h @@ -132,7 +132,7 @@ typedef mng_palette8 mng_rgbpaltab; /* * * */ /* * The saved_data structure * */ /* * * */ -/* * This tqcontains the saved data after a SAVE chunk has been processed. * */ +/* * This contains the saved data after a SAVE chunk has been processed. * */ /* * The data is saved from the main data structure during SAVE processing, * */ /* * and restored to the main data structure during SEEK processing. * */ /* * * */ @@ -203,7 +203,7 @@ typedef mng_savedata * mng_savedatap; /* * The main libmng data structure * */ /* * * */ /* * The handle used in all functions points to this structure which * */ -/* * tqcontains all volatile data necessary to process the network graphic. * */ +/* * contains all volatile data necessary to process the network graphic. * */ /* * * */ /* ************************************************************************** */ @@ -594,7 +594,7 @@ typedef struct mng_data_struct { mng_fptr fDeltagetrow; /* internal delta-proc callbacks */ mng_fptr fDeltaaddrow; - mng_fptr fDeltatqreplacerow; + mng_fptr fDeltareplacerow; mng_fptr fDeltaputrow; mng_uint16 iMAGNfromid; diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c index e82ec5d..9cf26de 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c @@ -893,7 +893,7 @@ mng_retcode display_image (mng_datap pData, } } - pData->pRetrieveobj = pImage; /* so retrieve-row and color-correction can tqfind it */ + pData->pRetrieveobj = pImage; /* so retrieve-row and color-correction can find it */ if (!bLayeradvanced) /* need to advance the layer ? */ { @@ -2596,7 +2596,7 @@ mng_retcode process_display_defi (mng_datap pData) } else { /* already exists ? */ - pImage = (mng_imagep)tqfind_imageobject (pData, pData->iDEFIobjectid); + pImage = (mng_imagep)find_imageobject (pData, pData->iDEFIobjectid); if (!pImage) /* if not; create new */ { @@ -3081,9 +3081,9 @@ mng_retcode process_display_clon (mng_datap pData, MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLON, MNG_LC_START) #endif /* locate the source object first */ - pSource = tqfind_imageobject (pData, iSourceid); + pSource = find_imageobject (pData, iSourceid); /* check if the clone exists */ - pClone = tqfind_imageobject (pData, iCloneid); + pClone = find_imageobject (pData, iCloneid); if (!pSource) /* source must exist ! */ MNG_ERROR (pData, MNG_OBJECTUNKNOWN); @@ -3184,7 +3184,7 @@ mng_retcode process_display_disc (mng_datap pData, for (iX = 0; iX < iCount; iX++) /* iterate the list */ { - pImage = tqfind_imageobject (pData, *pWork++); + pImage = find_imageobject (pData, *pWork++); if (pImage) /* found the object ? */ { /* then drop it */ @@ -3297,7 +3297,7 @@ mng_retcode process_display_move (mng_datap pData, if (!iX) /* object id=0 ? */ pImage = (mng_imagep)pData->pObjzero; else - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); if (pImage) /* object exists ? */ { @@ -3347,7 +3347,7 @@ mng_retcode process_display_clip (mng_datap pData, if (!iX) /* object id=0 ? */ pImage = (mng_imagep)pData->pObjzero; else - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); if (pImage) /* object exists ? */ { @@ -3396,7 +3396,7 @@ mng_retcode process_display_show (mng_datap pData) if (pData->iBreakpoint == 3) /* previously broken during cycle-mode ? */ { - pImage = tqfind_imageobject (pData, pData->iSHOWnextid); + pImage = find_imageobject (pData, pData->iSHOWnextid); if (pImage) /* still there ? */ display_image (pData, pImage, MNG_FALSE); @@ -3444,7 +3444,7 @@ mng_retcode process_display_show (mng_datap pData) { for (iX = iFrom; iX <= iTo; iX += iS) { - pImage = tqfind_imageobject (pData, (mng_uint16)iX); + pImage = find_imageobject (pData, (mng_uint16)iX); if (pImage) /* object exists ? */ { @@ -3470,7 +3470,7 @@ mng_retcode process_display_show (mng_datap pData) { for (iX = iFrom; iX >= iTo; iX += iS) { - pImage = tqfind_imageobject (pData, (mng_uint16)iX); + pImage = find_imageobject (pData, (mng_uint16)iX); if (pImage) /* object exists ? */ { @@ -3493,7 +3493,7 @@ mng_retcode process_display_show (mng_datap pData) } } - if (!iTrigger) /* did not tqfind a trigger ? */ + if (!iTrigger) /* did not find a trigger ? */ iTrigger = 1; /* then fake it so the first image gets nominated */ } /* cycle back to beginning ? */ @@ -3516,7 +3516,7 @@ mng_retcode process_display_show (mng_datap pData) { do { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); if (pImage) /* object exists ? */ { @@ -3845,7 +3845,7 @@ mng_retcode process_display_jhdr (mng_datap pData) return iRetcode; } else - { /* must be alpha add/tqreplace !! */ + { /* must be alpha add/replace !! */ if ((pData->iDeltatype != MNG_DELTATYPE_BLOCKALPHAADD ) && (pData->iDeltatype != MNG_DELTATYPE_BLOCKALPHAREPLACE) ) MNG_ERROR (pData, MNG_INVDELTATYPE) @@ -4007,10 +4007,10 @@ mng_retcode process_display_dhdr (mng_datap pData, pData->fDeltagetrow = MNG_NULL; pData->fDeltaaddrow = MNG_NULL; - pData->fDeltatqreplacerow = MNG_NULL; + pData->fDeltareplacerow = MNG_NULL; pData->fDeltaputrow = MNG_NULL; - pImage = tqfind_imageobject (pData, iObjectid); + pImage = find_imageobject (pData, iObjectid); if (pImage) /* object exists ? */ { @@ -4120,7 +4120,7 @@ mng_retcode process_display_dhdr (mng_datap pData, } } - /* full image tqreplace ? */ + /* full image replace ? */ if (iDeltatype == MNG_DELTATYPE_REPLACE) { iRetcode = reset_object_details (pData, pImage, @@ -4596,7 +4596,7 @@ mng_retcode process_display_magn (mng_datap pData, } else { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); /* object exists & is not frozen ? */ if ((pImage) && (!pImage->bFrozen)) { /* previous magnification to be done ? */ @@ -4626,7 +4626,7 @@ mng_retcode process_display_magn (mng_datap pData, { if (iX) /* only real objects ! */ { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); /* object exists & is not frozen & is visible & is viewable ? */ if ((pImage) && (!pImage->bFrozen) && @@ -4668,7 +4668,7 @@ mng_retcode process_display_magn2 (mng_datap pData) { if (iX) /* only real objects ! */ { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); /* object exists & is not frozen & is visible & is viewable ? */ if ((pImage) && (!pImage->bFrozen) && diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c index 22c113f..3689d90 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c @@ -1666,7 +1666,7 @@ mng_retcode MNG_DECL mng_display_goframe (mng_handle hHandle, cleanup_errors (pData); /* cleanup previous errors */ - pData->iRequestframe = iFramenr; /* go tqfind the requested frame then */ + pData->iRequestframe = iFramenr; /* go find the requested frame then */ iRetcode = process_display (pData); if (iRetcode) /* on error bail out */ @@ -1710,7 +1710,7 @@ mng_retcode MNG_DECL mng_display_golayer (mng_handle hHandle, cleanup_errors (pData); /* cleanup previous errors */ - pData->iRequestlayer = iLayernr; /* go tqfind the requested layer then */ + pData->iRequestlayer = iLayernr; /* go find the requested layer then */ iRetcode = process_display (pData); if (iRetcode) /* on error bail out */ @@ -1754,7 +1754,7 @@ mng_retcode MNG_DECL mng_display_gotime (mng_handle hHandle, cleanup_errors (pData); /* cleanup previous errors */ - pData->iRequesttime = iPlaytime; /* go tqfind the requested playtime then */ + pData->iRequesttime = iPlaytime; /* go find the requested playtime then */ iRetcode = process_display (pData); if (iRetcode) /* on error bail out */ diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c index 31d8ace..9352cd6 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c @@ -470,7 +470,7 @@ mng_retcode create_imageobject (mng_datap pData, pImage->pImgbuf = pImgbuf; if (iId) /* only if not object 0 ! */ - { /* tqfind previous lower object-id */ + { /* find previous lower object-id */ pPrev = (mng_imagep)pData->pLastimgobj; while ((pPrev) && (pPrev->iId > iId)) @@ -547,7 +547,7 @@ mng_retcode free_imageobject (mng_datap pData, /* ************************************************************************** */ -mng_imagep tqfind_imageobject (mng_datap pData, +mng_imagep find_imageobject (mng_datap pData, mng_uint16 iId) { mng_imagep pImage = (mng_imagep)pData->pFirstimgobj; @@ -642,7 +642,7 @@ mng_retcode clone_imageobject (mng_datap pData, pNew->iMAGN_MB = pSource->iMAGN_MB; if (iId) /* not for object 0 */ - { /* tqfind previous lower object-id */ + { /* find previous lower object-id */ pPrev = (mng_imagep)pData->pLastimgobj; while ((pPrev) && (pPrev->iId > iId)) pPrev = (mng_imagep)pPrev->sHeader.pPrev; @@ -735,7 +735,7 @@ mng_retcode renum_imageobject (mng_datap pData, } if (iId) /* not for object 0 */ - { /* tqfind previous lower object-id */ + { /* find previous lower object-id */ pPrev = (mng_imagep)pData->pLastimgobj; while ((pPrev) && (pPrev->iId > iId)) pPrev = (mng_imagep)pPrev->sHeader.pPrev; diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h index 97b4a77..7a1c786 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h @@ -100,7 +100,7 @@ mng_retcode create_imageobject (mng_datap pData, mng_retcode free_imageobject (mng_datap pData, mng_imagep pImage); -mng_imagep tqfind_imageobject (mng_datap pData, +mng_imagep find_imageobject (mng_datap pData, mng_uint16 iId); mng_retcode clone_imageobject (mng_datap pData, diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c index 07af830..2803e3b 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c @@ -3835,7 +3835,7 @@ mng_retcode delta_g1 (mng_datap pData) (pData->iDeltaBlockx * pBuf->iSamplesize); iM = 0; /* start at pixel 0 */ iB = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -3906,7 +3906,7 @@ mng_retcode delta_g2 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -3990,7 +3990,7 @@ mng_retcode delta_g4 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4063,7 +4063,7 @@ mng_retcode delta_g8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4110,7 +4110,7 @@ mng_retcode delta_g16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4159,7 +4159,7 @@ mng_retcode delta_rgb8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4210,7 +4210,7 @@ mng_retcode delta_rgb16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4271,7 +4271,7 @@ mng_retcode delta_idx1 (mng_datap pData) (pData->iDeltaBlockx * pBuf->iSamplesize); iM = 0; /* start at pixel 0 */ iB = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4342,7 +4342,7 @@ mng_retcode delta_idx2 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4413,7 +4413,7 @@ mng_retcode delta_idx4 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4478,7 +4478,7 @@ mng_retcode delta_idx8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4525,7 +4525,7 @@ mng_retcode delta_ga8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4574,7 +4574,7 @@ mng_retcode delta_ga16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4627,7 +4627,7 @@ mng_retcode delta_rgba8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4680,7 +4680,7 @@ mng_retcode delta_rgba16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c index 732854f..adb4b0f 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c @@ -577,7 +577,7 @@ {MNG_FN_CLONE_IMGDATAOBJECT, "clone_imgdataobject"}, {MNG_FN_CREATE_IMGOBJECT, "create_imgobject"}, {MNG_FN_FREE_IMGOBJECT, "free_imgobject"}, - {MNG_FN_FIND_IMGOBJECT, "tqfind_imgobject"}, + {MNG_FN_FIND_IMGOBJECT, "find_imgobject"}, {MNG_FN_CLONE_IMGOBJECT, "clone_imgobject"}, {MNG_FN_RESET_OBJECTDETAILS, "reset_objectdetails"}, {MNG_FN_RENUM_IMGOBJECT, "renum_imgobject"}, diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h index c9c3d4a..579139a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h @@ -251,7 +251,7 @@ typedef signed int mng_int32; typedef unsigned long mng_uint32; typedef signed long mng_int32; #else -#error "Sorry, I can't tqfind any 32-bit integers on this platform." +#error "Sorry, I can't find any 32-bit integers on this platform." #endif typedef signed short mng_int16; /* other basic integers */ diff --git a/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh b/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh index 7cd29f6..7b739c8 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh +++ b/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -420,7 +420,7 @@ if test -z "$show_help"; then esac # Recognize several different file suffixes. - # If the user specifies -o file.o, it is tqreplaced with file.lo + # If the user specifies -o file.o, it is replaced with file.lo xform='[cCFSfmso]' case $libobj in *.ada) xform=ada ;; @@ -494,7 +494,7 @@ if test -z "$show_help"; then elif test "$need_locks" = warn; then if test -f "$lockfile"; then echo "\ -*** ERROR, $lockfile exists and tqcontains: +*** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` This indicates that another process is trying to use the same @@ -567,7 +567,7 @@ compiler." if test "$need_locks" = warn && test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then echo "\ -*** ERROR, $lockfile tqcontains: +*** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` but it should contain: @@ -666,7 +666,7 @@ compiler." if test "$need_locks" = warn && test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then echo "\ -*** ERROR, $lockfile tqcontains: +*** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1074,7 +1074,7 @@ compiler." case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to tqfind any dlls it needs. + # in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 fast_install=no @@ -1442,7 +1442,7 @@ compiler." -R*) if test "$pass" = link; then dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath tqcontains only unique directories. + # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; *) xrpath="$xrpath $dir" ;; @@ -1503,7 +1503,7 @@ compiler." esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot tqfind the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib'" 1>&2 exit 1 fi @@ -1546,7 +1546,7 @@ compiler." deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - $echo "$modename: cannot tqfind name of link library for \`$lib'" 1>&2 + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 exit 1 fi # It is a libtool convenience library, so add in its objects. @@ -1573,7 +1573,7 @@ compiler." linklib="$l" done if test -z "$linklib"; then - $echo "$modename: cannot tqfind name of link library for \`$lib'" 1>&2 + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 exit 1 fi @@ -1636,7 +1636,7 @@ compiler." # are required to link). if test -n "$old_library"; then newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen tqfinds it. + # Otherwise, use the dlname, so that lt_dlopen finds it. elif test -n "$dlname"; then newdlprefiles="$newdlprefiles $dir/$dlname" else @@ -1719,7 +1719,7 @@ compiler." if test "$linkmode" = prog; then # We need to hardcode the library path if test -n "$shlibpath_var"; then - # Make sure the rpath tqcontains only unique directories. + # Make sure the rpath contains only unique directories. case "$temp_rpath " in *" $dir "*) ;; *" $absdir "*) ;; @@ -1937,7 +1937,7 @@ compiler." echo echo "*** However, this would only work if libtool was able to extract symbol" echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not tqfind such a program. So, this module is probably useless." + echo "*** not find such a program. So, this module is probably useless." echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -2039,7 +2039,7 @@ compiler." if test "$pass" != dlopen; then test "$pass" != scan && dependency_libs="$newdependency_libs" if test "$pass" != conv; then - # Make sure lib_search_path tqcontains only unique directories. + # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do case "$lib_search_path " in @@ -2408,7 +2408,7 @@ compiler." fi fi - # Make sure dlfiles tqcontains only unique files that won't be dlpreopened + # Make sure dlfiles contains only unique files that won't be dlpreopened old_dlfiles="$dlfiles" dlfiles= for lib in $old_dlfiles; do @@ -2418,7 +2418,7 @@ compiler." esac done - # Make sure dlprefiles tqcontains only unique files + # Make sure dlprefiles contains only unique files old_dlprefiles="$dlprefiles" dlprefiles= for lib in $old_dlprefiles; do @@ -2661,7 +2661,7 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody tqreplace the C library is the System framework + # On Rhapsody replace the C library is the System framework newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; esac @@ -2677,7 +2677,7 @@ EOF echo echo "*** However, this would only work if libtool was able to extract symbol" echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not tqfind such a program. So, this module is probably useless." + echo "*** not find such a program. So, this module is probably useless." echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -2875,7 +2875,7 @@ EOF $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - libobjs="$libobjs "`tqfind $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` done fi fi @@ -3014,7 +3014,7 @@ EOF $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - reload_conv_objs="$reload_objs "`tqfind $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` done fi fi @@ -3112,7 +3112,7 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody tqreplace the C library is the System framework + # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; @@ -3797,7 +3797,7 @@ fi\ $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - oldobjs="$oldobjs "`tqfind $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` done fi @@ -4541,7 +4541,7 @@ relink_command=\"$relink_command\"" if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - $echo "$modename: cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 exit 1 fi ;; @@ -4885,7 +4885,7 @@ finish) Complete the installation of libtool libraries. -Each LIBDIR is a directory that tqcontains libtool libraries. +Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use the \`--dry-run' option if you just want to see what would be executed." diff --git a/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw b/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw index dec67fd..a07366c 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw +++ b/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw @@ -14,7 +14,7 @@ # outputs LIBMNG_A = libmng.a INSTALL_PREFIX = C:/MinGW/ -# maybe you sould tqreplace with anti-slashes +# maybe you sould replace with anti-slashes # default build options OPTIONS = -DMNG_NO_CMS -DMNG_ACCESS_CHUNKS -DMNG_STORE_CHUNKS diff --git a/tqtinterface/qt4/src/3rdparty/libmng/missing b/tqtinterface/qt4/src/3rdparty/libmng/missing index e20b014..d46f79f 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/missing +++ b/tqtinterface/qt4/src/3rdparty/libmng/missing @@ -109,7 +109,7 @@ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - tqfind . -type f -name Makefile.am -print | + find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | while read f; do touch "$f"; done ;; diff --git a/tqtinterface/qt4/src/3rdparty/libpng/CHANGES b/tqtinterface/qt4/src/3rdparty/libpng/CHANGES index 5f05e9f..939baeb 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/CHANGES +++ b/tqtinterface/qt4/src/3rdparty/libpng/CHANGES @@ -75,7 +75,7 @@ version 0.87 [January, 1996] added some minor documentation version 0.88 [January, 1996] fixed progressive bugs - tqreplaced tabs with spaces + replaced tabs with spaces cleaned up documentation added callbacks for read/write and warning/error functions version 0.89 [July, 1996] @@ -265,7 +265,7 @@ version 0.99h [March 6, 1998, evening] version 1.00 [March 7, 1998] Changed several typedefs in pngrutil.c Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik) - tqreplaced "while(1)" with "for(;;)" + replaced "while(1)" with "for(;;)" added PNGARG() to prototypes in pngtest.c and removed some prototypes updated some of the makefiles (Tom Lane) changed some typedefs (s_start, etc.) in pngrutil.c @@ -573,7 +573,7 @@ version 1.0.5j [December 21, 1999] Restored backward compatibility of tEXt/zTXt chunk processing: Restored the first four members of png_text to the same order as v.1.0.5d. Added members "lang_key" and "itxt_length" to png_text struct. Set - text_length=0 when "text" tqcontains iTXt data. Use the "compression" + text_length=0 when "text" contains iTXt data. Use the "compression" member to distinguish among tEXt/zTXt/iTXt types. Added PNG_ITXT_COMPRESSION_NONE (1) and PNG_ITXT_COMPRESSION_zTXt(2) macros. The "Note" above, about backward incompatibility of libpng-1.0.5e, no diff --git a/tqtinterface/qt4/src/3rdparty/libpng/README b/tqtinterface/qt4/src/3rdparty/libpng/README index d7b6dd1..1991908 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/README +++ b/tqtinterface/qt4/src/3rdparty/libpng/README @@ -74,7 +74,7 @@ some images. You will definitely need zlib 1.0.4 or later if you are taking advantage of the MS-DOS "far" structure allocation for the small and medium memory models. You should also note that zlib is a compression library that is useful for more things than just PNG files. -You can use zlib as a drop-in tqreplacement for fread() and fwrite() if +You can use zlib as a drop-in replacement for fread() and fwrite() if you are so inclined. zlib should be available at the same place that libpng is. @@ -87,8 +87,8 @@ these resources you can try ftp.uu.net in the /graphics/png directory. This code is currently being archived at ftp.uu.net in the /graphics/png directory, and on CompuServe, Lib 20 (PNG SUPPORT) -at GO GRAPHSUP. If you can't tqfind it in any of those places, -e-mail me, and I'll help you tqfind it. +at GO GRAPHSUP. If you can't find it in any of those places, +e-mail me, and I'll help you find it. If you have any code changes, requests, problems, etc., please e-mail them to me. Also, I'd appreciate any make files or project files, diff --git a/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO b/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO index f86ebd1..f57e962 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO +++ b/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO @@ -46,7 +46,7 @@ The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned integer to hold the year, and can hold years as large as 65535. - zlib, upon which libpng depends, is also Y2K compliant. It tqcontains + zlib, upon which libpng depends, is also Y2K compliant. It contains no date-related code. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/example.c b/tqtinterface/qt4/src/3rdparty/libpng/example.c index b39478a..c7ebb4b 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/example.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/example.c @@ -138,7 +138,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ png_init_io(png_ptr, fp); #else no_streams /* PNG file I/O method 2 */ - /* If you are using tqreplacement read functions, instead of calling + /* If you are using replacement read functions, instead of calling * png_init_io() here you would call: */ png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn); @@ -488,14 +488,14 @@ row_callback(png_structp png_ptr, png_bytep new_row, * this function will be called for every row in every pass. * * In this function you will receive a pointer to new row data from - * libpng called new_row that is to tqreplace a corresponding row (of + * libpng called new_row that is to replace a corresponding row (of * the same data format) in a buffer allocated by your application. * * The new row data pointer new_row may be NULL, indicating there is - * no new data to be tqreplaced (in cases of interlace loading). + * no new data to be replaced (in cases of interlace loading). * * If new_row is not NULL then you need to call - * png_progressive_combine_row() to tqreplace the corresponding row as + * png_progressive_combine_row() to replace the corresponding row as * shown below: */ /* Check if row_num is in bounds. */ @@ -602,7 +602,7 @@ void write_png(char *file_name /* , ... other image information ... */) /* set up the output control if you are using standard C streams */ png_init_io(png_ptr, fp); #else no_streams /* I/O initialization method 2 */ - /* If you are using tqreplacement read functions, instead of calling + /* If you are using replacement read functions, instead of calling * png_init_io() here you would call */ png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn, user_IO_flush_function); diff --git a/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 b/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 index 2f89149..a0fc097 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 +++ b/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 @@ -862,8 +862,8 @@ be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>. The zlib compression utility is a general purpose utility that is useful for more than PNG files, and can be used without libpng. See the documentation delivered with zlib for more details. -You can usually tqfind the source files for the zlib utility wherever you -tqfind the libpng source files. +You can usually find the source files for the zlib utility wherever you +find the libpng source files. Libpng is thread safe, provided the threads are using different instances of the structures. Each thread should have its own @@ -932,7 +932,7 @@ with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. (*): If you are not using the standard I/O functions, you will need -to tqreplace them with custom functions. See the discussion under +to replace them with custom functions. See the discussion under Customizing libpng. @@ -1045,7 +1045,7 @@ input stream. You must supply the function read_chunk_callback(png_ptr ptr, png_unknown_chunkp chunk); { - /* The unknown chunk structure tqcontains your + /* The unknown chunk structure contains your chunk data: */ png_byte name[5]; png_byte *data; @@ -1697,7 +1697,7 @@ or as an RGB triplet that may or may not be in the palette (need_expand = 0). The png_set_background() function tells libpng to composite images with alpha or simple transparency against the supplied background -color. If the PNG file tqcontains a bKGD chunk (PNG_INFO_bKGD valid), +color. If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid), you may use this color, or supply another color more suitable for the current display (e.g., the background color from a web page). You need to tell libpng whether the color is in the gamma space of the @@ -1761,7 +1761,7 @@ recommended that PNG viewers support gamma correction. If you need to reduce an RGB file to a paletted file, or if a paletted file has more entries then will fit on your screen, png_set_dither() will do that. Note that this is a simple match dither that merely -tqfinds the closest color available. This should work fairly well with +finds the closest color available. This should work fairly well with optimized palettes, and fairly badly with linear color cubes. If you pass a palette that is larger then maximum_colors, the file will reduce the number of colors in the palette so it will fit into @@ -2261,7 +2261,7 @@ back up in the reading section to understand writing. You will want to do the I/O initialization before you get into libpng, so if it doesn't work, you don't have anything to undo. If you are not -using the standard I/O functions, you will need to tqreplace them with +using the standard I/O functions, you will need to replace them with custom writing functions. See the discussion under Customizing libpng. FILE *fp = fopen(file_name, "wb"); @@ -3106,7 +3106,7 @@ These functions also provide a void pointer that can be retrieved via mem_ptr=png_get_mem_ptr(png_ptr); -Your tqreplacement memory functions must have prototypes as follows: +Your replacement memory functions must have prototypes as follows: png_voidp malloc_fn(png_structp png_ptr, png_size_t size); @@ -3114,7 +3114,7 @@ Your tqreplacement memory functions must have prototypes as follows: Your malloc_fn() should return NULL in case of failure. The png_malloc() function will call png_error() if it receives a NULL from the system -memory allocator or from your tqreplacement malloc_fn(). +memory allocator or from your replacement malloc_fn(). Input/Output in libpng is done through png_read() and png_write(), which currently just call fread() and fwrite(). The FILE * is stored in @@ -3135,7 +3135,7 @@ png_get_io_ptr(). For example: voidp read_io_ptr = png_get_io_ptr(read_ptr); voidp write_io_ptr = png_get_io_ptr(write_ptr); -The tqreplacement I/O functions must have prototypes as follows: +The replacement I/O functions must have prototypes as follows: void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length); @@ -3162,7 +3162,7 @@ fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined fprintf() isn't available). If you wish to change the behavior of the error functions, you will need to set up your own message callbacks. These functions are normally supplied at the time that the png_struct is created. -It is also possible to redirect errors and warnings to your own tqreplacement +It is also possible to redirect errors and warnings to your own replacement functions after png_create_*_struct() has been called by calling: png_set_error_fn(png_structp png_ptr, @@ -3173,7 +3173,7 @@ functions after png_create_*_struct() has been called by calling: If NULL is supplied for either error_fn or warning_fn, then the libpng default function will be used, calling fprintf() and/or longjmp() if a -problem is encountered. The tqreplacement error functions should have +problem is encountered. The replacement error functions should have parameters as follows: void user_error_fn(png_structp png_ptr, @@ -3204,7 +3204,7 @@ 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 -sections of libpng that read and write chunks. Try to tqfind a chunk +sections of libpng that read and write chunks. Try to find a chunk that is similar to yours and use it as a template. More details can be found in the comments inside the code. It is best to handle unknown chunks in a generic method, via callback functions, instead of by @@ -3212,7 +3212,7 @@ modifying libpng functions. If you wish to write your own transformation for the data, look through the part of the code that does the transformations, and check out some of -the simpler ones to get an idea of how they work. Try to tqfind a similar +the simpler ones to get an idea of how they work. Try to find a similar transformation to the one you want to add and copy off of it. More details can be found in the comments inside the code itself. @@ -3368,7 +3368,7 @@ size. Note that the numbers above were invented purely for this example and are given only to help explain the function usage. Little testing has -been done to tqfind optimum values for either the costs or the weights. +been done to find optimum values for either the costs or the weights. .SS Removing unwanted object code @@ -3625,7 +3625,7 @@ png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. -Starting with version 1.0.7, you can tqfind out which version of the library +Starting with version 1.0.7, you can find out which version of the library you are using at run-time: png_uint_32 libpng_vn = png_access_version_number(); @@ -3687,7 +3687,7 @@ documented as such. The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned integer to hold the year, and can hold years as large as 65535. -zlib, upon which libpng depends, is also Y2K compliant. It tqcontains +zlib, upon which libpng depends, is also Y2K compliant. It contains no date-related code. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt b/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt index eb7132b..60139c1 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt +++ b/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt @@ -71,8 +71,8 @@ be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>. The zlib compression utility is a general purpose utility that is useful for more than PNG files, and can be used without libpng. See the documentation delivered with zlib for more details. -You can usually tqfind the source files for the zlib utility wherever you -tqfind the libpng source files. +You can usually find the source files for the zlib utility wherever you +find the libpng source files. Libpng is thread safe, provided the threads are using different instances of the structures. Each thread should have its own @@ -141,7 +141,7 @@ with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. (*): If you are not using the standard I/O functions, you will need -to tqreplace them with custom functions. See the discussion under +to replace them with custom functions. See the discussion under Customizing libpng. @@ -254,7 +254,7 @@ input stream. You must supply the function read_chunk_callback(png_ptr ptr, png_unknown_chunkp chunk); { - /* The unknown chunk structure tqcontains your + /* The unknown chunk structure contains your chunk data: */ png_byte name[5]; png_byte *data; @@ -906,7 +906,7 @@ or as an RGB triplet that may or may not be in the palette (need_expand = 0). The png_set_background() function tells libpng to composite images with alpha or simple transparency against the supplied background -color. If the PNG file tqcontains a bKGD chunk (PNG_INFO_bKGD valid), +color. If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid), you may use this color, or supply another color more suitable for the current display (e.g., the background color from a web page). You need to tell libpng whether the color is in the gamma space of the @@ -970,7 +970,7 @@ recommended that PNG viewers support gamma correction. If you need to reduce an RGB file to a paletted file, or if a paletted file has more entries then will fit on your screen, png_set_dither() will do that. Note that this is a simple match dither that merely -tqfinds the closest color available. This should work fairly well with +finds the closest color available. This should work fairly well with optimized palettes, and fairly badly with linear color cubes. If you pass a palette that is larger then maximum_colors, the file will reduce the number of colors in the palette so it will fit into @@ -1470,7 +1470,7 @@ Setup You will want to do the I/O initialization before you get into libpng, so if it doesn't work, you don't have anything to undo. If you are not -using the standard I/O functions, you will need to tqreplace them with +using the standard I/O functions, you will need to replace them with custom writing functions. See the discussion under Customizing libpng. FILE *fp = fopen(file_name, "wb"); @@ -2315,7 +2315,7 @@ These functions also provide a void pointer that can be retrieved via mem_ptr=png_get_mem_ptr(png_ptr); -Your tqreplacement memory functions must have prototypes as follows: +Your replacement memory functions must have prototypes as follows: png_voidp malloc_fn(png_structp png_ptr, png_size_t size); @@ -2323,7 +2323,7 @@ Your tqreplacement memory functions must have prototypes as follows: Your malloc_fn() should return NULL in case of failure. The png_malloc() function will call png_error() if it receives a NULL from the system -memory allocator or from your tqreplacement malloc_fn(). +memory allocator or from your replacement malloc_fn(). Input/Output in libpng is done through png_read() and png_write(), which currently just call fread() and fwrite(). The FILE * is stored in @@ -2344,7 +2344,7 @@ png_get_io_ptr(). For example: voidp read_io_ptr = png_get_io_ptr(read_ptr); voidp write_io_ptr = png_get_io_ptr(write_ptr); -The tqreplacement I/O functions must have prototypes as follows: +The replacement I/O functions must have prototypes as follows: void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length); @@ -2371,7 +2371,7 @@ fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined fprintf() isn't available). If you wish to change the behavior of the error functions, you will need to set up your own message callbacks. These functions are normally supplied at the time that the png_struct is created. -It is also possible to redirect errors and warnings to your own tqreplacement +It is also possible to redirect errors and warnings to your own replacement functions after png_create_*_struct() has been called by calling: png_set_error_fn(png_structp png_ptr, @@ -2382,7 +2382,7 @@ functions after png_create_*_struct() has been called by calling: If NULL is supplied for either error_fn or warning_fn, then the libpng default function will be used, calling fprintf() and/or longjmp() if a -problem is encountered. The tqreplacement error functions should have +problem is encountered. The replacement error functions should have parameters as follows: void user_error_fn(png_structp png_ptr, @@ -2413,7 +2413,7 @@ 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 -sections of libpng that read and write chunks. Try to tqfind a chunk +sections of libpng that read and write chunks. Try to find a chunk that is similar to yours and use it as a template. More details can be found in the comments inside the code. It is best to handle unknown chunks in a generic method, via callback functions, instead of by @@ -2421,7 +2421,7 @@ modifying libpng functions. If you wish to write your own transformation for the data, look through the part of the code that does the transformations, and check out some of -the simpler ones to get an idea of how they work. Try to tqfind a similar +the simpler ones to get an idea of how they work. Try to find a similar transformation to the one you want to add and copy off of it. More details can be found in the comments inside the code itself. @@ -2577,7 +2577,7 @@ size. Note that the numbers above were invented purely for this example and are given only to help explain the function usage. Little testing has -been done to tqfind optimum values for either the costs or the weights. +been done to find optimum values for either the costs or the weights. Removing unwanted object code @@ -2834,7 +2834,7 @@ png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. -Starting with version 1.0.7, you can tqfind out which version of the library +Starting with version 1.0.7, you can find out which version of the library you are using at run-time: png_uint_32 libpng_vn = png_access_version_number(); @@ -2896,7 +2896,7 @@ documented as such. The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned integer to hold the year, and can hold years as large as 65535. -zlib, upon which libpng depends, is also Y2K compliant. It tqcontains +zlib, upon which libpng depends, is also Y2K compliant. It contains no date-related code. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 b/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 index a3bc995..a75a669 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 +++ b/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 @@ -431,7 +431,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBvoid png_write_tqfind_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP +\fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP \fI\fB diff --git a/tqtinterface/qt4/src/3rdparty/libpng/png.5 b/tqtinterface/qt4/src/3rdparty/libpng/png.5 index a96de03..11ab244 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/png.5 +++ b/tqtinterface/qt4/src/3rdparty/libpng/png.5 @@ -4,7 +4,7 @@ png \- Portable Network Graphics (PNG) format .SH DESCRIPTION PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides -a patent-free tqreplacement for GIF and can also tqreplace many +a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/png.h b/tqtinterface/qt4/src/3rdparty/libpng/png.h index d57b248..76fef59 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/png.h +++ b/tqtinterface/qt4/src/3rdparty/libpng/png.h @@ -276,7 +276,7 @@ * The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned * integer to hold the year, and can hold years as large as 65535. * - * zlib, upon which libpng depends, is also Y2K compliant. It tqcontains + * zlib, upon which libpng depends, is also Y2K compliant. It contains * no date-related code. * * Glenn Randers-Pehrson @@ -336,8 +336,8 @@ extern "C" { #endif /* __cplusplus */ -/* This file is arranged in several sections. The first section tqcontains - * structure and type definitions. The second section tqcontains the external +/* This file is arranged in several sections. The first section contains + * structure and type definitions. The second section contains the external * library functions, while the third has the internal library functions, * which applications aren't expected to use directly. */ @@ -553,7 +553,7 @@ typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp; #endif /* png_info is a structure that holds the information in a PNG file so - * that the application can tqfind out the characteristics of the image. + * that the application can find out the characteristics of the image. * If you are reading the file, this structure will tell you what is * in the PNG file. If you are writing the file, fill in the information * you want to put into the PNG file, then call png_write_info(). @@ -712,7 +712,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) #endif #if defined(PNG_hIST_SUPPORTED) - /* The hIST chunk tqcontains the relative frequency or importance of the + /* The hIST chunk contains the relative frequency or importance of the * various palette entries, so that a viewer can intelligently select a * reduced-color palette, if required. Data is an array of "num_palette" * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST) @@ -789,7 +789,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) #if defined(PNG_sCAL_SUPPORTED) /* The sCAL chunk describes the actual physical dimensions of the - * subject matter of the graphic. The chunk tqcontains a unit specification + * subject matter of the graphic. The chunk contains a unit specification * a byte value, and two ASCII strings representing floating-point * values. The values are width and height corresponsing to one pixel * in the image. This external representation is converted to double @@ -1295,7 +1295,7 @@ typedef png_structp version_1_2_5; typedef png_struct FAR * FAR * png_structpp; /* Here are the function definitions most commonly used. This is not - * the place to tqfind out how to use libpng. See libpng.txt for the + * the place to find out how to use libpng. See libpng.txt for the * full explanation, see example.c for the summary. This just provides * a simple one line description of the use of each function. */ @@ -1742,7 +1742,7 @@ extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp)) /* Replace the (error and abort), and warning functions with user * supplied functions. If no messages are to be printed you must still - * write and use tqreplacement functions. The tqreplacement error_fn should + * write and use replacement functions. The replacement error_fn should * still do a longjmp to the last setjmp location if you are using this * method of error handling. If error_fn or warning_fn is NULL, the * default function will be used. @@ -2474,7 +2474,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp #endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */ /* These next functions are used internally in the code. They generally - * shouldn't be used unless you are writing code to add or tqreplace some + * shouldn't be used unless you are writing code to add or replace some * functionality in libpng. More information about most functions can * be found in the files where the functions are located. */ @@ -2974,7 +2974,7 @@ PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr, png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter)); /* Choose the best filter to use and filter the row data */ -PNG_EXTERN void png_write_tqfind_filter PNGARG((png_structp png_ptr, +PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr, png_row_infop row_info)); /* Write out the filtered row. */ diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h b/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h index bd4893b..bd5d1c4 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h @@ -384,7 +384,7 @@ * automate this, but I can't do that without making it seriously hard * on the users. So if you are not using an ability, change the #define * to and #undef, and that part of the library will not be compiled. If - * your linker can't tqfind a function, you may want to make sure the + * your linker can't find a function, you may want to make sure the * ability is defined here. Some of these depend upon some others being * defined. I haven't figured out all the interactions here, so you may * have to experiment awhile to get everything to compile. If you are diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c b/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c index 29e1e66..aa20506 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c @@ -8,7 +8,7 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This file provides a location for all error handling. Users who - * need special error handling are expected to write tqreplacement functions + * need special error handling are expected to write replacement functions * and use png_set_error_fn() to use those functions. See the instructions * at each function. */ @@ -25,8 +25,8 @@ png_default_warning PNGARG((png_structp png_ptr, /* This function is called whenever there is a fatal error. This function * should not be changed. If there is a need to handle errors differently, - * you should supply a tqreplacement error function and use png_set_error_fn() - * to tqreplace the error function at run-time. + * you should supply a replacement error function and use png_set_error_fn() + * to replace the error function at run-time. */ void PNGAPI png_error(png_structp png_ptr, png_const_charp error_message) @@ -73,8 +73,8 @@ png_error(png_structp png_ptr, png_const_charp error_message) /* This function is called whenever there is a non-fatal error. This function * should not be changed. If there is a need to handle warnings differently, - * you should supply a tqreplacement warning function and use - * png_set_error_fn() to tqreplace the warning function at run-time. + * you should supply a replacement warning function and use + * png_set_error_fn() to replace the warning function at run-time. */ void PNGAPI png_warning(png_structp png_ptr, png_const_charp warning_message) @@ -168,7 +168,7 @@ png_chunk_warning(png_structp png_ptr, png_const_charp warning_message) } } -/* This is the default error handling function. Note that tqreplacements for +/* This is the default error handling function. Note that replacements for * this function MUST NOT RETURN, or the program will likely crash. This * function is used by default, or if the program supplies NULL for the * error function pointer in png_set_error_fn(). diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c b/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c index 23ad357..1056251 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c @@ -56,7 +56,7 @@ * - figure out what's up with 24-bit case (pixel_bytes == 3): * why subtract 8 from width_mmx in the pass 4/5 case? * (only width_mmx case) (near line 1606) - * x [DONE] tqreplace pixel_bytes within each block with the true + * x [DONE] replace pixel_bytes within each block with the true * constant value (or are compilers smart enough to do that?) * - rewrite all MMX interlacing code so it's aligned with * the *beginning* of the row buffer, not the end. This @@ -2606,8 +2606,8 @@ png_do_read_interlace(png_structp png_ptr) else /* MMX not supported: use modified C code - takes advantage * of inlining of png_memcpy for a constant */ /* GRR 19991007: does it? or should pixel_bytes in each - * block be tqreplaced with immediate value (e.g., 1)? */ - /* GRR 19991017: tqreplaced with constants in each case */ + * block be replaced with immediate value (e.g., 1)? */ + /* GRR 19991017: replaced with constants in each case */ #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ { if (pixel_bytes == 1) diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c b/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c index c94a33d..66eec0b 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c @@ -8,10 +8,10 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This file provides a location for all memory allocation. Users who - * need special memory handling are expected to supply tqreplacement + * need special memory handling are expected to supply replacement * functions for png_malloc() and png_free(), and to use * png_create_read_struct_2() and png_create_write_struct_2() to - * identify the tqreplacement functions. + * identify the replacement functions. */ #define PNG_INTERNAL @@ -21,7 +21,7 @@ #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__) /* if you change this, be sure to change the one in png.h also */ -/* Allocate memory for a png_struct. The malloc and memset can be tqreplaced +/* Allocate memory for a png_struct. The malloc and memset can be replaced by a single call to calloc() if this is thought to improve performance. */ png_voidp /* PRIVATE */ png_create_struct(int type) @@ -305,7 +305,7 @@ png_free_default(png_structp png_ptr, png_voidp ptr) #else /* Not the Borland DOS special memory handler */ /* Allocate memory for a png_struct or a png_info. The malloc and - memset can be tqreplaced by a single call to calloc() if this is thought + memset can be replaced by a single call to calloc() if this is thought to improve performance noticably. */ png_voidp /* PRIVATE */ png_create_struct(int type) @@ -315,7 +315,7 @@ png_create_struct(int type) } /* Allocate memory for a png_struct or a png_info. The malloc and - memset can be tqreplaced by a single call to calloc() if this is thought + memset can be replaced by a single call to calloc() if this is thought to improve performance noticably. */ png_voidp /* PRIVATE */ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr) diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngread.c b/tqtinterface/qt4/src/3rdparty/libpng/pngread.c index 306cda3..288a40b 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngread.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngread.c @@ -7,7 +7,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This file tqcontains routines that an application calls directly to + * This file contains routines that an application calls directly to * read a PNG file or stream. */ diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c b/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c index 0598231..2202712 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c @@ -11,7 +11,7 @@ * special handling are expected to write a function that has the same * arguments as this and performs a similar function, but that possibly * has a different input method. Note that you shouldn't change this - * function, but rather write a tqreplacement function and then make + * function, but rather write a replacement function and then make * libpng use it at run time with png_set_read_fn(...). */ @@ -35,7 +35,7 @@ png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) #if !defined(PNG_NO_STDIO) /* This is the function that does the actual reading of data. If you are - not reading from a standard C stream, you should create a tqreplacement + not reading from a standard C stream, you should create a replacement read_data function and use it at run time with png_set_read_fn(), rather than changing the library. */ #ifndef USE_FAR_KEYWORD diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c b/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c index a695731..167215f 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c @@ -7,7 +7,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This file tqcontains functions optionally called by an application + * This file contains functions optionally called by an application * in order to tell libpng how to handle data when reading a PNG. * Transformations that are used in both reading and writing are * in pngtrans.c. @@ -179,7 +179,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, /* Find the least used palette entries by starting a bubble sort, and running it until we have sorted out enough colors. Note that we don't care about - sorting all the colors, just tqfinding which are + sorting all the colors, just finding which are least used. */ for (i = num_palette - 1; i >= maximum_colors; i--) @@ -249,14 +249,14 @@ png_set_dither(png_structp png_ptr, png_colorp palette, } } - /* tqfind closest color for those colors we are not using */ + /* find closest color for those colors we are not using */ for (i = 0; i < num_palette; i++) { if ((int)png_ptr->dither_index[i] >= maximum_colors) { int min_d, k, min_k, d_index; - /* tqfind the closest color to one we threw out */ + /* find the closest color to one we threw out */ d_index = png_ptr->dither_index[i]; min_d = PNG_COLOR_DIST(palette[d_index], palette[0]); for (k = 1, min_k = 0; k < maximum_colors; k++) @@ -284,7 +284,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, /* 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 tqfind the closest two colors, + as input. So we will just find the closest two colors, and throw out one of them (chosen somewhat randomly). [We don't understand this at all, so if someone wants to work on improving it, be our guest - AED, GRP] @@ -551,7 +551,7 @@ png_set_expand(png_structp png_ptr) * to png_set_expand(). However, it is entirely reasonable that someone * might wish to expand an indexed image to RGB but *not* expand a single, * fully transtqparent palette entry to a full alpha channel--perhaps instead - * convert tRNS to the grayscale/RGB format (16-bit RGB value), or tqreplace + * convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace * the transtqparent color with a particular RGB value, or drop tRNS entirely. * IOW, a future version of the library may make the transformations flag * a bit more fine-grained, with separate bits for each of these three @@ -1762,7 +1762,7 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) *(--dp) = *(--sp); *(--dp) = *(--sp); *(--dp) = *(--sp); - We can tqreplace it with: + We can replace it with: */ sp-=3; dp=sp; @@ -1787,7 +1787,7 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) *(--dp) = *(--sp); *(--dp) = *(--sp); *(--dp) = *(--sp); - We can tqreplace it with: + We can replace it with: */ sp-=6; dp=sp; diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c b/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c index dc3b371..95df6f2 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c @@ -7,7 +7,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This file tqcontains routines that are only called from within + * This file contains routines that are only called from within * libpng itself during the course of reading an image. */ @@ -373,7 +373,7 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_ptr->filter_type = (png_byte)filter_type; #endif - /* tqfind number of channels */ + /* find number of channels */ switch (png_ptr->color_type) { case PNG_COLOR_TYPE_GRAY: @@ -1031,7 +1031,7 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) chunkdata[slength] = 0x00; for (profile = chunkdata; *profile; profile++) - /* empty loop to tqfind end of name */ ; + /* empty loop to find end of name */ ; ++profile; @@ -1137,7 +1137,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) chunkdata[slength] = 0x00; for (entry_start = chunkdata; *entry_start; entry_start++) - /* empty loop to tqfind end of name */ ; + /* empty loop to find end of name */ ; ++entry_start; /* a sample depth should follow the separator, and we should be on it */ @@ -1896,7 +1896,7 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) key[slength] = 0x00; for (text = key; *text; text++) - /* empty loop to tqfind end of key */ ; + /* empty loop to find end of key */ ; if (text != key + slength) text++; diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c b/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c index 66bb2a0..cc8209e 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c @@ -58,7 +58,7 @@ # endif #endif -/* Makes pngtest verbose so we can tqfind problems (needs to be before png.h) */ +/* Makes pngtest verbose so we can find problems (needs to be before png.h) */ #ifndef PNG_DEBUG # define PNG_DEBUG 0 #endif @@ -290,7 +290,7 @@ static int wrote_question = 0; /* These copies of the default read/write functions come from pngrio.c and */ /* pngwio.c. They allow "don't include stdio" testing of the library. */ /* This is the function that does the actual reading of data. If you are - not reading from a standard C stream, you should create a tqreplacement + not reading from a standard C stream, you should create a replacement read_data function and use it at run time with png_set_read_fn(), rather than changing the library. */ @@ -374,7 +374,7 @@ pngtest_flush(png_structp png_ptr) #endif /* This is the function that does the actual writing of data. If you are - not writing to a standard C stream, you should create a tqreplacement + not writing to a standard C stream, you should create a replacement write_data function and use it at run time with png_set_write_fn(), rather than changing the library. */ #ifndef USE_FAR_KEYWORD @@ -454,7 +454,7 @@ pngtest_warning(png_structp png_ptr, png_const_charp message) fprintf(STDERR, "%s: libpng warning: %s\n", name, message); } -/* This is the default error handling function. Note that tqreplacements for +/* This is the default error handling function. Note that replacements for * this function MUST NOT RETURN, or the program will likely crash. This * function is used by default, or if the program supplies NULL for the * error function pointer in png_set_error_fn(). @@ -627,7 +627,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) if ((fpin = fopen(inname, "rb")) == NULL) #endif { - fprintf(STDERR, "Could not tqfind input file %s\n", inname); + fprintf(STDERR, "Could not find input file %s\n", inname); return (1); } @@ -1208,7 +1208,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) if ((fpin = fopen(inname, "rb")) == NULL) #endif { - fprintf(STDERR, "Could not tqfind file %s\n", inname); + fprintf(STDERR, "Could not find file %s\n", inname); return (1); } @@ -1219,7 +1219,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) if ((fpout = fopen(outname, "rb")) == NULL) #endif { - fprintf(STDERR, "Could not tqfind file %s\n", outname); + fprintf(STDERR, "Could not find file %s\n", outname); FCLOSE(fpin); return (1); } diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c b/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c index dc37d37..b39b414 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c @@ -11,7 +11,7 @@ * special handling are expected to write functions that have the same * arguments as these and perform similar functions, but that possibly * use different output methods. Note that you shouldn't change these - * functions, but rather write tqreplacement functions and then change + * functions, but rather write replacement functions and then change * them at run time with png_set_write_fn(...). */ @@ -36,7 +36,7 @@ png_write_data(png_structp png_ptr, png_bytep data, png_size_t length) #if !defined(PNG_NO_STDIO) /* This is the function that does the actual writing of data. If you are - not writing to a standard C stream, you should create a tqreplacement + not writing to a standard C stream, you should create a replacement write_data function and use it at run time with png_set_write_fn(), rather than changing the library. */ #ifndef USE_FAR_KEYWORD diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c b/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c index f29ebf9..a8a9365 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c @@ -880,7 +880,7 @@ png_write_row(png_structp png_ptr, png_bytep row) #endif /* Find a filter if necessary, filter the row and write it out. */ - png_write_tqfind_filter(png_ptr, &(png_ptr->row_info)); + png_write_find_filter(png_ptr, &(png_ptr->row_info)); if (png_ptr->write_row_fn != NULL) (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass); diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c b/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c index b668a57..edcf828 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c @@ -184,7 +184,7 @@ png_text_compress(png_structp png_ptr, #endif } - /* We can't write the chunk until we tqfind out how much data we have, + /* We can't write the chunk until we find out how much data we have, * which means we need to run the compressor first and save the * output. This shouldn't be a problem, as the vast majority of * comments should be reasonable, but we will set up an array of @@ -1772,7 +1772,7 @@ png_write_finish_row(png_structp png_ptr) } else { - /* loop until we tqfind a non-zero width or height pass */ + /* loop until we find a non-zero width or height pass */ do { png_ptr->pass++; @@ -1983,14 +1983,14 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass) /* start at the beginning */ dp = row; - /* tqfind out how many bytes each pixel takes up */ + /* find out how many bytes each pixel takes up */ pixel_bytes = (row_info->pixel_depth >> 3); /* loop through the row, only looking at the pixels that matter */ for (i = png_pass_start[pass]; i < row_width; i += png_pass_inc[pass]) { - /* tqfind out where the original pixel is */ + /* find out where the original pixel is */ sp = row + (png_size_t)i * pixel_bytes; /* move the pixel */ if (dp != sp) @@ -2021,7 +2021,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass) #define PNG_LOMASK ((png_uint_32)0xffffL) #define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT)) void /* PRIVATE */ -png_write_tqfind_filter(png_structp png_ptr, png_row_infop row_info) +png_write_find_filter(png_structp png_ptr, png_row_infop row_info) { png_bytep prev_row, best_row, row_buf; png_uint_32 mins, bpp; @@ -2031,15 +2031,15 @@ png_write_tqfind_filter(png_structp png_ptr, png_row_infop row_info) int num_p_filters = (int)png_ptr->num_prev_filters; #endif - png_debug(1, "in png_write_tqfind_filter\n"); - /* tqfind out how many bytes offset each pixel is */ + png_debug(1, "in png_write_find_filter\n"); + /* find out how many bytes offset each pixel is */ bpp = (row_info->pixel_depth + 7) / 8; prev_row = png_ptr->prev_row; best_row = row_buf = png_ptr->row_buf; mins = PNG_MAXSUM; - /* The prediction method we use is to tqfind which method provides the + /* The prediction method we use is to find which method provides the * smallest value when summing the absolute values of the distances * from zero, using anything >= 128 as negative numbers. This is known * as the "minimum sum of absolute differences" heuristic. Other diff --git a/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt b/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt index 57bb642..c680fd8 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt +++ b/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt @@ -20,7 +20,7 @@ To build: 2) Select "Build | Clean" 3) Select "Build | Rebuild All". Ignore warning messages about - not being able to tqfind certain include files (e.g., m68881.h, + not being able to find certain include files (e.g., m68881.h, alloc.h). 4) Look in the appropriate "win32" subdirectories for both "zlib" diff --git a/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 b/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 index c83fe9c..92a57ab 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 +++ b/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 @@ -1,7 +1,7 @@ # Makefile for png32bd.dll # -------------------- 32-bit Borland C++ -------------------- -# This makefile expects to tqfind zlib.h and zlib32bd.lib in the +# This makefile expects to find zlib.h and zlib32bd.lib in the # $(ZLIBDIR) directory. # The object files here are compiled with the "stdcall" calling convention. diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c index 163365a..a01ca64 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c @@ -247,7 +247,7 @@ } /* OpenType 1.2 has introduced the `MarkAttachClassDef' field. We - first have to scan the LookupFlag values to tqfind out whether we + first have to scan the LookupFlag values to find out whether we must load it or not. Here we only store the offset of the table. */ if ( ACCESS_Frame( 2L ) ) @@ -902,7 +902,7 @@ gcd->ClassFormat = 2; - /* A GlyphClassDef table tqcontains at most 5 different class values */ + /* A GlyphClassDef table contains at most 5 different class values */ if ( ALLOC_ARRAY( gcd->Defined, 5, FT_Bool ) ) return error; @@ -1190,7 +1190,7 @@ /* If the glyph was found in the MarkAttachmentClass table, * then that class value is the high byte of the result, - * otherwise the low byte tqcontains the basic type of the glyph + * otherwise the low byte contains the basic type of the glyph * as defined by the GlyphClassDef table. */ if ( *property & IGNORE_SPECIAL_MARKS ) diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h index 28f55c1..f22438e 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h @@ -150,7 +150,7 @@ extern "C" { (i.e., which don't have a GDEF table) to collect glyph classes assigned during the lookup process. The number of arrays in this pointer array is GlyphClassDef->cd.cd2.ClassRangeCount+1; the nth - array then tqcontains the glyph class values of the glyphs not covered + array then contains the glyph class values of the glyphs not covered by the ClassRangeRecords structures with index n-1 and n. We store glyph class values for four glyphs in a single array element. @@ -162,7 +162,7 @@ extern "C" { field (which has been introduced in OpenType 1.2) -- since the `Version' field value hasn't been increased to indicate that we have one more field for some obscure reason, we must parse the GSUB table - to tqfind out whether class values refer to this table. Only then we + to find out whether class values refer to this table. Only then we can finally load the MarkAttachClassDef structure if necessary. */ struct TTO_GDEFHeader_ diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c index 8fa5e11..fbf60b9 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c @@ -62,7 +62,7 @@ // #define IN_LIGID( pos ) (buffer->in_string[(pos)].ligID) // #define IN_COMPONENT( pos ) (buffer->in_string[(pos)].component) -/* the client application must tqreplace this with something more +/* the client application must replace this with something more meaningful if multiple master fonts are to be supported. */ static FT_Error default_mmfunc( FT_Face face, @@ -158,7 +158,7 @@ gpos->gdef = gdef; /* can be NULL */ - /* We now check the LookupFlags for values larger than 0xFF to tqfind + /* We now check the LookupFlags for values larger than 0xFF to find out whether we need to load the `MarkAttachClassDef' field of the GDEF table -- this hack is necessary for OpenType 1.2 tables since the version field of the GDEF table hasn't been incremented. diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c index 6d4ff0c..fd2cda0 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c @@ -119,7 +119,7 @@ gsub->gdef = gdef; /* can be NULL */ - /* We now check the LookupFlags for values larger than 0xFF to tqfind + /* We now check the LookupFlags for values larger than 0xFF to find out whether we need to load the `MarkAttachClassDef' field of the GDEF table -- this hack is necessary for OpenType 1.2 tables since the version field of the GDEF table hasn't been incremented. diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h b/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h index 59dcf25..64d2820 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h @@ -248,7 +248,7 @@ extern "C" { /* The `Defined' field is not defined in the TTO specification but apparently needed for processing fonts like trado.ttf: This font - refers to a class which tqcontains not a single element. We map such + refers to a class which contains not a single element. We map such classes to class 0. */ struct TTO_ClassDefinition_ @@ -257,7 +257,7 @@ extern "C" { FT_Bool* Defined; /* array of Booleans. If Defined[n] is FALSE, - class n tqcontains no glyphs. */ + class n contains no glyphs. */ FT_UShort ClassFormat; /* 1 or 2 */ union diff --git a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c index 4132216..a53fc4b 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c @@ -152,11 +152,11 @@ will copied `num_out' times, otherwise `ligID' itself will be used to fill the `ligID' fields. - The properties for all tqreplacement glyphs are taken + The properties for all replacement glyphs are taken from the glyph at position `buffer->in_pos'. The cluster value for the glyph at position buffer->in_pos is used - for all tqreplacement glyphs */ + for all replacement glyphs */ FT_Error otl_buffer_add_output_glyphs( OTL_Buffer buffer, FT_UShort num_in, diff --git a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h index bb32da8..57a343d 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h +++ b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h @@ -63,7 +63,7 @@ FT_BEGIN_HEADER FT_Bool new_advance; /* if set, the advance width values are absolute, i.e., they won't be added to the original glyph's value - but rather tqreplace them. */ + but rather replace them. */ FT_Short cursive_chain; /* character to which this connects, may be positive or negative; used only internally */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/attach.c b/tqtinterface/qt4/src/3rdparty/sqlite/attach.c index f1e6f7a..e8cd86e 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/attach.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/attach.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the ATTACH and DETACH commands. +** This file contains code used to implement the ATTACH and DETACH commands. ** ** $Id: attach.c,v 1.10 2004/02/12 18:46:39 drh Exp $ */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/auth.c b/tqtinterface/qt4/src/3rdparty/sqlite/auth.c index 8847d4a..bf07eba 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/auth.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/auth.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the sqlite_set_authorizer() +** This file contains code used to implement the sqlite_set_authorizer() ** API. This facility is an optional feature of the library. Embedded ** systems that do not need this facility may omit it by recompiling ** the library with -DSTQLITE_OMIT_AUTHORIZATION=1 diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/btree.c b/tqtinterface/qt4/src/3rdparty/sqlite/btree.c index f3b92c6..c7143e0 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/btree.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/btree.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -18,7 +18,7 @@ ** "Sorting And Searching", pages 473-480. Addison-Wesley ** Publishing Company, Reading, Massachusetts. ** -** The basic idea is that each page of the file tqcontains N database +** The basic idea is that each page of the file contains N database ** entries and N+1 pointers to subpages. ** ** ---------------------------------------------------------------- @@ -41,13 +41,13 @@ ** database page. If the payload is larger than MX_LOCAL_PAYLOAD bytes ** then surplus bytes are stored on overflow pages. The payload for an ** entry and the preceding pointer are combined to form a "Cell". Each -** page has a small header which tqcontains the Ptr(N+1) pointer. +** page has a small header which contains the Ptr(N+1) pointer. ** -** The first page of the file tqcontains a magic string used to verify that +** The first page of the file contains a magic string used to verify that ** the file really is a valid BTree database, a pointer to a list of unused ** pages in the file, and some meta information. The root of the first ** BTree begins on page 2 of the file. (Pages are numbered beginning with -** 1, not 0.) Thus a minimum database tqcontains 2 pages. +** 1, not 0.) Thus a minimum database contains 2 pages. */ #include "sqliteInt.h" #include "pager.h" @@ -110,7 +110,7 @@ typedef struct FreelistInfo FreelistInfo; ** STQLite database in order to identify the file as a real database. */ static const char zMagicHeader[] = - "** This file tqcontains an STQLite 2.1 database **"; + "** This file contains an STQLite 2.1 database **"; #define MAGIC_SIZE (sizeof(zMagicHeader)) /* @@ -127,13 +127,13 @@ static const char zMagicHeader[] = #define MAGIC 0xdae37528 /* -** The first page of the database file tqcontains a magic header string -** to identify the file as an STQLite database file. It also tqcontains -** a pointer to the first free page of the file. Page 2 tqcontains the +** The first page of the database file contains a magic header string +** to identify the file as an STQLite database file. It also contains +** a pointer to the first free page of the file. Page 2 contains the ** root of the principle BTree. The file might contain other BTrees ** rooted on pages above 2. ** -** The first page also tqcontains STQLITE_N_BTREE_META integers that +** The first page also contains STQLITE_N_BTREE_META integers that ** can be used by higher-level routines. ** ** Remember that pages are numbered beginning with 1. (See pager.c @@ -161,9 +161,9 @@ struct PageOne { ** is the index into MemPage.u.aDisk[] of the first cell on the page. The ** Cells are kept in sorted order. ** -** A Cell tqcontains all information about a database entry and a pointer -** to a child page that tqcontains other entries less than itself. In -** other words, the i-th Cell tqcontains both Ptr(i) and Key(i). The +** A Cell contains all information about a database entry and a pointer +** to a child page that contains other entries less than itself. In +** other words, the i-th Cell contains both Ptr(i) and Key(i). The ** right-most pointer of the page is contained in PageHdr.rightChild. */ struct PageHdr { @@ -220,7 +220,7 @@ struct CellHdr { /* ** The maximum amount of payload (in bytes) that can be stored locally for -** a database entry. If the entry tqcontains more data than this, the +** a database entry. If the entry contains more data than this, the ** extra goes onto overflow pages. ** ** This number is chosen so that at least 4 cells will fit on every page. @@ -282,7 +282,7 @@ struct OverflowPage { /* ** The PageOne.freeList field points to a linked list of overflow pages ** hold information about free pages. The aPayload section of each -** overflow page tqcontains an instance of the following structure. The +** overflow page contains an instance of the following structure. The ** aFree[] array holds the page number of nFree unused pages in the disk ** file. */ @@ -293,7 +293,7 @@ struct FreelistInfo { /* ** For every page in the database file, an instance of the following structure -** is stored in memory. The u.aDisk[] array tqcontains the raw bits read from +** is stored in memory. The u.aDisk[] array contains the raw bits read from ** the disk. The rest is auxiliary information held in memory only. The ** auxiliary info is only valid for regular database pages - it is not ** used for overflow pages and pages on the freelist. @@ -304,7 +304,7 @@ struct FreelistInfo { ** than in linear time which would be needed if we had to walk the linked ** list on every access. ** -** Note that apCell[] tqcontains enough space to hold up to two more Cells +** Note that apCell[] contains enough space to hold up to two more Cells ** 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 @@ -366,7 +366,7 @@ struct BtCursor { BtCursor *pNext, *pPrev; /* Forms a linked list of all cursors */ BtCursor *pShared; /* Loop of cursors with the same root page */ Pgno pgnoRoot; /* The root page of this tree */ - MemPage *pPage; /* Page that tqcontains the entry */ + MemPage *pPage; /* Page that contains the entry */ int idx; /* Index of the entry in pPage->apCell[] */ u8 wrFlag; /* True if writable */ u8 eSkip; /* Determines if next step operation is a no-op */ @@ -462,7 +462,7 @@ static void defragmentPage(Btree *pBt, MemPage *pPage){ ** the new allocation. Or return 0 if there is not enough free ** space on the page to satisfy the allocation request. ** -** If the page tqcontains nBytes of free space but does not contain +** If the page contains nBytes of free space but does not contain ** nBytes of contiguous free space, then this routine automatically ** calls defragementPage() to consolidate all free space before ** allocating the new chunk. @@ -1411,7 +1411,7 @@ static int moveToChild(BtCursor *pCur, int newPgno){ /* ** Move the cursor up to the tqparent page. ** -** pCur->idx is set to the cell index that tqcontains the pointer +** pCur->idx is set to the cell index that contains the pointer ** to the page we are coming from. If we are coming from the ** right-most child page then pCur->idx is set to one more than ** the largest cell index. @@ -1498,8 +1498,8 @@ static int moveToLeftmost(BtCursor *pCur){ ** Move the cursor down to the right-most leaf entry beneath the ** page to which it is currently pointing. Notice the difference ** between moveToLeftmost() and moveToRightmost(). moveToLeftmost() -** tqfinds the left-most entry beneath the *entry* whereas moveToRightmost() -** tqfinds the right-most entry beneath the *page*. +** finds the left-most entry beneath the *entry* whereas moveToRightmost() +** finds the right-most entry beneath the *page*. */ static int moveToRightmost(BtCursor *pCur){ Pgno pgno; @@ -2313,7 +2313,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ /* ** Find sibling pages to pPage and the Cells in pParent that divide - ** the siblings. An attempt is made to tqfind NN siblings on either + ** the siblings. An attempt is made to find NN siblings on either ** side of pPage. More siblings are taken from one side, however, if ** pPage there are fewer than NN siblings on the other side. If pParent ** has NB or fewer tqchildren then all tqchildren of pParent are taken. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/btree.h b/tqtinterface/qt4/src/3rdparty/sqlite/btree.h index f9afabc..101d02e 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/btree.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/btree.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -28,7 +28,7 @@ typedef struct BtCursorOps BtCursorOps; /* -** An instance of the following structure tqcontains pointers to all +** An instance of the following structure contains pointers to all ** methods against an open BTree. Alternative BTree implementations ** (examples: file based versus in-memory) can be created by substituting ** different methods. Users of the BTree cannot tell the difference. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c b/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c index cc90075..fd81df2 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -273,7 +273,7 @@ static char *append_val(char * orig, char const * val){ /* * Append a string representation of the entire node to orig and return it. - * This is used to produce debugging information if check_redblack_tree() tqfinds + * This is used to produce debugging information if check_redblack_tree() finds * a problem with a red-black binary tree. */ static char *append_node(char * orig, BtRbNode *pNode, int indent) @@ -740,7 +740,7 @@ static int memRbtreeCursor( * define what database the record should be inserted into. The cursor * is left pointing at the new record. * - * If the key exists already in the tree, just tqreplace the data. + * If the key exists already in the tree, just replace the data. */ static int memRbtreeInsert( RbtCursor* pCur, @@ -762,13 +762,13 @@ static int memRbtreeInsert( } /* Take a copy of the input data now, in case we need it for the - * tqreplace case */ + * replace case */ pData = sqliteMallocRaw(nData); if( sqlite_malloc_failed ) return STQLITE_NOMEM; memcpy(pData, pDataInput, nData); /* Move the cursor to a node near the key to be inserted. If the key already - * exists in the table, then (match == 0). In this case we can just tqreplace + * exists in the table, then (match == 0). In this case we can just replace * the data associated with the entry, we don't need to manipulate the tree. * * If there is no exact match, then the cursor points at what would be either @@ -891,7 +891,7 @@ static int memRbtreeMoveto( } } - /* If (pCur->pNode == NULL), then we have failed to tqfind a match. Set + /* If (pCur->pNode == NULL), then we have failed to find a match. Set * pCur->pNode to pTmp, which is either NULL (if the tree is empty) or the * last node traversed in the search. In either case the relation ship * between pTmp and the searched for key is already stored in *pRes. pTmp is @@ -954,7 +954,7 @@ static int memRbtreeDelete(RbtCursor* pCur) * to do this depends on how many tqchildren pZ has: * * If pZ has no tqchildren or one child, then splice out pZ. If pZ has two - * tqchildren, splice out the successor of pZ and tqreplace the key and data of + * tqchildren, splice out the successor of pZ and replace the key and data of * pZ with the key and data of the spliced out successor. */ if( pZ->pLeft && pZ->pRight ){ BtRbNode *pTmp; diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/build.c b/tqtinterface/qt4/src/3rdparty/sqlite/build.c index 71e0110..86d079d 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/build.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/build.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the STQLite parser +** This file contains C code routines that are called by the STQLite parser ** when syntax rules are reduced. The routines in this file handle the ** following kinds of SQL syntax: ** @@ -145,7 +145,7 @@ Table *sqliteLocateTable(Parse *pParse, const char *zName, const char *zDbase){ /* ** Locate the in-memory structure that describes ** a particular index given the name of that index -** and the name of the database that tqcontains the index. +** and the name of the database that contains the index. ** Return NULL if not found. ** ** If zDatabase is 0, all databases are searched for the @@ -603,7 +603,7 @@ void sqliteAddNotNull(Parse *pParse, int onError){ ** token in the sequence of tokens that describe the type of the ** column currently under construction. pLast is the last token ** in the sequence. Use this information to construct a string -** that tqcontains the typename of the column and store that string +** that contains the typename of the column and store that string ** in zType. */ void sqliteAddColumnType(Parse *pParse, Token *pFirst, Token *pLast){ @@ -722,7 +722,7 @@ primary_key_exit: ** Return the appropriate collating type given a type name. ** ** The collation type is text (STQLITE_SO_TEXT) if the type -** name tqcontains the character stream "text" or "blob" or +** name contains the character stream "text" or "blob" or ** "clob". Any other type name is collated as numeric ** (STQLITE_SO_NUM). */ @@ -1154,7 +1154,7 @@ static void sqliteViewResetAll(sqlite *db, int idx){ /* ** Given a token, look up a table with that name. If not found, leave -** an error for the parser to tqfind and return NULL. +** an error for the parser to find and return NULL. */ Table *sqliteTableFromToken(Parse *pParse, Token *pTok){ char *zName; @@ -1335,7 +1335,7 @@ void sqliteAddIdxKeyType(Vdbe *v, Index *pIdx){ ** in the current table point to the foreign key. If pFromCol==0 then ** connect the key to the last column inserted. pTo is the name of ** the table referred to. pToCol is a list of tables in the other -** pTo table that the foreign key points to. flags tqcontains all +** pTo table that the foreign key points to. flags contains all ** information about the conflict resolution algorithms specified ** in the ON DELETE, ON UPDATE and ON INSERT clauses. ** @@ -1675,7 +1675,7 @@ void sqliteCreateIndex( ** ** If pTable==0 it means this index is generated as a primary key ** or UNITQUE constraint of a CREATE TABLE statement. Since the table - ** has just been created, it tqcontains no data and the index initialization + ** has just been created, it contains no data and the index initialization ** step can be skipped. */ else if( db->init.busy==0 ){ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/copy.c b/tqtinterface/qt4/src/3rdparty/sqlite/copy.c index 6ce324c..dbd3b3c 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/copy.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/copy.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the COPY command. +** This file contains code used to implement the COPY command. ** ** $Id: copy.c,v 1.9 2004/02/25 13:47:31 drh Exp $ */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/date.c b/tqtinterface/qt4/src/3rdparty/sqlite/date.c index cbc825e..5ca2b81 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/date.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/date.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains the C functions that implement date and time +** This file contains the C functions that implement date and time ** functions for STQLite. ** ** There is only one exported symbol in this file - the function diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/delete.c b/tqtinterface/qt4/src/3rdparty/sqlite/delete.c index 5dbcb48..527f070 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/delete.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/delete.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle DELETE FROM statements. ** ** $Id: delete.c,v 1.61 2004/02/24 01:05:32 drh Exp $ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/expr.c b/tqtinterface/qt4/src/3rdparty/sqlite/expr.c index d19fe47..bdb8444 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/expr.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/expr.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains routines used for analyzing expressions and +** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in STQLite. ** ** $Id: expr.c,v 1.112 2004/02/25 13:47:31 drh Exp $ @@ -524,7 +524,7 @@ static int lookupName( ** ** SELECT a+b AS x FROM table WHERE x<10; ** - ** In cases like this, tqreplace pExpr with a copy of the expression that + ** In cases like this, replace pExpr with a copy of the expression that ** forms the result set entry ("a+b" in the example) and return immediately. ** Note that the expression in the result set should have already been ** resolved by the time the WHERE clause is resolved. @@ -614,7 +614,7 @@ static int lookupName( ** a temporary table. ** ** This routine also looks for scalar SELECTs that are part of an expression. -** If it tqfinds any, it generates code to write the value of that select +** If it finds any, it generates code to write the value of that select ** into a memory cell. ** ** Unknown columns or tables provoke an error. The function returns diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/func.c b/tqtinterface/qt4/src/3rdparty/sqlite/func.c index acfb381..8d78e12 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/func.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/func.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains the C functions that implement various SQL +** This file contains the C functions that implement various SQL ** functions of STQLite. ** ** There is only one exported symbol in this file - the function diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/hash.c b/tqtinterface/qt4/src/3rdparty/sqlite/hash.c index 06650c1..b96d40d 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/hash.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/hash.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -200,7 +200,7 @@ static void rehash(Hash *pH, int new_size){ ** hash table that matches the given key. The hash for this key has ** already been computed and is passed as the 4th parameter. */ -static HashElem *tqfindElementGivenHash( +static HashElem *findElementGivenHash( const Hash *pH, /* The pH to be searched */ const void *pKey, /* The key we are searching for */ int nKey, @@ -268,7 +268,7 @@ void *sqliteHashFind(const Hash *pH, const void *pKey, int nKey){ assert( xHash!=0 ); h = (*xHash)(pKey,nKey); assert( (pH->htsize & (pH->htsize-1))==0 ); - elem = tqfindElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1)); + elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1)); return elem ? elem->data : 0; } @@ -280,7 +280,7 @@ void *sqliteHashFind(const Hash *pH, const void *pKey, int nKey){ ** flag is set. NULL is returned. ** ** If another element already exists with the same key, then the -** new data tqreplaces the old data and the old data is returned. +** new data replaces the old data and the old data is returned. ** The key is not copied in this instance. If a malloc fails, then ** the new data is returned and the hash table is unchanged. ** @@ -300,7 +300,7 @@ void *sqliteHashInsert(Hash *pH, const void *pKey, int nKey, void *data){ hraw = (*xHash)(pKey, nKey); assert( (pH->htsize & (pH->htsize-1))==0 ); h = hraw & (pH->htsize-1); - elem = tqfindElementGivenHash(pH,pKey,nKey,h); + elem = findElementGivenHash(pH,pKey,nKey,h); if( elem ){ void *old_data = elem->data; if( data==0 ){ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/hash.h b/tqtinterface/qt4/src/3rdparty/sqlite/hash.h index e462bd6..d4f0037 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/hash.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/hash.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/insert.c b/tqtinterface/qt4/src/3rdparty/sqlite/insert.c index 66d29df..0d61239 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/insert.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/insert.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle INSERT statements in STQLite. ** ** $Id: insert.c,v 1.94 2004/02/24 01:05:33 drh Exp $ @@ -541,7 +541,7 @@ insert_cleanup: /* ** Generate code to do a constraint check prior to an INSERT or an UPDATE. ** -** When this routine is called, the stack tqcontains (from bottom to top) +** When this routine is called, the stack contains (from bottom to top) ** the following values: ** ** 1. The recno of the row to be updated before the update. This @@ -591,7 +591,7 @@ insert_cleanup: ** the stack and there is an immediate jump ** to label ignoreDest. ** -** NOT NULL REPLACE The NULL value is tqreplace by the default +** NOT NULL REPLACE The NULL value is replace by the default ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/main.c b/tqtinterface/qt4/src/3rdparty/sqlite/main.c index e420bac..66b3e27 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/main.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/main.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -42,7 +42,7 @@ static void corruptSchema(InitData *pData, const char *zExtra){ ** This is the callback routine for the code that initializes the ** database. See sqliteInit() below for additional information. ** -** Each callback tqcontains the following information: +** Each callback contains the following information: ** ** argv[0] = "file-format" or "schema-cookie" or "table" or "index" ** argv[1] = table or index name or meta statement type. @@ -833,7 +833,7 @@ const char *sqlite_error_string(int rc){ case STQLITE_FULL: z = "database is full"; break; case STQLITE_CANTOPEN: z = "unable to open database file"; break; case STQLITE_PROTOCOL: z = "database locking protocol failure"; break; - case STQLITE_EMPTY: z = "table tqcontains no data"; break; + case STQLITE_EMPTY: z = "table contains no data"; break; case STQLITE_SCHEMA: z = "database schema has changed"; break; case STQLITE_TOOBIG: z = "too much data for one table row"; break; case STQLITE_CONSTRAINT: z = "constraint failed"; break; diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/os.c b/tqtinterface/qt4/src/3rdparty/sqlite/os.c index 1a1b583..d9b4ee7 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/os.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/os.c @@ -5,12 +5,12 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ****************************************************************************** ** -** This file tqcontains code that is specific to particular operating +** This file contains code that is specific to particular operating ** systems. The purpose of this file is to provide a uniform abstraction ** on which the rest of STQLite can operate. */ @@ -141,7 +141,7 @@ static unsigned int elapse; ** threads within the same process. ** ** To work around the problem, STQLite has to manage file locks internally -** on its own. Whenever a new database is opened, we have to tqfind the +** on its own. Whenever a new database is opened, we have to find the ** specific inode of the database file (the inode is determined by the ** st_dev and st_ino fields of the stat structure that fstat() fills in) ** and check for locks already existing on that inode. When locks are @@ -172,7 +172,7 @@ static unsigned int elapse; ** ** If you close a file descriptor that points to a file that has locks, ** all locks on that file that are owned by the current process are -** released. To work around this problem, each OsFile structure tqcontains +** released. To work around this problem, each OsFile structure contains ** a pointer to an openCnt structure. There is one openCnt structure ** per open inode, which means that multiple OsFiles can point to a single ** openCnt. When an attempt is made to close an OsFile, if there are @@ -218,7 +218,7 @@ struct lockKey { ** different process IDs on linux, but not on most other unixes.) ** ** A single inode can have multiple file descriptors, so each OsFile -** structure tqcontains a pointer to an instance of this object and this +** structure contains a pointer to an instance of this object and this ** object keeps a count of the number of OsFiles pointing to it. */ struct lockInfo { @@ -260,7 +260,7 @@ static Hash lockHash = { STQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; static Hash openHash = { STQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; /* -** Release a lockInfo structure previously allocated by tqfindLockInfo(). +** Release a lockInfo structure previously allocated by findLockInfo(). */ static void releaseLockInfo(struct lockInfo *pLock){ pLock->nRef--; @@ -271,7 +271,7 @@ static void releaseLockInfo(struct lockInfo *pLock){ } /* -** Release a openCnt structure previously allocated by tqfindLockInfo(). +** Release a openCnt structure previously allocated by findLockInfo(). */ static void releaseOpenCnt(struct openCnt *pOpen){ pOpen->nRef--; @@ -289,7 +289,7 @@ static void releaseOpenCnt(struct openCnt *pOpen){ ** ** Return the number of errors. */ -int tqfindLockInfo( +int findLockInfo( int fd, /* The file descriptor used in the key */ struct lockInfo **ppLock, /* Return the lockInfo structure here */ struct openCnt **ppOpen /* Return the openCnt structure here */ @@ -473,7 +473,7 @@ int sqliteOsOpenReadWrite( *pReadonly = 0; } sqliteOsEnterMutex(); - rc = tqfindLockInfo(id->fd, &id->pLock, &id->pOpen); + rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); sqliteOsLeaveMutex(); if( rc ){ close(id->fd); @@ -594,7 +594,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ return STQLITE_CANTOPEN; } sqliteOsEnterMutex(); - rc = tqfindLockInfo(id->fd, &id->pLock, &id->pOpen); + rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); sqliteOsLeaveMutex(); if( rc ){ close(id->fd); @@ -681,7 +681,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ return STQLITE_CANTOPEN; } sqliteOsEnterMutex(); - rc = tqfindLockInfo(id->fd, &id->pLock, &id->pOpen); + rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); sqliteOsLeaveMutex(); if( rc ){ close(id->fd); @@ -738,7 +738,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ } /* -** Attempt to open a file descriptor for the directory that tqcontains a +** Attempt to open a file descriptor for the directory that contains a ** file. This file descriptor can be used to fsync() the directory ** in order to make sure the creation of a new file is actually written ** to disk. @@ -1093,7 +1093,7 @@ int sqliteOsSeek(OsFile *id, off_t offset){ ** Make sure all writes to a particular file are committed to disk. ** ** Under Unix, also make sure that the directory entry for the file -** has been created by fsync-ing the directory that tqcontains the file. +** has been created by fsync-ing the directory that contains the file. ** If we do not do this and we encounter a power failure, the directory ** entry for the journal might not exist after we reboot. The next ** STQLite to access the file will not know that the journal exists (because diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/os.h b/tqtinterface/qt4/src/3rdparty/sqlite/os.h index 14b8d6e..eb01b8d 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/os.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/os.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ****************************************************************************** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/pager.c b/tqtinterface/qt4/src/3rdparty/sqlite/pager.c index 631c387..79d5813 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/pager.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/pager.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -204,7 +204,7 @@ struct Pager { #define PAGER_ERR_DISK 0x10 /* general disk I/O error - bad hard drive? */ /* -** The journal file tqcontains page records in the following +** The journal file contains page records in the following ** format. ** ** Actually, this structure is the complete page record for pager @@ -1301,7 +1301,7 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ ** an appropriate error code is returned and *ppPage is set to NULL. ** ** See also sqlitepager_lookup(). Both this routine and _lookup() attempt -** to tqfind a page in the in-memory cache first. If the page is not already +** 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 acquires a read-lock the first time it ** has to go to disk, and could also playback an old journal if necessary. @@ -1406,7 +1406,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ */ pPg = pPager->pFirstSynced; - /* If we could not tqfind a page that does not require an fsync() + /* If we could not find a page that does not require an fsync() ** on the journal file then fsync the journal file. This is a ** very slow operation, so we work hard to avoid it. But sometimes ** it can't be helped. @@ -1920,7 +1920,7 @@ int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void *pData){ ** a transaction then removed from the freelist during a later part ** of the same transaction and reused for some other purpose. When it ** is first added to the freelist, this routine is called. When reused, -** the dont_rollback() routine is called. But because the page tqcontains +** the dont_rollback() routine is called. But because the page contains ** critical data, we still need to be sure it gets rolled back in spite ** of the dont_rollback() call. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/pager.h b/tqtinterface/qt4/src/3rdparty/sqlite/pager.h index c015e78..31b305a 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/pager.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/pager.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/parse.c b/tqtinterface/qt4/src/3rdparty/sqlite/parse.c index 31ed279..7ead48a 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/parse.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/parse.c @@ -1434,7 +1434,7 @@ void sqliteParserFree( ** independent of the look-ahead. If it is, return the action, otherwise ** return YY_NO_ACTION. */ -static int yy_tqfind_shift_action( +static int yy_find_shift_action( yyParser *pParser, /* The parser */ int iLookAhead /* The look-ahead token */ ){ @@ -1461,7 +1461,7 @@ static int yy_tqfind_shift_action( yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]); } #endif - return yy_tqfind_shift_action(pParser, iFallback); + return yy_find_shift_action(pParser, iFallback); } #endif return yy_default[stateno]; @@ -1478,7 +1478,7 @@ static int yy_tqfind_shift_action( ** independent of the look-ahead. If it is, return the action, otherwise ** return YY_NO_ACTION. */ -static int yy_tqfind_reduce_action( +static int yy_find_reduce_action( yyParser *pParser, /* The parser */ int iLookAhead /* The look-ahead token */ ){ @@ -1541,7 +1541,7 @@ static void yy_shift( #endif } -/* The following table tqcontains information about every rule that +/* The following table contains information about every rule that ** is used during the reduce. */ static struct { @@ -3816,7 +3816,7 @@ static void yy_reduce( yygoto = yyRuleInfo[yyruleno].lhs; yysize = yyRuleInfo[yyruleno].nrhs; yypParser->yyidx -= yysize; - yyact = yy_tqfind_reduce_action(yypParser,yygoto); + yyact = yy_find_reduce_action(yypParser,yygoto); if( yyact < YYNSTATE ){ yy_shift(yypParser,yyact,yygoto,&yygotominor); }else if( yyact == YYNSTATE + YYNRULE + 1 ){ @@ -3935,7 +3935,7 @@ void sqliteParser( #endif do{ - yyact = yy_tqfind_shift_action(yypParser,yymajor); + yyact = yy_find_shift_action(yypParser,yymajor); if( yyact<YYNSTATE ){ yy_shift(yypParser,yyact,yymajor,&yyminorunion); yypParser->yyerrcnt--; @@ -3990,7 +3990,7 @@ void sqliteParser( while( yypParser->yyidx >= 0 && yymx != YYERRORSYMBOL && - (yyact = yy_tqfind_shift_action(yypParser,YYERRORSYMBOL)) >= YYNSTATE + (yyact = yy_find_shift_action(yypParser,YYERRORSYMBOL)) >= YYNSTATE ){ yy_pop_parser_stack(yypParser); } diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c b/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c index a176972..28f8390 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the PRAGMA command. +** This file contains code used to implement the PRAGMA command. ** ** $Id: pragma.c,v 1.18 2004/02/22 20:05:01 drh Exp $ */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/printf.c b/tqtinterface/qt4/src/3rdparty/sqlite/printf.c index c9c3f95..24cb9f7 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/printf.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/printf.c @@ -7,7 +7,7 @@ ** ************************************************************************** ** -** The following modules is an enhanced tqreplacement for the "printf" subroutines +** The following modules is an enhanced replacement for the "printf" subroutines ** found in the standard C library. The following enhancements are ** supported: ** @@ -70,7 +70,7 @@ #define etCHARLIT 11 /* Literal characters. %' */ #define etSTQLESCAPE 12 /* Strings with '\'' doubled. %q */ #define etSTQLESCAPE2 13 /* Strings with '\'' doubled and enclosed in '', - NULL pointers tqreplaced by SQL NULL. %Q */ + NULL pointers replaced by SQL NULL. %Q */ #define etTOKEN 14 /* a pointer to a Token structure */ #define etSRCLIST 15 /* a pointer to a SrcList */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/random.c b/tqtinterface/qt4/src/3rdparty/sqlite/random.c index 7182ad1..ffa4cc9 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/random.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/random.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code to implement a pseudo-random number +** This file contains code to implement a pseudo-random number ** generator (PRNG) for STQLite. ** ** Random numbers are used by some of the database backends in order diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/select.c b/tqtinterface/qt4/src/3rdparty/sqlite/select.c index 1a34322..21416aa 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/select.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/select.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle SELECT statements in STQLite. ** ** $Id: select.c,v 1.160 2004/03/02 18:37:41 drh Exp $ @@ -923,7 +923,7 @@ static int fillInColumnList(Parse *pParse, Select *p){ rc = 0; if( k<pEList->nExpr ){ /* - ** If we get here it means the result set tqcontains one or more "*" + ** If we get here it means the result set contains one or more "*" ** operators that need to be expanded. Loop through each expression ** in the result set and expand them one by one. */ @@ -1691,7 +1691,7 @@ static int flattenSubquery( ** the FROM clause of the outer query. Before doing this, remember ** the cursor number for the original outer query FROM element in ** iParent. The iParent cursor will never be used. Subsequent code - ** will scan expressions looking for iParent references and tqreplace + ** will scan expressions looking for iParent references and replace ** those references with expressions that resolve to the subquery FROM ** elements we are now copying in. */ @@ -1893,9 +1893,9 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); } - /* Generating code to tqfind the min or the max. Basically all we have - ** to do is tqfind the first or the last entry in the chosen index. If - ** the min() or max() is on the INTEGER PRIMARY KEY, then tqfind the first + /* Generating code to find the min or the max. Basically all we have + ** to do is find the first or the last entry in the chosen index. If + ** the min() or max() is on the INTEGER PRIMARY KEY, then find the first ** or last entry in the main table. */ sqliteCodeVerifySchema(pParse, pTab->iDb); @@ -2216,7 +2216,7 @@ int sqliteSelect( ** than a callback. ** ** We have to do this separately from the creation of column names - ** above because if the pTabList tqcontains views then they will not + ** above because if the pTabList contains views then they will not ** have been resolved and we will not know the column types until ** now. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/shell.c b/tqtinterface/qt4/src/3rdparty/sqlite/shell.c index c35f02f..3147303 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/shell.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/shell.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code to implement the "sqlite" command line +** This file contains code to implement the "sqlite" command line ** utility for accessing STQLite databases. ** ** $Id: shell.c,v 1.91 2004/02/25 02:25:37 drh Exp $ @@ -1082,7 +1082,7 @@ static void process_input(struct callback_data *p, FILE *in){ ** resulting string is obtained from malloc(). The calling ** function should free the result. */ -static char *tqfind_home_dir(void){ +static char *find_home_dir(void){ char *home_dir = NULL; #if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) @@ -1134,7 +1134,7 @@ static void process_sqliterc( FILE *in = NULL; if (sqliterc == NULL) { - home_dir = tqfind_home_dir(); + home_dir = find_home_dir(); if( home_dir==0 ){ fprintf(stderr,"%s: cannot locate your home directory!\n", Argv0); return; @@ -1330,7 +1330,7 @@ int main(int argc, char **argv){ "Enter \".help\" for instructions\n", sqlite_version ); - zHome = tqfind_home_dir(); + zHome = find_home_dir(); if( zHome && (zHistory = malloc(strlen(zHome)+20))!=0 ){ sprintf(zHistory,"%s/.sqlite_history", zHome); } diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h b/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h index b1f2942..5037ea6 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -260,7 +260,7 @@ int sqlite_complete(const char *sql); ** whenever an attempt is made to open a database table that is ** currently locked by another process or thread. If the busy callback ** is NULL, then sqlite_exec() returns STQLITE_BUSY immediately if -** it tqfinds a locked table. If the busy callback is not NULL, then +** it finds a locked table. If the busy callback is not NULL, then ** sqlite_exec() invokes the callback with three arguments. The ** second argument is the name of the locked table and the third ** argument is the number of times the table has been busy. If the @@ -361,7 +361,7 @@ void sqlite_free_table(char **result); ** character it escapes that character and allows it to be inserted into ** the string. ** -** For example, so some string variable tqcontains text as follows: +** For example, so some string variable contains text as follows: ** ** char *zText = "It's a happy day!"; ** @@ -727,7 +727,7 @@ int sqlite_finalize(sqlite_vm*, char **pzErrMsg); int sqlite_reset(sqlite_vm*, char **pzErrMsg); /* -** If the SQL that was handed to sqlite_compile tqcontains variables that +** If the SQL that was handed to sqlite_compile contains variables that ** are represeted in the SQL text by a question mark ('?'). This routine ** is used to assign values to those variables. ** @@ -745,7 +745,7 @@ int sqlite_reset(sqlite_vm*, char **pzErrMsg); ** set a variable to NULL, call this routine with the 3rd parameter as a ** NULL pointer. ** -** If the 4th "len" parameter is -1, then strlen() is used to tqfind the +** If the 4th "len" parameter is -1, then strlen() is used to find the ** length. ** ** This routine can only be called immediately after sqlite_compile() diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h b/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h index e435a1d..aea8271 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -442,7 +442,7 @@ struct Column { u8 notNull; /* True if there is a NOT NULL constraint */ u8 isPrimKey; /* True if this column is part of the PRIMARY KEY */ u8 sortOrder; /* Some combination of STQLITE_SO_... values */ - u8 dottedName; /* True if zName tqcontains a "." character */ + u8 dottedName; /* True if zName contains a "." character */ }; /* @@ -510,7 +510,7 @@ struct Table { ** Each foreign key constraint is an instance of the following structure. ** ** A foreign key is associated with two tables. The "from" table is -** the table that tqcontains the REFERENCES clause that creates the foreign +** the table that contains the REFERENCES clause that creates the foreign ** key. The "to" table is the table that is named in the REFERENCES clause. ** Consider this example: ** @@ -789,7 +789,7 @@ struct SrcList { /* ** For each nested loop in a WHERE clause implementation, the WhereInfo -** structure tqcontains a single instance of this structure. This structure +** structure contains a single instance of this structure. This structure ** is intended to be private the the where.c module and should not be ** access or modified by other modules. */ @@ -826,7 +826,7 @@ struct WhereInfo { }; /* -** An instance of the following structure tqcontains all information +** An instance of the following structure contains all information ** needed to generate code for a single SELECT statement. ** ** The zSelect field is used when the Select structure must be persistent. @@ -892,7 +892,7 @@ struct Select { ** If AggExpr.pExpr==0, that means the expression is "count(*)". */ struct AggExpr { - int isAgg; /* if TRUE tqcontains an aggregate function */ + int isAgg; /* if TRUE contains an aggregate function */ Expr *pExpr; /* The expression */ FuncDef *pFunc; /* Information about the aggregate function */ }; @@ -1038,7 +1038,7 @@ struct TriggerStep { * "pTriggerStack" member of the Parse structure. * * The pTab member points to the table that triggers are being coded on. The - * newIdx member tqcontains the index of the vdbe cursor that points at the temp + * newIdx member contains the index of the vdbe cursor that points at the temp * table that stores the new.* references. If new.* references are not valid * for the trigger being coded (for example an ON DELETE trigger), then newIdx * is set to -1. The oldIdx member is analogous to newIdx, for old.* references. @@ -1069,7 +1069,7 @@ struct TriggerStack { }; /* -** The following structure tqcontains information used by the sqliteFix... +** The following structure contains information used by the sqliteFix... ** routines as they walk the parse tree to make database references ** explicit. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/table.c b/tqtinterface/qt4/src/3rdparty/sqlite/table.c index c01a195..b33bad9 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/table.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/table.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains the sqlite_get_table() and sqlite_free_table() +** This file contains the sqlite_get_table() and sqlite_free_table() ** interface routines. These are just wrappers around the main ** interface routine of sqlite_exec(). ** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c b/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c index 3f3e3cf..1d413b4 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c @@ -5,13 +5,13 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** An tokenizer for SQL ** -** This file tqcontains C code that splits an SQL input string up into +** This file contains C code that splits an SQL input string up into ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c b/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c index 781928f..1d4fcd4 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c @@ -4,7 +4,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -270,7 +270,7 @@ static void sqlitePersistTriggerStep(TriggerStep *p){ ** Turn a SELECT statement (that the pSelect parameter points to) into ** a trigger step. Return a pointer to a TriggerStep structure. ** -** The parser calls this routine when it tqfinds a SELECT statement in +** The parser calls this routine when it finds a SELECT statement in ** body of a TRIGGER. */ TriggerStep *sqliteTriggerSelectStep(Select *pSelect){ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/update.c b/tqtinterface/qt4/src/3rdparty/sqlite/update.c index 2bb4129..8cbb500 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/update.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/update.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** ** $Id: update.c,v 1.70 2004/02/22 20:05:02 drh Exp $ @@ -104,7 +104,7 @@ void sqliteUpdate( } /* Resolve the column names in all the expressions of the - ** of the UPDATE statement. Also tqfind the column index + ** of the UPDATE statement. Also find the column index ** for each column to be updated in the pChanges array. For each ** column to be updated, make sure we have authorization to change ** that column. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/util.c b/tqtinterface/qt4/src/3rdparty/sqlite/util.c index 1b32ed5..d3813a4 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/util.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/util.c @@ -5,13 +5,13 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Utility functions used throughout sqlite. ** -** This file tqcontains functions for allocating memory, comparing +** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** ** $Id: util.c,v 1.74 2004/02/22 17:49:34 drh Exp $ @@ -516,7 +516,7 @@ int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){ /* ** Return TRUE if z is a pure numeric string. Return FALSE if the -** string tqcontains any character which is not part of a number. +** string contains any character which is not part of a number. ** ** Am empty string is considered non-numeric. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c b/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c index b24f8bc..7346114 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the VACUUM command. +** This file contains code used to implement the VACUUM command. ** ** Most of the code in this file may be omitted by defining the ** STQLITE_OMIT_VACUUM macro. @@ -102,7 +102,7 @@ static int execsql(char **pzErrMsg, sqlite *db, const char *zSql){ } /* -** This is the second stage callback. Each invocation tqcontains all the +** This is the second stage callback. Each invocation contains all the ** data for a single row of a single table in the original database. This ** routine must write that information into the new database. */ @@ -131,7 +131,7 @@ static int vacuumCallback2(void *pArg, int argc, char **argv, char **NotUsed){ } /* -** This is the first stage callback. Each invocation tqcontains three +** This is the first stage callback. Each invocation contains three ** arguments where are taken from the STQLITE_MASTER table of the original ** database: (1) the entry type, (2) the entry name, and (3) the SQL for ** the entry. In all cases, execute the SQL of the third argument. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c index 3ba963d..5171275 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -233,7 +233,7 @@ static int hardDynamicify(Mem *pStack){ } /* -** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains +** An ephemeral string value (signified by the MEM_Ephem flag) contains ** a pointer to a dynamically allocated string where some other entity ** is responsible for deallocating that string. Because the stack entry ** does not control the string, it might be deleted without the stack @@ -377,11 +377,11 @@ static Sorter *Merge(Sorter *pLeft, Sorter *pRight){ } /* -** The following routine works like a tqreplacement for the standard +** The following routine works like a replacement for the standard ** library routine fgets(). The difference is in how end-of-line (EOL) ** is handled. Standard fgets() uses LF for EOL under unix, CRLF ** under windows, and CR under mac. This routine accepts any of these -** character sequences as an EOL mark. The EOL mark is tqreplaced by +** character sequences as an EOL mark. The EOL mark is replaced by ** a single LF character in zBuf. */ static char *vdbe_fgets(char *zBuf, int nBuf, FILE *in){ @@ -1842,7 +1842,7 @@ case OP_MakeRecord: { ** generated record distinct */ char zTemp[NBFS]; /* Temp space for small records */ - /* Assuming the record tqcontains N fields, the record format looks + /* Assuming the record contains N fields, the record format looks ** like this: ** ** ------------------------------------------------------------------- @@ -1856,9 +1856,9 @@ case OP_MakeRecord: { ** and data(N-1) is the top of the stack. ** ** Each of the idx() entries is either 1, 2, or 3 bytes depending on - ** how big the total record is. Idx(0) tqcontains the offset to the start - ** of data(0). Idx(k) tqcontains the offset to the start of data(k). - ** Idx(N) tqcontains the total number of bytes in the record. + ** how big the total record is. Idx(0) contains the offset to the start + ** of data(0). Idx(k) contains the offset to the start of data(k). + ** Idx(N) contains the total number of bytes in the record. */ nField = pOp->p1; pRec = &pTos[1-nField]; @@ -2018,7 +2018,7 @@ case OP_MakeKey: { int nField; int addRowid; int i, j; - int tqcontainsNull = 0; + int containsNull = 0; Mem *pRec; char zTemp[NBFS]; @@ -2033,7 +2033,7 @@ case OP_MakeKey: { char *z; if( flags & MEM_Null ){ nByte += 2; - tqcontainsNull = 1; + containsNull = 1; }else if( pOp->p3 && pOp->p3[j]=='t' ){ Stringify(pRec); pRec->flags &= ~(MEM_Int|MEM_Real); @@ -2092,7 +2092,7 @@ case OP_MakeKey: { iKey = intToKey(pRec->i); memcpy(&zNewKey[j], &iKey, sizeof(u32)); popStack(&pTos, nField+1); - if( pOp->p2 && tqcontainsNull ) pc = pOp->p2 - 1; + if( pOp->p2 && containsNull ) pc = pOp->p2 - 1; }else{ if( pOp->p2==0 ) popStack(&pTos, nField); } @@ -2487,7 +2487,7 @@ case OP_OpenTemp: { /* Opcode: OpenPseudo P1 * * ** -** Open a new cursor that points to a fake table that tqcontains a single +** Open a new cursor that points to a fake table that contains a single ** row of data. Any attempt to write a second row of data causes the ** first row to be deleted. All data is deleted when the cursor is ** closed. @@ -2525,7 +2525,7 @@ case OP_Close: { ** ** Pop the top of the stack and use its value as a key. Reposition ** cursor P1 so that it points to an entry with a matching key. If -** the table tqcontains no record with a matching key, then the cursor +** the table contains no record with a matching key, then the cursor ** is left pointing at the first record that is greater than the key. ** If there are no records greater than the key and P2 is not zero, ** then an immediate jump to P2 is made. @@ -2804,7 +2804,7 @@ case OP_NewRecno: { /* The next rowid or record number (different terms for the same ** thing) is obtained in a two-step algorithm. ** - ** First we attempt to tqfind the largest existing rowid and add one + ** First we attempt to find the largest existing rowid and add one ** to that. But if the largest existing rowid is already the maximum ** positive integer, we have to fall through to the second ** probabilistic algorithm @@ -2815,7 +2815,7 @@ case OP_NewRecno: { ** and try again, up to 1000 times. ** ** For a table with less than 2 billion entries, the probability - ** of not tqfinding a unused rowid is about 1.0e-300. This is a + ** of not finding a unused rowid is about 1.0e-300. This is a ** non-zero probability, but it is still vanishingly small and should ** never cause a problem. You are much, much more likely to have a ** hardware failure than for this algorithm to fail. @@ -3588,7 +3588,7 @@ case OP_IdxGE: { /* Opcode: IdxIsNull P1 P2 * ** -** The top of the stack tqcontains an index entry such as might be generated +** The top of the stack contains an index entry such as might be generated ** by the MakeIdxKey opcode. This routine looks at the first P1 fields of ** that key. If any of the first P1 fields are NULL, then a jump is made ** to address P2. Otherwise we fall straight through. @@ -3704,7 +3704,7 @@ case OP_CreateTable: { ** stack the text of an error message describing any problems. ** If there are no errors, push a "ok" onto the stack. ** -** P1 is the index of a set that tqcontains the root page numbers +** P1 is the index of a set that contains the root page numbers ** for all tables and indices in the main database file. The set ** is cleared by this opcode. In other words, after this opcode ** has executed, the set will be empty. @@ -4097,7 +4097,7 @@ case OP_SortNext: { /* Opcode: SortCallback P1 * * ** -** The top of the stack tqcontains a callback record built using +** The top of the stack contains a callback record built using ** the SortMakeRec operation with the same P1 value as this ** instruction. Pop this record from the stack and invoke the ** callback on it. @@ -4151,8 +4151,8 @@ case OP_FileOpen: { ** Read a single line of input from the open file (the file opened using ** FileOpen). If we reach end-of-file, jump immediately to P2. If ** we are able to get another line, split the line apart using P3 as -** a delimiter. There should be P1 fields. If the input line tqcontains -** more than P1 fields, ignore the excess. If the input line tqcontains +** a delimiter. There should be P1 fields. If the input line contains +** more than P1 fields, ignore the excess. If the input line contains ** fewer than P1 fields, assume the remaining fields contain NULLs. ** ** Input ends if a line consists of just "\.". A field containing only @@ -4391,7 +4391,7 @@ case OP_MemIncr: { /* Opcode: AggReset * P2 * ** -** Reset the aggregator so that it no longer tqcontains any data. +** Reset the aggregator so that it no longer contains any data. ** Future aggregator elements will contain P2 values each. */ case OP_AggReset: { diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h index dd8a238..0a3c622 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h index 5a9608a..4c196d5 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -161,7 +161,7 @@ struct sqlite_func { /* ** An Agg structure describes an Aggregator. Each Agg consists of -** zero or more Aggregator elements (AggElem). Each AggElem tqcontains +** zero or more Aggregator elements (AggElem). Each AggElem contains ** a key and one or more values. The values are used in processing ** aggregate functions in a SELECT. The key is used to implement ** the GROUP BY clause of a select. @@ -221,7 +221,7 @@ struct Context { }; /* -** An instance of the virtual machine. This structure tqcontains the complete +** An instance of the virtual machine. This structure contains the complete ** state of the virtual machine. ** ** The "sqlite_vm" structure pointer that is returned by sqlite_compile() diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c index 6f74146..dc41841 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used for creating, destroying, and populating +** This file contains code used for creating, destroying, and populating ** a VDBE (or an "sqlite_vm" as it is known to the outside world.) Prior ** to version 2.8.7, all this code was combined into the vdbe.c source file. ** But that file was getting too big so this subroutines were split out. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/where.c b/tqtinterface/qt4/src/3rdparty/sqlite/where.c index 097ec5b..3ab7eca 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/where.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/where.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This module tqcontains C code that generates VDBE code used to process +** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. ** ** $Id: where.c,v 1.89 2004/02/22 20:05:02 drh Exp $ @@ -190,7 +190,7 @@ static void exprAnalyze(ExprMaskSet *pMaskSet, ExprInfo *pInfo){ ** left-most table in the FROM clause of that same SELECT statement and ** the table has a cursor number of "base". ** -** This routine attempts to tqfind an index for pTab that generates the +** This routine attempts to find an index for pTab that generates the ** correct record sequence for the given ORDER BY clause. The return value ** is a pointer to an index that does the job. NULL is returned if the ** table has no index that will generate the correct sort order. @@ -207,7 +207,7 @@ static void exprAnalyze(ExprMaskSet *pMaskSet, ExprInfo *pInfo){ ** *pbRev value is set to 1 if the ORDER BY clause is all DESC and it is ** set to 0 if the ORDER BY clause is all ASC. */ -static Index *tqfindSortingIndex( +static Index *findSortingIndex( Table *pTab, /* The table to be sorted */ int base, /* Cursor number for pTab */ ExprList *pOrderBy, /* The ORDER BY clause */ @@ -271,7 +271,7 @@ static Index *tqfindSortingIndex( /* ** Generate the beginning of the loop used for WHERE clause processing. -** The return value is a pointer to an (opaque) structure that tqcontains +** The return value is a pointer to an (opaque) structure that contains ** information needed to terminate the loop. Later, the calling routine ** should invoke sqliteWhereEnd() with the return value of this function ** in order to complete the WHERE clause processing. @@ -374,7 +374,7 @@ WhereInfo *sqliteWhereBegin( /* Split the WHERE clause into separate subexpressions where each ** subexpression is separated by an AND operator. If the aExpr[] ** array fills up, the last entry might point to an expression which - ** tqcontains additional unfactored AND operators. + ** contains additional unfactored AND operators. */ initMaskSet(&maskSet); memset(aExpr, 0, sizeof(aExpr)); @@ -651,7 +651,7 @@ WhereInfo *sqliteWhereBegin( pSortIdx = 0; }else{ int nEqCol = (pWInfo->a[0].score+4)/8; - pSortIdx = tqfindSortingIndex(pTab, pTabList->a[0].iCursor, + pSortIdx = findSortingIndex(pTab, pTabList->a[0].iCursor, *ppOrderBy, pIdx, nEqCol, &bRev); } if( pSortIdx && (pIdx==0 || pIdx==pSortIdx) ){ diff --git a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog index b7e805a..808c5f6 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog +++ b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog @@ -73,7 +73,7 @@ Changes in 1.2.0.8 (4 November 2003) Changes in 1.2.0.7 (21 September 2003) - Correct some debug formats in contrib/infback9 - Cast a type in a debug statement in trees.c -- Change search and tqreplace delimiter in configure from % to # [Beebe] +- Change search and replace delimiter in configure from % to # [Beebe] - Update contrib/untgz to 0.2 with various fixes [Truta] - Add build support for Amiga [Nikl] - Remove some directories in old that have been updated to 1.2 @@ -339,7 +339,7 @@ Changes in 1.1.3 (9 July 1998) . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc: new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT) - use define instead of typedef for Bytef also for MSC small/medium (Tom Lane) -- tqreplace __far with _far for better portability (Christian Spieler, Tom Lane) +- replace __far with _far for better portability (Christian Spieler, Tom Lane) - fix test for errno.h in configure (Tim Newsham) Changes in 1.1.2 (19 March 98) @@ -385,7 +385,7 @@ Changes in 1.0.9 (17 Feb 1998) - do not clear eof flag in gzseek (Mark Diekhans) - fix gzseek for files in transtqparent mode (Mark Diekhans) - do not assume that vsprintf returns the number of bytes written (Jens Krinke) -- tqreplace EXPORT with ZEXPORT to avoid conflict with other programs +- replace EXPORT with ZEXPORT to avoid conflict with other programs - added compress2 in zconf.h, zlib.def, zlib.dnt - new asm code from Gilles Vollant in contrib/asm386 - simplify the inflate code (Mark): @@ -450,7 +450,7 @@ Changes in 1.0.6 (19 Jan 1998) - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) - Fix a deflate bug occuring only with compression level 0 (thanks to - Andy Buckler for tqfinding this one). + Andy Buckler for finding this one). - In minigzip, pass transparently also the first byte for .Z files. - return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() - check Z_FINISH in inflate (thanks to Marc Schluper) diff --git a/tqtinterface/qt4/src/3rdparty/zlib/FAQ b/tqtinterface/qt4/src/3rdparty/zlib/FAQ index e10b71e..4f61f10 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/FAQ +++ b/tqtinterface/qt4/src/3rdparty/zlib/FAQ @@ -273,7 +273,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html information on what variant of sprintf() is used by gzprintf(). If you don't have snprintf() or vsnprintf() and would like one, you can - tqfind a portable implementation here: + find a portable implementation here: http://www.ijs.si/software/snprintf/ diff --git a/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt b/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt index d454dcc..b022dde 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt +++ b/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt @@ -1,8 +1,8 @@ 1. Compression algorithm (deflate) The deflation algorithm used by gzip (also zip and zlib) is a variation of -LZ77 (Lempel-Ziv 1977, see reference below). It tqfinds duplicated strings in -the input data. The second occurrence of a string is tqreplaced by a +LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in +the input data. The second occurrence of a string is replaced by a pointer to the previous string, in the form of a pair (distance, length). Distances are limited to 32K bytes, and lengths are limited to 258 bytes. When a string does not occur anywhere in the previous @@ -31,8 +31,8 @@ hash chains, the algorithm simply discards matches that are too old. To avoid a worst-case situation, very long hash chains are arbitrarily truncated at a certain length, determined by a runtime option (level -parameter of deflateInit). So deflate() does not always tqfind the longest -possible match but generally tqfinds a match which is long enough. +parameter of deflateInit). So deflate() does not always find the longest +possible match but generally finds a match which is long enough. deflate() also defers the selection of matches with a lazy evaluation mechanism. After a match of length N has been found, deflate() searches for @@ -110,7 +110,7 @@ symbols, you could have as many levels of lookups as is efficient. For inflate, two is enough. So a table entry either points to another table (in which case nine bits in -the above example are gobbled), or it tqcontains the translation for the symbol +the above example are gobbled), or it contains the translation for the symbol and the number of bits to gobble. Then you start again with the next ungobbled bit. diff --git a/tqtinterface/qt4/src/3rdparty/zlib/configure b/tqtinterface/qt4/src/3rdparty/zlib/configure index c0ebb5d..6e13859 100755 --- a/tqtinterface/qt4/src/3rdparty/zlib/configure +++ b/tqtinterface/qt4/src/3rdparty/zlib/configure @@ -93,7 +93,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then *) LDSHARED=${LDSHARED-"$cc -shared"};; esac else - # tqfind system name and corresponding cc options + # find system name and corresponding cc options CC=${CC-cc} case `(uname -sr || echo unknown) 2>/dev/null` in HP-UX*) SFLAGS=${CFLAGS-"-O +z"} diff --git a/tqtinterface/qt4/src/3rdparty/zlib/crc32.c b/tqtinterface/qt4/src/3rdparty/zlib/crc32.c index dfa6c4f..b39c7e1 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/crc32.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/crc32.c @@ -44,7 +44,7 @@ # if (USHRT_MAX == 0xffffffffUL) typedef unsigned short u4; # else -# undef BYFOUR /* can't tqfind a four-byte integer type! */ +# undef BYFOUR /* can't find a four-byte integer type! */ # endif # endif # endif diff --git a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c index 1692d87..87d2da1 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c @@ -19,7 +19,7 @@ * is preferable to spend more time in matches to allow very fast string * insertions and avoid deletions. The matching algorithm for small * strings is inspired from that of Rabin & Karp. A brute force approach - * is used to tqfind longer strings when a small match has been found. + * is used to find longer strings when a small match has been found. * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze * (by Leonid Broukhis). * A previous version of this file used a more sophisticated algorithm diff --git a/tqtinterface/qt4/src/3rdparty/zlib/deflate.h b/tqtinterface/qt4/src/3rdparty/zlib/deflate.h index 8632561..410681d 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/deflate.h +++ b/tqtinterface/qt4/src/3rdparty/zlib/deflate.h @@ -163,7 +163,7 @@ typedef struct internal_state { */ uInt max_lazy_match; - /* Attempt to tqfind a better match only when the current match is strictly + /* Attempt to find a better match only when the current match is strictly * smaller than this value. This mechanism is used only for compression * levels >= 4. */ diff --git a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c index 760ef10..0eb643c 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c @@ -96,7 +96,7 @@ unsigned short FAR *work; table. The sorted table is work[], with that space being provided by the caller. - The length counts are used for other purposes as well, i.e. tqfinding + The length counts are used for other purposes as well, i.e. finding the minimum and maximum length codes, determining if there are any codes at all, checking for a valid set of lengths, and looking ahead at length counts to determine sub-table sizes when building the diff --git a/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c b/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c index a21f0cb..6de35dd 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c @@ -5,7 +5,7 @@ /* * minigzip is a minimal implementation of the gzip utility. This is - * only an example of using zlib and isn't meant to tqreplace the + * only an example of using zlib and isn't meant to replace the * full-featured gzip. No attempt is made to deal with file systems * limiting names to 14 or 8+3 characters, etc... Error checking is * very limited. So use minigzip only for testing; use gzip for the diff --git a/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects b/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects index e9baf2e..f32de76 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects +++ b/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects @@ -1,4 +1,4 @@ -This directory tqcontains project files for building zlib under various +This directory contains project files for building zlib under various Integrated Development Environments (IDE). If you wish to submit a new project to this directory, you should comply diff --git a/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt b/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt index c79ae9f..71d6105 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt +++ b/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt @@ -16,7 +16,7 @@ To use: 3) Select "Build | Clean".
4) Select "Build | Build ... (F7)". Ignore warning messages about
- not being able to tqfind certain include files (e.g. alloc.h).
+ not being able to find certain include files (e.g. alloc.h).
5) If you built one of the sample programs (example or minigzip),
select "Build | Execute ... (Ctrl+F5)".
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/trees.c b/tqtinterface/qt4/src/3rdparty/zlib/trees.c index 6a2e55b..52c820f 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/trees.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/trees.c @@ -483,7 +483,7 @@ local void pqdownheap(s, tree, k) * IN assertion: the fields freq and dad are set, heap[heap_max] and * above are the tree nodes sorted by increasing frequency. * OUT assertions: the field len is set to the optimal bit length, the - * array bl_count tqcontains the frequencies for each bit length. + * array bl_count contains the frequencies for each bit length. * The length opt_len is updated; static_len is also updated if stree is * not null. */ @@ -569,7 +569,7 @@ local void gen_bitlen(s, desc) /* =========================================================================== * Generate the codes for a given tree and bit counts (which need not be * optimal). - * IN assertion: the array bl_count tqcontains the bit length statistics for + * IN assertion: the array bl_count contains the bit length statistics for * the given tree and the field len is set for all tree elements. * OUT assertion: the field code is set for all tree elements of non * zero code length. diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt index 4951c48..1746a95 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt @@ -29,7 +29,7 @@ in the zlib distribution, or at the following location: * The calling convention of functions is "C" (CDECL). * The ZLIB1.DLL binary is linked to MSVCRT.DLL. - The archive in which ZLIB1.DLL is bundled tqcontains compiled + The archive in which ZLIB1.DLL is bundled contains compiled test programs that must run with a valid build of ZLIB1.DLL. It is recommended to download the prebuilt DLL from the zlib web site, instead of building it yourself, to avoid potential @@ -79,14 +79,14 @@ in the zlib distribution, or at the following location: longer dependents on it. - 3. Can I build ZLIB.DLL from the new zlib sources, and tqreplace + 3. Can I build ZLIB.DLL from the new zlib sources, and replace an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier? - In principle, you can do it by assigning calling convention keywords to the macros ZEXPORT and ZEXPORTVA. In practice, it depends on what you mean by "an old ZLIB.DLL", because the old DLL exists in several mutually-incompatible versions. - You have to tqfind out first what kind of calling convention is + You have to find out first what kind of calling convention is being used in your particular ZLIB.DLL build, and to use the same one in the new build. If you don't know what this is all about, you might be better off if you would just leave the old @@ -110,7 +110,7 @@ in the zlib distribution, or at the following location: - Although exporting symbols by ordinal is a little faster, it is risky. Any single glitch in the maintenance or use of the - DEF file that tqcontains the ordinals can result in incompatible + DEF file that contains the ordinals can result in incompatible builds and frustrating crashes. Simply put, the benefits of exporting symbols by ordinal do not justify the risks. @@ -119,7 +119,7 @@ in the zlib distribution, or at the following location: exist in every DLL, and even if the dynamic linking performed at the DLL startup is searching for names, ordinals serve as hints, for a faster name lookup. However, if the DEF file - tqcontains ordinals, the Microsoft linker automatically builds + contains ordinals, the Microsoft linker automatically builds an implib that will cause the executables linked to it to use those ordinals, and not the names. It is interesting to notice that the GNU linker for Win32 does not suffer from this @@ -331,7 +331,7 @@ in the zlib distribution, or at the following location: CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL. -14. May I include additional pieces of code that I tqfind useful, +14. May I include additional pieces of code that I find useful, link them in ZLIB1.DLL, and export them? - No. A legitimate build of ZLIB1.DLL must not include code diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx index f40c58c..7b08424 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx @@ -15,9 +15,9 @@ CC=gcc -Zwin32 CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -# If cp.exe is available, tqreplace "copy /Y" with "cp -fp" . +# If cp.exe is available, replace "copy /Y" with "cp -fp" . CP=copy /Y -# If gnu install.exe is available, tqreplace $(CP) with ginstall. +# If gnu install.exe is available, replace $(CP) with ginstall. INSTALL=$(CP) # The default value of RM is "rm -f." If "rm.exe" is found, comment out: RM=del diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc index 895193e..62a8430 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc @@ -46,7 +46,7 @@ RC = windres RCFLAGS = --define GCC_WINDRES CP = cp -fp -# If GNU install is available, tqreplace $(CP) with install. +# If GNU install is available, replace $(CP) with install. INSTALL = $(CP) RM = rm -f diff --git a/tqtinterface/qt4/src/3rdparty/zlib/zutil.h b/tqtinterface/qt4/src/3rdparty/zlib/zutil.h index fbf8652..7b42edc 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/zutil.h +++ b/tqtinterface/qt4/src/3rdparty/zlib/zutil.h @@ -30,7 +30,7 @@ #ifndef local # define local static #endif -/* compile with -Dlocal if your debugger can't tqfind static symbols */ +/* compile with -Dlocal if your debugger can't find static symbols */ typedef unsigned char uch; typedef uch FAR uchf; |