diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-07 21:58:34 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-05-07 21:58:34 -0500 |
| commit | c740211ffba3330d951f4c3ddefea8edf23a01cd (patch) | |
| tree | 0a8b7641d3c5b576d18a2f7912c75fc600f494e2 | |
| parent | 8a4eacb6185de3653f6ae401c352aef833a9e72a (diff) | |
| download | tqt3-c740211f.tar.gz tqt3-c740211f.zip | |
Automated update from Qt3
227 files changed, 577 insertions, 577 deletions
diff --git a/LICENSE.GPL3 b/LICENSE.GPL3 index 82922eb7..4fb1cff0 100644 --- a/LICENSE.GPL3 +++ b/LICENSE.GPL3 @@ -90,7 +90,7 @@ License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. To "modify" a work means to copy from or adapt all or part of the work -in a fashion retquiring copyright permission, other than the making of an +in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. @@ -373,12 +373,12 @@ that material) supplement the terms of this License with terms: a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or - b) Retquiring preservation of specified reasonable legal notices or + b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or - retquiring that modified versions of such material be marked in + requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or @@ -387,7 +387,7 @@ that material) supplement the terms of this License with terms: e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or - f) Retquiring indemnification of licensors and authors of that + f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on @@ -483,8 +483,8 @@ License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already actquired or -hereafter actquired, that would be infringed by some manner, permitted +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For diff --git a/changes-3.5 b/changes-3.5 index 129b523c..15164c40 100644 --- a/changes-3.5 +++ b/changes-3.5 @@ -10,7 +10,7 @@ General Improvements - Technical - * Modify TQStyle API to work without retquiring direct access to Qt-specific objects + * Modify TQStyle API to work without requiring direct access to Qt-specific objects See "TQStyle API Change" section below TQStyle API Change @@ -1914,7 +1914,7 @@ Configure options: -system-zlib ....... Use zlib from the operating system. See http://www.gzip.org/zlib - -fast .............. Configure Qt tquickly by generating Makefiles only for + -fast .............. Configure Qt quickly by generating Makefiles only for library and subdirectory targets. All other Makefiles are created as wrappers, which will in turn run qmake. * -no-fast ........... Configure Qt normally by generating Makefiles for all diff --git a/doc/3rdparty.doc b/doc/3rdparty.doc index 69991a30..d90a2f84 100644 --- a/doc/3rdparty.doc +++ b/doc/3rdparty.doc @@ -52,7 +52,7 @@ controlling the use of these libraries. \e{The FreeType project is a team of volunteers who develop free, portable and high-quality software solutions for digital typography. We specifically target embedded systems and focus on bringing small, efficient and -ubitquitous products.} -- quoted from \c 3rdparty/freetype/docs/freetype2.html. +ubiquitous products.} -- quoted from \c 3rdparty/freetype/docs/freetype2.html. See \c 3rdparty/freetype/docs/FIL.txt and \c 3rdparty/freetype/docs/GPL.txt for license details. @@ -116,7 +116,7 @@ statement in an appendix to the documentation. Copyright 1984-1989, 1994 Adobe Systems Incorporated. -Copyright 1988, 1994 Digital Etquipment Corporation. +Copyright 1988, 1994 Digital Equipment Corporation. Adobe is a trademark of Adobe Systems Incorporated which may be registered in certain jurisdictions. @@ -128,10 +128,10 @@ and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notices appear in all copies and that both those copyright notices and this permission notice appear in supporting documentation, and that the names of -Adobe Systems and Digital Etquipment Corporation not be used in +Adobe Systems and Digital Equipment Corporation not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Adobe Systems and -Digital Etquipment Corporation make no representations about the +Digital Equipment Corporation make no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. diff --git a/doc/changes.doc b/doc/changes.doc index 34ecb37f..ccfbe14f 100644 --- a/doc/changes.doc +++ b/doc/changes.doc @@ -164,7 +164,7 @@ text with different fonts, colors, paragraph styles, tables and images. The editor supports different word wrap modes, command-based undo/redo, multiple selections, drag and drop, and many other features. The new QTextEdit engine is highly optimized for proccesing -and displaying large documents tquickly and efficiently. +and displaying large documents quickly and efficiently. \section2 Unicode diff --git a/doc/credits.doc b/doc/credits.doc index de118d86..ca189f58 100644 --- a/doc/credits.doc +++ b/doc/credits.doc @@ -248,7 +248,7 @@ Patrick Voigt <Patrick.Voigt <i>at</i> Informatik.TU-Chemnitz.DE><br> Paul Bucheit <ptb <i>at</i> k2.cwru.edu><br> Paul Curtis <plc <i>at</i> rowley.co.uk><br> Paul Kendall <paul <i>at</i> kcbbs.gen.nz><br> -Paul Martquis <pmartquis <i>at</i> iddptm.iddis.com><br> +Paul Marquis <pmarquis <i>at</i> iddptm.iddis.com><br> Peter Bender <bender <i>at</i> iib.bauwesen.th-darmstadt.de><br> Peter Klotz <p.klotz <i>at</i> icoserve.com><br> Peter Pletcher <peter <i>at</i> delilah><br> diff --git a/doc/html/3rdparty.html b/doc/html/3rdparty.html index c24db563..2213896f 100644 --- a/doc/html/3rdparty.html +++ b/doc/html/3rdparty.html @@ -54,7 +54,7 @@ controlling the use of these libraries. <p> <h2> Freetype 2 (freetype) </h2> -<a name="1"></a><p> <em>The FreeType project is a team of volunteers who develop free, portable and high-quality software solutions for digital typography. We specifically target embedded systems and focus on bringing small, efficient and ubitquitous products.</em> -- quoted from <tt>3rdparty/freetype/docs/freetype2.html</tt>. +<a name="1"></a><p> <em>The FreeType project is a team of volunteers who develop free, portable and high-quality software solutions for digital typography. We specifically target embedded systems and focus on bringing small, efficient and ubiquitous products.</em> -- quoted from <tt>3rdparty/freetype/docs/freetype2.html</tt>. <p> See <tt>3rdparty/freetype/docs/FIL.txt</tt> and <tt>3rdparty/freetype/docs/GPL.txt</tt> for license details. <p> See also the files in <tt>3rdparty/opentype</tt> which are used by Freetype. @@ -79,7 +79,7 @@ Freetype. </h2> <a name="6"></a><p> <em>The Helvetica BDF font files supplied with TQt/Embedded are distributed under the following highly permissive license. We recommend that all TQt/Embedded installations that use these font files also acknowledge this contribution, and quote this license statement in an appendix to the documentation.</em> -- located in <tt>lib/fonts</tt> <p> Copyright 1984-1989, 1994 Adobe Systems Incorporated. -<p> Copyright 1988, 1994 Digital Etquipment Corporation. +<p> Copyright 1988, 1994 Digital Equipment Corporation. <p> Adobe is a trademark of Adobe Systems Incorporated which may be registered in certain jurisdictions. Permission to use these trademarks is hereby granted only in @@ -89,10 +89,10 @@ and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notices appear in all copies and that both those copyright notices and this permission notice appear in supporting documentation, and that the names of -Adobe Systems and Digital Etquipment Corporation not be used in +Adobe Systems and Digital Equipment Corporation not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. Adobe Systems and -Digital Etquipment Corporation make no representations about the +Digital Equipment Corporation make no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. <p> diff --git a/doc/html/credits.html b/doc/html/credits.html index 95f99ba5..2f3b20cb 100644 --- a/doc/html/credits.html +++ b/doc/html/credits.html @@ -238,7 +238,7 @@ Patrick Voigt <Patrick.Voigt <i>at</i> Informatik.TU-Chemnitz.DE><br> Paul Bucheit <ptb <i>at</i> k2.cwru.edu><br> Paul Curtis <plc <i>at</i> rowley.co.uk><br> Paul Kendall <paul <i>at</i> kcbbs.gen.nz><br> -Paul Martquis <pmartquis <i>at</i> iddptm.iddis.com><br> +Paul Marquis <pmarquis <i>at</i> iddptm.iddis.com><br> Peter Bender <bender <i>at</i> iib.bauwesen.th-darmstadt.de><br> Peter Klotz <p.klotz <i>at</i> icoserve.com><br> Peter Pletcher <peter <i>at</i> delilah><br> diff --git a/doc/html/designer-manual-1.html b/doc/html/designer-manual-1.html index 4de8d8c6..d41bfa22 100644 --- a/doc/html/designer-manual-1.html +++ b/doc/html/designer-manual-1.html @@ -53,7 +53,7 @@ body { background: #ffffff; color: black; } <p>Although the new version of <em>TQt Designer</em> introduces new approaches and techniques you can ignore these aspects and simply use it in exactly the same way as you used the version supplied with TQt 2.x, if you just want a simple but powerful single dialog visual design tool.</p> <h4><a name="3-1"></a>What's New in <em>TQt Designer</em> for TQt 3.1?</h4> <ul><li><p><em>TQt Designer</em> now features a start-up dialog for fast access to recently used files, etc. (It can be switched off if you don't want it.)</p> -<li><p>The signals and slots dialog has changed significantly. It is far easier to use and much faster for creating lots of connections in one go. You can still click and drag to create connections, but the new dialog is much tquicker.</p> +<li><p>The signals and slots dialog has changed significantly. It is far easier to use and much faster for creating lots of connections in one go. You can still click and drag to create connections, but the new dialog is much quicker.</p> <li><p>Widgets are now accessible using the Toolbox. (All the original toolbars are still available.) This provides the same easy access as toolbar buttons, and also shows the names of the widgets and takes up less space.</p> <li><p><a href="ntqwidgetstack.html">TQWidgetStack</a> is now available as a container widget. The new example demonstrates its use.</p> <li><p><tt>.ui.h</tt> files may now contain arbitrary C++, including <tt>const</tt> definitions, <tt>#include</tt>s, plain functions, etc.</p> diff --git a/doc/html/designer-manual-14.html b/doc/html/designer-manual-14.html index 471ff732..71f63b86 100644 --- a/doc/html/designer-manual-14.html +++ b/doc/html/designer-manual-14.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } <p>The 'Navigation and Editing' wizard page is used to create navigation and editing buttons.</p> <p>Check the 'Include Navigation Buttons' checkbox to include navigation buttons. In the 'Navigation section, click 'Previous' to display the 'Previous' button on the form. This option allows you to navigate to the previous record in the table. Click 'Next' to display the 'next' button on the form. This button allows you to navigate to the next record in the table. Click 'First' to display the 'First' button on the form. This option allows you to navigate to the first record in the table. Click 'Last' to display the 'Last' button on the form. This button allows you to navigate to the last record in the table.</p> <p>Click the 'Include Edit Buttons' checkbox to include editing buttons. In the 'Editing' section, check the 'Insert' checkbox to create an 'Insert' button for adding new records. Check the 'Update' checkbox to create an 'Update' button for updating existing records. Check the 'Delete' checkbox to create a 'Delete' button for deleting records.</p> -<p>The navigation buttons, and 'Update' and 'Delete' buttons will work without retquiring any code. Since most database designs expect new records to be created with a unique key the 'Insert' button will not work. This can easily be fixed by generating the key in a slot connected to the <tt>TQDataBrowser::beforeInsert()</tt> signal.</p> +<p>The navigation buttons, and 'Update' and 'Delete' buttons will work without requiring any code. Since most database designs expect new records to be created with a unique key the 'Insert' button will not work. This can easily be fixed by generating the key in a slot connected to the <tt>TQDataBrowser::beforeInsert()</tt> signal.</p> <p>Click <b>Next</b> to move on to the next wizard page. Click <b>Back</b> if you want to return to the 'Displayed Fields' wizard page.</p> <p align="center"><img align="middle" src="qd-databrowserwzdpage4.png" width="585" height="456"> </p> diff --git a/doc/html/designer-manual-2.html b/doc/html/designer-manual-2.html index 22d3e804..54df825f 100644 --- a/doc/html/designer-manual-2.html +++ b/doc/html/designer-manual-2.html @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/tools/designer/book/chap-tquickstart2.leaf:3 --> +<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/tools/designer/book/chap-quickstart2.leaf:3 --> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> @@ -31,7 +31,7 @@ body { background: #ffffff; color: black; } </td> <td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><p align="right">[<a href="designer-manual-1.html">Prev: Preface</a>] [<a href="designer-manual.html">Home</a>] [<a href="designer-manual-3.html">Next: Creating a Main Window Application</a>]</p> <h2 align="center">Quick Start</h2> -<p>This chapter provides a tquick start for users of <em>TQt Designer</em>. The chapter takes you step-by-step through the creation of a small dialog-style metric conversion application. It introduces many of the common tasks users perform when creating an application: adding widgets to a form, setting widget properties, making connections between signals and slots, laying out widgets, and adding custom code. This chapter only covers a portion of <em>TQt Designer</em>'s functionality; explanations and details are mostly left for the more detailed <tt>colortool</tt> tutorial presented in chapters two and three.</p> +<p>This chapter provides a quick start for users of <em>TQt Designer</em>. The chapter takes you step-by-step through the creation of a small dialog-style metric conversion application. It introduces many of the common tasks users perform when creating an application: adding widgets to a form, setting widget properties, making connections between signals and slots, laying out widgets, and adding custom code. This chapter only covers a portion of <em>TQt Designer</em>'s functionality; explanations and details are mostly left for the more detailed <tt>colortool</tt> tutorial presented in chapters two and three.</p> <p align="center"><img align="middle" src="qsmetric.png" width="328" height="239"> </p> <blockquote><p align="center"><em>The Metric Conversion Dialog</em></p></blockquote> @@ -112,7 +112,7 @@ body { background: #ffffff; color: black; } </ul><p align="center"><img align="middle" src="qs-pushbutt.png" width="428" height="232"> </p> <h5><a name="3-1-4"></a>Adding Spacers</h5> -<p>We need to add spacers to absorb redundant space in our dialog, so that it will lay out nicely at any size. Usually spacers are added as you experiment with the layout but, since this is a tquick guide to <em>TQt Designer</em>, and we already know that they will be needed, we will add the spacers now.</p> +<p>We need to add spacers to absorb redundant space in our dialog, so that it will lay out nicely at any size. Usually spacers are added as you experiment with the layout but, since this is a quick guide to <em>TQt Designer</em>, and we already know that they will be needed, we will add the spacers now.</p> <ul><li><p>Click the <b>Common Widgets</b> button in the Toolbox.</p> <li><p>Click the <b>Spacer</b> button. Click to the right of the "Decimal" label, drag right towards the spinbox, then release. A horizontal spacer will appear.</p> <li><p>Click the <b>Spacer</b> button again. Click to the right of the Calculate push button, drag right towards the Quit push button, then release.</p> diff --git a/doc/html/designer-manual-3.html b/doc/html/designer-manual-3.html index 4570aee8..c034e9d2 100644 --- a/doc/html/designer-manual-3.html +++ b/doc/html/designer-manual-3.html @@ -38,7 +38,7 @@ body { background: #ffffff; color: black; } <p>The <tt>colortool</tt> application is a multiplatform application that allows users to create, edit and save lists of colors. Each color has a user defined name and an RGB (Red, Green, Blue) value.</p> <p>This application presents the user with a view of a set of colors and their names. We will provide two views (using a <a href="ntqwidgetstack.html">TQWidgetStack</a>) which the user can switch between. The tabular view will show each color as a small square followed by its name and hex value. It will also provide the option of an indicator to show whether or not the color is one of the 216 standard web colors. The iconic view will show each color as a circular color swatch with the name of the color beneath.</p> <p>The application will read and write files in the format used by the X Consortium for the <tt>rgb.txt</tt> file. This will allow users to create their own color files and to load, edit and save <tt>rgb.txt</tt> format files.</p> -<p>We will provide a simple search option so that users can tquickly locate a color; this is particularly useful when hundreds or thousands of colors are shown. The search will be provided in a modeless dialog so that the user can conduct a search but still interact with the main form. We will also enable the user to add and delete colors, and to set some user options. To provide these facilities, we must create some modal dialogs.</p> +<p>We will provide a simple search option so that users can quickly locate a color; this is particularly useful when hundreds or thousands of colors are shown. The search will be provided in a modeless dialog so that the user can conduct a search but still interact with the main form. We will also enable the user to add and delete colors, and to set some user options. To provide these facilities, we must create some modal dialogs.</p> <p>Finally, we must ensure that the application loads user options at start up and saves user options at termination. We will also include the view and the size and position of the main window with these options, so that the application will always start with the size, position and view it had when the user last used it.</p> <p align="center"><img align="middle" src="mw-colortool2.png" alt="The Color Tool application" width="580" height="485"> </p> diff --git a/doc/html/designer-manual-4.html b/doc/html/designer-manual-4.html index d378ec9d..e23d76c9 100644 --- a/doc/html/designer-manual-4.html +++ b/doc/html/designer-manual-4.html @@ -53,7 +53,7 @@ body { background: #ffffff; color: black; } </blockquote> <h4><a name="1-2"></a>Creating the Dialog</h4> <a name="layouts-subsection"></a><h5><a name="1-2-1"></a>Layouts</h5> -<!-- index Layouts --><!-- index Scaling widgets and application windows --><!-- index Automatically scaling widgets and application windows --><!-- index Absolute positioning --><p>Layouts provide a means of laying out widgets, groups of widgets, and layouts into horizontal and vertical pairs and into grids. If you use layouts your forms, and the widgets they contain, will scale automatically when the user resizes the window. This is better than using absolute sizes and positions since you don't have to write any code to achieve the scaling and your users can make the most of their screen size whether they have a laptop or a very large screen desktop machine. Layouts use standard sizes for margins and widget spacing which helps give your applications a consistent and proportional look without retquiring any effort on your part. Layouts are also easier and faster to use than absolute positioning; you can just place your widgets on the form in approximate positions and leave the layout tools to size and scale the widgets correctly.</p> +<!-- index Layouts --><!-- index Scaling widgets and application windows --><!-- index Automatically scaling widgets and application windows --><!-- index Absolute positioning --><p>Layouts provide a means of laying out widgets, groups of widgets, and layouts into horizontal and vertical pairs and into grids. If you use layouts your forms, and the widgets they contain, will scale automatically when the user resizes the window. This is better than using absolute sizes and positions since you don't have to write any code to achieve the scaling and your users can make the most of their screen size whether they have a laptop or a very large screen desktop machine. Layouts use standard sizes for margins and widget spacing which helps give your applications a consistent and proportional look without requiring any effort on your part. Layouts are also easier and faster to use than absolute positioning; you can just place your widgets on the form in approximate positions and leave the layout tools to size and scale the widgets correctly.</p> <a name="adding-the-widgets-subsection"></a><h5><a name="1-2-2"></a>Adding the Widgets</h5> <p>We can use one of TQt's static dialogs to get the user to choose a color, but we need our own dialog to get them to give it a name. We'll create that dialog now.</p> <p>Click <b>File|New</b> to invoke the <em>New File</em> dialog, then click "Dialog", then click <b>OK</b>. Drag a corner of the new form to make it a lot smaller. Change the form's name (in the <a href="designer-manual-3.html#using-the-property-editor-sidebar">Property Editor</a>) to "ColorNameForm", and change its caption to "Color Tool -- Color Name". Click <b>File|Save</b>, then click <b>Save</b> to save it.</p> @@ -339,7 +339,7 @@ body { background: #ffffff; color: black; } <p align="center"><img align="middle" src="dialog3grpbox.png" width="472" height="371"> </p> <p>Click the ButtonGroup tool and click below the table view group box. Change this group's <em>title</em> property to "Copy to Clipboard As" and drag a corner to make it larger.</p> -<p>We want to add three radio buttons to the clipboard group. When there are a lot of identical widgets to add we can use <em>TQt Designer</em>'s multiple placement mode to work more tquickly.</p> +<p>We want to add three radio buttons to the clipboard group. When there are a lot of identical widgets to add we can use <em>TQt Designer</em>'s multiple placement mode to work more quickly.</p> <p><em>Double</em> click the RadioButton tool to enter multiple placement mode. Now every click on the form will create a radio button. Click inside, and towards the top of, the clipboard group box. Click below the first radio button. Click for a third time, below the second radio button. Now click the Pointer toolbar button to cancel multiple placement mode.</p> <p align="center"><img align="middle" src="dialog3clipgrp.png" width="473" height="370"> </p> diff --git a/doc/html/designer-manual-8.html b/doc/html/designer-manual-8.html index a0f4643b..93317ead 100644 --- a/doc/html/designer-manual-8.html +++ b/doc/html/designer-manual-8.html @@ -58,7 +58,7 @@ body { background: #ffffff; color: black; } ( tablename varchar(10), sequence numeric); </pre> - <p>The 'book' table is simplified for the purposes of the example. It can only relate a book to a single author (authorid) and lacks an ISBN field. The 'sequence' table is used for generating unique index values for the example tables. Note that SQL databases often provide their own method for creating sequences (for example, using the <tt>CREATE SETQUENCE</tt> command) which is very likely to be a more optimal solution. For the sake of portability the examples will use a 'sequence' table which will work with the vast majority of SQL databases.</p> + <p>The 'book' table is simplified for the purposes of the example. It can only relate a book to a single author (authorid) and lacks an ISBN field. The 'sequence' table is used for generating unique index values for the example tables. Note that SQL databases often provide their own method for creating sequences (for example, using the <tt>CREATE SEQUENCE</tt> command) which is very likely to be a more optimal solution. For the sake of portability the examples will use a 'sequence' table which will work with the vast majority of SQL databases.</p> </blockquote> <h3><a name="1"></a>Setting Up Database Connections</h3> <!-- index Databases!Connecting to Database Servers --><!-- index Connecting!Databases to Database Servers --><p>There are two aspects of database connections that we must consider. Firstly the connection we wish to use within <em>TQt Designer</em> itself, and secondly the connection we wish to use in the applications that we create.</p> diff --git a/doc/html/designer-manual-9.html b/doc/html/designer-manual-9.html index e25e7bc1..72fa93b5 100644 --- a/doc/html/designer-manual-9.html +++ b/doc/html/designer-manual-9.html @@ -210,7 +210,7 @@ myform.h: myform.ui <li><p>Packer layout</p> <p>GTK+ provides a class called GtkPacker that provides for exotic layouts; TQt does not provide a <b>TQPackerLayout</b> and none is planned. <em>TQt Designer</em> will treat packer layouts as if they were vertical layouts and you will probably have to change them to whatever combination of layouts that produces the right effect.</p> <li><p>Incorrectly-justified text after conversion</p> -<p>The "<em>hAlign</em>" property is sometimes set wrongly, in which case you have to change it manually. It is caused by a tquirk in Glade.</p> +<p>The "<em>hAlign</em>" property is sometimes set wrongly, in which case you have to change it manually. It is caused by a quirk in Glade.</p> </ul><!-- eof --> <p align="right">[<a href="designer-manual-8.html">Prev: Creating Database Applications</a>] [<a href="designer-manual.html">Home</a>] [<a href="designer-manual-10.html">Next: Reference: Key Bindings</a>]</p> <p><address><hr><div align=center> diff --git a/doc/html/gpl.html b/doc/html/gpl.html index 752e94e1..3f2b8885 100644 --- a/doc/html/gpl.html +++ b/doc/html/gpl.html @@ -305,14 +305,14 @@ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE TQUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSETQUENTIAL DAMAGES ARISING +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER diff --git a/doc/html/helpsystem.html b/doc/html/helpsystem.html index 8d8a3ac0..56f6f4c8 100644 --- a/doc/html/helpsystem.html +++ b/doc/html/helpsystem.html @@ -37,7 +37,7 @@ body { background: #ffffff; color: black; } with three levels of detail: <p> <ol type=1> <li> Tool Tips and Status Bar message - flyweight help, extremely brief, -entirely integrated in the user interface, retquiring little +entirely integrated in the user interface, requiring little or no user interaction to invoke. <li> What's This? - lightweight, but can be a three-paragraph explanation. diff --git a/doc/html/keyfeatures30.html b/doc/html/keyfeatures30.html index 4f948b0c..12f80ee4 100644 --- a/doc/html/keyfeatures30.html +++ b/doc/html/keyfeatures30.html @@ -116,7 +116,7 @@ text with different fonts, colors, paragraph styles, tables and images. The editor supports different word wrap modes, command-based undo/redo, multiple selections, drag and drop, and many other features. The new <a href="ntqtextedit.html">TQTextEdit</a> engine is highly optimized for proccesing -and displaying large documents tquickly and efficiently. +and displaying large documents quickly and efficiently. <p> <h3> Unicode </h3> <a name="1-4"></a><p> Apart from the rich text engine, another new feature of TQt 3.0 that diff --git a/doc/html/licenses.html b/doc/html/licenses.html index 0ddaf557..0f37a03d 100644 --- a/doc/html/licenses.html +++ b/doc/html/licenses.html @@ -68,7 +68,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -94,7 +94,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -122,7 +122,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -149,7 +149,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -174,7 +174,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -201,7 +201,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html index 8a5e52c5..a8b312e6 100644 --- a/doc/html/linguist-manual-4.html +++ b/doc/html/linguist-manual-4.html @@ -359,7 +359,7 @@ TRANSLATIONS = tt2_fr.ts \ <ul><li><p>E&xit - &Quitter</p> <li><p>Ctrl+Q - Ctrl+Q</p> <li><p>&File - &Fichier</p> -</ul></ul><p>It's tquickest to press <b>Alt+D</b> (which clicks the <em>Done & Next</em> button) after typing each translation, since this marks the translation as done and moves on to the next source text.</p> +</ul></ul><p>It's quickest to press <b>Alt+D</b> (which clicks the <em>Done & Next</em> button) after typing each translation, since this marks the translation as done and moves on to the next source text.</p> <p>Save the file and do the same for Dutch working with <tt>tt2_nl.ts</tt>:</p> <ul><li><p><tt>ArrowPad</tt></p> <ul><li><p>&Up - &Boven</p> diff --git a/doc/html/mail-example.html b/doc/html/mail-example.html index e3c895e2..2b825211 100644 --- a/doc/html/mail-example.html +++ b/doc/html/mail-example.html @@ -211,7 +211,7 @@ void <a name="f300"></a>Smtp::readyRead() *t << message << ".\r\n"; state = Quit; } else if ( state == Quit && responseLine[0] == '2' ) { - *t << "TQUIT\r\n"; + *t << "QUIT\r\n"; // here, we just close. state = Close; emit status( <a href="ntqobject.html#tr">tr</a>( "Message sent" ) ); diff --git a/doc/html/metaobjects.html b/doc/html/metaobjects.html index 4a4ec910..912f679e 100644 --- a/doc/html/metaobjects.html +++ b/doc/html/metaobjects.html @@ -56,7 +56,7 @@ reason for introducing the system), the meta object code provides additional features in TQObject: <p> <ul> <p> <li> the <a href="ntqobject.html#className">className()</a> function that -returns the class name as a string at runtime, without retquiring +returns the class name as a string at runtime, without requiring native runtime type information (RTTI) support through the C++ compiler. <p> <li> the <a href="ntqobject.html#inherits">inherits()</a> function that diff --git a/doc/html/moc.html b/doc/html/moc.html index 5f257f16..f7c38859 100644 --- a/doc/html/moc.html +++ b/doc/html/moc.html @@ -338,7 +338,7 @@ illegal example: </pre> <p> The TQButtonGroup::buttonPressed() slot is protected. -<p> C++ tquiz: What happens if you try to upgrade a protected member +<p> C++ quiz: What happens if you try to upgrade a protected member function which is overloaded? <ol type=1> <li> All the functions are overloaded. diff --git a/doc/html/motif-walkthrough-10.html b/doc/html/motif-walkthrough-10.html index b5e64017..dbc0e0bf 100644 --- a/doc/html/motif-walkthrough-10.html +++ b/doc/html/motif-walkthrough-10.html @@ -86,7 +86,7 @@ Apple Mac OS X. widget, we can extend the interface easily. We can use some of the more advanced features of <a href="ntqmainwindow.html">TQMainWindow</a>, which includes dockable toolbars. Adding these is simple with the <em>TQt Designer</em>. The -final version of our project includes a toolbar, which provides tquick +final version of our project includes a toolbar, which provides quick access to the <em>Open</em>, <em>Save</em>, <em>Print</em>, <em>New Page</em> and <em>Delete to Trash</em> actions. <p> The possibilities are endless. An <em>Edit</em> menu, with the common <em>Cut</em>, <em>Copy</em> and <em>Paste</em> actions, could be added in a relatively short period of time. As our project expands to other platforms, we diff --git a/doc/html/motif-walkthrough-8.html b/doc/html/motif-walkthrough-8.html index 1202ffdd..c87c1147 100644 --- a/doc/html/motif-walkthrough-8.html +++ b/doc/html/motif-walkthrough-8.html @@ -44,7 +44,7 @@ possibilities, each with several advantages and disadvantages. <p> <li> We can continue the conversion using existing TQt widgets. <p> <ul> <p> <li> Advantages - The widgets provided by TQt are well designed and -tested, allowing us to tquickly redesign the user interface. +tested, allowing us to quickly redesign the user interface. <p> <li> Disadvantages - Most, if not all, of the existing data structures and code will need to be modified or rewritten. New code must be written in a way that maintains compatibility with previous versions diff --git a/doc/html/motif-walkthrough.html b/doc/html/motif-walkthrough.html index 79aa2e85..b83e37b6 100644 --- a/doc/html/motif-walkthrough.html +++ b/doc/html/motif-walkthrough.html @@ -76,7 +76,7 @@ into individual chapters which cover a specific topic: <p> We will use the <em>todo</em> demo program included with the Motif 2.x distribution as our migration project. This walkthrough contains references to the source code, which is included in the <tt>extensions/motif/examples/walkthrough</tt> subdirectory. -<p> <h2> Preretquisites +<p> <h2> Prerequisites </h2> <a name="2"></a><p> Before we can start using the <em>TQt Motif Extension</em>, we must satisfy these requirements: diff --git a/doc/html/ntqbig5codec.html b/doc/html/ntqbig5codec.html index ea7f2d6a..4739a369 100644 --- a/doc/html/ntqbig5codec.html +++ b/doc/html/ntqbig5codec.html @@ -79,7 +79,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/ntqdatatable.html b/doc/html/ntqdatatable.html index a2ed372f..ae25effa 100644 --- a/doc/html/ntqdatatable.html +++ b/doc/html/ntqdatatable.html @@ -157,7 +157,7 @@ does not support the 'query size' property, rows are dynamically fetched from the database on an as-needed basis with the scrollbar becoming more accurate as the user scrolls down through the records. This allows extremely large queries to be displayed as -tquickly as possible, with minimum memory usage. +quickly as possible, with minimum memory usage. <p> TQDataTable inherits <a href="ntqtable.html">TQTable</a>'s API and extends it with functions to sort and filter the data and sort columns. See <a href="#setSqlCursor">setSqlCursor</a>(), <a href="#setFilter">setFilter</a>(), <a href="#setSort">setSort</a>(), <a href="ntqtable.html#setSorting">setSorting</a>(), <a href="#sortColumn">sortColumn</a>() and <a href="#refresh">refresh</a>(). diff --git a/doc/html/ntqeucjpcodec.html b/doc/html/ntqeucjpcodec.html index e082807f..1b04559d 100644 --- a/doc/html/ntqeucjpcodec.html +++ b/doc/html/ntqeucjpcodec.html @@ -75,7 +75,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/ntqeuckrcodec.html b/doc/html/ntqeuckrcodec.html index 63b7a9f3..8ebb6cb9 100644 --- a/doc/html/ntqeuckrcodec.html +++ b/doc/html/ntqeuckrcodec.html @@ -67,7 +67,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/ntqgb18030codec.html b/doc/html/ntqgb18030codec.html index a278ea03..09a545e2 100644 --- a/doc/html/ntqgb18030codec.html +++ b/doc/html/ntqgb18030codec.html @@ -97,7 +97,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/ntqimage.html b/doc/html/ntqimage.html index 678a44db..b5b1edfd 100644 --- a/doc/html/ntqimage.html +++ b/doc/html/ntqimage.html @@ -713,7 +713,7 @@ offset by when positioning relative to other images. Returns TRUE if this image and image <em>i</em> have different contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which -case the function will return tquickly. +case the function will return quickly. <p> <p>See also <a href="#operator-eq">operator=</a>(). <h3 class=fn><a href="ntqimage.html">TQImage</a> & <a name="operator-eq"></a>TQImage::operator= ( const <a href="ntqimage.html">TQImage</a> & image ) @@ -736,7 +736,7 @@ dereference the shared data. Returns TRUE if this image and image <em>i</em> have the same contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which -case the function will return tquickly. +case the function will return quickly. <p> <p>See also <a href="#operator-eq">operator=</a>(). <h3 class=fn><a href="ntqstringlist.html">TQStringList</a> <a name="outputFormatList"></a>TQImage::outputFormatList ()<tt> [static]</tt> diff --git a/doc/html/ntqjiscodec.html b/doc/html/ntqjiscodec.html index 2bee9fc8..9cd38c4e 100644 --- a/doc/html/ntqjiscodec.html +++ b/doc/html/ntqjiscodec.html @@ -104,7 +104,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/ntqpalette.html b/doc/html/ntqpalette.html index c62c1110..b79a13c5 100644 --- a/doc/html/ntqpalette.html +++ b/doc/html/ntqpalette.html @@ -206,7 +206,7 @@ stricter than equality. </h3> <p> Returns TRUE (slowly) if this palette is different from <em>p</em>; -otherwise returns FALSE (usually tquickly). +otherwise returns FALSE (usually quickly). <h3 class=fn><a href="ntqpalette.html">TQPalette</a> & <a name="operator-eq"></a>TQPalette::operator= ( const <a href="ntqpalette.html">TQPalette</a> & p ) </h3> @@ -217,7 +217,7 @@ palette. <h3 class=fn>bool <a name="operator-eq-eq"></a>TQPalette::operator== ( const <a href="ntqpalette.html">TQPalette</a> & p ) const </h3> -Returns TRUE (usually tquickly) if this palette is equal to <em>p</em>; +Returns TRUE (usually quickly) if this palette is equal to <em>p</em>; otherwise returns FALSE (slowly). <h3 class=fn>int <a name="serialNumber"></a>TQPalette::serialNumber () const diff --git a/doc/html/ntqpixmap.html b/doc/html/ntqpixmap.html index 449abcce..68859144 100644 --- a/doc/html/ntqpixmap.html +++ b/doc/html/ntqpixmap.html @@ -154,7 +154,7 @@ using <a href="#xForm">xForm</a>() if you create more than about 1000 pixmaps, independent of the size of the pixmaps or installed RAM. Windows NT-systems (including 2000, XP and following versions) do not have the same limitation, -but depending on the graphics etquipment the system will fail to +but depending on the graphics equipment the system will fail to allocate pixmap objects at some point (due to system running out of GDI resources). <p> TQt tries to work around the resource limitation. If you set the diff --git a/doc/html/ntqpoint.html b/doc/html/ntqpoint.html index afe9033a..1e0376aa 100644 --- a/doc/html/ntqpoint.html +++ b/doc/html/ntqpoint.html @@ -135,7 +135,7 @@ traditionally known as the "Manhattan length" of the vector from the origin to the point. The tradition arises because such distances apply to travelers who can only travel on a rectangular grid, like the streets of Manhattan. -<p> This is a useful, and tquick to calculate, approximation to the +<p> This is a useful, and quick to calculate, approximation to the true length: sqrt(pow(x(),2)+pow(y(),2)). <h3 class=fn><a href="ntqpoint.html">TQPoint</a> & <a name="operator*-eq"></a>TQPoint::operator*= ( int c ) diff --git a/doc/html/ntqprogressdialog.html b/doc/html/ntqprogressdialog.html index 9844b2b1..5a8fc488 100644 --- a/doc/html/ntqprogressdialog.html +++ b/doc/html/ntqprogressdialog.html @@ -358,7 +358,7 @@ See the <a href="ntqprogressdialog.html#wasCancelled-prop">"wasCancelled"</a> pr <p>This property holds the time that must pass before the dialog appears. <p>If the expected duration of the task is less than the minimumDuration, the dialog will not appear at all. This prevents -the dialog popping up for tasks that are tquickly over. For tasks +the dialog popping up for tasks that are quickly over. For tasks that are expected to exceed the minimumDuration, the dialog will pop up after the minimumDuration time or as soon as any progress is set. diff --git a/doc/html/ntqsemaphore.html b/doc/html/ntqsemaphore.html index 3f1c9506..b51410c9 100644 --- a/doc/html/ntqsemaphore.html +++ b/doc/html/ntqsemaphore.html @@ -82,7 +82,7 @@ released with <a href="#operator--">operator--</a>() or <a href="#operator--eq"> accesses allowed is retrieved with <a href="#available">available</a>(), and the total number with <a href="#total">total</a>(). Note that the incrementing functions will block if there aren't enough available accesses. Use <a href="#tryAccess">tryAccess</a>() -if you want to actquire accesses without blocking. +if you want to acquire accesses without blocking. <p>See also <a href="environment.html">Environment Classes</a> and <a href="thread.html">Threading</a>. <hr><h2>Member Function Documentation</h2> diff --git a/doc/html/ntqsjiscodec.html b/doc/html/ntqsjiscodec.html index ec11ca4d..b050245f 100644 --- a/doc/html/ntqsjiscodec.html +++ b/doc/html/ntqsjiscodec.html @@ -76,7 +76,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/ntqsound.html b/doc/html/ntqsound.html index 2e052157..d8a7f530 100644 --- a/doc/html/ntqsound.html +++ b/doc/html/ntqsound.html @@ -86,7 +86,7 @@ only WAVE format sound files are supported. <p> On X11 the <a href="ftp://ftp.x.org/contrib/audio/nas/">Network Audio System</a> is used if available, otherwise all operations work silently. NAS supports WAVE and AU files. -<p> On Macintosh, ironically, we use QT (<a href="http://tquicktime.apple.com">QuickTime</a>) for sound, this +<p> On Macintosh, ironically, we use QT (<a href="http://quicktime.apple.com">QuickTime</a>) for sound, this means all QuickTime formats are supported by TQt/Mac. <p> On TQt/Embedded, a built-in mixing sound server is used, which accesses <tt>/dev/dsp</tt> directly. Only the WAVE format is supported. @@ -97,7 +97,7 @@ accesses <tt>/dev/dsp</tt> directly. Only the WAVE format is supported. <hr><h2>Member Function Documentation</h2> <h3 class=fn><a name="TQSound"></a>TQSound::TQSound ( const <a href="ntqstring.html">TQString</a> & filename, <a href="ntqobject.html">TQObject</a> * parent = 0, const char * name = 0 ) </h3> -Constructs a TQSound that can tquickly play the sound in a file +Constructs a TQSound that can quickly play the sound in a file named <em>filename</em>. <p> This may use more memory than the static <tt>play</tt> function. <p> The <em>parent</em> and <em>name</em> arguments (default 0) are passed on to @@ -124,7 +124,7 @@ returns FALSE. An application may choose either to notify the user if sound is crucial to the application or to operate silently without bothering the user. <p> If no sound is available, all TQSound operations work silently and -tquickly. +quickly. <h3 class=fn>bool <a name="isFinished"></a>TQSound::isFinished () const </h3> diff --git a/doc/html/ntqsqlcursor.html b/doc/html/ntqsqlcursor.html index 3fce8514..69d8a7e3 100644 --- a/doc/html/ntqsqlcursor.html +++ b/doc/html/ntqsqlcursor.html @@ -386,7 +386,7 @@ record. <a name="x2446"></a> cur.<a href="#insert">insert</a>(); </pre> <p> In the above example, a cursor is created on the 'prices' table -and a pointer to the insert buffer is atquired using <a href="#primeInsert">primeInsert</a>(). +and a pointer to the insert buffer is acquired using <a href="#primeInsert">primeInsert</a>(). Each field's value is set to the desired value and then <a href="#insert">insert</a>() is called to insert the data into the database. Remember: all edit operations (insert(), <a href="#update">update</a>() and delete()) operate on the @@ -721,7 +721,7 @@ can move to a valid record. For example: </pre> <p> In the above example, a cursor is created on the 'prices' table and is positioned on the record to be updated. Then a pointer to -the cursor's edit buffer is actquired using <a href="#primeUpdate">primeUpdate</a>(). A new +the cursor's edit buffer is acquired using <a href="#primeUpdate">primeUpdate</a>(). A new value is calculated and placed into the edit buffer with the <a href="ntqsqlrecord.html#setValue">setValue</a>() call. Finally, an <a href="#update">update</a>() call is made on the cursor which uses the tables's primary index to update the record in the diff --git a/doc/html/ntqsqldatabase.html b/doc/html/ntqsqldatabase.html index 40332ea1..fb58a607 100644 --- a/doc/html/ntqsqldatabase.html +++ b/doc/html/ntqsqldatabase.html @@ -271,7 +271,7 @@ explicitly remove the connection, use <a href="#removeDatabase">removeDatabase</ <h3 class=fn>void <a name="close"></a>TQSqlDatabase::close () </h3> -Closes the database connection, freeing any resources actquired. +Closes the database connection, freeing any resources acquired. <p> <p>See also <a href="#removeDatabase">removeDatabase</a>(). <h3 class=fn>bool <a name="commit"></a>TQSqlDatabase::commit () diff --git a/doc/html/ntqt.html b/doc/html/ntqt.html index a82ff5f3..8c05858a 100644 --- a/doc/html/ntqt.html +++ b/doc/html/ntqt.html @@ -180,7 +180,7 @@ normally different from all the ones in the palette(). Set using <a href="ntqwidget.html#setPaletteBackgroundPixmap">setPaletteBackgroundPixmap()</a>. </ul><p> Although <a href="#BackgroundMode-enum">FixedColor</a> and <a href="#BackgroundMode-enum">FixedPixmap</a> are sometimes just right, if you use them, make sure that you test your application -when the desktop color scheme has been changed. (On X11, a tquick +when the desktop color scheme has been changed. (On X11, a quick way to test this is e.g. "./myapp -bg paleblue". On Windows, you must use the control panel.) <p> <p>See also <a href="ntqwidget.html#backgroundMode-prop">TQWidget::backgroundMode</a>, <a href="ntqwidget.html#backgroundMode-prop">TQWidget::backgroundMode</a>, <a href="ntqwidget.html#setBackgroundPixmap">TQWidget::setBackgroundPixmap</a>(), and <a href="ntqwidget.html#paletteBackgroundColor-prop">TQWidget::paletteBackgroundColor</a>. diff --git a/doc/html/ntqtextedit.html b/doc/html/ntqtextedit.html index f439fbad..02e3c613 100644 --- a/doc/html/ntqtextedit.html +++ b/doc/html/ntqtextedit.html @@ -244,7 +244,7 @@ The TQTextEdit widget provides a powerful single-page rich text editor. </h3> <a name="1"></a><p> TQTextEdit is an advanced WYSIWYG viewer/editor supporting rich text formatting using HTML-style tags. It is optimized to handle -large documents and to respond tquickly to user input. +large documents and to respond quickly to user input. <p> TQTextEdit has four modes of operation: <center><table cellpadding="4" cellspacing="2" border="0"> <tr bgcolor="#a2c511"> <th valign="top">Mode <th valign="top">Command <th valign="top">Notes diff --git a/doc/html/ntqtimer.html b/doc/html/ntqtimer.html index e0ca0b9d..b04fa1a9 100644 --- a/doc/html/ntqtimer.html +++ b/doc/html/ntqtimer.html @@ -89,7 +89,7 @@ user interface: </pre> <p> myObject->processOneThing() will be called repeatedly and should -return tquickly (typically after processing one data item) so that +return quickly (typically after processing one data item) so that TQt can deliver events to widgets and stop the timer as soon as it has done all its work. This is the traditional way of implementing heavy work in GUI applications; multi-threading is diff --git a/doc/html/ntqtoolbar.html b/doc/html/ntqtoolbar.html index 1a56c354..79d84118 100644 --- a/doc/html/ntqtoolbar.html +++ b/doc/html/ntqtoolbar.html @@ -61,7 +61,7 @@ widgets such as tool buttons. <p> <p> A toolbar is a panel that contains a set of controls, usually -represented by small icons. It's purpose is to provide tquick +represented by small icons. It's purpose is to provide quick access to frequently used commands or options. Within a <a href="ntqmainwindow.html">TQMainWindow</a> the user can drag toolbars within and between the <a href="ntqdockarea.html">dock areas</a>. Toolbars can also be dragged @@ -143,7 +143,7 @@ floating) toolbars or toolbars in the <a href="ntqstatusbar.html">status This is an overloaded member function, provided for convenience. It behaves essentially like the above function. <p> Constructs an empty toolbar called <em>name</em>, with parent <em>parent</em>, in its <em>parent</em>'s top dock area, without any label and without -retquiring a newline. +requiring a newline. <h3 class=fn>void <a name="addSeparator"></a>TQToolBar::addSeparator () </h3> diff --git a/doc/html/ntqtoolbutton.html b/doc/html/ntqtoolbutton.html index 0b244cde..95c588c9 100644 --- a/doc/html/ntqtoolbutton.html +++ b/doc/html/ntqtoolbutton.html @@ -31,7 +31,7 @@ body { background: #ffffff; color: black; } </td> <td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>TQToolButton Class Reference</h1> -<p>The TQToolButton class provides a tquick-access button to +<p>The TQToolButton class provides a quick-access button to commands or options, usually used inside a TQToolBar. <a href="#details">More...</a> <p><tt>#include <<a href="qtoolbutton-h.html">ntqtoolbutton.h</a>></tt> @@ -98,11 +98,11 @@ commands or options, usually used inside a TQToolBar. <hr><a name="details"></a><h2>Detailed Description</h2> -The TQToolButton class provides a tquick-access button to +The TQToolButton class provides a quick-access button to commands or options, usually used inside a <a href="ntqtoolbar.html">TQToolBar</a>. <p> -<p> A tool button is a special button that provides tquick-access to +<p> A tool button is a special button that provides quick-access to specific commands or options. As opposed to a normal command button, a tool button usually doesn't show a text label, but shows an icon instead. Its classic usage is to select tools, for example diff --git a/doc/html/ntqtooltip.html b/doc/html/ntqtooltip.html index 5682679c..5c1e8d38 100644 --- a/doc/html/ntqtooltip.html +++ b/doc/html/ntqtooltip.html @@ -89,10 +89,10 @@ elsewhere (most often in a <a href="ntqstatusbar.html">status bar</a>). dormant mode the tips are not shown and in active mode they are. The mode is global, not particular to any one widget. <p> TQToolTip switches from dormant to active mode when the user hovers -the mouse on a tip-etquipped region for a second or so and remains +the mouse on a tip-equipped region for a second or so and remains active until the user either clicks a mouse button, presses a key, lets the mouse hover for five seconds or moves the mouse outside -<em>all</em> tip-etquipped regions for at least a second. +<em>all</em> tip-equipped regions for at least a second. <p> The TQToolTip class can be used in three different ways: <ol type=1> <li> Adding a tip to an entire widget. diff --git a/doc/html/ntqtsciicodec.html b/doc/html/ntqtsciicodec.html index 0f849a86..6cd76e28 100644 --- a/doc/html/ntqtsciicodec.html +++ b/doc/html/ntqtsciicodec.html @@ -72,7 +72,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/ntqwidget.html b/doc/html/ntqwidget.html index dae28b81..a5b827f8 100644 --- a/doc/html/ntqwidget.html +++ b/doc/html/ntqwidget.html @@ -699,7 +699,7 @@ pixmap. <h3 class=fn><a name="FocusPolicy-enum"></a>TQWidget::FocusPolicy</h3> <p> This enum type defines the various policies a widget can have with -respect to actquiring <a href="focus.html#keyboard-focus">keyboard focus</a>. +respect to acquiring <a href="focus.html#keyboard-focus">keyboard focus</a>. <ul> <li><tt>TQWidget::TabFocus</tt> - the widget accepts focus by tabbing. <li><tt>TQWidget::ClickFocus</tt> - the widget accepts focus by clicking. diff --git a/doc/html/plugins-howto.html b/doc/html/plugins-howto.html index 3181027d..1e91156d 100644 --- a/doc/html/plugins-howto.html +++ b/doc/html/plugins-howto.html @@ -212,7 +212,7 @@ developer writing plugins would need to know which features are in use, both in their plugin and internally by the utility classes in TQt. The TQt library would require complex feature and dependency queries and verification when loading plugins. -Retquiring this would place an unnecessary burden on the developer, and +Requiring this would place an unnecessary burden on the developer, and increase the overhead of loading a plugin. To reduce both development time and application runtime costs, a simple string comparision of the build keys is used. diff --git a/doc/html/porting2.html b/doc/html/porting2.html index c9983a87..c7ddd4d8 100644 --- a/doc/html/porting2.html +++ b/doc/html/porting2.html @@ -834,7 +834,7 @@ In TQt 2.x this confusing situation has been cleaned up: generated identifiers are always unique across the entire application. <p> If your code depends on generated ids -being equal to the item's index, a tquick fix is to use +being equal to the item's index, a quick fix is to use <pre> TQMenuData::indexOf(int id)</pre> in the handling function instead. You may alternatively pass diff --git a/doc/html/propertydocs b/doc/html/propertydocs index a49a1efd..7d0239f0 100644 --- a/doc/html/propertydocs +++ b/doc/html/propertydocs @@ -2904,7 +2904,7 @@ indicator. <p>This property holds the time that must pass before the dialog appears. <p>If the expected duration of the task is less than the minimumDuration, the dialog will not appear at all. This prevents -the dialog popping up for tasks that are tquickly over. For tasks +the dialog popping up for tasks that are quickly over. For tasks that are expected to exceed the minimumDuration, the dialog will pop up after the minimumDuration time or as soon as any progress is set. diff --git a/doc/html/qbig5hkscscodec.html b/doc/html/qbig5hkscscodec.html index 80043170..7eda79ff 100644 --- a/doc/html/qbig5hkscscodec.html +++ b/doc/html/qbig5hkscscodec.html @@ -83,7 +83,7 @@ documentation and/or other materials provided with the distribution. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/qcanvaspolygonalitem.html b/doc/html/qcanvaspolygonalitem.html index 09351761..b9f74003 100644 --- a/doc/html/qcanvaspolygonalitem.html +++ b/doc/html/qcanvaspolygonalitem.html @@ -80,7 +80,7 @@ handling, etc., which is much faster for non-rectangular items. to maximize efficiency, but the polygon must <em>definitely</em> be contained completely within the polygonal area. Calculating the exact requirements is usually difficult, but if you allow a small -overestimate it can be easy and tquick, while still getting almost +overestimate it can be easy and quick, while still getting almost all of TQCanvasPolygonalItem's speed. <p> Note that all subclasses <em>must</em> call <a href="qcanvasitem.html#hide">hide</a>() in their destructor since hide() needs to be able to access <a href="#areaPoints">areaPoints</a>(). diff --git a/doc/html/qcanvassprite.html b/doc/html/qcanvassprite.html index 9cfed2fd..b651264e 100644 --- a/doc/html/qcanvassprite.html +++ b/doc/html/qcanvassprite.html @@ -96,7 +96,7 @@ left-hand and right-hand x-coordinates respectively. Use and top y-coordinates respectively. These functions have an overload which will accept an integer frame number to retrieve the coordinates of a particular frame. -<p> TQCanvasSprite draws very tquickly, at the expense of memory. +<p> TQCanvasSprite draws very quickly, at the expense of memory. <p> The current frame's image can be drawn on a painter with <a href="#draw">draw</a>(). <p> Like any other canvas item, canvas sprites can be moved with <a href="#move">move</a>() which sets the x and y coordinates and the frame number, as diff --git a/doc/html/qeucjpcodec-h.html b/doc/html/qeucjpcodec-h.html index f17e98e9..8a9fefe1 100644 --- a/doc/html/qeucjpcodec-h.html +++ b/doc/html/qeucjpcodec-h.html @@ -94,7 +94,7 @@ body { background: #ffffff; color: black; } * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/qeuckrcodec-h.html b/doc/html/qeuckrcodec-h.html index 0b94b763..760f2b7d 100644 --- a/doc/html/qeuckrcodec-h.html +++ b/doc/html/qeuckrcodec-h.html @@ -90,7 +90,7 @@ body { background: #ffffff; color: black; } * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 9f399867..953f5d89 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -179,7 +179,7 @@ body { background: #ffffff; color: black; } # define Q_OS_QNX6 #elif defined(__QNX__) # define Q_OS_QNX -#elif defined(_SETQUENT_) +#elif defined(_SEQUENT_) # define Q_OS_DYNIX #elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ # define Q_OS_SCO diff --git a/doc/html/qjiscodec-h.html b/doc/html/qjiscodec-h.html index ce2f0eff..d676a002 100644 --- a/doc/html/qjiscodec-h.html +++ b/doc/html/qjiscodec-h.html @@ -94,7 +94,7 @@ body { background: #ffffff; color: black; } * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/qkeysequence-h.html b/doc/html/qkeysequence-h.html index be0575d3..783cc959 100644 --- a/doc/html/qkeysequence-h.html +++ b/doc/html/qkeysequence-h.html @@ -74,8 +74,8 @@ body { background: #ffffff; color: black; } ** **********************************************************************/ -#ifndef TQKEYSETQUENCE_H -#define TQKEYSETQUENCE_H +#ifndef TQKEYSEQUENCE_H +#define TQKEYSEQUENCE_H #ifndef QT_H #ifndef QT_H diff --git a/doc/html/qlistviewitem.html b/doc/html/qlistviewitem.html index 0731f840..82b69923 100644 --- a/doc/html/qlistviewitem.html +++ b/doc/html/qlistviewitem.html @@ -205,7 +205,7 @@ Space when the item is the current item. <p> Some subclasses call <a href="#setExpandable">setExpandable</a>(TRUE) even when they have no children, and populate themselves when <a href="#setup">setup</a>() or <a href="#setOpen">setOpen</a>(TRUE) is called. The <a href="dirview-example.html">dirview/dirview.cpp</a> example program uses this -technique to start up tquickly: The files and subdirectories in a +technique to start up quickly: The files and subdirectories in a directory aren't inserted into the tree until they're actually needed. <p> <center><img src="qlistviewitems.png" alt="List View Items"></center> diff --git a/doc/html/qmake-manual-3.html b/doc/html/qmake-manual-3.html index 4247a526..0c78efee 100644 --- a/doc/html/qmake-manual-3.html +++ b/doc/html/qmake-manual-3.html @@ -1,5 +1,5 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/qmake/book/qmake-tquick.leaf:3 --> +<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/qmake/book/qmake-quick.leaf:3 --> <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> diff --git a/doc/html/qprocess-h.html b/doc/html/qprocess-h.html index a49803ef..7ad8847c 100644 --- a/doc/html/qprocess-h.html +++ b/doc/html/qprocess-h.html @@ -118,7 +118,7 @@ public: virtual bool launch( const TQString& buf, TQStringList *env=0 ); virtual bool launch( const TQByteArray& buf, TQStringList *env=0 ); - // intquire the status + // inquire the status bool isRunning() const; bool normalExit() const; int exitStatus() const; diff --git a/doc/html/qptrqueue-h.html b/doc/html/qptrqueue-h.html index 9b5b4978..9c7cbb63 100644 --- a/doc/html/qptrqueue-h.html +++ b/doc/html/qptrqueue-h.html @@ -74,8 +74,8 @@ body { background: #ffffff; color: black; } ** **********************************************************************/ -#ifndef TQPTRTQUEUE_H -#define TQPTRTQUEUE_H +#ifndef TQPTRQUEUE_H +#define TQPTRQUEUE_H #ifndef QT_H #include "ntqglist.h" @@ -127,7 +127,7 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtr #define TQQueue TQPtrQueue #endif -#endif // TQPTRTQUEUE_H +#endif // TQPTRQUEUE_H </pre> <!-- eof --> <p><address><hr><div align=center> diff --git a/doc/html/qsjiscodec-h.html b/doc/html/qsjiscodec-h.html index 9bce4468..2e36feb9 100644 --- a/doc/html/qsjiscodec-h.html +++ b/doc/html/qsjiscodec-h.html @@ -94,7 +94,7 @@ body { background: #ffffff; color: black; } * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/qsqlquery-h.html b/doc/html/qsqlquery-h.html index f60d27ac..50310207 100644 --- a/doc/html/qsqlquery-h.html +++ b/doc/html/qsqlquery-h.html @@ -73,8 +73,8 @@ body { background: #ffffff; color: black; } ** **********************************************************************/ -#ifndef TQSQLTQUERY_H -#define TQSQLTQUERY_H +#ifndef TQSQLQUERY_H +#define TQSQLQUERY_H #ifndef QT_H #include "ntqobject.h" diff --git a/doc/html/qtmac-as-native.html b/doc/html/qtmac-as-native.html index e9d51f0a..90ee10f6 100644 --- a/doc/html/qtmac-as-native.html +++ b/doc/html/qtmac-as-native.html @@ -65,7 +65,7 @@ design are probably these: those described in the Human Interface Descriptions. TQt/Mac's widgets use the Appearance Manager to implement the look, so Apple's own API's are doing the rendering (TQt/Mac <3.1 used an -emulation style with pixmaps, however this tquickly proved to be +emulation style with pixmaps, however this quickly proved to be cumbersome, and unable to keep up with style changes at Apple). <p> <li> <em>Aqua feel</em><br> <p> This is a bit more subjective, but certainly TQt/Mac strives to diff --git a/doc/html/qtsciicodec-h.html b/doc/html/qtsciicodec-h.html index 248ba431..297a64b5 100644 --- a/doc/html/qtsciicodec-h.html +++ b/doc/html/qtsciicodec-h.html @@ -92,7 +92,7 @@ body { background: #ffffff; color: black; } * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/doc/html/sql.html b/doc/html/sql.html index 1eb65759..b61bcba5 100644 --- a/doc/html/sql.html +++ b/doc/html/sql.html @@ -814,7 +814,7 @@ that uniquely distinguishes each record. If this is not the case a <a href="ntqs editable views.) <p> Each cursor has an internal 'edit buffer' which is used by all the edit operations (insert, update and delete). The editing process is -the same for each operation: actquire a pointer to the relevant buffer; +the same for each operation: acquire a pointer to the relevant buffer; call setValue() to <a href="primes.html#prime">prime</a> the buffer with the values you want; call insert() or update() or del() to perform the desired operation. For example, when inserting a record using a cursor, you call @@ -1010,7 +1010,7 @@ been achieved by applying the sort to the cursor itself. <p> Once everything is set up we call refresh() to load the data from the database and show() to make the widget visible. <p> TQDataTables only retrieve visible rows which (depending on the driver) -allows even large tables to be displayed very tquickly with minimal +allows even large tables to be displayed very quickly with minimal memory cost. <p> <a name="Creating_Forms"></a> <h3> Creating Data-Aware Forms diff --git a/doc/html/tools-list.html b/doc/html/tools-list.html index cc1efaa5..7de101ca 100644 --- a/doc/html/tools-list.html +++ b/doc/html/tools-list.html @@ -41,7 +41,7 @@ with a link to its documentation. design forms <li> <a href="linguist-manual.html">TQt Linguist, lupdate and lrelease</a> - translate applications to reach international markets -<li> <a href="assistant.html">TQt Assistant</a> - tquickly find the +<li> <a href="assistant.html">TQt Assistant</a> - quickly find the help you need <li> <a href="qmake-manual.html">qmake</a> - create Makefiles from simple platform-independent project files diff --git a/doc/html/troll.html b/doc/html/troll.html index f45c7c64..95c363f8 100644 --- a/doc/html/troll.html +++ b/doc/html/troll.html @@ -37,7 +37,7 @@ headquarters in Oslo, the capital of Norway, and with offices in Brisbane, Australia, and Redwood City, California. <p> Our flagship product is <a href="http://www.trolltech.com/products/ntqt.html">TQt</a>, the multi-platform C++ GUI toolkit. TQt enables you to build professional, -efficient, portable and maintainable GUI applications tquickly and +efficient, portable and maintainable GUI applications quickly and easily. <p> <a href="http://www.trolltech.com/products/embedded/index.html">TQt/Embedded</a>, the embedded version of TQt, is designed to power todays new generation of embedded computers and electronic consumer @@ -53,7 +53,7 @@ making good software. Therefore, we do not compromise our demands for superior design and technical quality when we develop our products. <p> Trolltech is also known for providing top quality technical support -to our customers. At Trolltech, support intquiries are handled by the +to our customers. At Trolltech, support inquiries are handled by the most qualified developers and designers themselves. <p> <h2> History </h2> @@ -77,10 +77,10 @@ art in usability, look and feel, performance, and stability. <td rowspan=4><br></td> <tr> <td ><br></td> -<td valign="top"> General intquiries and questions. Please check the +<td valign="top"> General inquiries and questions. Please check the <a href="http://www.trolltech.com/faq/">FAQ</a> to see if your question is already answered there.</td> <td ><br></td> -<td valign="top"> Intquires related to purchasing, pricing and availability of +<td valign="top"> Inquires related to purchasing, pricing and availability of Trolltech products</td></tr> <tr> <td colspan=2><a href="mailto:www@trolltech.com"><strong>www@trolltech.com</strong></a> @@ -111,14 +111,14 @@ pages provide information about how to secure your server. <td rowspan=4><br></td> <tr> <td ><br></td> -<td valign="top"> General intquiries: +47 21 60 48 00</td> +<td valign="top"> General inquiries: +47 21 60 48 00</td> <td rowspan=3><br></td> <td valign="top" rowspan=3> Sandakerveien 116<br> PO Box 4332 Nydalen<br> NO-0402 Oslo<br> Norway</td></tr> <tr> <td colspan=2><strong>Telefax</strong></td> <tr> <td ><br></td> -<td valign="top"> All intquiries: +47 21 60 48 01</td> +<td valign="top"> All inquiries: +47 21 60 48 01</td> <tr bgcolor="#ffffff"><td bgcolor="#ffffff" colspan="6"> <br> </td></tr> <tr><th colspan=6 valign="top" bgcolor="#a2c511">USA Office</th></tr> </tr> @@ -129,14 +129,14 @@ pages provide information about how to secure your server. <td rowspan=4><br></td> <tr> <td ><br></td> -<td valign="top"> General intquiries: (+1) 650-551-1676</td> +<td valign="top"> General inquiries: (+1) 650-551-1676</td> <td rowspan=3><br></td> <td valign="top" rowspan=3> 555 Twin Dolphin Drive<br> Suite 280<br> Redwood City, CA 94065<br> USA</td></tr> <tr> <td colspan=2><strong>Telefax</strong></td> <tr> <td ><br></td> -<td valign="top"> All intquiries: (+1) 650-551-1851</td> +<td valign="top"> All inquiries: (+1) 650-551-1851</td> </table> <p> <!-- eof --> diff --git a/doc/html/xml-sax-walkthrough.html b/doc/html/xml-sax-walkthrough.html index cd26dc90..4703e6cb 100644 --- a/doc/html/xml-sax-walkthrough.html +++ b/doc/html/xml-sax-walkthrough.html @@ -39,7 +39,7 @@ To learn more about SAX2 see the document describing <a href="xml.html#sax2">the TQt SAX2 implementation.</a> <p> Before reading on you should at least be familiar with the <a href="xml.html#sax2Intro">Introduction to SAX2.</a> -<p> <a name="tquickStart"></a> +<p> <a name="quickStart"></a> <h2>A tiny parser</h2> <p> In this section we will present a small example reader that outputs the names of all elements in an XML document on the command line. diff --git a/doc/indices.doc b/doc/indices.doc index 37e6d079..5f43656a 100644 --- a/doc/indices.doc +++ b/doc/indices.doc @@ -708,7 +708,7 @@ with three levels of detail: \list 1 \i Tool Tips and Status Bar message - flyweight help, extremely brief, - entirely integrated in the user interface, retquiring little + entirely integrated in the user interface, requiring little or no user interaction to invoke. \i What's This? - lightweight, but can be a three-paragraph explanation. diff --git a/doc/man/man1/moc.1 b/doc/man/man1/moc.1 index ac83e752..d09602cf 100644 --- a/doc/man/man1/moc.1 +++ b/doc/man/man1/moc.1 @@ -322,7 +322,7 @@ public slots: .PP The QButtonGroup::buttonPressed() slot is protected. .PP -C++ tquiz: What happens if you try to upgrade a protected member +C++ quiz: What happens if you try to upgrade a protected member function which is overloaded? .IP - All the functions are upgraded. @@ -445,5 +445,5 @@ public: .PP .SH "SEE ALSO" .BR http://www.trolltech.com ", " -.BR "C++ ARM, section r.11.3" " (for the answer to the tquiz), and" +.BR "C++ ARM, section r.11.3" " (for the answer to the quiz), and" .BR http://doc.trolltech.com " (for complete Qt documentation)." diff --git a/doc/man/man1/qvfb.1 b/doc/man/man1/qvfb.1 index 89a91cf2..0ae800d3 100644 --- a/doc/man/man1/qvfb.1 +++ b/doc/man/man1/qvfb.1 @@ -46,7 +46,7 @@ using a real framebuffer. The target refresh rate can be set via the "View|Refresh Rate" menu item. This will cause qvfb to check for -updated regions more tquickly. The rate is a target only. +updated regions more quickly. The rate is a target only. If little drawing is being done, the framebuffer will not show any updates between drawing events. If an application is displaying an animation the updates will diff --git a/doc/man/man3/qapplication.3qt b/doc/man/man3/qapplication.3qt index f1f1c49d..94f3ff32 100644 --- a/doc/man/man3/qapplication.3qt +++ b/doc/man/man3/qapplication.3qt @@ -169,7 +169,7 @@ Inherits QObject. .SS "Public Slots" .in +1c .ti -1c -.BI "void \fBtquit\fR ()" +.BI "void \fBquit\fR ()" .br .ti -1c .BI "void \fBcloseAllWindows\fR ()" diff --git a/doc/man/man3/qcanvaspolygonalitem.3qt b/doc/man/man3/qcanvaspolygonalitem.3qt index 6f4a191a..0ce0fc97 100644 --- a/doc/man/man3/qcanvaspolygonalitem.3qt +++ b/doc/man/man3/qcanvaspolygonalitem.3qt @@ -74,7 +74,7 @@ The QCanvasPolygonalItem class provides a polygonal canvas item on a QCanvas. .PP The mostly rectangular classes, such as QCanvasSprite and QCanvasText, use the object's bounding rectangle for movement, repainting and collision calculations. For most other items, the bounding rectangle can be far too large -- a diagonal line being the worst case, and there are many other cases which are also bad. QCanvasPolygonalItem provides polygon-based bounding rectangle handling, etc., which is much faster for non-rectangular items. .PP -Derived classes should try to define as small an area as possible to maximize efficiency, but the polygon must \fIdefinitely\fR be contained completely within the polygonal area. Calculating the exact requirements is usually difficult, but if you allow a small overestimate it can be easy and tquick, while still getting almost all of QCanvasPolygonalItem's speed. +Derived classes should try to define as small an area as possible to maximize efficiency, but the polygon must \fIdefinitely\fR be contained completely within the polygonal area. Calculating the exact requirements is usually difficult, but if you allow a small overestimate it can be easy and quick, while still getting almost all of QCanvasPolygonalItem's speed. .PP Note that all subclasses \fImust\fR call hide() in their destructor since hide() needs to be able to access areaPoints(). .PP diff --git a/doc/man/man3/qcanvassprite.3qt b/doc/man/man3/qcanvassprite.3qt index ccfe5d51..5f69d370 100644 --- a/doc/man/man3/qcanvassprite.3qt +++ b/doc/man/man3/qcanvassprite.3qt @@ -107,7 +107,7 @@ Use width() and height() to retrieve the dimensions of the current frame. .PP Use leftEdge() and rightEdge() to retrieve the current frame's left-hand and right-hand x-coordinates respectively. Use bottomEdge() and topEdge() to retrieve the current frame's bottom and top y-coordinates respectively. These functions have an overload which will accept an integer frame number to retrieve the coordinates of a particular frame. .PP -QCanvasSprite draws very tquickly, at the expense of memory. +QCanvasSprite draws very quickly, at the expense of memory. .PP The current frame's image can be drawn on a painter with draw(). .PP diff --git a/doc/man/man3/qdatatable.3qt b/doc/man/man3/qdatatable.3qt index 0a493e67..4f301af3 100644 --- a/doc/man/man3/qdatatable.3qt +++ b/doc/man/man3/qdatatable.3qt @@ -293,7 +293,7 @@ QDataTable supports various functions for presenting and editing SQL data from a .PP If you want a to present your data in a form use QDataBrowser, or for read-only forms, QDataView. .PP -When displaying data, QDataTable only retrieves data for visible rows. If the driver supports the 'query size' property the QDataTable will have the correct number of rows and the vertical scrollbar will accurately reflect the number of rows displayed in proportion to the number of rows in the dataset. If the driver does not support the 'query size' property, rows are dynamically fetched from the database on an as-needed basis with the scrollbar becoming more accurate as the user scrolls down through the records. This allows extremely large queries to be displayed as tquickly as possible, with minimum memory usage. +When displaying data, QDataTable only retrieves data for visible rows. If the driver supports the 'query size' property the QDataTable will have the correct number of rows and the vertical scrollbar will accurately reflect the number of rows displayed in proportion to the number of rows in the dataset. If the driver does not support the 'query size' property, rows are dynamically fetched from the database on an as-needed basis with the scrollbar becoming more accurate as the user scrolls down through the records. This allows extremely large queries to be displayed as quickly as possible, with minimum memory usage. .PP QDataTable inherits QTable's API and extends it with functions to sort and filter the data and sort columns. See setSqlCursor(), setFilter(), setSort(), setSorting(), sortColumn() and refresh(). .PP diff --git a/doc/man/man3/qimage.3qt b/doc/man/man3/qimage.3qt index ad47abd2..5b9e1e49 100644 --- a/doc/man/man3/qimage.3qt +++ b/doc/man/man3/qimage.3qt @@ -746,7 +746,7 @@ Example: themes/wood.cpp. .SH "QPoint QImage::offset () const" Returns the number of pixels by which the image is intended to be offset by when positioning relative to other images. .SH "bool QImage::operator!= ( const QImage & i ) const" -Returns TRUE if this image and image \fIi\fR have different contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which case the function will return tquickly. +Returns TRUE if this image and image \fIi\fR have different contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which case the function will return quickly. .PP See also operator=(). .SH "QImage & QImage::operator= ( const QImage & image )" @@ -762,7 +762,7 @@ If the image shares data with other images, it will first dereference the shared .PP Makes a call to QPixmap::convertToImage(). .SH "bool QImage::operator== ( const QImage & i ) const" -Returns TRUE if this image and image \fIi\fR have the same contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which case the function will return tquickly. +Returns TRUE if this image and image \fIi\fR have the same contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which case the function will return quickly. .PP See also operator=(). .SH "QStringList QImage::outputFormatList ()\fC [static]\fR" diff --git a/doc/man/man3/qlistviewitem.3qt b/doc/man/man3/qlistviewitem.3qt index f6a8c092..521cd8df 100644 --- a/doc/man/man3/qlistviewitem.3qt +++ b/doc/man/man3/qlistviewitem.3qt @@ -306,7 +306,7 @@ l - l. Function Description text() Returns the text in a column. Many subclasses .fi </center> .PP -Some subclasses call setExpandable(TRUE) even when they have no children, and populate themselves when setup() or setOpen(TRUE) is called. The dirview/dirview.cpp example program uses this technique to start up tquickly: The files and subdirectories in a directory aren't inserted into the tree until they're actually needed. +Some subclasses call setExpandable(TRUE) even when they have no children, and populate themselves when setup() or setOpen(TRUE) is called. The dirview/dirview.cpp example program uses this technique to start up quickly: The files and subdirectories in a directory aren't inserted into the tree until they're actually needed. .PP <center> .ce 1 diff --git a/doc/man/man3/qpalette.3qt b/doc/man/man3/qpalette.3qt index 1e6ef2be..3ecf55dd 100644 --- a/doc/man/man3/qpalette.3qt +++ b/doc/man/man3/qpalette.3qt @@ -202,7 +202,7 @@ Returns the active color group. Use active() instead. .PP See also setActive() and active(). .SH "bool QPalette::operator!= ( const QPalette & p ) const" -Returns TRUE (slowly) if this palette is different from \fIp\fR; otherwise returns FALSE (usually tquickly). +Returns TRUE (slowly) if this palette is different from \fIp\fR; otherwise returns FALSE (usually quickly). .SH "QPalette & QPalette::operator= ( const QPalette & p )" Assigns \fIp\fR to this palette and returns a reference to this palette. .PP @@ -210,7 +210,7 @@ This is fast (it uses copy-on-write). .PP See also copy(). .SH "bool QPalette::operator== ( const QPalette & p ) const" -Returns TRUE (usually tquickly) if this palette is equal to \fIp\fR; otherwise returns FALSE (slowly). +Returns TRUE (usually quickly) if this palette is equal to \fIp\fR; otherwise returns FALSE (slowly). .SH "int QPalette::serialNumber () const" Returns a number that uniquely identifies this QPalette object. The serial number is intended for caching. Its value may not be used for anything other than equality testing. .PP diff --git a/doc/man/man3/qpixmap.3qt b/doc/man/man3/qpixmap.3qt index cbb5de25..5ca74ab2 100644 --- a/doc/man/man3/qpixmap.3qt +++ b/doc/man/man3/qpixmap.3qt @@ -234,7 +234,7 @@ You can retrieve the width(), height(), depth() and size() of a pixmap. The encl .PP In addition to loading a pixmap from file using load() you can also loadFromData(). You can control optimization with setOptimization() and obtain a transformed version of the pixmap using xForm() .PP -Note regarding Windows 95 and 98: on Windows 9x the system crashes if you create more than about 1000 pixmaps, independent of the size of the pixmaps or installed RAM. Windows NT-systems (including 2000, XP and following versions) do not have the same limitation, but depending on the graphics etquipment the system will fail to allocate pixmap objects at some point (due to system running out of GDI resources). +Note regarding Windows 95 and 98: on Windows 9x the system crashes if you create more than about 1000 pixmaps, independent of the size of the pixmaps or installed RAM. Windows NT-systems (including 2000, XP and following versions) do not have the same limitation, but depending on the graphics equipment the system will fail to allocate pixmap objects at some point (due to system running out of GDI resources). .PP Qt tries to work around the resource limitation. If you set the pixmap optimization to QPixmap::MemoryOptim and the width of your pixmap is less than or equal to 128 pixels, Qt stores the pixmap in a way that is very memory-efficient when there are many pixmaps. .PP diff --git a/doc/man/man3/qpoint.3qt b/doc/man/man3/qpoint.3qt index 1d6413f7..21f6d095 100644 --- a/doc/man/man3/qpoint.3qt +++ b/doc/man/man3/qpoint.3qt @@ -160,7 +160,7 @@ Returns TRUE if both the x value and the y value are 0; otherwise returns FALSE. .SH "int QPoint::manhattanLength () const" Returns the sum of the absolute values of x() and y(), traditionally known as the "Manhattan length" of the vector from the origin to the point. The tradition arises because such distances apply to travelers who can only travel on a rectangular grid, like the streets of Manhattan. .PP -This is a useful, and tquick to calculate, approximation to the true length: sqrt(pow(x(),2)+pow(y(),2)). +This is a useful, and quick to calculate, approximation to the true length: sqrt(pow(x(),2)+pow(y(),2)). .SH "QPoint & QPoint::operator*= ( int c )" Multiplies this point's x and y by \fIc\fR, and returns a reference to this point. .PP diff --git a/doc/man/man3/qprogressdialog.3qt b/doc/man/man3/qprogressdialog.3qt index 2e1dd7cf..7dcb397a 100644 --- a/doc/man/man3/qprogressdialog.3qt +++ b/doc/man/man3/qprogressdialog.3qt @@ -368,7 +368,7 @@ Set this property's value with setLabelText() and get this property's value with .SH "int minimumDuration" This property holds the time that must pass before the dialog appears. .PP -If the expected duration of the task is less than the minimumDuration, the dialog will not appear at all. This prevents the dialog popping up for tasks that are tquickly over. For tasks that are expected to exceed the minimumDuration, the dialog will pop up after the minimumDuration time or as soon as any progress is set. +If the expected duration of the task is less than the minimumDuration, the dialog will not appear at all. This prevents the dialog popping up for tasks that are quickly over. For tasks that are expected to exceed the minimumDuration, the dialog will pop up after the minimumDuration time or as soon as any progress is set. .PP If set to 0, the dialog is always shown as soon as any progress is set. The default is 4000 milliseconds. .PP diff --git a/doc/man/man3/qsemaphore.3qt b/doc/man/man3/qsemaphore.3qt index 5a957fbb..567f8ad6 100644 --- a/doc/man/man3/qsemaphore.3qt +++ b/doc/man/man3/qsemaphore.3qt @@ -52,7 +52,7 @@ For example, suppose we have an application that stores data in a large tree str .PP A non-computing example of a semaphore would be dining at a restuarant. A semaphore is initialized to have a maximum count equal to the number of chairs in the restuarant. As people arrive, they want a seat. As seats are filled, the semaphore is accessed, once per person. As people leave, the access is released, allowing more people to enter. If a party of 10 people want to be seated, but there are only 9 seats, those 10 people will wait, but a party of 4 people would be seated (taking the available seats to 5, making the party of 10 people wait longer). .PP -When a semaphore is created it is given a number which is the maximum number of concurrent accesses it will permit. Accesses to the sempahore are gained using operator++() or operator+=(), and released with operator--() or operator-=(). The number of accesses allowed is retrieved with available(), and the total number with total(). Note that the incrementing functions will block if there aren't enough available accesses. Use tryAccess() if you want to actquire accesses without blocking. +When a semaphore is created it is given a number which is the maximum number of concurrent accesses it will permit. Accesses to the sempahore are gained using operator++() or operator+=(), and released with operator--() or operator-=(). The number of accesses allowed is retrieved with available(), and the total number with total(). Note that the incrementing functions will block if there aren't enough available accesses. Use tryAccess() if you want to acquire accesses without blocking. .PP See also Environment Classes and Threading. .SH MEMBER FUNCTION DOCUMENTATION diff --git a/doc/man/man3/qsound.3qt b/doc/man/man3/qsound.3qt index a2f2ac35..439b2720 100644 --- a/doc/man/man3/qsound.3qt +++ b/doc/man/man3/qsound.3qt @@ -95,7 +95,7 @@ The availability of sound can be tested with QSound::isAvailable(). See also Multimedia Classes. .SH MEMBER FUNCTION DOCUMENTATION .SH "QSound::QSound ( const QString & filename, QObject * parent = 0, const char * name = 0 )" -Constructs a QSound that can tquickly play the sound in a file named \fIfilename\fR. +Constructs a QSound that can quickly play the sound in a file named \fIfilename\fR. .PP This may use more memory than the static \fCplay\fR function. .PP @@ -111,7 +111,7 @@ Returns the filename associated with the sound. .SH "bool QSound::isAvailable ()\fC [static]\fR" Returns TRUE if sound facilities exist on the platform; otherwise returns FALSE. An application may choose either to notify the user if sound is crucial to the application or to operate silently without bothering the user. .PP -If no sound is available, all QSound operations work silently and tquickly. +If no sound is available, all QSound operations work silently and quickly. .SH "bool QSound::isFinished () const" Returns TRUE if the sound has finished playing; otherwise returns FALSE. .PP diff --git a/doc/man/man3/qsqlcursor.3qt b/doc/man/man3/qsqlcursor.3qt index 47df1a62..a9aabf5a 100644 --- a/doc/man/man3/qsqlcursor.3qt +++ b/doc/man/man3/qsqlcursor.3qt @@ -376,7 +376,7 @@ If \fIinvalidate\fR is TRUE (the default), the cursor will no longer be position cur.insert(); .fi .PP -In the above example, a cursor is created on the 'prices' table and a pointer to the insert buffer is atquired using primeInsert(). Each field's value is set to the desired value and then insert() is called to insert the data into the database. Remember: all edit operations (insert(), update() and delete()) operate on the contents of the cursor edit buffer and not on the contents of the cursor itself. +In the above example, a cursor is created on the 'prices' table and a pointer to the insert buffer is acquired using primeInsert(). Each field's value is set to the desired value and then insert() is called to insert the data into the database. Remember: all edit operations (insert(), update() and delete()) operate on the contents of the cursor edit buffer and not on the contents of the cursor itself. .PP See also setMode() and lastError(). .SH "bool QSqlCursor::isCalculated ( const QString & name ) const" @@ -617,7 +617,7 @@ If \fIinvalidate\fR is TRUE (the default), the current cursor can no longer be n } .fi .PP -In the above example, a cursor is created on the 'prices' table and is positioned on the record to be updated. Then a pointer to the cursor's edit buffer is actquired using primeUpdate(). A new value is calculated and placed into the edit buffer with the setValue() call. Finally, an update() call is made on the cursor which uses the tables's primary index to update the record in the database with the contents of the cursor's edit buffer. Remember: all edit operations (insert(), update() and delete()) operate on the contents of the cursor edit buffer and not on the contents of the cursor itself. +In the above example, a cursor is created on the 'prices' table and is positioned on the record to be updated. Then a pointer to the cursor's edit buffer is acquired using primeUpdate(). A new value is calculated and placed into the edit buffer with the setValue() call. Finally, an update() call is made on the cursor which uses the tables's primary index to update the record in the database with the contents of the cursor's edit buffer. Remember: all edit operations (insert(), update() and delete()) operate on the contents of the cursor edit buffer and not on the contents of the cursor itself. .PP Note that if the primary index does not uniquely distinguish records the database may be changed into an inconsistent state. .PP diff --git a/doc/man/man3/qsqldatabase.3qt b/doc/man/man3/qsqldatabase.3qt index af1bdd7b..7ee98726 100644 --- a/doc/man/man3/qsqldatabase.3qt +++ b/doc/man/man3/qsqldatabase.3qt @@ -274,7 +274,7 @@ Note: The host name (or service name) is needed when constructing the QTDSDriver .PP See also drivers(). .SH "void QSqlDatabase::close ()" -Closes the database connection, freeing any resources actquired. +Closes the database connection, freeing any resources acquired. .PP See also removeDatabase(). .SH "bool QSqlDatabase::commit ()" diff --git a/doc/man/man3/qt.3qt b/doc/man/man3/qt.3qt index afd5f560..bce3ebb8 100644 --- a/doc/man/man3/qt.3qt +++ b/doc/man/man3/qt.3qt @@ -231,7 +231,7 @@ The final three values have special meaning: .TP \fCQt::FixedPixmap\fR - the widget is cleared to a fixed pixmap, normally different from all the ones in the palette(). Set using setPaletteBackgroundPixmap(). .PP -Although FixedColor and FixedPixmap are sometimes just right, if you use them, make sure that you test your application when the desktop color scheme has been changed. (On X11, a tquick way to test this is e.g. "./myapp -bg paleblue". On Windows, you must use the control panel.) +Although FixedColor and FixedPixmap are sometimes just right, if you use them, make sure that you test your application when the desktop color scheme has been changed. (On X11, a quick way to test this is e.g. "./myapp -bg paleblue". On Windows, you must use the control panel.) .PP See also QWidget::backgroundMode, QWidget::backgroundMode, QWidget::setBackgroundPixmap(), and QWidget::paletteBackgroundColor. .SH "Qt::BrushStyle" diff --git a/doc/man/man3/qtextedit.3qt b/doc/man/man3/qtextedit.3qt index 6ef96226..0ae7b1eb 100644 --- a/doc/man/man3/qtextedit.3qt +++ b/doc/man/man3/qtextedit.3qt @@ -528,7 +528,7 @@ Using QTextEdit as an Editor Editing key bindings .SH "Introduction and Concepts" -QTextEdit is an advanced WYSIWYG viewer/editor supporting rich text formatting using HTML-style tags. It is optimized to handle large documents and to respond tquickly to user input. +QTextEdit is an advanced WYSIWYG viewer/editor supporting rich text formatting using HTML-style tags. It is optimized to handle large documents and to respond quickly to user input. .PP QTextEdit has four modes of operation: <center>.nf .TS diff --git a/doc/man/man3/qtimer.3qt b/doc/man/man3/qtimer.3qt index 2e80611f..4aae0ded 100644 --- a/doc/man/man3/qtimer.3qt +++ b/doc/man/man3/qtimer.3qt @@ -84,7 +84,7 @@ This can be used to do heavy work while providing a snappy user interface: .br .fi .PP -myObject->processOneThing() will be called repeatedly and should return tquickly (typically after processing one data item) so that Qt can deliver events to widgets and stop the timer as soon as it has done all its work. This is the traditional way of implementing heavy work in GUI applications; multi-threading is now becoming available on more and more platforms, and we expect that null events will eventually be replaced by threading. +myObject->processOneThing() will be called repeatedly and should return quickly (typically after processing one data item) so that Qt can deliver events to widgets and stop the timer as soon as it has done all its work. This is the traditional way of implementing heavy work in GUI applications; multi-threading is now becoming available on more and more platforms, and we expect that null events will eventually be replaced by threading. .PP Note that QTimer's accuracy depends on the underlying operating system and hardware. Most platforms support an accuracy of 20ms; some provide more. If Qt is unable to deliver the requested number of timer clicks, it will silently discard some. .PP diff --git a/doc/man/man3/qtoolbar.3qt b/doc/man/man3/qtoolbar.3qt index 1e1f9858..fc753db5 100644 --- a/doc/man/man3/qtoolbar.3qt +++ b/doc/man/man3/qtoolbar.3qt @@ -52,7 +52,7 @@ Inherits QDockWindow. .SH DESCRIPTION The QToolBar class provides a movable panel containing widgets such as tool buttons. .PP -A toolbar is a panel that contains a set of controls, usually represented by small icons. It's purpose is to provide tquick access to frequently used commands or options. Within a QMainWindow the user can drag toolbars within and between the dock areas. Toolbars can also be dragged out of any dock area to float freely as top-level windows. +A toolbar is a panel that contains a set of controls, usually represented by small icons. It's purpose is to provide quick access to frequently used commands or options. Within a QMainWindow the user can drag toolbars within and between the dock areas. Toolbars can also be dragged out of any dock area to float freely as top-level windows. .PP QToolBar is a specialization of QDockWindow, and so provides all the functionality of a QDockWindow. .PP @@ -104,7 +104,7 @@ Use this constructor if you want to create torn-off (undocked, floating) toolbar .SH "QToolBar::QToolBar ( QMainWindow * parent = 0, const char * name = 0 )" This is an overloaded member function, provided for convenience. It behaves essentially like the above function. .PP -Constructs an empty toolbar called \fIname\fR, with parent \fIparent\fR, in its \fIparent\fR's top dock area, without any label and without retquiring a newline. +Constructs an empty toolbar called \fIname\fR, with parent \fIparent\fR, in its \fIparent\fR's top dock area, without any label and without requiring a newline. .SH "void QToolBar::addSeparator ()" Adds a separator to the right/bottom of the toolbar. .PP diff --git a/doc/man/man3/qtoolbutton.3qt b/doc/man/man3/qtoolbutton.3qt index 3071d643..94d0c49c 100644 --- a/doc/man/man3/qtoolbutton.3qt +++ b/doc/man/man3/qtoolbutton.3qt @@ -164,9 +164,9 @@ Inherits QButton. .br .in -1c .SH DESCRIPTION -The QToolButton class provides a tquick-access button to commands or options, usually used inside a QToolBar. +The QToolButton class provides a quick-access button to commands or options, usually used inside a QToolBar. .PP -A tool button is a special button that provides tquick-access to specific commands or options. As opposed to a normal command button, a tool button usually doesn't show a text label, but shows an icon instead. Its classic usage is to select tools, for example the "pen" tool in a drawing program. This would be implemented with a QToolButton as toggle button (see setToggleButton() ). +A tool button is a special button that provides quick-access to specific commands or options. As opposed to a normal command button, a tool button usually doesn't show a text label, but shows an icon instead. Its classic usage is to select tools, for example the "pen" tool in a drawing program. This would be implemented with a QToolButton as toggle button (see setToggleButton() ). .PP QToolButton supports auto-raising. In auto-raise mode, the button draws a 3D frame only when the mouse points at it. The feature is automatically turned on when a button is used inside a QToolBar. Change it with setAutoRaise(). .PP diff --git a/doc/man/man3/qtooltip.3qt b/doc/man/man3/qtooltip.3qt index f08c9280..b9a8bd87 100644 --- a/doc/man/man3/qtooltip.3qt +++ b/doc/man/man3/qtooltip.3qt @@ -111,7 +111,7 @@ QToolTipGroup provides a way for tool tips to display another text elsewhere (mo .PP At any point in time, QToolTip is either dormant or active. In dormant mode the tips are not shown and in active mode they are. The mode is global, not particular to any one widget. .PP -QToolTip switches from dormant to active mode when the user hovers the mouse on a tip-etquipped region for a second or so and remains active until the user either clicks a mouse button, presses a key, lets the mouse hover for five seconds or moves the mouse outside \fIall\fR tip-etquipped regions for at least a second. +QToolTip switches from dormant to active mode when the user hovers the mouse on a tip-equipped region for a second or so and remains active until the user either clicks a mouse button, presses a key, lets the mouse hover for five seconds or moves the mouse outside \fIall\fR tip-equipped regions for at least a second. .PP The QToolTip class can be used in three different ways: <ol type=1> .IP 1 @@ -129,7 +129,7 @@ To add a tip to a widget, call the \fIstatic\fR function QToolTip::add() with th .br .fi .PP -This is the simplest and most common use of QToolTip. The tip will be deleted automatically when \fItquitButton\fR is deleted, but you can remove it yourself, too: +This is the simplest and most common use of QToolTip. The tip will be deleted automatically when \fIquitButton\fR is deleted, but you can remove it yourself, too: .PP .nf .br diff --git a/doc/man/man3/qwidget.3qt b/doc/man/man3/qwidget.3qt index 09b8ef8e..2e49ff95 100644 --- a/doc/man/man3/qwidget.3qt +++ b/doc/man/man3/qwidget.3qt @@ -1119,7 +1119,7 @@ The pixmap is drawn using the: .TP \fCQWidget::AncestorOrigin\fR - same origin as the parent uses. .SH "QWidget::FocusPolicy" -This enum type defines the various policies a widget can have with respect to actquiring keyboard focus. +This enum type defines the various policies a widget can have with respect to acquiring keyboard focus. .TP \fCQWidget::TabFocus\fR - the widget accepts focus by tabbing. .TP diff --git a/doc/metaobjects.doc b/doc/metaobjects.doc index 79c568b7..4956538d 100644 --- a/doc/metaobjects.doc +++ b/doc/metaobjects.doc @@ -71,7 +71,7 @@ additional features in QObject: \list \i the \link QObject::className() className() \endlink function that -returns the class name as a string at runtime, without retquiring +returns the class name as a string at runtime, without requiring native runtime type information (RTTI) support through the C++ compiler. diff --git a/doc/misc.doc b/doc/misc.doc index 3bcd98a7..845e25ef 100644 --- a/doc/misc.doc +++ b/doc/misc.doc @@ -810,7 +810,7 @@ in Brisbane, Australia, and Redwood City, California. Our flagship product is \link http://www.trolltech.com/products/ntqt.html Qt\endlink, the multi-platform C++ GUI toolkit. Qt enables you to build professional, -efficient, portable and maintainable GUI applications tquickly and +efficient, portable and maintainable GUI applications quickly and easily. \link http://www.trolltech.com/products/embedded/index.html @@ -832,7 +832,7 @@ superior design and technical quality when we develop our products. Trolltech is also known for providing top quality technical support -to our customers. At Trolltech, support intquiries are handled by the +to our customers. At Trolltech, support inquiries are handled by the most qualified developers and designers themselves. \section1 History @@ -862,10 +862,10 @@ Trolltech website\endlink. <td rowspan=4><br></td> <tr> <td ><br></td> -<td valign="top"> General intquiries and questions. Please check the +<td valign="top"> General inquiries and questions. Please check the \link http://www.trolltech.com/faq/ FAQ\endlink to see if your question is already answered there.</td> <td ><br></td> -<td valign="top"> Intquires related to purchasing, pricing and availability of +<td valign="top"> Inquires related to purchasing, pricing and availability of Trolltech products</td></tr> <tr> <td colspan=2>\link mailto:www@trolltech.com <strong>www@trolltech.com</strong>\endlink @@ -896,14 +896,14 @@ pages provide information about how to secure your server. <td rowspan=4><br></td> <tr> <td ><br></td> -<td valign="top"> General intquiries: +47 21 60 48 00</td> +<td valign="top"> General inquiries: +47 21 60 48 00</td> <td rowspan=3><br></td> <td valign="top" rowspan=3> Sandakerveien 116<br> PO Box 4332 Nydalen<br> NO-0402 Oslo<br> Norway</td></tr> <tr> <td colspan=2><strong>Telefax</strong></td> <tr> <td ><br></td> -<td valign="top"> All intquiries: +47 21 60 48 01</td> +<td valign="top"> All inquiries: +47 21 60 48 01</td> <tr bgcolor="#ffffff"><td bgcolor="#ffffff" colspan="6"> <br> </td></tr> <tr><th colspan=6 valign="top" bgcolor="#a2c511">USA Office</th></tr> </tr> @@ -914,14 +914,14 @@ pages provide information about how to secure your server. <td rowspan=4><br></td> <tr> <td ><br></td> -<td valign="top"> General intquiries: (+1) 650-551-1676</td> +<td valign="top"> General inquiries: (+1) 650-551-1676</td> <td rowspan=3><br></td> <td valign="top" rowspan=3> 555 Twin Dolphin Drive<br> Suite 280<br> Redwood City, CA 94065<br> USA</td></tr> <tr> <td colspan=2><strong>Telefax</strong></td> <tr> <td ><br></td> -<td valign="top"> All intquiries: (+1) 650-551-1851</td> +<td valign="top"> All inquiries: (+1) 650-551-1851</td> </table> */ diff --git a/doc/moc.doc b/doc/moc.doc index 7aa23b60..23d98793 100644 --- a/doc/moc.doc +++ b/doc/moc.doc @@ -397,7 +397,7 @@ illegal example: The QButtonGroup::buttonPressed() slot is protected. -C++ tquiz: What happens if you try to upgrade a protected member +C++ quiz: What happens if you try to upgrade a protected member function which is overloaded? \list 1 \i All the functions are overloaded. diff --git a/doc/networking.doc b/doc/networking.doc index 62b4a49a..41db5cf8 100644 --- a/doc/networking.doc +++ b/doc/networking.doc @@ -275,7 +275,7 @@ Protocol) is declared (\c network/infoprotocol/infourlclient/qip.h): \skipto Qip \printuntil }; -QNetworkProtocol is the base class for every Network Protocol class. Because this protocol uses network, we embedded one QSocket* member variable to which we'll delegate network communication. Protocols that doesn't require to use network will do it on their own way - e.g. QLocalFs uses QDir, some data actquisition protocol may use serial or USB connection, only requirement is that protocol uses hierarchical structure and can be accessed using URLs (to have addressable nodes). +QNetworkProtocol is the base class for every Network Protocol class. Because this protocol uses network, we embedded one QSocket* member variable to which we'll delegate network communication. Protocols that doesn't require to use network will do it on their own way - e.g. QLocalFs uses QDir, some data acquisition protocol may use serial or USB connection, only requirement is that protocol uses hierarchical structure and can be accessed using URLs (to have addressable nodes). Let us go to the Qip implementation (\c network/infoprotocol/infourlclient/qip.cpp): @@ -346,7 +346,7 @@ Here is where we use some QNetworkProtocol magic. (QUrlOperator)op is constructe \printuntil return \printuntil } -This function implements simple QFileDialog that will serve us to browse through the nodes on the server and to select one data node to view. Starting url is "qip://localhost/" which indicates to QFileDialog that we want to use Qip protocol served on the local server. We could also specify the exact port, e.g. "qip://my_server:123" will try to intquire my_server over port 123, otherwise the default port is used. +This function implements simple QFileDialog that will serve us to browse through the nodes on the server and to select one data node to view. Starting url is "qip://localhost/" which indicates to QFileDialog that we want to use Qip protocol served on the local server. We could also specify the exact port, e.g. "qip://my_server:123" will try to inquire my_server over port 123, otherwise the default port is used. We didn't use static function QFileDialog::getOpenFileName() because under Windows and Mac OS X, it will usually use the native file dialog and not a QFileDialog, in which case we wouldn't be able to use our protocol at all. diff --git a/doc/plugins-howto.doc b/doc/plugins-howto.doc index d006b1b0..18149804 100644 --- a/doc/plugins-howto.doc +++ b/doc/plugins-howto.doc @@ -261,7 +261,7 @@ The build key contains the following information: in use, both in their plugin and internally by the utility classes in Qt. The Qt library would require complex feature and dependency queries and verification when loading plugins. - Retquiring this would place an unnecessary burden on the developer, and + Requiring this would place an unnecessary burden on the developer, and increase the overhead of loading a plugin. To reduce both development time and application runtime costs, a simple string comparision of the build keys is used. diff --git a/doc/porting2.doc b/doc/porting2.doc index 5b70b5fd..064ae8ac 100644 --- a/doc/porting2.doc +++ b/doc/porting2.doc @@ -953,7 +953,7 @@ situation has been cleaned up: generated identifiers are always unique across the entire application. If your code depends on generated ids -being equal to the item's index, a tquick fix is to use +being equal to the item's index, a quick fix is to use \code QMenuData::indexOf(int id)\endcode in the handling function instead. You may alternatively pass \code QMenuData::count()\endcode diff --git a/doc/qtmac-as-native.doc b/doc/qtmac-as-native.doc index 57b281c0..83125030 100644 --- a/doc/qtmac-as-native.doc +++ b/doc/qtmac-as-native.doc @@ -83,7 +83,7 @@ it can interact with specific components of the Mac OS X experience: those described in the Human Interface Descriptions. Qt/Mac's widgets use the Appearance Manager to implement the look, so Apple's own API's are doing the rendering (Qt/Mac \<3.1 used an - emulation style with pixmaps, however this tquickly proved to be + emulation style with pixmaps, however this quickly proved to be cumbersome, and unable to keep up with style changes at Apple). \i \e{Aqua feel}<br> diff --git a/doc/sql.doc b/doc/sql.doc index c33ac2ef..2eb8e5c1 100644 --- a/doc/sql.doc +++ b/doc/sql.doc @@ -681,7 +681,7 @@ editable views.) Each cursor has an internal 'edit buffer' which is used by all the edit operations (insert, update and delete). The editing process is -the same for each operation: actquire a pointer to the relevant buffer; +the same for each operation: acquire a pointer to the relevant buffer; call setValue() to prime the buffer with the values you want; call insert() or update() or del() to perform the desired operation. For example, when inserting a record using a cursor, you call @@ -845,7 +845,7 @@ Once everything is set up we call refresh() to load the data from the database and show() to make the widget visible. QDataTables only retrieve visible rows which (depending on the driver) -allows even large tables to be displayed very tquickly with minimal +allows even large tables to be displayed very quickly with minimal memory cost. \target Creating_Forms diff --git a/doc/tools-list.doc b/doc/tools-list.doc index c4946e6b..096417ac 100644 --- a/doc/tools-list.doc +++ b/doc/tools-list.doc @@ -11,7 +11,7 @@ design forms \i \link linguist-manual.book Qt Linguist, lupdate and lrelease \endlink - translate applications to reach international markets - \i \link assistant.book Qt Assistant \endlink - tquickly find the + \i \link assistant.book Qt Assistant \endlink - quickly find the help you need \i \link qmake-manual.book qmake \endlink - create Makefiles from simple platform-independent project files diff --git a/doc/xml-sax-walkthrough.doc b/doc/xml-sax-walkthrough.doc index 21ecf8ef..b0279ca2 100644 --- a/doc/xml-sax-walkthrough.doc +++ b/doc/xml-sax-walkthrough.doc @@ -51,7 +51,7 @@ Before reading on you should at least be familiar with the \link xml.html#sax2Intro Introduction to SAX2. \endlink -<a name="tquickStart"></a> +<a name="quickStart"></a> <h2>A tiny parser</h2> In this section we will present a small example reader that outputs diff --git a/examples/network/mail/smtp.cpp b/examples/network/mail/smtp.cpp index 43a2cf24..3a288fc0 100644 --- a/examples/network/mail/smtp.cpp +++ b/examples/network/mail/smtp.cpp @@ -107,7 +107,7 @@ void Smtp::readyRead() *t << message << ".\r\n"; state = Quit; } else if ( state == Quit && responseLine[0] == '2' ) { - *t << "TQUIT\r\n"; + *t << "QUIT\r\n"; // here, we just close. state = Close; emit status( tr( "Message sent" ) ); diff --git a/examples/opengl/overlay/glteapots.cpp b/examples/opengl/overlay/glteapots.cpp index 2afc1ad0..6d0d5b56 100644 --- a/examples/opengl/overlay/glteapots.cpp +++ b/examples/opengl/overlay/glteapots.cpp @@ -25,7 +25,7 @@ * INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR * FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON * GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT, - * SPECIAL, INCIDENTAL, INDIRECT OR CONSETQUENTIAL DAMAGES OF ANY + * SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY * KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION, * LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF * THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN diff --git a/examples/textedit/example.html b/examples/textedit/example.html index 39b60ff7..9db97cc4 100644 --- a/examples/textedit/example.html +++ b/examples/textedit/example.html @@ -1,6 +1,6 @@ <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:12pt;font-family:helvetica"> <p align="center"><span style="font-size:24pt;font-weight:600">TQTextEdit</span></p> -<p align="justify">TQTextEdit is an advanced WYSIWYG editor supporting richtext formatting. It is optimized to handle large documents and to respond tquickly to user input.</p> +<p align="justify">TQTextEdit is an advanced WYSIWYG editor supporting richtext formatting. It is optimized to handle large documents and to respond quickly to user input.</p> <p align="justify">TQTextEdit supports font styles such as <span style="font-weight:600">bold</span>, <span style="font-style:italic">italic, </span><span style="text-decoration:underline">underlined</span> as well as various <span style="font-weight:600;color:#00007f">c</span><span style="font-weight:600;color:#aa0000">o</span><span style="font-weight:600;color:#005500">l</span><span style="font-weight:600;color:#aa5500">o</span><span style="font-weight:600;color:#00aa00">r</span><span style="font-weight:600;color:#ff0000">s </span>and <span style="font-size:16pt">s</span><span style="font-size:18pt">i</span><span style="font-size:20pt">z</span><span style="font-size:22pt">e</span><span style="font-size:28pt">s</span>. You can select different font families, for example <span style="font-family:Times;font-weight:600">Times New Roman</span> or <span style="font-family:Courier;font-weight:600">Courier</span>. Futhermore the widget supports different paragraph alignments such as justified,</p> <p>left aligned,</p> <p align="center">centered,</p> diff --git a/examples/widgets/widgets.cpp b/examples/widgets/widgets.cpp index 6ef91f65..d012f1c1 100644 --- a/examples/widgets/widgets.cpp +++ b/examples/widgets/widgets.cpp @@ -418,7 +418,7 @@ WidgetView::WidgetView( TQWidget *parent, const char *name ) mleText += TQChar((ushort)0x00d8); // Norwegian mleText += "\n"; mleText += "Unicode (black square): "; - mleText += TQChar((ushort)0x25A0); // BLACK STQUARE + mleText += TQChar((ushort)0x25A0); // BLACK SQUARE mleText += "\n"; #endif mle->setText( mleText ); diff --git a/mkspecs/win32-watcom/qmake.conf b/mkspecs/win32-watcom/qmake.conf index a04fb636..3430655f 100644 --- a/mkspecs/win32-watcom/qmake.conf +++ b/mkspecs/win32-watcom/qmake.conf @@ -35,7 +35,7 @@ QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH) -fo=$obj $src QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -fo=$obj $src QMAKE_LINK = wlink -QMAKE_LFLAGS = op tquiet op c +QMAKE_LFLAGS = op quiet op c QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = d all QMAKE_LFLAGS_CONSOLE = sys nt diff --git a/plugins/src/inputmethods/simple/composetable.cpp b/plugins/src/inputmethods/simple/composetable.cpp index 0fd2a670..0a055212 100644 --- a/plugins/src/inputmethods/simple/composetable.cpp +++ b/plugins/src/inputmethods/simple/composetable.cpp @@ -817,7 +817,7 @@ static const TQComposeTableElement defaultTable[] = { // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x0074, 0, 0, 0}, 0x0167 }, // U0167 # LATIN SMALL LETTER T WITH STROKE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x007a, 0, 0, 0}, 0x01b6 }, // U01B6 # LATIN SMALL LETTER Z WITH STROKE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x0294, 0, 0, 0}, 0x02a1 }, // U02A1 # LATIN LETTER GLOTTAL STOP WITH STROKE -// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x0338, 0, 0, 0}, 0x2260 }, // U2260 # NOT ETQUAL TO +// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x0338, 0, 0, 0}, 0x2260 }, // U2260 # NOT EQUAL TO // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x0413, 0, 0, 0}, 0x0492 }, // U0492 # CYRILLIC CAPITAL LETTER GHE WITH STROKE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x041a, 0, 0, 0}, 0x049e }, // U049E # CYRILLIC CAPITAL LETTER KA WITH STROKE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0000, 0x0433, 0, 0, 0}, 0x0493 }, // U0493 # CYRILLIC SMALL LETTER GHE WITH STROKE @@ -892,10 +892,10 @@ static const TQComposeTableElement defaultTable[] = { // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0000, 0x004f, 0, 0}, 0x1e4e }, // U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0000, 0x006f, 0, 0}, 0x1e4f }, // U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0027, 0, 0, 0}, 0x0344 }, // U0344 # COMBINING GREEK DIALYTIKA TONOS - { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x002c, 0, 0, 0}, 0x201e }, // U201e # DOUBLE LOW-9 TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x002f, 0, 0, 0}, 0x301e }, // U301e # DOUBLE PRIME TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x003c, 0, 0, 0}, 0x201c }, // U201c # LEFT DOUBLE TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x003e, 0, 0, 0}, 0x201d }, // U201d # RIGHT DOUBLE TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x002c, 0, 0, 0}, 0x201e }, // U201e # DOUBLE LOW-9 QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x002f, 0, 0, 0}, 0x301e }, // U301e # DOUBLE PRIME QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x003c, 0, 0, 0}, 0x201c }, // U201c # LEFT DOUBLE QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x003e, 0, 0, 0}, 0x201d }, // U201d # RIGHT DOUBLE QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0041, 0, 0, 0}, 0x00c4 }, // U00C4 # LATIN CAPITAL LETTER A WITH DIAERESIS { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0045, 0, 0, 0}, 0x00cb }, // U00CB # LATIN CAPITAL LETTER E WITH DIAERESIS { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0048, 0, 0, 0}, 0x1e26 }, // U1E26 # LATIN CAPITAL LETTER H WITH DIAERESIS @@ -905,7 +905,7 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0057, 0, 0, 0}, 0x1e84 }, // U1E84 # LATIN CAPITAL LETTER W WITH DIAERESIS { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0058, 0, 0, 0}, 0x1e8c }, // U1E8C # LATIN CAPITAL LETTER X WITH DIAERESIS { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0059, 0, 0, 0}, 0x0178 }, // U0178 # LATIN CAPITAL LETTER Y WITH DIAERESIS - { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x005c, 0, 0, 0}, 0x301d }, // U301d # REVERSED DOUBLE PRIME TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x005c, 0, 0, 0}, 0x301d }, // U301d # REVERSED DOUBLE PRIME QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x005f, 0x0055, 0, 0}, 0x1e7a }, // U1E7A # LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x005f, 0x0075, 0, 0}, 0x1e7b }, // U1E7B # LATIN SMALL LETTER U WITH MACRON AND DIAERESIS { {UNITIZE(TQt::Key_Multi_key), 0x0022, 0x0061, 0, 0, 0}, 0x00e4 }, // U00E4 # LATIN SMALL LETTER A WITH DIAERESIS @@ -1015,13 +1015,13 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002b, 0x0055, 0, 0}, 0x1ee8 }, // U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002b, 0x006f, 0, 0}, 0x1edb }, // U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002b, 0x0075, 0, 0}, 0x1ee9 }, // U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE - { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002c, 0, 0, 0}, 0x201a }, // U201a # SINGLE LOW-9 TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002c, 0, 0, 0}, 0x201a }, // U201a # SINGLE LOW-9 QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002c, 0x0043, 0, 0}, 0x1e08 }, // U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002c, 0x0063, 0, 0}, 0x1e09 }, // U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002f, 0x004f, 0, 0}, 0x01fe }, // U01FE # LATIN CAPITAL LETTER O WITH STROKE AND ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x002f, 0x006f, 0, 0}, 0x01ff }, // U01FF # LATIN SMALL LETTER O WITH STROKE AND ACUTE - { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x003c, 0, 0, 0}, 0x2018 }, // U2018 # LEFT SINGLE TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x003e, 0, 0, 0}, 0x2019 }, // U2019 # RIGHT SINGLE TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x003c, 0, 0, 0}, 0x2018 }, // U2018 # LEFT SINGLE QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x003e, 0, 0, 0}, 0x2019 }, // U2019 # RIGHT SINGLE QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x0041, 0, 0, 0}, 0x00c1 }, // U00C1 # LATIN CAPITAL LETTER A WITH ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x0043, 0, 0, 0}, 0x0106 }, // U0106 # LATIN CAPITAL LETTER C WITH ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x0027, 0x0045, 0, 0, 0}, 0x00c9 }, // U00C9 # LATIN CAPITAL LETTER E WITH ACUTE @@ -1642,8 +1642,8 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x002b, 0x006f, 0, 0, 0}, 0x01a1 }, // U01A1 # LATIN SMALL LETTER O WITH HORN { {UNITIZE(TQt::Key_Multi_key), 0x002b, 0x0075, 0, 0, 0}, 0x01b0 }, // U01B0 # LATIN SMALL LETTER U WITH HORN { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x0020, 0, 0, 0}, 0x00b8 }, // cedilla - { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x0022, 0, 0, 0}, 0x201e }, // U201e # DOUBLE LOW-9 TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x0027, 0, 0, 0}, 0x201a }, // U201a # SINGLE LOW-9 TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x0022, 0, 0, 0}, 0x201e }, // U201e # DOUBLE LOW-9 QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x0027, 0, 0, 0}, 0x201a }, // U201a # SINGLE LOW-9 QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x002d, 0, 0, 0}, 0x00ac }, // U00AC # NOT SIGN { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x0043, 0, 0, 0}, 0x00c7 }, // U00C7 # LATIN CAPITAL LETTER C WITH CEDILLA { {UNITIZE(TQt::Key_Multi_key), 0x002c, 0x0044, 0, 0, 0}, 0x1e10 }, // U1E10 # LATIN CAPITAL LETTER D WITH CEDILLA @@ -1779,8 +1779,8 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x002f, 0x2192, 0, 0, 0}, 0x219b }, // U219B # RIGHTWARDS ARROW WITH STROKE { {UNITIZE(TQt::Key_Multi_key), 0x002f, 0x2194, 0, 0, 0}, 0x21ae }, // U21AE # LEFT RIGHT ARROW WITH STROKE { {UNITIZE(TQt::Key_Multi_key), 0x0031, 0x0032, 0, 0, 0}, 0x00bd }, // U00BD # VULGAR FRACTION ONE HALF - { {UNITIZE(TQt::Key_Multi_key), 0x0031, 0x0034, 0, 0, 0}, 0x00bc }, // U00BC # VULGAR FRACTION ONE TQUARTER - { {UNITIZE(TQt::Key_Multi_key), 0x0033, 0x0034, 0, 0, 0}, 0x00be }, // U00BE # VULGAR FRACTION THREE TQUARTERS + { {UNITIZE(TQt::Key_Multi_key), 0x0031, 0x0034, 0, 0, 0}, 0x00bc }, // U00BC # VULGAR FRACTION ONE QUARTER + { {UNITIZE(TQt::Key_Multi_key), 0x0033, 0x0034, 0, 0, 0}, 0x00be }, // U00BE # VULGAR FRACTION THREE QUARTERS { {UNITIZE(TQt::Key_Multi_key), 0x003a, 0x002d, 0, 0, 0}, 0x00f7 }, // U00F7 # DIVISION SIGN { {UNITIZE(TQt::Key_Multi_key), 0x003b, 0x0041, 0, 0, 0}, 0x0104 }, // U0104 # LATIN CAPITAL LETTER A WITH OGONEK { {UNITIZE(TQt::Key_Multi_key), 0x003b, 0x0045, 0, 0, 0}, 0x0118 }, // U0118 # LATIN CAPITAL LETTER E WITH OGONEK @@ -1792,10 +1792,10 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x003b, 0x0069, 0, 0, 0}, 0x012f }, // U012F # LATIN SMALL LETTER I WITH OGONEK { {UNITIZE(TQt::Key_Multi_key), 0x003b, 0x006f, 0, 0, 0}, 0x01eb }, // U01EB # LATIN SMALL LETTER O WITH OGONEK { {UNITIZE(TQt::Key_Multi_key), 0x003b, 0x0075, 0, 0, 0}, 0x0173 }, // U0173 # LATIN SMALL LETTER U WITH OGONEK - { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x0022, 0, 0, 0}, 0x201c }, // U201c # LEFT DOUBLE TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x0027, 0, 0, 0}, 0x2018 }, // U2018 # LEFT SINGLE TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x0022, 0, 0, 0}, 0x201c }, // U201c # LEFT DOUBLE QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x0027, 0, 0, 0}, 0x2018 }, // U2018 # LEFT SINGLE QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x002f, 0, 0, 0}, 0x005c }, // backslash - { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x003c, 0, 0, 0}, 0x00ab }, // guillemotleft # LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x003c, 0, 0, 0}, 0x00ab }, // guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x0338, 0, 0, 0}, 0x226e }, // U226E # NOT LESS-THAN { {UNITIZE(TQt::Key_Multi_key), 0x003c, 0x0338, 0, 0, 0}, 0x226e }, // U226E # NOT LESS-THAN { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x0043, 0, 0, 0}, 0x20ac }, // EuroSign # EURO SIGN @@ -1808,13 +1808,13 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x0059, 0, 0, 0}, 0x00a5 }, // yen { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x006f, 0, 0, 0}, 0x0151 }, // U0151 # LATIN SMALL LETTER O WITH DOUBLE ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x0075, 0, 0, 0}, 0x0171 }, // U0171 # LATIN SMALL LETTER U WITH DOUBLE ACUTE - { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x0338, 0, 0, 0}, 0x2260 }, // U2260 # NOT ETQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x0338, 0, 0, 0}, 0x2260 }, // U2260 # NOT EQUAL TO { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x0423, 0, 0, 0}, 0x04f2 }, // U04F2 # CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x003d, 0x0443, 0, 0, 0}, 0x04f3 }, // U04F3 # CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x0020, 0, 0, 0}, 0x005e }, // asciicircum - { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x0022, 0, 0, 0}, 0x201d }, // U201d # RIGHT DOUBLE TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x0027, 0, 0, 0}, 0x2019 }, // U2019 # RIGHT SINGLE TQUOTATION MARK - { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x003e, 0, 0, 0}, 0x00bb }, // guillemotright # RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x0022, 0, 0, 0}, 0x201d }, // U201d # RIGHT DOUBLE QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x0027, 0, 0, 0}, 0x2019 }, // U2019 # RIGHT SINGLE QUOTATION MARK + { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x003e, 0, 0, 0}, 0x00bb }, // guillemotright # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x0338, 0, 0, 0}, 0x226f }, // U226F # NOT GREATER-THAN { {UNITIZE(TQt::Key_Multi_key), 0x003e, 0x0338, 0, 0, 0}, 0x226f }, // U226F # NOT GREATER-THAN // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x003f, 0x0000, 0, 0, 0}, 0x1eed }, // U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE @@ -1947,7 +1947,7 @@ static const TQComposeTableElement defaultTable[] = { // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x2074 }, // U2074 # SUPERSCRIPT FOUR // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x00b3 }, // U00B3 # SUPERSCRIPT THREE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x2077 }, // U2077 # SUPERSCRIPT SEVEN -// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT ETQUALS SIGN +// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT EQUALS SIGN // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x207a }, // U207A # SUPERSCRIPT PLUS SIGN // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x00b2 }, // U00B2 # SUPERSCRIPT TWO // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0000, 0, 0, 0}, 0x2079 }, // U2079 # SUPERSCRIPT NINE @@ -1979,7 +1979,7 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0037, 0, 0, 0}, 0x2077 }, // U2077 # SUPERSCRIPT SEVEN { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0038, 0, 0, 0}, 0x2078 }, // U2078 # SUPERSCRIPT EIGHT { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0039, 0, 0, 0}, 0x2079 }, // U2079 # SUPERSCRIPT NINE - { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x003d, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT ETQUALS SIGN + { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x003d, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT EQUALS SIGN { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0041, 0, 0, 0}, 0x00c2 }, // U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0043, 0, 0, 0}, 0x0108 }, // U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX { {UNITIZE(TQt::Key_Multi_key), 0x005e, 0x0045, 0, 0, 0}, 0x00ca }, // U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX @@ -2095,8 +2095,8 @@ static const TQComposeTableElement defaultTable[] = { // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0, 0, 0}, 0x2082 }, // U2082 # SUBSCRIPT TWO // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0, 0, 0}, 0x2081 }, // U2081 # SUBSCRIPT ONE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0, 0, 0}, 0x2082 }, // U2082 # SUBSCRIPT TWO -// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT ETQUALS SIGN -// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT ETQUALS SIGN +// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT EQUALS SIGN +// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT EQUALS SIGN // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0x004c, 0, 0}, 0x1e38 }, // U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0x004f, 0, 0}, 0x022c }, // U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0000, 0x0052, 0, 0}, 0x1e5c }, // U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON @@ -2145,8 +2145,8 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0039, 0, 0, 0}, 0x2089 }, // U2089 # SUBSCRIPT NINE { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x003b, 0x004f, 0, 0}, 0x01ec }, // U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x003b, 0x006f, 0, 0}, 0x01ed }, // U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON - { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x003d, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT ETQUALS SIGN - { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x003d, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT ETQUALS SIGN + { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x003d, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT EQUALS SIGN + { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x003d, 0, 0, 0}, 0x208c }, // U208C # SUBSCRIPT EQUALS SIGN { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0041, 0, 0, 0}, 0x0100 }, // U0100 # LATIN CAPITAL LETTER A WITH MACRON { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0045, 0, 0, 0}, 0x0112 }, // U0112 # LATIN CAPITAL LETTER E WITH MACRON { {UNITIZE(TQt::Key_Multi_key), 0x005f, 0x0047, 0, 0, 0}, 0x1e20 }, // U1E20 # LATIN CAPITAL LETTER G WITH MACRON @@ -3804,7 +3804,7 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x11f0, 0x11ba, 0, 0, 0}, 0x11f1 }, // U11f1 # ��� ��� = ��� { {UNITIZE(TQt::Key_Multi_key), 0x11f0, 0x11eb, 0, 0, 0}, 0x11f2 }, // U11f2 # ��� ��� = ��� // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x1d157, 0x1d165, 0, 0, 0}, 0xd15e }, // U1D15E # MUSICAL SYMBOL HALF NOTE -// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x1d158, 0x1d165, 0, 0, 0}, 0xd15f }, // U1D15F # MUSICAL SYMBOL TQUARTER NOTE +// /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x1d158, 0x1d165, 0, 0, 0}, 0xd15f }, // U1D15F # MUSICAL SYMBOL QUARTER NOTE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x1d158, 0x1d165, 0x1d16e, 0, 0}, 0xd160 }, // U1D160 # MUSICAL SYMBOL EIGHTH NOTE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x1d158, 0x1d165, 0x1d16f, 0, 0}, 0xd161 }, // U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE // /* broken */ { {UNITIZE(TQt::Key_Multi_key), 0x1d158, 0x1d165, 0x1d170, 0, 0}, 0xd162 }, // U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE @@ -3851,37 +3851,37 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Multi_key), 0x2223, 0x0338, 0, 0, 0}, 0x2224 }, // U2224 # DOES NOT DIVIDE { {UNITIZE(TQt::Key_Multi_key), 0x2225, 0x0338, 0, 0, 0}, 0x2226 }, // U2226 # NOT PARALLEL TO { {UNITIZE(TQt::Key_Multi_key), 0x223c, 0x0338, 0, 0, 0}, 0x2241 }, // U2241 # NOT TILDE - { {UNITIZE(TQt::Key_Multi_key), 0x223c, 0x0338, 0, 0, 0}, 0x2247 }, // U2247 # NEITHER APPROXIMATELY NOR ACTUALLY ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2243, 0x0338, 0, 0, 0}, 0x2244 }, // U2244 # NOT ASYMPTOTICALLY ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2248, 0x0338, 0, 0, 0}, 0x2249 }, // U2249 # NOT ALMOST ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x224d, 0x0338, 0, 0, 0}, 0x226d }, // U226D # NOT ETQUIVALENT TO + { {UNITIZE(TQt::Key_Multi_key), 0x223c, 0x0338, 0, 0, 0}, 0x2247 }, // U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2243, 0x0338, 0, 0, 0}, 0x2244 }, // U2244 # NOT ASYMPTOTICALLY EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2248, 0x0338, 0, 0, 0}, 0x2249 }, // U2249 # NOT ALMOST EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x224d, 0x0338, 0, 0, 0}, 0x226d }, // U226D # NOT EQUIVALENT TO { {UNITIZE(TQt::Key_Multi_key), 0x2261, 0x0338, 0, 0, 0}, 0x2262 }, // U2262 # NOT IDENTICAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2264, 0x0338, 0, 0, 0}, 0x2270 }, // U2270 # NEITHER LESS-THAN NOR ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2265, 0x0338, 0, 0, 0}, 0x2271 }, // U2271 # NEITHER GREATER-THAN NOR ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2272, 0x0338, 0, 0, 0}, 0x2274 }, // U2274 # NEITHER LESS-THAN NOR ETQUIVALENT TO - { {UNITIZE(TQt::Key_Multi_key), 0x2273, 0x0338, 0, 0, 0}, 0x2275 }, // U2275 # NEITHER GREATER-THAN NOR ETQUIVALENT TO + { {UNITIZE(TQt::Key_Multi_key), 0x2264, 0x0338, 0, 0, 0}, 0x2270 }, // U2270 # NEITHER LESS-THAN NOR EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2265, 0x0338, 0, 0, 0}, 0x2271 }, // U2271 # NEITHER GREATER-THAN NOR EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2272, 0x0338, 0, 0, 0}, 0x2274 }, // U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO + { {UNITIZE(TQt::Key_Multi_key), 0x2273, 0x0338, 0, 0, 0}, 0x2275 }, // U2275 # NEITHER GREATER-THAN NOR EQUIVALENT TO { {UNITIZE(TQt::Key_Multi_key), 0x2276, 0x0338, 0, 0, 0}, 0x2278 }, // U2278 # NEITHER LESS-THAN NOR GREATER-THAN { {UNITIZE(TQt::Key_Multi_key), 0x2277, 0x0338, 0, 0, 0}, 0x2279 }, // U2279 # NEITHER GREATER-THAN NOR LESS-THAN { {UNITIZE(TQt::Key_Multi_key), 0x227a, 0x0338, 0, 0, 0}, 0x2280 }, // U2280 # DOES NOT PRECEDE { {UNITIZE(TQt::Key_Multi_key), 0x227b, 0x0338, 0, 0, 0}, 0x2281 }, // U2281 # DOES NOT SUCCEED - { {UNITIZE(TQt::Key_Multi_key), 0x227c, 0x0338, 0, 0, 0}, 0x22e0 }, // U22E0 # DOES NOT PRECEDE OR ETQUAL - { {UNITIZE(TQt::Key_Multi_key), 0x227d, 0x0338, 0, 0, 0}, 0x22e1 }, // U22E1 # DOES NOT SUCCEED OR ETQUAL + { {UNITIZE(TQt::Key_Multi_key), 0x227c, 0x0338, 0, 0, 0}, 0x22e0 }, // U22E0 # DOES NOT PRECEDE OR EQUAL + { {UNITIZE(TQt::Key_Multi_key), 0x227d, 0x0338, 0, 0, 0}, 0x22e1 }, // U22E1 # DOES NOT SUCCEED OR EQUAL { {UNITIZE(TQt::Key_Multi_key), 0x2282, 0x0338, 0, 0, 0}, 0x2284 }, // U2284 # NOT A SUBSET OF { {UNITIZE(TQt::Key_Multi_key), 0x2282, 0x0338, 0, 0, 0}, 0x2284 }, // U2284 # NOT A SUBSET OF { {UNITIZE(TQt::Key_Multi_key), 0x2283, 0x0338, 0, 0, 0}, 0x2285 }, // U2285 # NOT A SUPERSET OF { {UNITIZE(TQt::Key_Multi_key), 0x2283, 0x0338, 0, 0, 0}, 0x2285 }, // U2285 # NOT A SUPERSET OF - { {UNITIZE(TQt::Key_Multi_key), 0x2286, 0x0338, 0, 0, 0}, 0x2288 }, // U2288 # NEITHER A SUBSET OF NOR ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2287, 0x0338, 0, 0, 0}, 0x2289 }, // U2289 # NEITHER A SUPERSET OF NOR ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2291, 0x0338, 0, 0, 0}, 0x22e2 }, // U22E2 # NOT STQUARE IMAGE OF OR ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x2292, 0x0338, 0, 0, 0}, 0x22e3 }, // U22E3 # NOT STQUARE ORIGINAL OF OR ETQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2286, 0x0338, 0, 0, 0}, 0x2288 }, // U2288 # NEITHER A SUBSET OF NOR EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2287, 0x0338, 0, 0, 0}, 0x2289 }, // U2289 # NEITHER A SUPERSET OF NOR EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2291, 0x0338, 0, 0, 0}, 0x22e2 }, // U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x2292, 0x0338, 0, 0, 0}, 0x22e3 }, // U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO { {UNITIZE(TQt::Key_Multi_key), 0x22a3, 0x0338, 0, 0, 0}, 0x22ac }, // U22AC # DOES NOT PROVE { {UNITIZE(TQt::Key_Multi_key), 0x22a8, 0x0338, 0, 0, 0}, 0x22ad }, // U22AD # NOT TRUE { {UNITIZE(TQt::Key_Multi_key), 0x22a9, 0x0338, 0, 0, 0}, 0x22ae }, // U22AE # DOES NOT FORCE { {UNITIZE(TQt::Key_Multi_key), 0x22ab, 0x0338, 0, 0, 0}, 0x22af }, // U22AF # NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE { {UNITIZE(TQt::Key_Multi_key), 0x22b2, 0x0338, 0, 0, 0}, 0x22ea }, // U22EA # NOT NORMAL SUBGROUP OF { {UNITIZE(TQt::Key_Multi_key), 0x22b3, 0x0338, 0, 0, 0}, 0x22eb }, // U22EB # DOES NOT CONTAIN AS NORMAL SUBGROUP - { {UNITIZE(TQt::Key_Multi_key), 0x22b4, 0x0338, 0, 0, 0}, 0x22ec }, // U22EC # NOT NORMAL SUBGROUP OF OR ETQUAL TO - { {UNITIZE(TQt::Key_Multi_key), 0x22b5, 0x0338, 0, 0, 0}, 0x22ed }, // U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR ETQUAL + { {UNITIZE(TQt::Key_Multi_key), 0x22b4, 0x0338, 0, 0, 0}, 0x22ec }, // U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO + { {UNITIZE(TQt::Key_Multi_key), 0x22b5, 0x0338, 0, 0, 0}, 0x22ed }, // U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL { {UNITIZE(TQt::Key_Multi_key), 0x2add, 0x0338, 0, 0, 0}, 0x2adc }, // U2ADC # FORKING // /* broken */ { {UNITIZE(TQt::Key_Dead_Grave), 0x0000, 0, 0, 0, 0}, 0x1eeb }, // U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE // /* broken */ { {UNITIZE(TQt::Key_Dead_Grave), 0x0000, 0, 0, 0, 0}, 0x1edd }, // U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE @@ -4318,7 +4318,7 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Dead_Acute), UNITIZE(TQt::Key_Dead_Horn), 0x006f, 0, 0, 0}, 0x1edb }, // U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE { {UNITIZE(TQt::Key_Dead_Acute), UNITIZE(TQt::Key_Dead_Horn), 0x0075, 0, 0, 0}, 0x1ee9 }, // U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE // /* broken */ { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0000, 0, 0, 0, 0}, 0x207a }, // U207A # SUPERSCRIPT PLUS SIGN -// /* broken */ { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0000, 0, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT ETQUALS SIGN +// /* broken */ { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0000, 0, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT EQUALS SIGN // /* broken */ { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0000, 0, 0, 0, 0}, 0x00b2 }, // U00B2 # SUPERSCRIPT TWO // /* broken */ { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0000, 0, 0, 0, 0}, 0x2079 }, // U2079 # SUPERSCRIPT NINE // /* broken */ { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0000, 0, 0, 0, 0}, 0x00b3 }, // U00B3 # SUPERSCRIPT THREE @@ -4350,7 +4350,7 @@ static const TQComposeTableElement defaultTable[] = { { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0037, 0, 0, 0, 0}, 0x2077 }, // U2077 # SUPERSCRIPT SEVEN { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0038, 0, 0, 0, 0}, 0x2078 }, // U2078 # SUPERSCRIPT EIGHT { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0039, 0, 0, 0, 0}, 0x2079 }, // U2079 # SUPERSCRIPT NINE - { {UNITIZE(TQt::Key_Dead_Circumflex), 0x003d, 0, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT ETQUALS SIGN + { {UNITIZE(TQt::Key_Dead_Circumflex), 0x003d, 0, 0, 0, 0}, 0x207c }, // U207C # SUPERSCRIPT EQUALS SIGN { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0041, 0, 0, 0, 0}, 0x00c2 }, // U00C2 # LATIN CAPITAL LETTER A WITH CIRCUMFLEX { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0043, 0, 0, 0, 0}, 0x0108 }, // U0108 # LATIN CAPITAL LETTER C WITH CIRCUMFLEX { {UNITIZE(TQt::Key_Dead_Circumflex), 0x0045, 0, 0, 0, 0}, 0x00ca }, // U00CA # LATIN CAPITAL LETTER E WITH CIRCUMFLEX diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp index e9b42c9b..907ed1ad 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp +++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp @@ -87,7 +87,7 @@ class Cmp { public: bool operator () (const TQComposeTableElement &lhs, const TQComposeTableElement &rhs) const { - for ( size_t i=0; i < QT_KEYSETQUENCE_MAX_LEN; i++ ) { + for ( size_t i=0; i < QT_KEYSEQUENCE_MAX_LEN; i++ ) { if ( lhs.keys[i] < rhs.keys[i] ) return TRUE; else if ( lhs.keys[i] > rhs.keys[i] ) return FALSE; @@ -95,8 +95,8 @@ public: return FALSE; } - bool operator () (const TQComposeTableElement &lhs, const uint rhs[QT_KEYSETQUENCE_MAX_LEN]) const { - for ( size_t i=0; i < QT_KEYSETQUENCE_MAX_LEN; i++ ) { + bool operator () (const TQComposeTableElement &lhs, const uint rhs[QT_KEYSEQUENCE_MAX_LEN]) const { + for ( size_t i=0; i < QT_KEYSEQUENCE_MAX_LEN; i++ ) { if ( lhs.keys[i] < rhs[i] ) return TRUE; else if ( lhs.keys[i] > rhs[i] ) return FALSE; @@ -146,10 +146,10 @@ bool TQSimpleInputContext::filterEvent( const TQEvent *event ) // Store value int nCompose = 0; - while ( composeBuffer[nCompose] != 0 && nCompose < QT_KEYSETQUENCE_MAX_LEN ) + while ( composeBuffer[nCompose] != 0 && nCompose < QT_KEYSEQUENCE_MAX_LEN ) nCompose++; - if ( nCompose == QT_KEYSETQUENCE_MAX_LEN ) { + if ( nCompose == QT_KEYSEQUENCE_MAX_LEN ) { clearComposeBuffer(); nCompose = 0; } @@ -247,7 +247,7 @@ bool TQSimpleInputContext::checkComposeTable( uint* composeBuffer, const TQCompo } // check if compose buffer is matched - for ( int i=0; i < QT_KEYSETQUENCE_MAX_LEN; i++ ) { + for ( int i=0; i < QT_KEYSEQUENCE_MAX_LEN; i++ ) { // check if partial match if ( composeBuffer[i] == 0 && p->keys[i] ) { diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.h b/plugins/src/inputmethods/simple/qsimpleinputcontext.h index d6499bd7..c301bfd9 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontext.h +++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.h @@ -46,11 +46,11 @@ #include <ntqinputcontext.h> #include <ntqnamespace.h> -#define QT_KEYSETQUENCE_MAX_LEN 6 +#define QT_KEYSEQUENCE_MAX_LEN 6 #define UNITIZE(qkey) (0x02000000|qkey) struct TQComposeTableElement { - uint keys[QT_KEYSETQUENCE_MAX_LEN]; + uint keys[QT_KEYSEQUENCE_MAX_LEN]; uint value; }; @@ -86,7 +86,7 @@ protected: void clearComposeBuffer(void); protected: - uint composeBuffer[QT_KEYSETQUENCE_MAX_LEN + 1]; + uint composeBuffer[QT_KEYSEQUENCE_MAX_LEN + 1]; static const TQComposeTable defaultComposeTable; }; diff --git a/qmake/book/qmake-manual.book b/qmake/book/qmake-manual.book index 918c6170..68eb0e61 100644 --- a/qmake/book/qmake-manual.book +++ b/qmake/book/qmake-manual.book @@ -4,7 +4,7 @@ \input qmake-preface.leaf \input qmake-install.leaf -\input qmake-tquick.leaf +\input qmake-quick.leaf \input qmake-tutorial.leaf \input qmake-concepts.leaf \input qmake-advanced.leaf diff --git a/src/3rdparty/libmng/README.autoconf b/src/3rdparty/libmng/README.autoconf index ba4282ed..e52d84b5 100644 --- a/src/3rdparty/libmng/README.autoconf +++ b/src/3rdparty/libmng/README.autoconf @@ -177,7 +177,7 @@ operates. `--help' Print a summary of the options to `configure', and exit. -`--tquiet' +`--quiet' `--silent' `-q' Do not print messages saying which checks are being made. To diff --git a/src/3rdparty/libmng/aclocal.m4 b/src/3rdparty/libmng/aclocal.m4 index 15199022..e94a29ab 100644 --- a/src/3rdparty/libmng/aclocal.m4 +++ b/src/3rdparty/libmng/aclocal.m4 @@ -557,7 +557,7 @@ EOF # Now try to grab the symbols. nlist=conftest.nm if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" else @@ -1996,7 +1996,7 @@ else solaris*) # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, retquiring libgcc.a to resolve some of + # shared libraries reliably, requiring libgcc.a to resolve some of # the object symbols generated in some cases. Libraries that use # assert need libgcc.a to resolve __eprintf, for example. Linking # a copy of libgcc.a into every shared library to guarantee resolving diff --git a/src/3rdparty/libmng/configure b/src/3rdparty/libmng/configure index 9725a723..b204ca02 100755 --- a/src/3rdparty/libmng/configure +++ b/src/3rdparty/libmng/configure @@ -332,7 +332,7 @@ Configuration: --cache-file=FILE cache test results in FILE --help print this message --no-create do not create output files - --tquiet, --silent do not print \`checking...' messages + --quiet, --silent do not print \`checking...' messages --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -477,7 +477,7 @@ EOF | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name="$ac_optarg" ;; - -q | -tquiet | --tquiet | --tquie | --tqui | --qu | --q \ + -q | -quiet | --quiet | --tquie | --tqui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -2247,7 +2247,7 @@ EOF # Now try to grab the symbols. nlist=conftest.nm if { (eval echo configure:2250: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" else @@ -3822,7 +3822,7 @@ else solaris*) # gcc --version < 3.0 without binutils cannot create self contained - # shared libraries reliably, retquiring libgcc.a to resolve some of + # shared libraries reliably, requiring libgcc.a to resolve some of # the object symbols generated in some cases. Libraries that use # assert need libgcc.a to resolve __eprintf, for example. Linking # a copy of libgcc.a into every shared library to guarantee resolving diff --git a/src/3rdparty/libmng/doc/libmng.txt b/src/3rdparty/libmng/doc/libmng.txt index a18940bb..9c76be53 100644 --- a/src/3rdparty/libmng/doc/libmng.txt +++ b/src/3rdparty/libmng/doc/libmng.txt @@ -829,7 +829,7 @@ callback! This method is preferred if you are reading from a slow input device (such as a dialup-line) and you wish to start displaying something -as tquickly as possible. This functionality is provided mainly for +as quickly as possible. This functionality is provided mainly for browser-type applications but may be appropriate for other applications as well. diff --git a/src/3rdparty/libmng/doc/man/libmng.3 b/src/3rdparty/libmng/doc/man/libmng.3 index bdc47457..54d6ad34 100644 --- a/src/3rdparty/libmng/doc/man/libmng.3 +++ b/src/3rdparty/libmng/doc/man/libmng.3 @@ -847,7 +847,7 @@ callback! This method is preferred if you are reading from a slow input device (such as a dialup-line) and you wish to start displaying something -as tquickly as possible. This functionality is provided mainly for +as quickly as possible. This functionality is provided mainly for browser-type applications but may be appropriate for other applications as well. diff --git a/src/3rdparty/libmng/libmng.h b/src/3rdparty/libmng/libmng.h index f9e7d525..924f40db 100644 --- a/src/3rdparty/libmng/libmng.h +++ b/src/3rdparty/libmng/libmng.h @@ -2096,7 +2096,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_INVALIDSIG (mng_retcode)1025 /* invalid graphics file */ #define MNG_INVALIDCRC (mng_retcode)1027 /* crc check failed */ #define MNG_INVALIDLENGTH (mng_retcode)1028 /* chunklength mystifies me */ -#define MNG_SETQUENCEERROR (mng_retcode)1029 /* invalid chunk sequence */ +#define MNG_SEQUENCEERROR (mng_retcode)1029 /* invalid chunk sequence */ #define MNG_CHUNKNOTALLOWED (mng_retcode)1030 /* completely out-of-place */ #define MNG_MULTIPLEERROR (mng_retcode)1031 /* only one occurence allowed */ #define MNG_PLTEMISSING (mng_retcode)1032 /* indexed-color requires PLTE */ @@ -2461,7 +2461,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_COMPRESSION_BASELINEJPEG 8 /* JHDR */ -#define MNG_INTERLACE_SETQUENTIAL 0 /* JHDR */ +#define MNG_INTERLACE_SEQUENTIAL 0 /* JHDR */ #define MNG_INTERLACE_PROGRESSIVE 8 #endif /* MNG_INCLUDE_JNG */ diff --git a/src/3rdparty/libmng/libmng_chunk_io.c b/src/3rdparty/libmng/libmng_chunk_io.c index f16ef91d..0f61a708 100644 --- a/src/3rdparty/libmng/libmng_chunk_io.c +++ b/src/3rdparty/libmng/libmng_chunk_io.c @@ -559,14 +559,14 @@ READ_CHUNK (read_ihdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) /* sequence checks */ if ((pData->eSigtype == mng_it_png) && (pData->iChunkseq > 1)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasIDAT)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) pData->bHasIHDR = MNG_TRUE; /* indicate IHDR is present */ /* and store interesting fields */ @@ -711,14 +711,14 @@ READ_CHUNK (read_plte) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJHDR)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* multiple PLTE only inside BASI */ if ((pData->bHasPLTE) && (!pData->bHasBASI)) MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -884,15 +884,15 @@ READ_CHUNK (read_idat) #else if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasJHDR) && (pData->iJHDRalphacompression != MNG_COMPRESSION_DEFLATE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasJSEP) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #endif /* not allowed for for deltatype NO_CHANGE */ if ((pData->bHasDHDR) && ((pData->iDeltatype == MNG_DELTATYPE_NOCHANGE))) @@ -958,7 +958,7 @@ READ_CHUNK (read_iend) #else if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* IHDR-block requires IDAT */ if ((pData->bHasIHDR) && (!pData->bHasIDAT)) MNG_ERROR (pData, MNG_IDATMISSING) @@ -1032,14 +1032,14 @@ READ_CHUNK (read_trns) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJHDR)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* multiple tRNS only inside BASI */ if ((pData->bHasTRNS) && (!pData->bHasBASI)) MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -1280,14 +1280,14 @@ READ_CHUNK (read_gama) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1393,14 +1393,14 @@ READ_CHUNK (read_chrm) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1561,14 +1561,14 @@ READ_CHUNK (read_srgb) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1681,14 +1681,14 @@ READ_CHUNK (read_iccp) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasPLTE) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasIDAT) || (pData->bHasPLTE)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) @@ -1904,7 +1904,7 @@ READ_CHUNK (read_text) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 2) /* length must be at least 2 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2003,7 +2003,7 @@ READ_CHUNK (read_ztxt) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 3) /* length must be at least 3 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2145,7 +2145,7 @@ READ_CHUNK (read_itxt) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 6) /* length must be at least 6 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2174,7 +2174,7 @@ READ_CHUNK (read_itxt) iCompressedsize = (mng_uint32)(iRawlen - iKeywordlen - iLanguagelen - iTranslationlen - 5); iCompressionflag = *(pNull1+1); - zKeyword = 0; /* no buffers actquired yet */ + zKeyword = 0; /* no buffers acquired yet */ zLanguage = 0; zTranslation = 0; pBuf = 0; @@ -2348,14 +2348,14 @@ READ_CHUNK (read_bkgd) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 6) /* it just can't be bigger than that! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2529,14 +2529,14 @@ READ_CHUNK (read_phys) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if (pData->bHasIDAT) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* it's 9 bytes or empty; no more, no less! */ if ((iRawlen != 9) && (iRawlen != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2592,14 +2592,14 @@ READ_CHUNK (read_sbit) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasPLTE) || (pData->bHasIDAT) || (pData->bHasJDAT) || (pData->bHasJDAA)) #else if ((pData->bHasPLTE) || (pData->bHasIDAT)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 4) /* it just can't be bigger than that! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2711,10 +2711,10 @@ READ_CHUNK (read_splt) /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasIDAT) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen) { @@ -2804,10 +2804,10 @@ READ_CHUNK (read_hist) #endif /* sequence checks */ if ((!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((!pData->bHasPLTE) || (pData->bHasIDAT)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* length oke ? */ if ( ((iRawlen & 0x01) != 0) || ((iRawlen >> 1) != pData->iPLTEcount) ) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2864,7 +2864,7 @@ READ_CHUNK (read_time) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 7) /* length must be exactly 7 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -2911,7 +2911,7 @@ READ_CHUNK (read_mhdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) if (pData->bHasheader) /* can only be the first chunk! */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* correct length ? */ if ((iRawlen != 28) && (iRawlen != 12)) MNG_ERROR (pData, MNG_INVALIDLENGTH); @@ -3003,7 +3003,7 @@ READ_CHUNK (read_mend) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen > 0) /* must not contain data! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3045,7 +3045,7 @@ READ_CHUNK (read_loop) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (!pData->bCacheplayback) /* must store playback info to work!! */ MNG_ERROR (pData, MNG_LOOPWITHCACHEOFF) @@ -3055,7 +3055,7 @@ READ_CHUNK (read_loop) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen >= 5) /* length checks */ { @@ -3199,14 +3199,14 @@ READ_CHUNK (read_endl) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 1) /* length must be exactly 1 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3268,14 +3268,14 @@ READ_CHUNK (read_defi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 2) && (iRawlen != 3) && (iRawlen != 4) && (iRawlen != 12) && (iRawlen != 28)) @@ -3415,14 +3415,14 @@ READ_CHUNK (read_basi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 13) && (iRawlen != 19) && (iRawlen != 21) && (iRawlen != 22)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3559,14 +3559,14 @@ READ_CHUNK (read_clon) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 4) && (iRawlen != 5) && (iRawlen != 6) && (iRawlen != 7) && (iRawlen != 16)) @@ -3677,14 +3677,14 @@ READ_CHUNK (read_past) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen < 41) || (((iRawlen - 11) % 30) != 0)) @@ -3763,14 +3763,14 @@ READ_CHUNK (read_disc) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((iRawlen % 2) != 0) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3832,14 +3832,14 @@ READ_CHUNK (read_back) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 6) && (iRawlen != 7) && (iRawlen != 9) && (iRawlen != 10)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -3924,14 +3924,14 @@ READ_CHUNK (read_fram) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen <= 1) /* only framing-mode ? */ { @@ -4175,14 +4175,14 @@ READ_CHUNK (read_move) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 13) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4243,14 +4243,14 @@ READ_CHUNK (read_clip) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 21) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4317,14 +4317,14 @@ READ_CHUNK (read_show) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check the length */ if ((iRawlen != 0) && (iRawlen != 2) && (iRawlen != 4) && (iRawlen != 5)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4410,17 +4410,17 @@ READ_CHUNK (read_term) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasLOOP) /* no way, jose! */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasTERM) /* only 1 allowed! */ MNG_ERROR (pData, MNG_MULTIPLEERROR) @@ -4490,14 +4490,14 @@ READ_CHUNK (read_save) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (pData->bHasSAVE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) pData->bHasSAVE = MNG_TRUE; @@ -4701,14 +4701,14 @@ READ_CHUNK (read_seek) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasSAVE)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->fProcessseek) /* inform the app ? */ { @@ -4782,14 +4782,14 @@ READ_CHUNK (read_expi) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 3) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -4841,14 +4841,14 @@ READ_CHUNK (read_fpri) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 2) /* must be two bytes long */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5022,14 +5022,14 @@ READ_CHUNK (read_need) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 1) /* check the length */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5097,14 +5097,14 @@ READ_CHUNK (read_phyg) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* it's 9 bytes or empty; no more, no less! */ if ((iRawlen != 9) && (iRawlen != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5158,10 +5158,10 @@ READ_CHUNK (read_jhdr) MNG_ERROR (pData, MNG_CHUNKNOTALLOWED) if ((pData->eSigtype == mng_it_jng) && (pData->iChunkseq > 1)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 16) /* length oke ? */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5193,7 +5193,7 @@ READ_CHUNK (read_jhdr) if (pData->iJHDRimgcompression != MNG_COMPRESSION_BASELINEJPEG) MNG_ERROR (pData, MNG_INVALIDCOMPRESS) - if ((pData->iJHDRimginterlace != MNG_INTERLACE_SETQUENTIAL ) && + if ((pData->iJHDRimginterlace != MNG_INTERLACE_SEQUENTIAL ) && (pData->iJHDRimginterlace != MNG_INTERLACE_PROGRESSIVE) ) MNG_ERROR (pData, MNG_INVALIDINTERLACE) @@ -5314,13 +5314,13 @@ READ_CHUNK (read_jdaa) #endif /* sequence checks */ if ((!pData->bHasJHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->bHasJSEP) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (pData->iJHDRalphacompression != MNG_COMPRESSION_BASELINEJPEG) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen == 0) /* can never be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5376,7 +5376,7 @@ READ_CHUNK (read_jdat) #endif /* sequence checks */ if ((!pData->bHasJHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen == 0) /* can never be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5432,7 +5432,7 @@ READ_CHUNK (read_jsep) #endif if (!pData->bHasJHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* must be empty ! */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5470,14 +5470,14 @@ READ_CHUNK (read_dhdr) #endif if (!pData->bHasMHDR) /* sequence checks */ - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) #ifdef MNG_INCLUDE_JNG if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR) || (pData->bHasJHDR)) #else if ((pData->bHasIHDR) || (pData->bHasBASI) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check for valid length */ if ((iRawlen != 4) && (iRawlen != 12) && (iRawlen != 20)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5581,7 +5581,7 @@ READ_CHUNK (read_prom) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 3) /* gotta be exactly 3 bytes */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5652,7 +5652,7 @@ READ_CHUNK (read_ipng) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* gotta be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5706,7 +5706,7 @@ READ_CHUNK (read_pplt) #endif /* sequence checks */ if ((!pData->bHasMHDR) && (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 1) /* must have at least 1 byte */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5880,7 +5880,7 @@ READ_CHUNK (read_ijng) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen != 0) /* gotta be empty */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5924,7 +5924,7 @@ READ_CHUNK (read_drop) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen < 4) || ((iRawlen % 4) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -5986,7 +5986,7 @@ READ_CHUNK (read_dbyk) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) if (iRawlen < 6) /* must be at least 6 long */ MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6037,7 +6037,7 @@ READ_CHUNK (read_ordr) #endif /* sequence checks */ if ((!pData->bHasMHDR) || (!pData->bHasDHDR)) - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen < 5) || ((iRawlen % 5) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6108,7 +6108,7 @@ READ_CHUNK (read_magn) #else if ((!pData->bHasMHDR) || (pData->bHasIHDR) || (pData->bHasDHDR)) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* check length */ if ((iRawlen > 20) || ((iRawlen & 0x01) != 0)) MNG_ERROR (pData, MNG_INVALIDLENGTH) @@ -6226,7 +6226,7 @@ READ_CHUNK (read_unknown) if ((!pData->bHasMHDR) && (!pData->bHasIHDR) && (!pData->bHasBASI) && (!pData->bHasDHDR) ) #endif - MNG_ERROR (pData, MNG_SETQUENCEERROR) + MNG_ERROR (pData, MNG_SEQUENCEERROR) /* critical chunk ? */ if (((mng_uint32)pData->iChunkname & 0x20000000) == 0) MNG_ERROR (pData, MNG_UNKNOWNCRITICAL) diff --git a/src/3rdparty/libmng/libmng_error.c b/src/3rdparty/libmng/libmng_error.c index b3e42180..237f4671 100644 --- a/src/3rdparty/libmng/libmng_error.c +++ b/src/3rdparty/libmng/libmng_error.c @@ -102,7 +102,7 @@ {MNG_INVALIDSIG, "The signature is invalid"}, {MNG_INVALIDCRC, "The CRC for this chunk is invalid"}, {MNG_INVALIDLENGTH, "Chunk-length is invalid"}, - {MNG_SETQUENCEERROR, "Chunk out of sequence"}, + {MNG_SEQUENCEERROR, "Chunk out of sequence"}, {MNG_CHUNKNOTALLOWED, "Chunk not allowed at this point"}, {MNG_MULTIPLEERROR, "Chunk cannot occur multiple times"}, {MNG_PLTEMISSING, "Missing PLTE chunk"}, diff --git a/src/3rdparty/libmng/ltmain.sh b/src/3rdparty/libmng/ltmain.sh index 59b9650b..7b739c80 100644 --- a/src/3rdparty/libmng/ltmain.sh +++ b/src/3rdparty/libmng/ltmain.sh @@ -177,7 +177,7 @@ do --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --tquiet | --silent) + --quiet | --silent) show=: ;; @@ -263,7 +263,7 @@ if test -z "$show_help"; then generic_help="$help" help="Try \`$modename --help --mode=$mode' for more information." - # These modes are in order of execution frequency so that they run tquickly. + # These modes are in order of execution frequency so that they run quickly. case $mode in # libtool compile mode compile) @@ -3305,7 +3305,7 @@ extern \"C\" { $mv "$nlist"T "$nlist" fi - # Try sorting and unitquifying the output. + # Try sorting and uniquifying the output. if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then : else @@ -4805,7 +4805,7 @@ Provide generalized library-building support services. --finish same as \`--mode=finish' --help display this help message and exit --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --tquiet same as \`--silent' + --quiet same as \`--silent' --silent don't print informational messages --version print version information diff --git a/src/3rdparty/libpng/CHANGES b/src/3rdparty/libpng/CHANGES index 65d047b1..d151a41c 100644 --- a/src/3rdparty/libpng/CHANGES +++ b/src/3rdparty/libpng/CHANGES @@ -167,7 +167,7 @@ version 0.96 [May, 1997] fixed DOS medium model support (Tim Wegner) fixed png_check_keyword() for case with error in static string text added read of CRC after IEND chunk for embedded PNGs (Laszlo Nyul) - added typecasts to tquiet compiler errors + added typecasts to quiet compiler errors added more debugging info version 0.97 [January, 1998] removed PNG_USE_OWN_CRC capability @@ -935,7 +935,7 @@ version 1.0.11 [April 27, 2001] version 1.0.12beta1 [May 14, 2001] Test for Windows platform in pngconf.h when including malloc.h (Emmanuel Blot) Updated makefile.cygwin and handling of Cygwin's ALL_STATIC in pngconf.h - Added some never-to-be-executed code in pnggccrd.c to tquiet compiler warnings. + Added some never-to-be-executed code in pnggccrd.c to quiet compiler warnings. Eliminated the png_error about apps using png_read|write_init(). Instead, libpng will reallocate the png_struct and info_struct if they are too small. This retains future binary compatibility for old applications written for @@ -1055,7 +1055,7 @@ version 1.2.2beta5 [March 26, 2002] Revised makefiles to make symlink to libpng.so.NN in addition to libpngNN.so version 1.2.2beta6 [March 31, 2002] version 1.0.13beta1 [March 31, 2002] - Prevent png_zalloc() from trying to memset memory that it failed to actquire. + Prevent png_zalloc() from trying to memset memory that it failed to acquire. Add typecasts of PNG_MAX_UINT in pngset_cHRM_fixed() (Matt Holgate). Ensure that the right function (user or default) is used to free the png_struct after an error in png_create_read_struct_2(). diff --git a/src/3rdparty/libpng/INSTALL b/src/3rdparty/libpng/INSTALL index d407c9e4..1d6dfc5f 100644 --- a/src/3rdparty/libpng/INSTALL +++ b/src/3rdparty/libpng/INSTALL @@ -132,7 +132,7 @@ Then read pngconf.h to see if you want to make any configuration changes. Then just run "make test" which will create the libpng library in -this directory and run a tquick test that reads the "pngtest.png" +this directory and run a quick test that reads the "pngtest.png" file and writes a "pngout.png" file that should be identical to it. Look for "9782 zero samples" in the output of the test. For more confidence, you can run another test by typing "pngtest pngnow.png" diff --git a/src/3rdparty/libpng/libpng.3 b/src/3rdparty/libpng/libpng.3 index 249fc095..b54b5479 100644 --- a/src/3rdparty/libpng/libpng.3 +++ b/src/3rdparty/libpng/libpng.3 @@ -957,7 +957,7 @@ pointers to error handling functions, and a pointer to a data struct for use by the error functions, if necessary (the pointer and functions can be NULL if the default error handlers are to be used). See the section on Changes to Libpng below regarding the old initialization functions. -The structure allocation functions tquietly return NULL if they fail to +The structure allocation functions quietly return NULL if they fail to create the structure, so your application should check for that. png_structp png_ptr = png_create_read_struct @@ -1470,7 +1470,7 @@ rowbytes, as some of the transformations could increase the space needed to hold a row (expand, filler, gray_to_rgb, etc.). See png_read_update_info(), below. -A tquick word about text_ptr and num_text. PNG stores comments in +A quick word about text_ptr and num_text. PNG stores comments in keyword/text pairs, one pair per chunk, with no limit on the number of text chunks, and a 2^31 byte limit on their size. While there are suggested keywords, there is no requirement to restrict the use to these @@ -2626,7 +2626,7 @@ structure (that is, the value of "i", which is the order in which the chunk was either read from the input file or defined with png_set_unknown_chunks). -A tquick word about text and num_text. text is an array of png_text +A quick word about text and num_text. text is an array of png_text structures. num_text is the number of valid structures in the array. Each png_text structure holds a language code, a keyword, a text value, and a compression type. @@ -3200,7 +3200,7 @@ library code itself needs to know about interactions between your chunk and existing `intrinsic' chunks. If you need to write a new intrinsic chunk, first read the PNG -specification. Actquire a first level of +specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the diff --git a/src/3rdparty/libpng/libpng.txt b/src/3rdparty/libpng/libpng.txt index c0892e50..689b5648 100644 --- a/src/3rdparty/libpng/libpng.txt +++ b/src/3rdparty/libpng/libpng.txt @@ -166,7 +166,7 @@ pointers to error handling functions, and a pointer to a data struct for use by the error functions, if necessary (the pointer and functions can be NULL if the default error handlers are to be used). See the section on Changes to Libpng below regarding the old initialization functions. -The structure allocation functions tquietly return NULL if they fail to +The structure allocation functions quietly return NULL if they fail to create the structure, so your application should check for that. png_structp png_ptr = png_create_read_struct @@ -679,7 +679,7 @@ rowbytes, as some of the transformations could increase the space needed to hold a row (expand, filler, gray_to_rgb, etc.). See png_read_update_info(), below. -A tquick word about text_ptr and num_text. PNG stores comments in +A quick word about text_ptr and num_text. PNG stores comments in keyword/text pairs, one pair per chunk, with no limit on the number of text chunks, and a 2^31 byte limit on their size. While there are suggested keywords, there is no requirement to restrict the use to these @@ -1835,7 +1835,7 @@ structure (that is, the value of "i", which is the order in which the chunk was either read from the input file or defined with png_set_unknown_chunks). -A tquick word about text and num_text. text is an array of png_text +A quick word about text and num_text. text is an array of png_text structures. num_text is the number of valid structures in the array. Each png_text structure holds a language code, a keyword, a text value, and a compression type. @@ -2409,7 +2409,7 @@ library code itself needs to know about interactions between your chunk and existing `intrinsic' chunks. If you need to write a new intrinsic chunk, first read the PNG -specification. Actquire a first level of +specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the diff --git a/src/3rdparty/libpng/png.h b/src/3rdparty/libpng/png.h index 98390e26..55f9b650 100644 --- a/src/3rdparty/libpng/png.h +++ b/src/3rdparty/libpng/png.h @@ -746,7 +746,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) * The integer range [0, 2^bit_depth - 1] maps to the floating-point * range given by [pcal_X0, pcal_X1], and are further transformed by a * (possibly non-linear) transformation function given by "pcal_type" - * and "pcal_params" into "pcal_units". Please see the PNG_ETQUATION_ + * and "pcal_params" into "pcal_units". Please see the PNG_EQUATION_ * defines below, and the PNG-Group's PNG extensions document for a * complete description of the transformations and how they should be * implemented, and for a description of the ASCII parameter strings. @@ -757,7 +757,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) png_int_32 pcal_X1; /* maximum value */ png_charp pcal_units; /* Latin-1 string giving physical units */ png_charpp pcal_params; /* ASCII strings containing parameter values */ - png_byte pcal_type; /* equation type (see PNG_ETQUATION_ below) */ + png_byte pcal_type; /* equation type (see PNG_EQUATION_ below) */ png_byte pcal_nparams; /* number of parameters given in pcal_params */ #endif @@ -875,11 +875,11 @@ typedef png_info FAR * FAR * png_infopp; #define PNG_OFFSET_LAST 2 /* Not a valid value */ /* These are for the pCAL chunk. These values should NOT be changed. */ -#define PNG_ETQUATION_LINEAR 0 /* Linear transformation */ -#define PNG_ETQUATION_BASE_E 1 /* Exponential base e transform */ -#define PNG_ETQUATION_ARBITRARY 2 /* Arbitrary base exponential transform */ -#define PNG_ETQUATION_HYPERBOLIC 3 /* Hyperbolic sine transformation */ -#define PNG_ETQUATION_LAST 4 /* Not a valid value */ +#define PNG_EQUATION_LINEAR 0 /* Linear transformation */ +#define PNG_EQUATION_BASE_E 1 /* Exponential base e transform */ +#define PNG_EQUATION_ARBITRARY 2 /* Arbitrary base exponential transform */ +#define PNG_EQUATION_HYPERBOLIC 3 /* Hyperbolic sine transformation */ +#define PNG_EQUATION_LAST 4 /* Not a valid value */ /* These are for the sCAL chunk. These values should NOT be changed. */ #define PNG_SCALE_UNKNOWN 0 /* unknown unit (image scale) */ @@ -1505,7 +1505,7 @@ extern PNG_EXPORT(void,png_set_background) PNGARG((png_structp png_ptr, #define PNG_BACKGROUND_GAMMA_UNKNOWN 0 #define PNG_BACKGROUND_GAMMA_SCREEN 1 #define PNG_BACKGROUND_GAMMA_FILE 2 -#define PNG_BACKGROUND_GAMMA_UNITQUE 3 +#define PNG_BACKGROUND_GAMMA_UNIQUE 3 #endif #if defined(PNG_READ_16_TO_8_SUPPORTED) @@ -1619,7 +1619,7 @@ extern PNG_EXPORT(void,png_set_crc_action) PNGARG((png_structp png_ptr, #define PNG_CRC_ERROR_QUIT 1 /* error/quit error/quit */ #define PNG_CRC_WARN_DISCARD 2 /* (INVALID) warn/discard data */ #define PNG_CRC_WARN_USE 3 /* warn/use data warn/use data */ -#define PNG_CRC_QUIET_USE 4 /* tquiet/use data tquiet/use data */ +#define PNG_CRC_QUIET_USE 4 /* quiet/use data quiet/use data */ #define PNG_CRC_NO_CHANGE 5 /* use current value use current value */ /* These functions give the user control over the scan-line filtering in diff --git a/src/3rdparty/libpng/pngpread.c b/src/3rdparty/libpng/pngpread.c index 5da819b4..36701f62 100644 --- a/src/3rdparty/libpng/pngpread.c +++ b/src/3rdparty/libpng/pngpread.c @@ -1031,7 +1031,7 @@ png_push_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place tEXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1127,7 +1127,7 @@ png_push_handle_zTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place zTXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1319,7 +1319,7 @@ png_push_handle_iTXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 if (!(png_ptr->mode & PNG_HAVE_IHDR) || (png_ptr->mode & PNG_HAVE_IEND)) { png_error(png_ptr, "Out of place iTXt"); - /* to tquiet some compiler warnings */ + /* to quiet some compiler warnings */ if(info_ptr == NULL) return; } @@ -1446,7 +1446,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 #endif png_chunk_error(png_ptr, "unknown critical chunk"); - /* to tquiet compiler warnings about unused info_ptr */ + /* to quiet compiler warnings about unused info_ptr */ if (info_ptr == NULL) return; } diff --git a/src/3rdparty/libpng/pngread.c b/src/3rdparty/libpng/pngread.c index 269a6be0..80d0ba04 100644 --- a/src/3rdparty/libpng/pngread.c +++ b/src/3rdparty/libpng/pngread.c @@ -1412,7 +1412,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr, png_read_end(png_ptr, info_ptr); if(transforms == 0 || params == NULL) - /* tquiet compiler warnings */ return; + /* quiet compiler warnings */ return; } #endif diff --git a/src/3rdparty/libpng/pngrtran.c b/src/3rdparty/libpng/pngrtran.c index 4f002c80..a0a3994d 100644 --- a/src/3rdparty/libpng/pngrtran.c +++ b/src/3rdparty/libpng/pngrtran.c @@ -30,7 +30,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE; break; - case PNG_CRC_QUIET_USE: /* tquiet/use data */ + case PNG_CRC_QUIET_USE: /* quiet/use data */ png_ptr->flags &= ~PNG_FLAG_CRC_CRITICAL_MASK; png_ptr->flags |= PNG_FLAG_CRC_CRITICAL_USE | PNG_FLAG_CRC_CRITICAL_IGNORE; @@ -52,7 +52,7 @@ png_set_crc_action(png_structp png_ptr, int crit_action, int ancil_action) png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE; break; - case PNG_CRC_QUIET_USE: /* tquiet/use data */ + case PNG_CRC_QUIET_USE: /* quiet/use data */ png_ptr->flags &= ~PNG_FLAG_CRC_ANCILLARY_MASK; png_ptr->flags |= PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN; @@ -281,7 +281,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, } else { - /* This is much harder to do simply (and tquickly). Perhaps + /* This is much harder to do simply (and quickly). Perhaps we need to go through a median cut routine, but those don't always behave themselves with only a few colors as input. So we will just find the closest two colors, @@ -813,7 +813,7 @@ png_init_read_transformations(png_structp png_ptr) g = 1.0 / (png_ptr->gamma); gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); break; - case PNG_BACKGROUND_GAMMA_UNITQUE: + case PNG_BACKGROUND_GAMMA_UNIQUE: g = 1.0 / (png_ptr->background_gamma); gs = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); @@ -897,7 +897,7 @@ png_init_read_transformations(png_structp png_ptr) g = 1.0 / (png_ptr->gamma); gs = 1.0 / (png_ptr->gamma * png_ptr->screen_gamma); break; - case PNG_BACKGROUND_GAMMA_UNITQUE: + case PNG_BACKGROUND_GAMMA_UNIQUE: g = 1.0 / (png_ptr->background_gamma); gs = 1.0 / (png_ptr->background_gamma * png_ptr->screen_gamma); diff --git a/src/3rdparty/libpng/pngrutil.c b/src/3rdparty/libpng/pngrutil.c index 798abd2f..13e08523 100644 --- a/src/3rdparty/libpng/pngrutil.c +++ b/src/3rdparty/libpng/pngrutil.c @@ -551,7 +551,7 @@ png_handle_IEND(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) { png_error(png_ptr, "No image in file"); - info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */ + info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */ } png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND); @@ -1624,16 +1624,16 @@ png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_debug(3, "Checking pCAL equation type and number of parameters\n"); /* Check that we have the right number of parameters for known equation types. */ - if ((type == PNG_ETQUATION_LINEAR && nparams != 2) || - (type == PNG_ETQUATION_BASE_E && nparams != 3) || - (type == PNG_ETQUATION_ARBITRARY && nparams != 3) || - (type == PNG_ETQUATION_HYPERBOLIC && nparams != 4)) + if ((type == PNG_EQUATION_LINEAR && nparams != 2) || + (type == PNG_EQUATION_BASE_E && nparams != 3) || + (type == PNG_EQUATION_ARBITRARY && nparams != 3) || + (type == PNG_EQUATION_HYPERBOLIC && nparams != 4)) { png_warning(png_ptr, "Invalid pCAL parameters for equation type"); png_free(png_ptr, purpose); return; } - else if (type >= PNG_ETQUATION_LAST) + else if (type >= PNG_EQUATION_LAST) { png_warning(png_ptr, "Unrecognized equation type for pCAL chunk"); } @@ -2211,7 +2211,7 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_crc_finish(png_ptr, skip); #if !defined(PNG_READ_USER_CHUNKS_SUPPORTED) - info_ptr = info_ptr; /* tquiet compiler warnings about unused info_ptr */ + info_ptr = info_ptr; /* quiet compiler warnings about unused info_ptr */ #endif } diff --git a/src/3rdparty/libpng/pngwrite.c b/src/3rdparty/libpng/pngwrite.c index 1e98090a..10c9ea40 100644 --- a/src/3rdparty/libpng/pngwrite.c +++ b/src/3rdparty/libpng/pngwrite.c @@ -1444,7 +1444,7 @@ png_write_png(png_structp png_ptr, png_infop info_ptr, png_write_end(png_ptr, info_ptr); if(transforms == 0 || params == NULL) - /* tquiet compiler warnings */ return; + /* quiet compiler warnings */ return; } #endif #endif /* PNG_WRITE_SUPPORTED */ diff --git a/src/3rdparty/libpng/pngwutil.c b/src/3rdparty/libpng/pngwutil.c index d640179a..43d26c2a 100644 --- a/src/3rdparty/libpng/pngwutil.c +++ b/src/3rdparty/libpng/pngwutil.c @@ -1470,7 +1470,7 @@ png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0, int i; png_debug1(1, "in png_write_pCAL (%d parameters)\n", nparams); - if (type >= PNG_ETQUATION_LAST) + if (type >= PNG_EQUATION_LAST) png_warning(png_ptr, "Unrecognized equation type for pCAL chunk"); purpose_len = png_check_keyword(png_ptr, purpose, &new_purpose) + 1; diff --git a/src/3rdparty/libpng/scripts/makefile.amiga b/src/3rdparty/libpng/scripts/makefile.amiga index 9e352507..79cb4249 100644 --- a/src/3rdparty/libpng/scripts/makefile.amiga +++ b/src/3rdparty/libpng/scripts/makefile.amiga @@ -22,7 +22,7 @@ LDLIBS= libpng.lib libgz.lib LIB:scm.lib LIB:sc.lib Lib:amiga.lib # linker LN= slink # file deletion command -RM= delete tquiet +RM= delete quiet # library (.lib) file creation command AR= oml # make directory command diff --git a/src/3rdparty/libpng/scripts/pngdef.pas b/src/3rdparty/libpng/scripts/pngdef.pas index ecfb8feb..6e206831 100644 --- a/src/3rdparty/libpng/scripts/pngdef.pas +++ b/src/3rdparty/libpng/scripts/pngdef.pas @@ -210,7 +210,7 @@ const PNG_CRC_ERROR_QUIT = 1; // error/quit error/quit PNG_CRC_WARN_DISCARD = 2; // (INVALID) warn/discard data PNG_CRC_WARN_USE = 3; // warn/use data warn/use data - PNG_CRC_QUIET_USE = 4; // tquiet/use data tquiet/use data + PNG_CRC_QUIET_USE = 4; // quiet/use data quiet/use data PNG_CRC_NO_CHANGE = 5; // use current value use current value // Flags for png_set_filter() to say which filters to use. The flags diff --git a/src/3rdparty/libpng/scripts/smakefile.ppc b/src/3rdparty/libpng/scripts/smakefile.ppc index 5406dbbb..e5c02784 100644 --- a/src/3rdparty/libpng/scripts/smakefile.ppc +++ b/src/3rdparty/libpng/scripts/smakefile.ppc @@ -13,7 +13,7 @@ RANLIB = ppc-amigaos-ranlib LDFLAGS = -r -o LDLIBS = ../zlib/libzip.a LIB:scppc.a LN = ppc-amigaos-ld -RM = delete tquiet +RM = delete quiet MKDIR = makedir OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o pngread.o \ diff --git a/src/3rdparty/sqlite/btree.c b/src/3rdparty/sqlite/btree.c index c5f077ab..6b9c6b02 100644 --- a/src/3rdparty/sqlite/btree.c +++ b/src/3rdparty/sqlite/btree.c @@ -308,7 +308,7 @@ struct FreelistInfo { ** than can possibly fit on one page. In the steady state, every apCell[] ** points to memory inside u.aDisk[]. But in the middle of an insert ** operation, some apCell[] entries may temporarily point to data space -** outside of u.aDisk[]. This is a transient situation that is tquickly +** outside of u.aDisk[]. This is a transient situation that is quickly ** resolved. But while it is happening, it is possible for a database ** page to hold as many as two more cells than it might otherwise hold. ** The extra two entries in apCell[] are an allowance for this situation. @@ -772,7 +772,7 @@ static int fileBtreeSetSafetyLevel(Btree *pBt, int level){ /* ** Get a reference to page1 of the database file. This will -** also actquire a readlock on that file. +** also acquire a readlock on that file. ** ** SQLITE_OK is returned on success. If the file is not a ** well-formed database file, then SQLITE_CORRUPT is returned. @@ -997,7 +997,7 @@ static int fileBtreeRollbackCkpt(Btree *pBt){ /* ** Create a new cursor for the BTree whose root is on the page -** iTable. The act of actquiring a cursor gets a read lock on +** iTable. The act of acquiring a cursor gets a read lock on ** the database file. ** ** If wrFlag==0, then the cursor can only be used for reading. @@ -1028,7 +1028,7 @@ static int fileBtreeRollbackCkpt(Btree *pBt){ ** to write. ** ** No checking is done to make sure that page iTable really is the -** root page of a b-tree. If it is not, then the cursor actquired +** root page of a b-tree. If it is not, then the cursor acquired ** will not work correctly. */ static int fileBtreeCursor(Btree *pBt, int iTable, int wrFlag, BtCursor **ppCur){ @@ -3423,7 +3423,7 @@ char *fileBtreeIntegrityCheck(Btree *pBt, int *aRoot, int nRoot){ nRef = *sqlitepager_stats(pBt->pPager); if( lockBtree(pBt)!=SQLITE_OK ){ - return sqliteStrDup("Unable to actquire a read lock on the database"); + return sqliteStrDup("Unable to acquire a read lock on the database"); } sCheck.pBt = pBt; sCheck.pPager = pBt->pPager; diff --git a/src/3rdparty/sqlite/build.c b/src/3rdparty/sqlite/build.c index 2639604b..87c88346 100644 --- a/src/3rdparty/sqlite/build.c +++ b/src/3rdparty/sqlite/build.c @@ -527,7 +527,7 @@ void sqliteStartTable( /* Begin generating the code that will insert the table record into ** the SQLITE_MASTER table. Note in particular that we must go ahead ** and allocate the record number for the table entry now. Before any - ** PRIMARY KEY or UNITQUE keywords are parsed. Those keywords will cause + ** PRIMARY KEY or UNIQUE keywords are parsed. Those keywords will cause ** indices to be created and the table record must come before the ** indices. Hence, the record number for the table must be allocated ** now. @@ -1462,7 +1462,7 @@ void sqliteDeferForeignKey(Parse *pParse, int isDeferred){ ** Create a new index for an SQL table. pIndex is the name of the index ** and pTable is the name of the table that is to be indexed. Both will ** be NULL for a primary key or an index that is created to satisfy a -** UNITQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable +** UNIQUE constraint. If pTable and pIndex are NULL, use pParse->pNewTable ** as the table to be indexed. pParse->pNewTable is a table that is ** currently being constructed by a CREATE TABLE statement. ** @@ -1532,7 +1532,7 @@ void sqliteCreateIndex( ** index, then we will continue to process this index. ** ** If pName==0 it means that we are - ** dealing with a primary key or UNITQUE constraint. We have to invent our + ** dealing with a primary key or UNIQUE constraint. We have to invent our ** own name. */ if( pName && !db->init.busy ){ @@ -1674,7 +1674,7 @@ void sqliteCreateIndex( ** we don't want to recreate it. ** ** If pTable==0 it means this index is generated as a primary key - ** or UNITQUE constraint of a CREATE TABLE statement. Since the table + ** or UNIQUE constraint of a CREATE TABLE statement. Since the table ** has just been created, it contains no data and the index initialization ** step can be skipped. */ @@ -1768,7 +1768,7 @@ void sqliteDropIndex(Parse *pParse, SrcList *pName){ goto exit_drop_index; } if( pIndex->autoIndex ){ - sqliteErrorMsg(pParse, "index associated with UNITQUE " + sqliteErrorMsg(pParse, "index associated with UNIQUE " "or PRIMARY KEY constraint cannot be dropped", 0); goto exit_drop_index; } diff --git a/src/3rdparty/sqlite/insert.c b/src/3rdparty/sqlite/insert.c index 5957f300..64e18ba0 100644 --- a/src/3rdparty/sqlite/insert.c +++ b/src/3rdparty/sqlite/insert.c @@ -567,7 +567,7 @@ insert_cleanup: ** aIdxUsed!=0 and aIdxUsed[i]!=0. ** ** This routine also generates code to check constraints. NOT NULL, -** CHECK, and UNITQUE constraints are all checked. If a constraint fails, +** CHECK, and UNIQUE constraints are all checked. If a constraint fails, ** then the appropriate action is performed. There are five possible ** actions: ROLLBACK, ABORT, FAIL, REPLACE, and IGNORE. ** @@ -595,7 +595,7 @@ insert_cleanup: ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** -** UNITQUE REPLACE The other row that conflicts with the row +** UNIQUE REPLACE The other row that conflicts with the row ** being inserted is removed. ** ** CHECK REPLACE Illegal. The results in an exception. @@ -753,7 +753,7 @@ void sqliteGenerateConstraintChecks( } } - /* Test all UNITQUE constraints by creating entries for each UNITQUE + /* Test all UNIQUE constraints by creating entries for each UNIQUE ** index and making sure that duplicate entries do not already exist. ** Add the new records to the indices as we go. */ @@ -777,7 +777,7 @@ void sqliteGenerateConstraintChecks( /* Find out what action to take in case there is an indexing conflict */ onError = pIdx->onError; - if( onError==OE_None ) continue; /* pIdx is not a UNITQUE index */ + if( onError==OE_None ) continue; /* pIdx is not a UNIQUE index */ if( overrideError!=OE_Default ){ onError = overrideError; }else if( pParse->db->onError!=OE_Default ){ @@ -843,7 +843,7 @@ void sqliteGenerateConstraintChecks( default: assert(0); } contAddr = sqliteVdbeCurrentAddr(v); -#if NULL_DISTINCT_FOR_UNITQUE +#if NULL_DISTINCT_FOR_UNIQUE sqliteVdbeChangeP2(v, jumpInst1, contAddr); #endif sqliteVdbeChangeP2(v, jumpInst2, contAddr); diff --git a/src/3rdparty/sqlite/main.c b/src/3rdparty/sqlite/main.c index 725b6503..6fa01410 100644 --- a/src/3rdparty/sqlite/main.c +++ b/src/3rdparty/sqlite/main.c @@ -90,7 +90,7 @@ int sqliteInitCallback(void *pInit, int argc, char **argv, char **azColName){ db->init.iDb = 0; }else{ /* If the SQL column is blank it means this is an index that - ** was created to be the PRIMARY KEY or to fulfill a UNITQUE + ** was created to be the PRIMARY KEY or to fulfill a UNIQUE ** constraint for a CREATE TABLE. The index should have already ** been created when we processed the CREATE TABLE. All we have ** to do here is record the root page number for that index. diff --git a/src/3rdparty/sqlite/os.c b/src/3rdparty/sqlite/os.c index 3130bdee..b4ae7a10 100644 --- a/src/3rdparty/sqlite/os.c +++ b/src/3rdparty/sqlite/os.c @@ -1245,7 +1245,7 @@ int isNT(void){ ** A database write lock is obtained by locking all bytes in the range. ** There can only be one writer. ** -** A lock is obtained on the first byte of the lock range before actquiring +** A lock is obtained on the first byte of the lock range before acquiring ** either a read lock or a write lock. This prevents two processes from ** attempting to get a lock at a same time. The semantics of ** sqliteOsReadLock() require that if there is already a write lock, that @@ -1280,7 +1280,7 @@ int isNT(void){ /* ** Change the status of the lock on the file "id" to be a readlock. ** If the file was write locked, then this reduces the lock to a read. -** If the file was read locked, then this actquires a new read lock. +** If the file was read locked, then this acquires a new read lock. ** ** Return SQLITE_OK on success and SQLITE_BUSY on failure. If this ** library was compiled with large file support (LFS) but LFS is not @@ -1685,7 +1685,7 @@ static int inMutex = 0; ** executed code that is surrounded by EnterMutex() and LeaveMutex(). ** ** SQLite uses only a single Mutex. There is not much critical -** code and what little there is executes tquickly and without blocking. +** code and what little there is executes quickly and without blocking. */ void sqliteOsEnterMutex(){ #ifdef SQLITE_UNIX_THREADS diff --git a/src/3rdparty/sqlite/pager.c b/src/3rdparty/sqlite/pager.c index 32dcf19b..8b6a1546 100644 --- a/src/3rdparty/sqlite/pager.c +++ b/src/3rdparty/sqlite/pager.c @@ -463,7 +463,7 @@ static void pager_reset(Pager *pPager){ /* ** When this routine is called, the pager has the journal file open and ** a write lock on the database. This routine releases the database -** write lock and actquires a read lock in its place. The journal file +** write lock and acquires a read lock in its place. The journal file ** is deleted and closed. ** ** TODO: Consider keeping the journal file open for temporary databases. @@ -1286,9 +1286,9 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ } /* -** Actquire a page. +** Acquire a page. ** -** A read lock on the disk file is obtained when the first page is actquired. +** A read lock on the disk file is obtained when the first page is acquired. ** This read lock is dropped when the last page is released. ** ** A _get works for any page number greater than 0. If the database @@ -1297,13 +1297,13 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ ** all zeros. The extra data appended to a page is always initialized ** to zeros the first time a page is loaded into memory. ** -** The actquisition might fail for several reasons. In all cases, +** The acquisition might fail for several reasons. In all cases, ** an appropriate error code is returned and *ppPage is set to NULL. ** ** See also sqlitepager_lookup(). Both this routine and _lookup() attempt ** to find a page in the in-memory cache first. If the page is not already ** in memory, this routine goes to disk to read it in whereas _lookup() -** just returns 0. This routine actquires a read-lock the first time it +** just returns 0. This routine acquires a read-lock the first time it ** has to go to disk, and could also playback an old journal if necessary. ** Since _lookup() never goes to disk, it never has to deal with locks ** or journal files. @@ -1366,7 +1366,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ pPager->journalStarted = 0; /* Playback and delete the journal. Drop the database write - ** lock and reactquire the read lock. + ** lock and reacquire the read lock. */ rc = pager_playback(pPager, 0); if( rc!=SQLITE_OK ){ @@ -1544,7 +1544,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ } /* -** Actquire a page if it is already in the in-memory cache. Do +** Acquire a page if it is already in the in-memory cache. Do ** not read the page from disk. Return a pointer to the page, ** or 0 if the page is not in cache. ** @@ -1692,7 +1692,7 @@ static int pager_open_journal(Pager *pPager){ } /* -** Actquire a write-lock on the database. The lock is removed when +** Acquire a write-lock on the database. The lock is removed when ** the any of the following happen: ** ** * sqlitepager_commit() is called. @@ -1702,7 +1702,7 @@ static int pager_open_journal(Pager *pPager){ ** ** The parameter to this routine is a pointer to any open page of the ** database file. Nothing changes about the page - it is used merely -** to actquire a pointer to the Pager structure and as proof that there +** to acquire a pointer to the Pager structure and as proof that there ** is already a read-lock on the database. ** ** A journal file is opened if this is not a temporary file. For @@ -1739,8 +1739,8 @@ int sqlitepager_begin(void *pData){ ** changes to a page. ** ** The first time this routine is called, the pager creates a new -** journal and actquires a write lock on the database. If the write -** lock could not be actquired, this routine returns SQLITE_BUSY. The +** journal and acquires a write lock on the database. If the write +** lock could not be acquired, this routine returns SQLITE_BUSY. The ** calling routine must check for that return value and be careful not to ** change any page data until this routine returns SQLITE_OK. ** diff --git a/src/3rdparty/sqlite/parse.c b/src/3rdparty/sqlite/parse.c index 2fd6ae39..46353691 100644 --- a/src/3rdparty/sqlite/parse.c +++ b/src/3rdparty/sqlite/parse.c @@ -711,7 +711,7 @@ static const YYCODETYPE yyFallback[] = { 0, /* FLOAT => nothing */ 0, /* NULL => nothing */ 0, /* PRIMARY => nothing */ - 0, /* UNITQUE => nothing */ + 0, /* UNIQUE => nothing */ 0, /* CHECK => nothing */ 0, /* REFERENCES => nothing */ 0, /* COLLATE => nothing */ @@ -840,7 +840,7 @@ static const char *yyTokenName[] = { "STAR", "SLASH", "REM", "CONCAT", "UMINUS", "UPLUS", "BITNOT", "STRING", "JOIN_KW", "INTEGER", "CONSTRAINT", "DEFAULT", - "FLOAT", "NULL", "PRIMARY", "UNITQUE", + "FLOAT", "NULL", "PRIMARY", "UNIQUE", "CHECK", "REFERENCES", "COLLATE", "ON", "DELETE", "UPDATE", "INSERT", "SET", "DEFERRABLE", "FOREIGN", "DROP", "UNION", @@ -935,7 +935,7 @@ static const char *yyRuleName[] = { /* 53 */ "ccons ::= NULL onconf", /* 54 */ "ccons ::= NOT NULL onconf", /* 55 */ "ccons ::= PRIMARY KEY sortorder onconf", - /* 56 */ "ccons ::= UNITQUE onconf", + /* 56 */ "ccons ::= UNIQUE onconf", /* 57 */ "ccons ::= CHECK LP expr RP onconf", /* 58 */ "ccons ::= REFERENCES nm idxlist_opt refargs", /* 59 */ "ccons ::= defer_subclause", @@ -962,7 +962,7 @@ static const char *yyRuleName[] = { /* 80 */ "conslist ::= tcons", /* 81 */ "tcons ::= CONSTRAINT nm", /* 82 */ "tcons ::= PRIMARY KEY LP idxlist RP onconf", - /* 83 */ "tcons ::= UNITQUE LP idxlist RP onconf", + /* 83 */ "tcons ::= UNIQUE LP idxlist RP onconf", /* 84 */ "tcons ::= CHECK expr onconf", /* 85 */ "tcons ::= FOREIGN KEY LP idxlist RP REFERENCES nm idxlist_opt refargs defer_subclause_opt", /* 86 */ "defer_subclause_opt ::=", @@ -1115,7 +1115,7 @@ static const char *yyRuleName[] = { /* 233 */ "expritem ::= expr", /* 234 */ "expritem ::=", /* 235 */ "cmd ::= CREATE uniqueflag INDEX nm ON nm dbnm LP idxlist RP onconf", - /* 236 */ "uniqueflag ::= UNITQUE", + /* 236 */ "uniqueflag ::= UNIQUE", /* 237 */ "uniqueflag ::=", /* 238 */ "idxlist_opt ::=", /* 239 */ "idxlist_opt ::= LP idxlist RP", @@ -2183,7 +2183,7 @@ static void yy_reduce( #line 191 "parse.y" {sqliteCreateIndex(pParse,0,0,0,yymsp[0].minor.yy372,0,0);} #line 2185 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 57: /* No destructor defined for CHECK */ @@ -2342,7 +2342,7 @@ static void yy_reduce( #line 238 "parse.y" {sqliteCreateIndex(pParse,0,0,yymsp[-2].minor.yy320,yymsp[0].minor.yy372,0,0);} #line 2344 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ /* No destructor defined for LP */ /* No destructor defined for RP */ break; @@ -3428,7 +3428,7 @@ static void yy_reduce( #line 740 "parse.y" { yygotominor.yy372 = OE_Abort; } #line 3430 "parse.c" - /* No destructor defined for UNITQUE */ + /* No destructor defined for UNIQUE */ break; case 237: #line 741 "parse.y" diff --git a/src/3rdparty/sqlite/parse.h b/src/3rdparty/sqlite/parse.h index 35949283..188a336c 100644 --- a/src/3rdparty/sqlite/parse.h +++ b/src/3rdparty/sqlite/parse.h @@ -92,7 +92,7 @@ #define TK_FLOAT 92 #define TK_NULL 93 #define TK_PRIMARY 94 -#define TK_UNITQUE 95 +#define TK_UNIQUE 95 #define TK_CHECK 96 #define TK_REFERENCES 97 #define TK_COLLATE 98 diff --git a/src/3rdparty/sqlite/sqliteInt.h b/src/3rdparty/sqlite/sqliteInt.h index 6fa4af40..4c2b6434 100644 --- a/src/3rdparty/sqlite/sqliteInt.h +++ b/src/3rdparty/sqlite/sqliteInt.h @@ -45,16 +45,16 @@ /* ** If the following macro is set to 1, then NULL values are considered ** distinct when determining whether or not two entries are the same -** in a UNITQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, +** in a UNIQUE index. This is the way PostgreSQL, Oracle, DB2, MySQL, ** OCELOT, and Firebird all work. The SQL92 spec explicitly says this ** is the way things are suppose to work. ** ** If the following macro is set to 0, the NULLs are indistinct for -** a UNITQUE index. In this mode, you can only have a single NULL entry -** for a column declared UNITQUE. This is the way Informix and SQL Server +** a UNIQUE index. In this mode, you can only have a single NULL entry +** for a column declared UNIQUE. This is the way Informix and SQL Server ** work. */ -#define NULL_DISTINCT_FOR_UNITQUE 1 +#define NULL_DISTINCT_FOR_UNIQUE 1 /* ** The maximum number of attached databases. This must be at least 2 @@ -559,7 +559,7 @@ struct FKey { ** occurs. IGNORE means that the particular row that caused the constraint ** error is not inserted or updated. Processing continues and no error ** is returned. REPLACE means that preexisting database rows that caused -** a UNITQUE constraint violation are removed so that the new insert or +** a UNIQUE constraint violation are removed so that the new insert or ** update can proceed. Processing continues and no error is reported. ** ** RESTRICT, SETNULL, and CASCADE actions apply only to foreign keys. @@ -619,7 +619,7 @@ struct Index { Table *pTable; /* The SQL table being indexed */ int tnum; /* Page containing root of this index in database file */ u8 onError; /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */ - u8 autoIndex; /* True if is automatically created (ex: by UNITQUE) */ + u8 autoIndex; /* True if is automatically created (ex: by UNIQUE) */ u8 iDb; /* Index in sqlite.aDb[] of where this index is stored */ Index *pNext; /* The next index associated with the same table */ }; diff --git a/src/3rdparty/sqlite/tokenize.c b/src/3rdparty/sqlite/tokenize.c index 96dad9f4..d0a34fed 100644 --- a/src/3rdparty/sqlite/tokenize.c +++ b/src/3rdparty/sqlite/tokenize.c @@ -130,7 +130,7 @@ static Keyword aKeywordTable[] = { { "TRANSACTION", TK_TRANSACTION, }, { "TRIGGER", TK_TRIGGER, }, { "UNION", TK_UNION, }, - { "UNITQUE", TK_UNITQUE, }, + { "UNIQUE", TK_UNIQUE, }, { "UPDATE", TK_UPDATE, }, { "USING", TK_USING, }, { "VACUUM", TK_VACUUM, }, diff --git a/src/3rdparty/sqlite/util.c b/src/3rdparty/sqlite/util.c index 074afedf..16b3b46a 100644 --- a/src/3rdparty/sqlite/util.c +++ b/src/3rdparty/sqlite/util.c @@ -933,7 +933,7 @@ static int sqlite_utf8_to_int(const unsigned char *z){ ** "[a-z]" matches any single lower-case letter. To match a '-', make ** it the last character in the list. ** -** This routine is usually tquick, but can be N**2 in the worst case. +** This routine is usually quick, but can be N**2 in the worst case. ** ** Hints: to match '*' or '?', put them in "[]". Like this: ** diff --git a/src/3rdparty/sqlite/vdbe.c b/src/3rdparty/sqlite/vdbe.c index 3f0965a9..0d3fb43e 100644 --- a/src/3rdparty/sqlite/vdbe.c +++ b/src/3rdparty/sqlite/vdbe.c @@ -2348,7 +2348,7 @@ case OP_VerifyCookie: { ** ** There will be a read lock on the database whenever there is an ** open cursor. If the database was unlocked prior to this instruction -** then a read lock is actquired as part of this instruction. A read +** then a read lock is acquired as part of this instruction. A read ** lock allows other processes to read the database but prohibits ** any other process from modifying the database. The read lock is ** released when all cursors are closed. If this instruction attempts @@ -2741,7 +2741,7 @@ case OP_IsUnique: { /* The last four bytes of the key are different from R. Convert the ** last four bytes of the key into an integer and push it onto the ** stack. (These bytes are the record number of an entry that - ** violates a UNITQUE constraint.) + ** violates a UNIQUE constraint.) */ pTos++; pTos->i = v; diff --git a/src/3rdparty/sqlite/vdbeInt.h b/src/3rdparty/sqlite/vdbeInt.h index c5ac7495..79b6b51a 100644 --- a/src/3rdparty/sqlite/vdbeInt.h +++ b/src/3rdparty/sqlite/vdbeInt.h @@ -182,7 +182,7 @@ struct AggElem { }; /* -** A Set structure is used for tquick testing to see if a value +** A Set structure is used for quick testing to see if a value ** is part of a small set. Sets are used to implement code like ** this: ** x.y IN ('hi','hoo','hum') diff --git a/src/3rdparty/sqlite/where.c b/src/3rdparty/sqlite/where.c index ea713c33..34195c65 100644 --- a/src/3rdparty/sqlite/where.c +++ b/src/3rdparty/sqlite/where.c @@ -412,7 +412,7 @@ WhereInfo *sqliteWhereBegin( exprAnalyze(&maskSet, &aExpr[i]); /* If we are executing a trigger body, remove all references to - ** new.* and old.* tables from the preretquisite masks. + ** new.* and old.* tables from the prerequisite masks. */ if( pParse->trigStack ){ int x; diff --git a/src/3rdparty/zlib/deflate.c b/src/3rdparty/zlib/deflate.c index c7f75a3e..0fc53bc1 100644 --- a/src/3rdparty/zlib/deflate.c +++ b/src/3rdparty/zlib/deflate.c @@ -154,7 +154,7 @@ local const config configuration_table[10] = { * meaning. */ -#define ETQUAL 0 +#define EQUAL 0 /* result of memcmp for equal strings */ #ifndef NO_DUMMY_DECL @@ -1064,7 +1064,7 @@ local void check_match(s, start, match, length) { /* check that the match is indeed a match */ if (zmemcmp(s->window + match, - s->window + start, length) != ETQUAL) { + s->window + start, length) != EQUAL) { fprintf(stderr, " start %u, match %u, length %d\n", start, match, length); do { diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 4c01661b..c563991e 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -590,7 +590,7 @@ ZEXTERN int Q_ZEXPORT deflateParams OF((z_streamp strm, Dynamically update the compression level and compression strategy. The interpretation of level and strategy is as in deflateInit2. This can be used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data retquiring a different + to switch to a different kind of input data requiring a different strategy. If the compression level is changed, the input available so far is compressed with the old level (and may be flushed); the new level will take effect only at the next call of deflate(). diff --git a/src/attic/qtmultilineedit.cpp b/src/attic/qtmultilineedit.cpp index 1a93c8b2..8361bedc 100644 --- a/src/attic/qtmultilineedit.cpp +++ b/src/attic/qtmultilineedit.cpp @@ -1454,7 +1454,7 @@ void TQtMultiLineEdit::pageDown( bool mark ) int pageSize = viewHeight() / cellHeight(); int newTopCell = TQMIN( topCell() + pageSize, numLines() - 1 - pageSize ); - if ( pageSize >= numLines() ) { // tquick fix to handle small texts + if ( pageSize >= numLines() ) { // quick fix to handle small texts newTopCell = topCell(); } if ( !curXPos ) @@ -1506,7 +1506,7 @@ void TQtMultiLineEdit::pageUp( bool mark ) int pageSize = viewHeight() / cellHeight(); bool partial = delta == pageSize && viewHeight() != pageSize * cellHeight(); int newTopCell = TQMAX( topCell() - pageSize, 0 ); - if ( pageSize > numLines() ) { // tquick fix to handle small texts + if ( pageSize > numLines() ) { // quick fix to handle small texts newTopCell = 0; delta = 0; } diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp index a8b348b9..d5eceae9 100644 --- a/src/canvas/qcanvas.cpp +++ b/src/canvas/qcanvas.cpp @@ -2522,7 +2522,7 @@ static bool collision_double_dispatch( const TQCanvasSprite* s1, which will accept an integer frame number to retrieve the coordinates of a particular frame. - TQCanvasSprite draws very tquickly, at the expense of memory. + TQCanvasSprite draws very quickly, at the expense of memory. The current frame's image can be drawn on a painter with draw(). @@ -3749,7 +3749,7 @@ TQSize TQCanvasView::sizeHint() const to maximize efficiency, but the polygon must \e definitely be contained completely within the polygonal area. Calculating the exact requirements is usually difficult, but if you allow a small - overestimate it can be easy and tquick, while still getting almost + overestimate it can be easy and quick, while still getting almost all of TQCanvasPolygonalItem's speed. Note that all subclasses \e must call hide() in their destructor diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/ntqeucjpcodec.h index b5d6e7d8..e0f2edcf 100644 --- a/src/codecs/ntqeucjpcodec.h +++ b/src/codecs/ntqeucjpcodec.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/ntqeuckrcodec.h index 7235ca31..216cce61 100644 --- a/src/codecs/ntqeuckrcodec.h +++ b/src/codecs/ntqeuckrcodec.h @@ -54,7 +54,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/ntqjiscodec.h index 00cbf7cd..6a34cb7d 100644 --- a/src/codecs/ntqjiscodec.h +++ b/src/codecs/ntqjiscodec.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqjpunicode.h b/src/codecs/ntqjpunicode.h index 37f6f242..8d19960f 100644 --- a/src/codecs/ntqjpunicode.h +++ b/src/codecs/ntqjpunicode.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/ntqsjiscodec.h index 9bac66ca..46fbc918 100644 --- a/src/codecs/ntqsjiscodec.h +++ b/src/codecs/ntqsjiscodec.h @@ -58,7 +58,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/ntqtsciicodec.h b/src/codecs/ntqtsciicodec.h index 4b881b13..ad04e2f7 100644 --- a/src/codecs/ntqtsciicodec.h +++ b/src/codecs/ntqtsciicodec.h @@ -56,7 +56,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp index 49ebce4e..ddf6a2a2 100644 --- a/src/codecs/qbig5codec.cpp +++ b/src/codecs/qbig5codec.cpp @@ -89,7 +89,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -802,7 +802,7 @@ int TQBig5Codec::heuristicNameMatch(const char* hint) const ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp index 52ce9592..6230559d 100644 --- a/src/codecs/qeucjpcodec.cpp +++ b/src/codecs/qeucjpcodec.cpp @@ -80,7 +80,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -105,7 +105,7 @@ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -157,10 +157,10 @@ int TQEucJpCodec::mibEnum() const code set 1: JIS X0208-1990 (a double 8-bit byte set) restricted to A0-FF in both bytes code set 2: Half Width Katakana (a single 7-bit byte set) - retquiring SS2 as the character prefix + requiring SS2 as the character prefix code set 3: JIS X0212-1990 (a double 7-bit byte set) restricted to A0-FF in both bytes - retquiring SS3 as the character prefix + requiring SS3 as the character prefix Alias: csEUCPkdFmtJapanese Alias: EUC-JP (preferred MIME name) */ diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp index 433f4b8b..1b325ce6 100644 --- a/src/codecs/qeuckrcodec.cpp +++ b/src/codecs/qeuckrcodec.cpp @@ -70,7 +70,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp index e6aca796..db2a76fd 100644 --- a/src/codecs/qgb18030codec.cpp +++ b/src/codecs/qgb18030codec.cpp @@ -106,7 +106,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp index 9f125a33..366a19f5 100644 --- a/src/codecs/qjiscodec.cpp +++ b/src/codecs/qjiscodec.cpp @@ -123,7 +123,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp index 500dab38..ea0ca2ba 100644 --- a/src/codecs/qjpunicode.cpp +++ b/src/codecs/qjpunicode.cpp @@ -73,7 +73,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp index bf2a94be..c03506b6 100644 --- a/src/codecs/qrtlcodec.cpp +++ b/src/codecs/qrtlcodec.cpp @@ -45,7 +45,7 @@ // NOT REVISED -static const uchar unkn = '?'; // BLACK STQUARE (94) would be better +static const uchar unkn = '?'; // BLACK SQUARE (94) would be better static const ushort heb_to_unicode[128] = { 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp index 7a2e0c49..33aee755 100644 --- a/src/codecs/qsjiscodec.cpp +++ b/src/codecs/qsjiscodec.cpp @@ -81,7 +81,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp index e57f4fd7..5a615e74 100644 --- a/src/codecs/qtsciicodec.cpp +++ b/src/codecs/qtsciicodec.cpp @@ -83,7 +83,7 @@ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index e883fdc6..cbeeac68 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -141,7 +141,7 @@ void jump( TQtMsgType t, const char * m ) rich += TQStyleSheet::convertFromPlainText( m, TQStyleSheetItem::WhiteSpaceNormal ); - // ### work around text engine tquirk + // ### work around text engine quirk if ( rich.endsWith("</p>") ) rich.truncate( rich.length() - 4 ); diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp index eeaf54dc..d0320af6 100644 --- a/src/dialogs/qprogressdialog.cpp +++ b/src/dialogs/qprogressdialog.cpp @@ -722,7 +722,7 @@ void TQProgressDialog::layout() If the expected duration of the task is less than the minimumDuration, the dialog will not appear at all. This prevents - the dialog popping up for tasks that are tquickly over. For tasks + the dialog popping up for tasks that are quickly over. For tasks that are expected to exceed the minimumDuration, the dialog will pop up after the minimumDuration time or as soon as any progress is set. diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/ntqkeysequence.h index f77bebc5..e326570c 100644 --- a/src/kernel/ntqkeysequence.h +++ b/src/kernel/ntqkeysequence.h @@ -38,8 +38,8 @@ ** **********************************************************************/ -#ifndef TQKEYSETQUENCE_H -#define TQKEYSETQUENCE_H +#ifndef TQKEYSEQUENCE_H +#define TQKEYSEQUENCE_H #ifndef QT_H #ifndef QT_H diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h index 5638517e..6dfba30f 100644 --- a/src/kernel/ntqprocess.h +++ b/src/kernel/ntqprocess.h @@ -82,7 +82,7 @@ public: virtual bool launch( const TQString& buf, TQStringList *env=0 ); virtual bool launch( const TQByteArray& buf, TQStringList *env=0 ); - // intquire the status + // inquire the status bool isRunning() const; bool normalExit() const; int exitStatus() const; diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index e9fee790..847d713a 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -829,7 +829,7 @@ static bool create_atoms_now = 0; If the application is being initialized, this function stores the adddress of the atom and tqt_init_internal will do the actual work - tquickly. If the application is running, the atom is created here. + quickly. If the application is running, the atom is created here. Neither argument may point to temporary variables. *****************************************************************************/ @@ -1129,7 +1129,7 @@ bool TQApplication::x11_apply_settings() #ifndef QT_NO_IM /* - The identifier name of an input method is actquired from the + The identifier name of an input method is acquired from the configuration file as a default. If a environment variable "QT_IM_SWITCHER" is not empty it will overwrite the configuration file. The "imsw-multi" becomes the default if the entry diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp index ac8deedd..7179cc1f 100644 --- a/src/kernel/qdnd_x11.cpp +++ b/src/kernel/qdnd_x11.cpp @@ -779,7 +779,7 @@ void qt_handle_xdnd_leave( TQWidget *w, const XEvent * xe, bool /*passive*/ ) TQApplication::sendEvent( qt_xdnd_current_widget, &e ); if ( l[0] != qt_xdnd_dragsource_xid ) { - // This often happens - leave other-process window tquickly + // This often happens - leave other-process window quickly //tqDebug( "xdnd drag leave from unexpected source (%08lx not %08lx", //l[0], qt_xdnd_dragsource_xid ); qt_xdnd_current_widget = 0; diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp index 0b7b862a..059b5baf 100644 --- a/src/kernel/qimage.cpp +++ b/src/kernel/qimage.cpp @@ -6235,7 +6235,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, Returns TRUE if this image and image \a i have the same contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which - case the function will return tquickly. + case the function will return quickly. \sa operator=() */ @@ -6284,7 +6284,7 @@ bool TQImage::operator==( const TQImage & i ) const Returns TRUE if this image and image \a i have different contents; otherwise returns FALSE. The comparison can be slow, unless there is some obvious difference, such as different widths, in which - case the function will return tquickly. + case the function will return quickly. \sa operator=() */ diff --git a/src/kernel/qinternal.cpp b/src/kernel/qinternal.cpp index 453ff05b..8281e70b 100644 --- a/src/kernel/qinternal.cpp +++ b/src/kernel/qinternal.cpp @@ -497,7 +497,7 @@ void TQSharedDoubleBuffer::flush() } /* \internal - Atquire ownership of the shared double buffer pixmap, subject to the + Acquire ownership of the shared double buffer pixmap, subject to the following conditions: \list 1 @@ -510,7 +510,7 @@ void TQSharedDoubleBuffer::flush() object becomes the owner of the shared double buffer pixmap. The shared double buffer pixmap is resize if necessary, and this function returns a pointer to the pixmap. Ownership must later be - relintquished by calling releasePixmap(). + relinquished by calling releasePixmap(). If none of the above conditions are met, this function returns zero. diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp index fc97c3d6..58f87e78 100644 --- a/src/kernel/qmotifdnd_x11.cpp +++ b/src/kernel/qmotifdnd_x11.cpp @@ -405,9 +405,9 @@ static void DndWriteReceiverProperty(Display * dpy, Window window, /* protocol style equiv (preregister stuff really) */ -#define DND_DRAG_DROP_ONLY_ETQUIV 3 -#define DND_DRAG_DYNAMIC_ETQUIV1 2 -#define DND_DRAG_DYNAMIC_ETQUIV2 4 +#define DND_DRAG_DROP_ONLY_EQUIV 3 +#define DND_DRAG_DYNAMIC_EQUIV1 2 +#define DND_DRAG_DYNAMIC_EQUIV2 4 /* Produce a client message to be sent by the caller */ diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp index 7f0cabe4..add847a1 100644 --- a/src/kernel/qpalette.cpp +++ b/src/kernel/qpalette.cpp @@ -908,11 +908,11 @@ void TQPalette::setInactive( const TQColorGroup &g ) \fn bool TQPalette::operator!=( const TQPalette &p ) const Returns TRUE (slowly) if this palette is different from \a p; - otherwise returns FALSE (usually tquickly). + otherwise returns FALSE (usually quickly). */ /*! - Returns TRUE (usually tquickly) if this palette is equal to \a p; + Returns TRUE (usually quickly) if this palette is equal to \a p; otherwise returns FALSE (slowly). */ diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp index 95fbed5a..7dd6c0d7 100644 --- a/src/kernel/qpixmap.cpp +++ b/src/kernel/qpixmap.cpp @@ -107,7 +107,7 @@ if you create more than about 1000 pixmaps, independent of the size of the pixmaps or installed RAM. Windows NT-systems (including 2000, XP and following versions) do not have the same limitation, - but depending on the graphics etquipment the system will fail to + but depending on the graphics equipment the system will fail to allocate pixmap objects at some point (due to system running out of GDI resources). diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index 06fcaabf..cc9c211c 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -1877,11 +1877,11 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags ) if( axi->bytes_per_line == (int)w ) { int max = w * h; while (max--) - *aptr++ = *iptr++ >> 24; // stquirt + *aptr++ = *iptr++ >> 24; // squirt } else { for (uint i = 0; i < h; ++i ) { for (uint j = 0; j < w; ++j ) - *aptr++ = *iptr++ >> 24; // stquirt + *aptr++ = *iptr++ >> 24; // squirt aptr += ( axi->bytes_per_line - w ); } } diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp index b3a634ab..d391d5c4 100644 --- a/src/kernel/qpngio.cpp +++ b/src/kernel/qpngio.cpp @@ -425,7 +425,7 @@ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) if ( image.hasAlphaBuffer() ) { // Many PNG files lie (eg. from PhotoShop). Fortunately this loop will - // usually be tquick to find those that tell the truth. + // usually be quick to find those that tell the truth. TQRgb* c; int n; if (image.depth()==32) { diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp index 98dc7257..d073ab1d 100644 --- a/src/kernel/qpoint.cpp +++ b/src/kernel/qpoint.cpp @@ -434,7 +434,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPoint &p ) distances apply to travelers who can only travel on a rectangular grid, like the streets of Manhattan. - This is a useful, and tquick to calculate, approximation to the + This is a useful, and quick to calculate, approximation to the true length: sqrt(pow(x(),2)+pow(y(),2)). */ int TQPoint::manhattanLength() const diff --git a/src/kernel/qpolygonscanner.cpp b/src/kernel/qpolygonscanner.cpp index 92f36f3e..ef772bc1 100644 --- a/src/kernel/qpolygonscanner.cpp +++ b/src/kernel/qpolygonscanner.cpp @@ -360,7 +360,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -374,7 +374,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index 80b91d8c..c1d234df 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -369,7 +369,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) #else pid = fork(); if ( pid == 0 ) { // child process - // if possible, exit tquickly, so the actual lp/lpr + // if possible, exit quickly, so the actual lp/lpr // becomes a child of init, and ::waitpid() is // guaranteed not to wait. if ( fork() > 0 ) { diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp index 39027459..3bba1bca 100644 --- a/src/kernel/qprocess_unix.cpp +++ b/src/kernel/qprocess_unix.cpp @@ -789,7 +789,7 @@ bool TQProcess::start( TQStringList *env ) arglist[i] = 0; // Must make sure signal handlers are installed before exec'ing - // in case the process exits tquickly. + // in case the process exits quickly. if ( d->procManager == 0 ) { d->procManager = new TQProcessManager; tqAddPostRoutine(qprocess_cleanup); diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index 1b4553b6..90d81223 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -221,7 +221,7 @@ static const struct { { 0x0000, ".notdef" }, { 0x0020, "space" }, // SPACE { 0x0021, "exclam" }, // EXCLAMATION MARK - { 0x0022, "quotedbl" }, // TQUOTATION MARK + { 0x0022, "quotedbl" }, // QUOTATION MARK { 0x0023, "numbersign" }, // NUMBER SIGN { 0x0024, "dollar" }, // DOLLAR SIGN { 0x0025, "percent" }, // PERCENT SIGN @@ -248,9 +248,9 @@ static const struct { { 0x003A, "colon" }, // COLON { 0x003B, "semicolon" }, // SEMICOLON { 0x003C, "less" }, // LESS-THAN SIGN - { 0x003D, "equal" }, // ETQUALS SIGN + { 0x003D, "equal" }, // EQUALS SIGN { 0x003E, "greater" }, // GREATER-THAN SIGN - { 0x003F, "question" }, // TQUESTION MARK + { 0x003F, "question" }, // QUESTION MARK { 0x0040, "at" }, // COMMERCIAL AT { 0x0041, "A" }, // LATIN CAPITAL LETTER A { 0x0042, "B" }, // LATIN CAPITAL LETTER B @@ -278,9 +278,9 @@ static const struct { { 0x0058, "X" }, // LATIN CAPITAL LETTER X { 0x0059, "Y" }, // LATIN CAPITAL LETTER Y { 0x005A, "Z" }, // LATIN CAPITAL LETTER Z - { 0x005B, "bracketleft" }, // LEFT STQUARE BRACKET + { 0x005B, "bracketleft" }, // LEFT SQUARE BRACKET { 0x005C, "backslash" }, // REVERSE SOLIDUS - { 0x005D, "bracketright" }, // RIGHT STQUARE BRACKET + { 0x005D, "bracketright" }, // RIGHT SQUARE BRACKET { 0x005E, "asciicircum" }, // CIRCUMFLEX ACCENT { 0x005F, "underscore" }, // LOW LINE { 0x0060, "grave" }, // GRAVE ACCENT @@ -325,7 +325,7 @@ static const struct { { 0x00A8, "dieresis" }, // DIAERESIS { 0x00A9, "copyright" }, // COPYRIGHT SIGN { 0x00AA, "ordfeminine" }, // FEMININE ORDINAL INDICATOR - { 0x00AB, "guillemotleft" }, // LEFT-POINTING DOUBLE ANGLE TQUOTATION MARK + { 0x00AB, "guillemotleft" }, // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK { 0x00AC, "logicalnot" }, // NOT SIGN { 0x00AD, "hyphen" }, // SOFT HYPHEN;Duplicate { 0x00AE, "registered" }, // REGISTERED SIGN @@ -341,11 +341,11 @@ static const struct { { 0x00B8, "cedilla" }, // CEDILLA { 0x00B9, "onesuperior" }, // SUPERSCRIPT ONE { 0x00BA, "ordmasculine" }, // MASCULINE ORDINAL INDICATOR - { 0x00BB, "guillemotright" }, // RIGHT-POINTING DOUBLE ANGLE TQUOTATION MARK - { 0x00BC, "onequarter" }, // VULGAR FRACTION ONE TQUARTER + { 0x00BB, "guillemotright" }, // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK + { 0x00BC, "onequarter" }, // VULGAR FRACTION ONE QUARTER { 0x00BD, "onehalf" }, // VULGAR FRACTION ONE HALF - { 0x00BE, "threequarters" }, // VULGAR FRACTION THREE TQUARTERS - { 0x00BF, "questiondown" }, // INVERTED TQUESTION MARK + { 0x00BE, "threequarters" }, // VULGAR FRACTION THREE QUARTERS + { 0x00BF, "questiondown" }, // INVERTED QUESTION MARK { 0x00C0, "Agrave" }, // LATIN CAPITAL LETTER A WITH GRAVE { 0x00C1, "Aacute" }, // LATIN CAPITAL LETTER A WITH ACUTE { 0x00C2, "Acircumflex" }, // LATIN CAPITAL LETTER A WITH CIRCUMFLEX @@ -799,7 +799,7 @@ static const struct { { 0x05F2, "afii57718" }, // HEBREW LIGATURE YIDDISH DOUBLE YOD { 0x060C, "afii57388" }, // ARABIC COMMA { 0x061B, "afii57403" }, // ARABIC SEMICOLON - { 0x061F, "afii57407" }, // ARABIC TQUESTION MARK + { 0x061F, "afii57407" }, // ARABIC QUESTION MARK { 0x0621, "afii57409" }, // ARABIC LETTER HAMZA { 0x0622, "afii57410" }, // ARABIC LETTER ALEF WITH MADDA ABOVE { 0x0623, "afii57411" }, // ARABIC LETTER ALEF WITH HAMZA ABOVE @@ -885,13 +885,13 @@ static const struct { { 0x2014, "emdash" }, // EM DASH { 0x2015, "afii00208" }, // HORIZONTAL BAR { 0x2017, "underscoredbl" }, // DOUBLE LOW LINE - { 0x2018, "quoteleft" }, // LEFT SINGLE TQUOTATION MARK - { 0x2019, "quoteright" }, // RIGHT SINGLE TQUOTATION MARK - { 0x201A, "quotesinglbase" }, // SINGLE LOW-9 TQUOTATION MARK - { 0x201B, "quotereversed" }, // SINGLE HIGH-REVERSED-9 TQUOTATION MARK - { 0x201C, "quotedblleft" }, // LEFT DOUBLE TQUOTATION MARK - { 0x201D, "quotedblright" }, // RIGHT DOUBLE TQUOTATION MARK - { 0x201E, "quotedblbase" }, // DOUBLE LOW-9 TQUOTATION MARK + { 0x2018, "quoteleft" }, // LEFT SINGLE QUOTATION MARK + { 0x2019, "quoteright" }, // RIGHT SINGLE QUOTATION MARK + { 0x201A, "quotesinglbase" }, // SINGLE LOW-9 QUOTATION MARK + { 0x201B, "quotereversed" }, // SINGLE HIGH-REVERSED-9 QUOTATION MARK + { 0x201C, "quotedblleft" }, // LEFT DOUBLE QUOTATION MARK + { 0x201D, "quotedblright" }, // RIGHT DOUBLE QUOTATION MARK + { 0x201E, "quotedblbase" }, // DOUBLE LOW-9 QUOTATION MARK { 0x2020, "dagger" }, // DAGGER { 0x2021, "daggerdbl" }, // DOUBLE DAGGER { 0x2022, "bullet" }, // BULLET @@ -904,8 +904,8 @@ static const struct { { 0x2030, "perthousand" }, // PER MILLE SIGN { 0x2032, "minute" }, // PRIME { 0x2033, "second" }, // DOUBLE PRIME - { 0x2039, "guilsinglleft" }, // SINGLE LEFT-POINTING ANGLE TQUOTATION MARK - { 0x203A, "guilsinglright" }, // SINGLE RIGHT-POINTING ANGLE TQUOTATION MARK + { 0x2039, "guilsinglleft" }, // SINGLE LEFT-POINTING ANGLE QUOTATION MARK + { 0x203A, "guilsinglright" }, // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK { 0x203C, "exclamdbl" }, // DOUBLE EXCLAMATION MARK { 0x2044, "fraction" }, // FRACTION SLASH { 0x2070, "zerosuperior" }, // SUPERSCRIPT ZERO @@ -982,7 +982,7 @@ static const struct { { 0x2215, "fraction" }, // DIVISION SLASH;Duplicate { 0x2217, "asteriskmath" }, // ASTERISK OPERATOR { 0x2219, "periodcentered" }, // BULLET OPERATOR;Duplicate - { 0x221A, "radical" }, // STQUARE ROOT + { 0x221A, "radical" }, // SQUARE ROOT { 0x221D, "proportional" }, // PROPORTIONAL TO { 0x221E, "infinity" }, // INFINITY { 0x221F, "orthogonal" }, // RIGHT ANGLE @@ -994,17 +994,17 @@ static const struct { { 0x222B, "integral" }, // INTEGRAL { 0x2234, "therefore" }, // THEREFORE { 0x223C, "similar" }, // TILDE OPERATOR - { 0x2245, "congruent" }, // APPROXIMATELY ETQUAL TO - { 0x2248, "approxequal" }, // ALMOST ETQUAL TO - { 0x2260, "notequal" }, // NOT ETQUAL TO + { 0x2245, "congruent" }, // APPROXIMATELY EQUAL TO + { 0x2248, "approxequal" }, // ALMOST EQUAL TO + { 0x2260, "notequal" }, // NOT EQUAL TO { 0x2261, "equivalence" }, // IDENTICAL TO - { 0x2264, "lessequal" }, // LESS-THAN OR ETQUAL TO - { 0x2265, "greaterequal" }, // GREATER-THAN OR ETQUAL TO + { 0x2264, "lessequal" }, // LESS-THAN OR EQUAL TO + { 0x2265, "greaterequal" }, // GREATER-THAN OR EQUAL TO { 0x2282, "propersubset" }, // SUBSET OF { 0x2283, "propersuperset" }, // SUPERSET OF { 0x2284, "notsubset" }, // NOT A SUBSET OF - { 0x2286, "reflexsubset" }, // SUBSET OF OR ETQUAL TO - { 0x2287, "reflexsuperset" }, // SUPERSET OF OR ETQUAL TO + { 0x2286, "reflexsubset" }, // SUBSET OF OR EQUAL TO + { 0x2287, "reflexsuperset" }, // SUPERSET OF OR EQUAL TO { 0x2295, "circleplus" }, // CIRCLED PLUS { 0x2297, "circlemultiply" }, // CIRCLED TIMES { 0x22A5, "perpendicular" }, // UP TACK @@ -1063,10 +1063,10 @@ static const struct { { 0x2591, "ltshade" }, // LIGHT SHADE { 0x2592, "shade" }, // MEDIUM SHADE { 0x2593, "dkshade" }, // DARK SHADE - { 0x25A0, "filledbox" }, // BLACK STQUARE - { 0x25A1, "H22073" }, // WHITE STQUARE - { 0x25AA, "H18543" }, // BLACK SMALL STQUARE - { 0x25AB, "H18551" }, // WHITE SMALL STQUARE + { 0x25A0, "filledbox" }, // BLACK SQUARE + { 0x25A1, "H22073" }, // WHITE SQUARE + { 0x25AA, "H18543" }, // BLACK SMALL SQUARE + { 0x25AB, "H18551" }, // WHITE SMALL SQUARE { 0x25AC, "filledrect" }, // BLACK RECTANGLE { 0x25B2, "triagup" }, // BLACK UP-POINTING TRIANGLE { 0x25BA, "triagrt" }, // BLACK RIGHT-POINTING POINTER diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp index ccf40672..51ef757a 100644 --- a/src/kernel/qregion_x11.cpp +++ b/src/kernel/qregion_x11.cpp @@ -128,7 +128,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -142,7 +142,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS @@ -248,7 +248,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987, 1988 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -262,7 +262,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS @@ -1463,7 +1463,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -1477,7 +1477,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS @@ -1761,7 +1761,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the X Consortium. -Copyright 1987 by Digital Etquipment Corporation, Maynard, Massachusetts. +Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts. All Rights Reserved @@ -1775,7 +1775,7 @@ software without specific, written prior permission. DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL -DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSETQUENTIAL DAMAGES OR +DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp index 604bf130..dd46cc74 100644 --- a/src/kernel/qsound.cpp +++ b/src/kernel/qsound.cpp @@ -131,7 +131,7 @@ public: silently. NAS supports WAVE and AU files. On Macintosh, ironically, we use QT (\link - http://tquicktime.apple.com QuickTime\endlink) for sound, this + http://quicktime.apple.com QuickTime\endlink) for sound, this means all QuickTime formats are supported by TQt/Mac. On TQt/Embedded, a built-in mixing sound server is used, which @@ -156,7 +156,7 @@ void TQSound::play(const TQString& filename) } /*! - Constructs a TQSound that can tquickly play the sound in a file + Constructs a TQSound that can quickly play the sound in a file named \a filename. This may use more memory than the static \c play function. @@ -266,7 +266,7 @@ void TQSound::stop() without bothering the user. If no sound is available, all TQSound operations work silently and - tquickly. + quickly. */ bool TQSound::isAvailable() { diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp index 95dcef20..dbed45c3 100644 --- a/src/kernel/qtaddons_x11.cpp +++ b/src/kernel/qtaddons_x11.cpp @@ -16,7 +16,7 @@ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSETQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp index a99a49c1..0c70113f 100644 --- a/src/kernel/qtimer.cpp +++ b/src/kernel/qtimer.cpp @@ -82,7 +82,7 @@ \endcode myObject->processOneThing() will be called repeatedly and should - return tquickly (typically after processing one data item) so that + return quickly (typically after processing one data item) so that TQt can deliver events to widgets and stop the timer as soon as it has done all its work. This is the traditional way of implementing heavy work in GUI applications; multi-threading is diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp index f0ff3ed5..ba615afa 100644 --- a/src/kernel/qwidget.cpp +++ b/src/kernel/qwidget.cpp @@ -2609,7 +2609,7 @@ void TQWidget::setBackgroundFromMode() Although \c FixedColor and \c FixedPixmap are sometimes just right, if you use them, make sure that you test your application - when the desktop color scheme has been changed. (On X11, a tquick + when the desktop color scheme has been changed. (On X11, a quick way to test this is e.g. "./myapp -bg paleblue". On Windows, you must use the control panel.) @@ -3877,7 +3877,7 @@ void TQWidget::setGeometry( int x, int y, int w, int h ) \enum TQWidget::FocusPolicy This enum type defines the various policies a widget can have with - respect to actquiring keyboard focus. + respect to acquiring keyboard focus. \value TabFocus the widget accepts focus by tabbing. \value ClickFocus the widget accepts focus by clicking. diff --git a/src/moc/moc.y b/src/moc/moc.y index 6f773449..faa4c524 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -895,7 +895,7 @@ const_expression: /* empty */ { initExpression(); ; /* def_argument is just like const expression but handles the "," - slightly differently. It was added for 3.0 as tquick solution. TODO: + slightly differently. It was added for 3.0 as quick solution. TODO: merge with const_expression. */ diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index 616b3dfd..9f370a8e 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -1476,7 +1476,7 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) d->rrs->next(); } } - // if we found a positive result, return tquickly + // if we found a positive result, return quickly if ( answer && l->count() ) { #if defined(TQDNS_DEBUG) tqDebug( "found %d records for %s", diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index 222c2a59..31f07de3 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -1502,7 +1502,7 @@ int TQFtp::login( const TQString &user, const TQString &password ) */ int TQFtp::close() { - return addCommand( new TQFtpCommand( Close, TQStringList("TQUIT\r\n") ) ); + return addCommand( new TQFtpCommand( Close, TQStringList("QUIT\r\n") ) ); } /*! diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp index 827cc349..565ab7d3 100644 --- a/src/network/qsocketdevice_unix.cpp +++ b/src/network/qsocketdevice_unix.cpp @@ -625,10 +625,10 @@ int TQSocketDevice::accept() case ETIMEDOUT: // in all these cases, an error happened during connection // setup. we're not interested in what happened, so we - // just treat it like the client-closed-tquickly case. + // just treat it like the client-closed-quickly case. case EPERM: // firewalling wouldn't let us accept. we treat it like - // the client-closed-tquickly case. + // the client-closed-quickly case. case EAGAIN: #if EAGAIN != EWOULDBLOCK case EWOULDBLOCK: diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index 35033667..ece3b9ee 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -450,7 +450,7 @@ TQSqlIndex TQSQLiteDriver::primaryIndex(const TQString &tblname) const TQSqlQuery q = createQuery(); q.setForwardOnly(TRUE); - // finrst find a UNITQUE INDEX + // finrst find a UNIQUE INDEX q.exec("PRAGMA index_list('" + tblname + "');"); TQString indexname; while(q.next()) { diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h index 4852e78e..718886c2 100644 --- a/src/sql/ntqsqlquery.h +++ b/src/sql/ntqsqlquery.h @@ -38,8 +38,8 @@ ** **********************************************************************/ -#ifndef TQSQLTQUERY_H -#define TQSQLTQUERY_H +#ifndef TQSQLQUERY_H +#define TQSQLQUERY_H #ifndef QT_H #include "ntqobject.h" diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp index 3fbdc326..3a901a86 100644 --- a/src/sql/qdatatable.cpp +++ b/src/sql/qdatatable.cpp @@ -154,7 +154,7 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor ) fetched from the database on an as-needed basis with the scrollbar becoming more accurate as the user scrolls down through the records. This allows extremely large queries to be displayed as - tquickly as possible, with minimum memory usage. + quickly as possible, with minimum memory usage. TQDataTable inherits TQTable's API and extends it with functions to sort and filter the data and sort columns. See setSqlCursor(), diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp index b2a53dbd..3e462480 100644 --- a/src/sql/qsqlcursor.cpp +++ b/src/sql/qsqlcursor.cpp @@ -1007,7 +1007,7 @@ TQString TQSqlCursor::toString( const TQSqlIndex& i, TQSqlRecord* rec, const TQS \printuntil insert In the above example, a cursor is created on the 'prices' table - and a pointer to the insert buffer is atquired using primeInsert(). + and a pointer to the insert buffer is acquired using primeInsert(). Each field's value is set to the desired value and then insert() is called to insert the data into the database. Remember: all edit operations (insert(), update() and delete()) operate on the @@ -1175,7 +1175,7 @@ TQSqlRecord* TQSqlCursor::primeInsert() In the above example, a cursor is created on the 'prices' table and is positioned on the record to be updated. Then a pointer to - the cursor's edit buffer is actquired using primeUpdate(). A new + the cursor's edit buffer is acquired using primeUpdate(). A new value is calculated and placed into the edit buffer with the setValue() call. Finally, an update() call is made on the cursor which uses the tables's primary index to update the record in the diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index 45f4323b..798e7948 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -773,7 +773,7 @@ bool TQSqlDatabase::open( const TQString& user, const TQString& password ) } /*! - Closes the database connection, freeing any resources actquired. + Closes the database connection, freeing any resources acquired. \sa removeDatabase() */ diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp index 173d3003..09f67db2 100644 --- a/src/styles/qplatinumstyle.cpp +++ b/src/styles/qplatinumstyle.cpp @@ -110,7 +110,7 @@ void TQPlatinumStyle::drawPrimitive( PrimitiveElement pe, TQColorGroup myCG = cg; TQBrush fill; - // tquick trick to make sure toolbuttons drawn sunken + // quick trick to make sure toolbuttons drawn sunken // when they are activated... if ( flags & Style_On ) flags |= Style_Sunken; diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h index bc8cb99d..7b54c340 100644 --- a/src/tools/ntqglobal.h +++ b/src/tools/ntqglobal.h @@ -147,7 +147,7 @@ # define Q_OS_QNX6 #elif defined(__QNX__) # define Q_OS_QNX -#elif defined(_SETQUENT_) +#elif defined(_SEQUENT_) # define Q_OS_DYNIX #elif defined(_SCO_DS) /* SCO OpenServer 5 + GCC */ # define Q_OS_SCO diff --git a/src/tools/ntqptrqueue.h b/src/tools/ntqptrqueue.h index 0c1bd5e6..0f3cbbd3 100644 --- a/src/tools/ntqptrqueue.h +++ b/src/tools/ntqptrqueue.h @@ -38,8 +38,8 @@ ** **********************************************************************/ -#ifndef TQPTRTQUEUE_H -#define TQPTRTQUEUE_H +#ifndef TQPTRQUEUE_H +#define TQPTRQUEUE_H #ifndef QT_H #include "ntqglist.h" @@ -91,4 +91,4 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtrCollection:: #define TQQueue TQPtrQueue #endif -#endif // TQPTRTQUEUE_H +#endif // TQPTRQUEUE_H diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp index 2b9a10bc..22c20cae 100644 --- a/src/tools/qlocale.cpp +++ b/src/tools/qlocale.cpp @@ -3285,7 +3285,7 @@ TQString TQLocalePrivate::doubleToString(double d, else mode = 2; - /* This next bit is a bit tquirky. In DFExponent form, the precision + /* This next bit is a bit quirky. In DFExponent form, the precision is the number of digits after decpt. So that would suggest using mode=3 for qdtoa. But qdtoa behaves strangely when mode=3 and precision=0. So we get around this by using mode=2 and reasoning @@ -3779,7 +3779,7 @@ TQ_ULLONG TQLocalePrivate::stringToUnsLongLong(TQString num, int base, * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT @@ -4027,7 +4027,7 @@ static TQ_LLONG qstrtoll(const char *nptr, const char **endptr, register int bas * #define No_leftright to omit left-right logic in fast floating-point * computation of dtoa. * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3. - * #define RND_PRODTQUOT to use rnd_prod and rnd_quot (assembly routines + * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines * that use extended-precision instructions to compute rounded * products and quotients) with IBM. * #define ROUND_BIASED for IEEE-format with biased rounding. @@ -4245,7 +4245,7 @@ static inline void Storeinc(ULong *&a, const ULong &b, const ULong &c) #define ROUND_BIASED #endif -#ifdef RND_PRODTQUOT +#ifdef RND_PRODQUOT #define rounded_product(a,b) a = rnd_prod(a, b) #define rounded_quotient(a,b) a = rnd_quot(a, b) extern double rnd_prod(double, double), rnd_quot(double, double); @@ -5139,7 +5139,7 @@ static double qstrtod(CONST char *s00, CONST char **se, bool *ok) rv = tens[k - 9] * rv + z; bd0 = 0; if (nd <= DBL_DIG -#ifndef RND_PRODTQUOT +#ifndef RND_PRODQUOT && FLT_ROUNDS == 1 #endif ) { @@ -5758,7 +5758,7 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, int bbits, b2, b5, be, dig, i, ieps, ilim0, j, j1, k, k0, k_check, leftright, m2, m5, s2, s5, - try_tquick; + try_quick; int ilim = 0, ilim1 = 0, spec_case = 0; /* pacify gcc */ Long L; #ifndef Sudden_Underflow @@ -5901,10 +5901,10 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, } if (mode < 0 || mode > 9) mode = 0; - try_tquick = 1; + try_quick = 1; if (mode > 5) { mode -= 4; - try_tquick = 0; + try_quick = 0; } leftright = 1; switch(mode) { @@ -5935,7 +5935,7 @@ static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, *resultp = (char *) malloc(i + 1); s = s0 = *resultp; - if (ilim >= 0 && ilim <= Quick_max && try_tquick) { + if (ilim >= 0 && ilim <= Quick_max && try_quick) { /* Try to get by with floating-point arithmetic. */ diff --git a/src/tools/qsemaphore.cpp b/src/tools/qsemaphore.cpp index ed3c328b..d4f240f7 100644 --- a/src/tools/qsemaphore.cpp +++ b/src/tools/qsemaphore.cpp @@ -83,7 +83,7 @@ accesses allowed is retrieved with available(), and the total number with total(). Note that the incrementing functions will block if there aren't enough available accesses. Use tryAccess() - if you want to actquire accesses without blocking. + if you want to acquire accesses without blocking. */ diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 878f3e60..a5408cac 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -6493,7 +6493,7 @@ int TQString::compare( const TQString& s ) const #if !defined(CSTR_LESS_THAN) #define CSTR_LESS_THAN 1 -#define CSTR_ETQUAL 2 +#define CSTR_EQUAL 2 #define CSTR_GREATER_THAN 3 #endif diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 111e6daf..42aebfbe 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -475,7 +475,7 @@ static TQString qEllipsisText( const TQString &org, const TQFontMetrics &fm, int Some subclasses call setExpandable(TRUE) even when they have no children, and populate themselves when setup() or setOpen(TRUE) is called. The \c dirview/dirview.cpp example program uses this - technique to start up tquickly: The files and subdirectories in a + technique to start up quickly: The files and subdirectories in a directory aren't inserted into the tree until they're actually needed. @@ -3093,7 +3093,7 @@ void TQListView::paintEmptyArea( TQPainter * p, const TQRect & rect ) /* Rebuilds the list of drawable TQListViewItems. This function is - const so that const functions can call it without retquiring + const so that const functions can call it without requiring d->drawables to be mutable. */ diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp index 5bdf7924..9507d4f0 100644 --- a/src/widgets/qtextedit.cpp +++ b/src/widgets/qtextedit.cpp @@ -226,7 +226,7 @@ static bool block_set_alignment = FALSE; TQTextEdit is an advanced WYSIWYG viewer/editor supporting rich text formatting using HTML-style tags. It is optimized to handle - large documents and to respond tquickly to user input. + large documents and to respond quickly to user input. TQTextEdit has four modes of operation: \table diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index b465faff..518d81c4 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -219,7 +219,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * ) \mainclass A toolbar is a panel that contains a set of controls, usually - represented by small icons. It's purpose is to provide tquick + represented by small icons. It's purpose is to provide quick access to frequently used commands or options. Within a TQMainWindow the user can drag toolbars within and between the \link TQDockArea dock areas\endlink. Toolbars can also be dragged @@ -353,7 +353,7 @@ TQToolBar::TQToolBar( const TQString &label, TQMainWindow * mainWindow, Constructs an empty toolbar called \a name, with parent \a parent, in its \a parent's top dock area, without any label and without - retquiring a newline. + requiring a newline. */ TQToolBar::TQToolBar( TQMainWindow * parent, const char * name ) diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp index 1912bebf..cb10ffba 100644 --- a/src/widgets/qtoolbutton.cpp +++ b/src/widgets/qtoolbutton.cpp @@ -77,13 +77,13 @@ public: /*! \class TQToolButton ntqtoolbutton.h - \brief The TQToolButton class provides a tquick-access button to + \brief The TQToolButton class provides a quick-access button to commands or options, usually used inside a TQToolBar. \ingroup basic \mainclass - A tool button is a special button that provides tquick-access to + A tool button is a special button that provides quick-access to specific commands or options. As opposed to a normal command button, a tool button usually doesn't show a text label, but shows an icon instead. Its classic usage is to select tools, for example diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp index b6826a81..93091437 100644 --- a/src/widgets/qtooltip.cpp +++ b/src/widgets/qtooltip.cpp @@ -370,7 +370,7 @@ void TQTipManager::removeFromGroup( TQToolTipGroup *g ) bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e ) { // avoid dumping core in case of application madness, and return - // tquickly for some common but irrelevant events + // quickly for some common but irrelevant events if ( e->type() == TQEvent::WindowDeactivate && tqApp && !tqApp->activeWindow() && label && label->isVisible() ) @@ -671,10 +671,10 @@ void TQTipManager::setWakeUpDelay ( int i ) The mode is global, not particular to any one widget. TQToolTip switches from dormant to active mode when the user hovers - the mouse on a tip-etquipped region for a second or so and remains + the mouse on a tip-equipped region for a second or so and remains active until the user either clicks a mouse button, presses a key, lets the mouse hover for five seconds or moves the mouse outside - \e all tip-etquipped regions for at least a second. + \e all tip-equipped regions for at least a second. The TQToolTip class can be used in three different ways: \list 1 diff --git a/tools/assistant/assistant_de.ts b/tools/assistant/assistant_de.ts index 5d2f00a3..15b0b971 100644 --- a/tools/assistant/assistant_de.ts +++ b/tools/assistant/assistant_de.ts @@ -2,7 +2,7 @@ <context> <name>Assistant</name> <message> - <source>Welcome to the <b>Qt Assistant</b>. Qt Assistant will give you tquicker access to help and tips while using applications like Qt Designer.</source> + <source>Welcome to the <b>Qt Assistant</b>. Qt Assistant will give you quicker access to help and tips while using applications like Qt Designer.</source> <translation type="obsolete">Wilkommen bei <b>Qt Assistant</b>. Qt Assistant ermöglicht einen schnellen Zugriff der Onlinehilfe während dem Arbeiten mit Programmen wie dem Qt Designer.</translation> </message> <message> diff --git a/tools/assistant/assistant_fr.ts b/tools/assistant/assistant_fr.ts index 58785a1d..0dfa69fc 100644 --- a/tools/assistant/assistant_fr.ts +++ b/tools/assistant/assistant_fr.ts @@ -2,7 +2,7 @@ <context> <name>Assistant</name> <message> - <source>Welcome to the <b>Qt Assistant</b>. Qt Assistant will give you tquicker access to help and tips while using applications like Qt Designer.</source> + <source>Welcome to the <b>Qt Assistant</b>. Qt Assistant will give you quicker access to help and tips while using applications like Qt Designer.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/tools/designer/designer/designer_de.ts b/tools/designer/designer/designer_de.ts index 5ed9aaac..64f3cf3f 100644 --- a/tools/designer/designer/designer_de.ts +++ b/tools/designer/designer/designer_de.ts @@ -2237,7 +2237,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source><b>The Object Explorer</b><p>The object explorer gives a tquick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.</p><p>The columns can be resized by dragging the separator in the list header.</p><p>On the second tab you can see all the declared slots, variables, includes, etc. of the form.</p></source> + <source><b>The Object Explorer</b><p>The object explorer gives a quick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.</p><p>The columns can be resized by dragging the separator in the list header.</p><p>On the second tab you can see all the declared slots, variables, includes, etc. of the form.</p></source> <translation type="unfinished"></translation> </message> <message> diff --git a/tools/designer/designer/designer_fr.ts b/tools/designer/designer/designer_fr.ts index 5ed9aaac..64f3cf3f 100644 --- a/tools/designer/designer/designer_fr.ts +++ b/tools/designer/designer/designer_fr.ts @@ -2237,7 +2237,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source><b>The Object Explorer</b><p>The object explorer gives a tquick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.</p><p>The columns can be resized by dragging the separator in the list header.</p><p>On the second tab you can see all the declared slots, variables, includes, etc. of the form.</p></source> + <source><b>The Object Explorer</b><p>The object explorer gives a quick overview about the relations between the widgets in your form. You can use the clipboard functions using a context menu for each item in the view.</p><p>The columns can be resized by dragging the separator in the list header.</p><p>On the second tab you can see all the declared slots, variables, includes, etc. of the form.</p></source> <translation type="unfinished"></translation> </message> <message> diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp index 98aa69e5..bbcba778 100644 --- a/tools/designer/designer/designerappiface.cpp +++ b/tools/designer/designer/designerappiface.cpp @@ -317,7 +317,7 @@ TQString DesignerProjectImpl::customSetting( const TQString &key ) const { if ( key == "TQTSCRIPT_PACKAGES" ) { TQString s = getenv( "TQTSCRIPT_PACKAGES" ); - TQString s2 = project->customSetting( "TQUICK_PACKAGES" ); + TQString s2 = project->customSetting( "QUICK_PACKAGES" ); if ( !s.isEmpty() && !s2.isEmpty() ) #if defined(Q_OS_WIN32) s += ";"; diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index 07d9c3c2..9fb744b9 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -108,7 +108,7 @@ static const char * whatsthis_image[] = { " ooo "}; const TQString toolbarHelp = "<p>Toolbars contain a number of buttons to " -"provide tquick access to often used functions.%1" +"provide quick access to often used functions.%1" "<br>Click on the toolbar handle to hide the toolbar, " "or drag and place the toolbar to a different location.</p>"; diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp index bec1bd9f..7cc81ff2 100644 --- a/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tools/designer/plugins/cppeditor/yyreg.cpp @@ -129,7 +129,7 @@ static void stopTokenizer() } /* - These two macros implement tquick-and-dirty hashing for telling + These two macros implement quick-and-dirty hashing for telling apart keywords fast. */ #define HASH( ch, len ) ( (ch) | ((len) << 8) ) diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index 7074d59f..570380bc 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -709,7 +709,7 @@ Now, enter the following translations: \endlist \endlist -It's tquickest to press \Key Alt+D (which clicks the \e {Done \& Next} +It's quickest to press \Key Alt+D (which clicks the \e {Done \& Next} button) after typing each translation, since this marks the translation as done and moves on to the next source text. diff --git a/tools/linguist/shared/metatranslator.h b/tools/linguist/shared/metatranslator.h index 7e0419d2..4462a77f 100644 --- a/tools/linguist/shared/metatranslator.h +++ b/tools/linguist/shared/metatranslator.h @@ -112,7 +112,7 @@ private: }; /* - This is a tquick hack. The proper way to handle this would be + This is a quick hack. The proper way to handle this would be to extend MetaTranslator's interface. */ #define ContextComment "QT_LINGUIST_INTERNAL_CONTEXT_COMMENT" diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 79506cef..07c2f92a 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -387,7 +387,7 @@ MainWindow::MainWindow() This code makes it possible to set up default input method. The list of identifier names of input method which can be used - is actquired using TQInputContextFactory::keys(). And it is + is acquired using TQInputContextFactory::keys(). And it is translated to display name and set to inputMethodCombo which displays the list of input method. */ diff --git a/translations/qt_es.ts b/translations/qt_es.ts index 64557671..5dfa7ea2 100644 --- a/translations/qt_es.ts +++ b/translations/qt_es.ts @@ -291,7 +291,7 @@ </message> <message> <source>Executable '%1' requires Qt %2, found Qt %3.</source> - <translation>El programa '%1' retquiere Qt %2, se encontró Qt %3.</translation> + <translation>El programa '%1' requiere Qt %2, se encontró Qt %3.</translation> </message> <message> <source>Incompatible Qt Library Error</source> diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index c1a6f7e6..5ec0f086 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -303,7 +303,7 @@ </message> <message> <source>Executable '%1' requires Qt %2, found Qt %3.</source> - <translation>L'exécutable '%1' retquiert Qt %2 (Qt %3 présent).</translation> + <translation>L'exécutable '%1' requiert Qt %2 (Qt %3 présent).</translation> </message> <message> <source>Incompatible Qt Library Error</source> |