From 3ad1b623ac4af0f19db3580e4ef6b0d923260ba0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:07:55 -0600 Subject: Sync again --- configure | 16 +- doc/html/canvas-chart-example.html | 2 +- doc/html/chart-chart-pro.html | 2 +- doc/html/emb-fonts.html | 2 +- doc/html/extension-dialog-example.html | 2 +- doc/html/linguist-manual-3.html | 2 +- doc/html/linguist-manual-4.html | 2 +- doc/html/motif-walkthrough-5.html | 2 +- doc/html/qmake-manual-8.html | 6 +- doc/html/qmessagebox-h.html | 4 +- doc/html/tutorial2-10.html | 2 +- doc/qws.doc | 2 +- mkspecs/macx-mwerks/mwerkstmpl.xml | 2 +- qmake/generators/mac/metrowerks_xml.cpp | 4 +- qmake/generators/mac/pbuilder_pbx.cpp | 4 +- qmake/generators/makefile.cpp | 4 +- qmake/generators/unix/unixmake.cpp | 2 +- qmake/generators/unix/unixmake2.cpp | 6 +- qmake/generators/win32/borland_bmake.cpp | 4 +- qmake/generators/win32/mingw_make.cpp | 4 +- qmake/generators/win32/msvc_dsp.cpp | 4 +- qmake/generators/win32/msvc_nmake.cpp | 4 +- qmake/generators/win32/msvc_vcproj.cpp | 4 +- qmake/project.cpp | 8 +- src/3rdparty/libjpeg/README | 2 +- src/3rdparty/libjpeg/jmorecfg.h | 4 +- src/3rdparty/libjpeg/usage.doc | 2 +- src/3rdparty/libmng/README.contrib | 8 +- src/3rdparty/libmng/README.examples | 2 +- src/3rdparty/libmng/doc/rpm/libmng.spec | 2 +- src/3rdparty/libpng/INSTALL | 4 +- src/3rdparty/libpng/README | 4 +- src/3rdparty/zlib/projects/README.projects | 2 +- src/dialogs/qmessagebox.h | 4 +- src/kernel/qfontengine_x11.cpp | 8 +- src/kernel/qpainter_x11.cpp | 2 +- src/tools/qfeatures.txt | 436 +++++++++++++-------------- src/widgets/qtoolbar.cpp | 2 +- tools/linguist/book/linguist-programmer.leaf | 2 +- tools/linguist/book/linguist-translator.leaf | 2 +- tools/qconfig/main.cpp | 6 +- 41 files changed, 293 insertions(+), 293 deletions(-) diff --git a/configure b/configure index 13ba608af..00fc6f145 100755 --- a/configure +++ b/configure @@ -2057,7 +2057,7 @@ Configure options: -no-exceptions ..... Disable exceptions on platforms that support it. -version-script .... Use a version script when linking the Qt library. - Internal symbols will be marked as local. Retquires + Internal symbols will be marked as local. Requires a recent GNU binutils package. WARNING: Experimental, may be removed in future @@ -2259,32 +2259,32 @@ Qt/X11 only: $SHN -no-xshape ......... Do not compile XShape support. $SHY -xshape ............ Compile XShape support. - Retquires X11/extensions/shape.h. + Requires X11/extensions/shape.h. $XRN -no-xinerama ....... Do not compile Xinerama (multihead) support. $XRY -xinerama .......... Compile Xinerama support. - Retquires X11/extensions/Xinerama.h and libXinerama. + Requires X11/extensions/Xinerama.h and libXinerama. $XCN -no-xcursor ........ Do not compile Xcursor support. $XCY -xcursor ........... Compile Xcursor support. - Retquires X11/Xcursor/Xcursor.h and libXcursor. + Requires X11/Xcursor/Xcursor.h and libXcursor. $XZN -no-xrandr ......... Do not compile XRandR (resize and rotate) support. $XZY -xrandr ............ Compile XRandR support. - Retquires X11/extensions/Xrandr.h and libXrandr. + Requires X11/extensions/Xrandr.h and libXrandr. $XRN -no-xrender ........ Do not compile XRender support. $XRY -xrender ........... Compile XRender support. - Retquires Xft support (see -xft below), + Requires Xft support (see -xft below), X11/extensions/Xrender.h and libXrender $XFTN -no-xft ............ Do not compile Xft (anti-aliased font) support. $XFTY -xft ............... Compile Xft support. - Retquires X11/Xft/Xft.h and libXft. + Requires X11/Xft/Xft.h and libXft. $XIN -no-tablet ......... Do not compile Tablet support. $XIY -tablet ............ Compile Tablet support. - Retquires IRIX with wacom.h and libXi or + Requires IRIX with wacom.h and libXi or XFree86 with X11/extensions/XInput.h and libXi. $XKN -no-xkb ............ Do not compile XKB (X KeyBoard extension) support. diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html index 19df8421b..bcf4ae444 100644 --- a/doc/html/canvas-chart-example.html +++ b/doc/html/canvas-chart-example.html @@ -44,7 +44,7 @@ demonstrates basic canvas usage. CONFIG += warn_on -RETQUIRES = full-config +REQUIRES = full-config HEADERS += element.h \ canvastext.h \ diff --git a/doc/html/chart-chart-pro.html b/doc/html/chart-chart-pro.html index 4f439ced5..6b4741791 100644 --- a/doc/html/chart-chart-pro.html +++ b/doc/html/chart-chart-pro.html @@ -36,7 +36,7 @@ body { background: #ffffff; color: black; } CONFIG += warn_on -RETQUIRES = full-config +REQUIRES = full-config HEADERS += element.h \ canvastext.h \ diff --git a/doc/html/emb-fonts.html b/doc/html/emb-fonts.html index da3117895..09dc1a4ba 100644 --- a/doc/html/emb-fonts.html +++ b/doc/html/emb-fonts.html @@ -64,7 +64,7 @@ fonts and sizes you need, then remove TTF and BDF support.

See tools/makeqpf for a tool that helps produce TQPF files from the TTF and BDF, or just run your application with the -savefonts option. -

Memory Retquirements +

Memory Requirements

With TTF fonts, each character in the font at a given point size is only rendered when first used in a drawing or metrics operation. With diff --git a/doc/html/extension-dialog-example.html b/doc/html/extension-dialog-example.html index 5951601ca..281905abf 100644 --- a/doc/html/extension-dialog-example.html +++ b/doc/html/extension-dialog-example.html @@ -46,7 +46,7 @@ LANGUAGE = C++ CONFIG += qt warn_on release -RETQUIRES = full-config nocrosscompiler +REQUIRES = full-config nocrosscompiler SOURCES += main.cpp FORMS = mainform.ui \ diff --git a/doc/html/linguist-manual-3.html b/doc/html/linguist-manual-3.html index 73cee9911..0837075a6 100644 --- a/doc/html/linguist-manual-3.html +++ b/doc/html/linguist-manual-3.html @@ -57,7 +57,7 @@ body { background: #ffffff; color: black; }

Common Tasks

Leaving a Translation for Later

If you wish to leave a translation press Ctrl+L (Next Unfinished) to move to the next unfinished translation. An unfinished translation is one that either has not been translated at all or one which fails validation. To move to the next phrase press Shift+Ctrl+L. You can also navigate using the Translation menu. If you want to go to a different context entirely, click the context you want to work on in the Context list, then click the source text in the Source Text area.

-

Phrases That Retquire Multiple Translations Depending on Context

+

Phrases That Require Multiple Translations Depending on Context

The same phrase may occur in two or more contexts without conflict. Once a phrase has been translated in one context, TQt Linguist notes that the translation has been made and when the translator reaches a later occurrence of the same phrase TQt Linguist will provide the previous translation as a possible translation candidate in the phrases and guesses area. If the previous translation is acceptable just click the Done & Next button (press Ctrl+Enter) to move on to the next unfinished phrase.

If a phrase occurs more than once in a particular context it will only be shown once in TQt Linguist's context list and the translation will be applied to every occurrence within the context. If the same phrase needs to be translated differently within the same context the programmer must provide a distinguishing comment for each of the phrases concerned. If such comments are used the duplicate phrases will appear in the context list. The programmers comments will appear in the translation area on a light blue background.

Changing Keyboard Accelerators

diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html index bffd3062a..5be94e04b 100644 --- a/doc/html/linguist-manual-4.html +++ b/doc/html/linguist-manual-4.html @@ -92,7 +92,7 @@ body { background: #ffffff; color: black; } 
     TQObject::tr("&Quit")
-

Distinguishing Identical Strings That Retquire Different Translations

+

Distinguishing Identical Strings That Require Different Translations

The lupdate program automatically provides a context for every source text. This context is the class name of the class that contains the tr() call. This is sufficient in the vast majority of cases. Sometimes however, the translator will need further information to uniquely identify a source text; for example, a dialog that contained two separate frames, each of which contained an "Enabled" option would need each identified because in some languages the translation would differ between the two. This is easily achieved using the two argument form of the tr() call, e.g.

     rbc = new TQRadioButton( tr("Enabled", "Color frame"), this );
diff --git a/doc/html/motif-walkthrough-5.html b/doc/html/motif-walkthrough-5.html
index 8d0be21c7..d93d3258a 100644
--- a/doc/html/motif-walkthrough-5.html
+++ b/doc/html/motif-walkthrough-5.html
@@ -43,7 +43,7 @@ removed once we have finished our migration, since we will use
 worth replacing the Print dialog with a custom TQDialog replacement.
 Instead, we will keep the Motif based dialog and use TQMotifDialog to
 integrate the dialog with the application.
-
 
 Modality Retquirements
+
 
 Modality Requirements
 

 
 Modality with TQDialog is different from Motif.  The TQDialog::exec()
 function does not return until the dialog is finished.  In Motif,
diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html
index 5eded6cb6..b239495c5 100644
--- a/doc/html/qmake-manual-8.html
+++ b/doc/html/qmake-manual-8.html
@@ -212,8 +212,8 @@ win32:UI_HEADERS_DIR = c:\myproject\ui\include
 unix:UI_SOURCES_DIR = ../myproject/ui/src
 win32:UI_SOURCES_DIR = c:\myproject\ui\src
-
RETQUIRES
-

This is a special variable processed by qmake. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to RETQUIRES) are missing.

+
REQUIRES
+

This is a special variable processed by qmake. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to REQUIRES) are missing.

This is mainly used in TQt's build system for building the examples.

SOURCES

This variable contains the name of all source files in the project.

@@ -369,7 +369,7 @@ app {

This variable contains C++ compiler flags for generating compiler warnings. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

QMAKE_EXTENSION_SHLIB

This variable contains the extention for shared libraries. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

-
QMAKE_FAILED_RETQUIREMENTS
+
QMAKE_FAILED_REQUIREMENTS

This variable contains the list of requirements that were failed to be met when qmake was used. For example, the sql module is needed and wasn't compiled into TQt. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

QMAKE_FILETAGS

This variable contains the file tags needed to be entered into the makefile, such as SOURCES and HEADERS. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

diff --git a/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html index 1b9710956..31197dbc1 100644 --- a/doc/html/qmessagebox-h.html +++ b/doc/html/qmessagebox-h.html @@ -240,11 +240,11 @@ private: // Disabled copy constructor and operator= * #include <qmessagebox.h> * int main( int argc, char**argv ) * { -* QT_RETQUIRE_VERSION( argc, argv, "3.0.5" ) +* QT_REQUIRE_VERSION( argc, argv, "3.0.5" ) * ... * } */ -#define QT_RETQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ +#define QT_REQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \ diff --git a/doc/html/tutorial2-10.html b/doc/html/tutorial2-10.html index d234b19d0..badf321c3 100644 --- a/doc/html/tutorial2-10.html +++ b/doc/html/tutorial2-10.html @@ -40,7 +40,7 @@ body { background: #ffffff; color: black; } CONFIG += warn_on - RETQUIRES = full-config + REQUIRES = full-config HEADERS += element.h \ canvastext.h \ diff --git a/doc/qws.doc b/doc/qws.doc index 419411dc4..746baa962 100644 --- a/doc/qws.doc +++ b/doc/qws.doc @@ -226,7 +226,7 @@ See \link makeqpf.html tools/makeqpf\endlink for a tool that helps produce QPF files from the TTF and BDF, or just run your application with the \c -savefonts option. -\section1 Memory Retquirements +\section1 Memory Requirements With TTF fonts, each character in the font at a given point size is only rendered when first used in a drawing or metrics operation. With diff --git a/mkspecs/macx-mwerks/mwerkstmpl.xml b/mkspecs/macx-mwerks/mwerkstmpl.xml index 2996ac46f..462deac4a 100644 --- a/mkspecs/macx-mwerks/mwerkstmpl.xml +++ b/mkspecs/macx-mwerks/mwerkstmpl.xml @@ -63,7 +63,7 @@ AlwaysSearchUserPathsfalse InterpretDOSAndUnixPathstrue - RetquireFrameworkStyleIncludestrue + RequireFrameworkStyleIncludestrue UserSearchPaths SearchPath diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp index 4a81eb71a..9633ef3d1 100644 --- a/qmake/generators/mac/metrowerks_xml.cpp +++ b/qmake/generators/mac/metrowerks_xml.cpp @@ -57,10 +57,10 @@ MetrowerksMakefileGenerator::MetrowerksMakefileGenerator(TQMakeProject *p) : Mak bool MetrowerksMakefileGenerator::writeMakefile(TQTextStream &t) { - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { /* for now just dump, I need to generated an empty xml or something.. */ fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", - var("QMAKE_FAILED_RETQUIREMENTS").latin1()); + var("QMAKE_FAILED_REQUIREMENTS").latin1()); return TRUE; } diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 4cd383605..ebbcb3ce9 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -60,10 +60,10 @@ ProjectBuilderMakefileGenerator::ProjectBuilderMakefileGenerator(TQMakeProject * bool ProjectBuilderMakefileGenerator::writeMakefile(TQTextStream &t) { - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { /* for now just dump, I need to generated an empty xml or something.. */ fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", - var("QMAKE_FAILED_RETQUIREMENTS").latin1()); + var("QMAKE_FAILED_REQUIREMENTS").latin1()); return TRUE; } diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index e937570a9..c769e93eb 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1427,7 +1427,7 @@ MakefileGenerator::write() findLibraries(); if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || //write prl Option::qmake_mode == Option::QMAKE_GENERATE_PRL) && - project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty() && + project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty() && project->isActiveConfig("create_prl") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("plugin")) { TQString prl = var("TARGET"); @@ -2160,7 +2160,7 @@ bool MakefileGenerator::writeMakeQmake(TQTextStream &t) { TQString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name())); - if(project->isEmpty("QMAKE_FAILED_RETQUIREMENTS") && !project->isActiveConfig("no_autoqmake") && + if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake") && !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) { TQStringList files = fileFixify(Option::mkfile::project_files); t << project->first("QMAKE_INTERNAL_PRL_FILE") << ": " << "\n\t" diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 985fcb139..f55132d4a 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -52,7 +52,7 @@ UnixMakefileGenerator::init() return; init_flag = TRUE; - if(!project->isEmpty("QMAKE_FAILED_RETQUIREMENTS")) /* no point */ + if(!project->isEmpty("QMAKE_FAILED_REQUIREMENTS")) /* no point */ return; TQStringList &configs = project->variables()["CONFIG"]; diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 8b6430bcd..a7f7dc6bd 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -73,7 +73,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t) { writeHeader(t); - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl; { //write the extra unix targets.. TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"]; @@ -82,7 +82,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t) } t << "all clean install distclean mocables uninstall uicables:" << "\n\t" << "@echo \"Some of the required modules (" - << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" + << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; writeMakeQmake(t); return TRUE; @@ -690,7 +690,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) } writeMakeQmake(t); - if(project->isEmpty("QMAKE_FAILED_RETQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) { + if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) { TQString meta_files; if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("compile_libtool")) { //libtool diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index fbbc1dfcb..1f942417b 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -53,10 +53,10 @@ bool BorlandMakefileGenerator::writeMakefile(TQTextStream &t) { writeHeader(t); - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { t << "all clean:" << "\n\t" << "@echo \"Some of the required modules (" - << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" + << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; return TRUE; } diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index c792ae3c5..d08359ca1 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -59,10 +59,10 @@ bool MingwMakefileGenerator::writeMakefile(TQTextStream &t) { writeHeader(t); - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { t << "all clean:" << "\n\t" << "@echo \"Some of the required modules (" - << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" + << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; writeMakeQmake(t); return TRUE; diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index e027bd121..2ab133e48 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -51,10 +51,10 @@ DspMakefileGenerator::DspMakefileGenerator(TQMakeProject *p) : Win32MakefileGene bool DspMakefileGenerator::writeMakefile(TQTextStream &t) { - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { /* for now just dump, I need to generated an empty dsp or something.. */ fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", - var("QMAKE_FAILED_RETQUIREMENTS").latin1()); + var("QMAKE_FAILED_REQUIREMENTS").latin1()); return TRUE; } diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index e8b0cde59..49eaf0515 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -53,7 +53,7 @@ bool NmakeMakefileGenerator::writeMakefile(TQTextStream &t) { writeHeader(t); - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { { //write the extra unix targets.. TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"]; for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it) @@ -61,7 +61,7 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t) } t << "all clean:" << "\n\t" << "@echo \"Some of the required modules (" - << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" + << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; writeMakeQmake(t); return TRUE; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index a17b32ac7..b11b9a934 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -182,9 +182,9 @@ VcprojGenerator::VcprojGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), bool VcprojGenerator::writeMakefile(TQTextStream &t) { // Check if all requirements are fullfilled - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", - var("QMAKE_FAILED_RETQUIREMENTS").latin1()); + var("QMAKE_FAILED_REQUIREMENTS").latin1()); return TRUE; } diff --git a/qmake/project.cpp b/qmake/project.cpp index 9b62d4cde..5b883b3c4 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -448,7 +448,7 @@ TQMakeProject::parse(const TQString &t, TQMap &place) varlist.remove((*valit)); } } - if(var == "RETQUIRES") /* special case to get communicated to backends! */ + if(var == "REQUIRES") /* special case to get communicated to backends! */ doProjectCheckReqs(vallist, place); return TRUE; @@ -1050,7 +1050,7 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with - ansi2knr (Retquires ansi2knr.c from + ansi2knr (Requires ansi2knr.c from ftp://ftp.cs.wisc.edu/ghost) makefile.aix => AIX/gcc makefile makefile.cygwin => Cygwin/gcc makefile @@ -98,7 +98,7 @@ include makefile.acorn => Acorn makefile makefile.amiga => Amiga makefile smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC compiler - (Retquires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) + (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) makefile.atari => Atari makefile makefile.beos => BEOS makefile for X86 makefile.bor => Borland makefile (uses bcc) diff --git a/src/3rdparty/libpng/README b/src/3rdparty/libpng/README index b1b81384c..199190848 100644 --- a/src/3rdparty/libpng/README +++ b/src/3rdparty/libpng/README @@ -193,7 +193,7 @@ Files in this distribution: tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with - ansi2knr (Retquires ansi2knr.c from + ansi2knr (Requires ansi2knr.c from ftp://ftp.cs.wisc.edu/ghost) makefile.aix => AIX makefile makefile.cygwin => Cygwin/gcc makefile @@ -223,7 +223,7 @@ Files in this distribution: makefile.acorn => Acorn makefile makefile.amiga => Amiga makefile smakefile.ppc => AMIGA smakefile for SAS C V6.58/7.00 PPC - compiler (Retquires SCOPTIONS, copied from + compiler (Requires SCOPTIONS, copied from scripts/SCOPTIONS.ppc) makefile.atari => Atari makefile makefile.beos => BEOS makefile for X86 diff --git a/src/3rdparty/zlib/projects/README.projects b/src/3rdparty/zlib/projects/README.projects index 56efb8e7c..f32de76ba 100644 --- a/src/3rdparty/zlib/projects/README.projects +++ b/src/3rdparty/zlib/projects/README.projects @@ -7,7 +7,7 @@ a custom piece of code that changes the zlib interface or its behavior), please consider submitting the project to the contrib directory. -Retquirements +Requirements ============ - The project must build zlib using exclusively the source files from diff --git a/src/dialogs/qmessagebox.h b/src/dialogs/qmessagebox.h index 2c1713239..65a7b6244 100644 --- a/src/dialogs/qmessagebox.h +++ b/src/dialogs/qmessagebox.h @@ -204,11 +204,11 @@ private: // Disabled copy constructor and operator= * #include * int main( int argc, char**argv ) * { -* QT_RETQUIRE_VERSION( argc, argv, "3.0.5" ) +* QT_REQUIRE_VERSION( argc, argv, "3.0.5" ) * ... * } */ -#define QT_RETQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ +#define QT_REQUIRE_VERSION( argc, argv, str ) { TQString s=TQString::fromLatin1(str);\ TQString sq=TQString::fromLatin1(qVersion()); if ( (sq.section('.',0,0).toInt()<<16)+\ (sq.section('.',1,1).toInt()<<8)+sq.section('.',2,2).toInt()<(s.section('.',0,0).toInt()<<16)+\ (s.section('.',1,1).toInt()<<8)+s.section('.',2,2).toInt() ){if ( !qApp){ int c=0; new \ diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp index fe63cff2e..5693e238d 100644 --- a/src/kernel/qfontengine_x11.cpp +++ b/src/kernel/qfontengine_x11.cpp @@ -2255,8 +2255,8 @@ static inline char *tag_to_string(FT_ULong tag) #define DefaultScript FT_MAKE_TAG('D', 'F', 'L', 'T') enum { - RetquiresGsub = 1, - RetquiresGpos = 2 + RequiresGsub = 1, + RequiresGpos = 2 }; struct OTScripts { @@ -2440,7 +2440,7 @@ bool TQOpenType::checkScript(unsigned int script) uint tag = ot_scripts[script].tag; int requirements = ot_scripts[script].flags; - if (requirements & RetquiresGsub) { + if (requirements & RequiresGsub) { if (!gsub) return FALSE; @@ -2454,7 +2454,7 @@ bool TQOpenType::checkScript(unsigned int script) } } - if (requirements & RetquiresGpos) { + if (requirements & RequiresGpos) { if (!gpos) return FALSE; diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp index 3aad71641..d2127be2f 100644 --- a/src/kernel/qpainter_x11.cpp +++ b/src/kernel/qpainter_x11.cpp @@ -2813,7 +2813,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h, else sy = sy % sh; /* - Retquirements for optimizing tiled pixmaps: + Requirements for optimizing tiled pixmaps: - not an external device - not scale or rotshear - not mono pixmap diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt index 0581fcb11..af6f62046 100644 --- a/src/tools/qfeatures.txt +++ b/src/tools/qfeatures.txt @@ -1,1314 +1,1314 @@ Feature: WORKSPACE Section: Widgets -Retquires: SCROLLBAR VBOX TITLEBAR RESIZEHANDLER POPUPMENU LABEL TOOLBUTTON MAINWINDOW TOOLBAR MENUBAR +Requires: SCROLLBAR VBOX TITLEBAR RESIZEHANDLER POPUPMENU LABEL TOOLBUTTON MAINWINDOW TOOLBAR MENUBAR Name: QWorkSpace SeeAlso: ??? Feature: WHEELEVENT Section: Kernel -Retquires: +Requires: Name: Wheel-mouse events SeeAlso: ??? Feature: WMATRIX Section: Data structures -Retquires: +Requires: Name: QWMatrix SeeAlso: ??? Feature: STL Section: Data structures -Retquires: +Requires: Name: Standard template library compatiblity SeeAlso: ??? Feature: CANVAS Section: Widgets -Retquires: SCROLLVIEW BEZIER +Requires: SCROLLVIEW BEZIER Name: QCanvas SeeAlso: ??? Feature: TOOLBOX Section: Widgets -Retquires: ICONSET SCROLLVIEW TOOLTIP LAYOUT TOOLBUTTON +Requires: ICONSET SCROLLVIEW TOOLTIP LAYOUT TOOLBUTTON Name: Tool box SeeAlso: ??? Feature: TABLE Section: Widgets -Retquires: COMBOBOX HEADER CHECKBOX +Requires: COMBOBOX HEADER CHECKBOX Name: QTable SeeAlso: ??? Feature: XML Section: Data structures -Retquires: TEXTSTREAM TEXTCODEC REGEXP_CAPTURE +Requires: TEXTSTREAM TEXTCODEC REGEXP_CAPTURE Name: XML SeeAlso: ??? Feature: SQL Section: Database -Retquires: STRINGLIST REGEXP_CAPTURE VARIANT SPRINTF DATESTRING +Requires: STRINGLIST REGEXP_CAPTURE VARIANT SPRINTF DATESTRING Name: SQL classes SeeAlso: ??? Feature: SQL_FORM Section: Database -Retquires: SQL PROPERTIES +Requires: SQL PROPERTIES Name: QSqlForm SeeAlso: ??? Feature: SQL_EDIT_WIDGETS Section: Database -Retquires: SQL SPINBOX COMBOBOX CHECKBOX DATETIMEEDIT +Requires: SQL SPINBOX COMBOBOX CHECKBOX DATETIMEEDIT Name: SQL value editor widgets SeeAlso: ??? Feature: SQL_VIEW_WIDGETS Section: Database -Retquires: SQL_FORM SQL_EDIT_WIDGETS TABLE +Requires: SQL_FORM SQL_EDIT_WIDGETS TABLE Name: SQL table widgets SeeAlso: ??? Feature: STRINGLIST Section: Data structures -Retquires: +Requires: Name: QStringList SeeAlso: ??? Feature: REGEXP Section: Data structures -Retquires: +Requires: Name: Regular expression capture SeeAlso: ??? Feature: REGEXP_CAPTURE Section: Data structures -Retquires: REGEXP STRINGLIST +Requires: REGEXP STRINGLIST Name: Regular expression capture SeeAlso: ??? Feature: TEMPLATE_VARIANT Section: Data structures -Retquires: VARIANT STRINGLIST +Requires: VARIANT STRINGLIST Name: Template classes in QVariant SeeAlso: ??? Feature: VARIANT Section: Data structures -Retquires: +Requires: Name: QVariant SeeAlso: ??? Feature: REGEXP_OPTIM Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression optimization SeeAlso: ??? Feature: REGEXP_LOOKAHEAD Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression lookahead SeeAlso: ??? Feature: REGEXP_INTERVAL Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression interval SeeAlso: ??? Feature: REGEXP_ESCAPE Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression escape SeeAlso: ??? Feature: REGEXP_CCLASS Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression character-class SeeAlso: ??? Feature: REGEXP_BACKREF Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression back-reference SeeAlso: ??? Feature: REGEXP_ANCHOR_ALT Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression anchors SeeAlso: ??? Feature: REGEXP_WILDCARD Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: Regular expression wildcard SeeAlso: ??? Feature: SPRINTF Section: Data structures -Retquires: REGEXP +Requires: REGEXP Name: QString::sprintf() SeeAlso: ??? Feature: QUUID_STRING Section: Data structures -Retquires: STRINGLIST +Requires: STRINGLIST Name: Convert UUID to/from string SeeAlso: ??? Feature: TEXTDATE Section: Data structures -Retquires: STRINGLIST DATESTRING +Requires: STRINGLIST DATESTRING Name: Month and day names in dates SeeAlso: ??? Feature: DATESTRING Section: Data structures -Retquires: +Requires: Name: QDate/QTime/QDateTime toString() and fromString() SeeAlso: ??? Feature: ICONSET Section: Images -Retquires: IMAGEIO IMAGE_SMOOTHSCALE PALETTE IMAGE_HEURISTIC_MASK +Requires: IMAGEIO IMAGE_SMOOTHSCALE PALETTE IMAGE_HEURISTIC_MASK Name: QIconSet SeeAlso: ??? Feature: DIR Section: File I/O -Retquires: STRINGLIST REGEXP +Requires: STRINGLIST REGEXP Name: QDir SeeAlso: ??? Feature: PALETTE Section: Kernel -Retquires: +Requires: Name: Palettes SeeAlso: ??? Feature: TEXTSTREAM Section: File I/O -Retquires: +Requires: Name: QTextStream SeeAlso: ??? Feature: DATASTREAM Section: File I/O -Retquires: +Requires: Name: QDataStream SeeAlso: ??? Feature: LIBRARY Section: File I/O -Retquires: REGEXP +Requires: REGEXP Name: Shared library wrapper SeeAlso: ??? Feature: COMPONENT Section: File I/O -Retquires: QUUID_STRING SETTINGS SPRINTF LIBRARY DATESTRING +Requires: QUUID_STRING SETTINGS SPRINTF LIBRARY DATESTRING Name: Dynamic module linking SeeAlso: ??? Feature: SETTINGS Section: File I/O -Retquires: DIR TEXTSTREAM REGEXP_CAPTURE +Requires: DIR TEXTSTREAM REGEXP_CAPTURE Name: Persistent application settings SeeAlso: ??? Feature: SIGNALMAPPER Section: Widgets -Retquires: +Requires: Name: QSignalMapper SeeAlso: ??? Feature: IMAGEIO Section: Images -Retquires: REGEXP +Requires: REGEXP Name: Image formats SeeAlso: ??? Feature: IMAGEIO_BMP Section: Images -Retquires: IMAGEIO DATASTREAM +Requires: IMAGEIO DATASTREAM Name: BMP image I/O SeeAlso: ??? Feature: IMAGEIO_PPM Section: Images -Retquires: IMAGEIO +Requires: IMAGEIO Name: PPM image I/O SeeAlso: ??? Feature: IMAGEIO_XBM Section: Images -Retquires: IMAGEIO +Requires: IMAGEIO Name: XBM image I/O SeeAlso: ??? Feature: IMAGEIO_XPM Section: Images -Retquires: IMAGEIO SPRINTF TEXTSTREAM +Requires: IMAGEIO SPRINTF TEXTSTREAM Name: XPM image I/O SeeAlso: ??? Feature: IMAGEIO_PNG Section: Images -Retquires: IMAGEIO +Requires: IMAGEIO Name: PNG image I/O SeeAlso: ??? Feature: IMAGEIO_MNG Section: Images -Retquires: IMAGEIO +Requires: IMAGEIO Name: MNG image I/O SeeAlso: ??? Feature: IMAGEIO_JPEG Section: Images -Retquires: IMAGEIO +Requires: IMAGEIO Name: JPEG image I/O SeeAlso: ??? Feature: ASYNC_IO Section: Images -Retquires: +Requires: Name: Asynchronous I/O SeeAlso: ??? Feature: ASYNC_IMAGE_IO Section: Images -Retquires: IMAGEIO +Requires: IMAGEIO Name: Asynchronous image I/O SeeAlso: ??? Feature: MOVIE Section: Images -Retquires: ASYNC_IO ASYNC_IMAGE_IO +Requires: ASYNC_IO ASYNC_IMAGE_IO Name: Animated images SeeAlso: ??? Feature: FREETYPE Section: Fonts -Retquires: +Requires: Name: Freetype font engine SeeAlso: ??? Feature: BDF Section: Fonts -Retquires: TEXTSTREAM STRINGLIST +Requires: TEXTSTREAM STRINGLIST Name: BDF font files SeeAlso: ??? Feature: FONTDATABASE Section: Fonts -Retquires: STRINGLIST +Requires: STRINGLIST Name: QFontDatabase SeeAlso: ??? Feature: TRANSLATION Section: Internationalization -Retquires: DATASTREAM +Requires: DATASTREAM Name: Translations via QObject::tr() SeeAlso: ??? Feature: TRANSLATION_UTF8 Section: Internationalization -Retquires: TRANSLATION TEXTCODEC +Requires: TRANSLATION TEXTCODEC Name: Translations via QObject::trUtf8() SeeAlso: ??? Feature: TEXTCODEC Section: Internationalization -Retquires: +Requires: Name: Character set conversions SeeAlso: ??? Feature: CODECS Section: Internationalization -Retquires: TEXTCODEC +Requires: TEXTCODEC Name: Non-Unicode text conversions SeeAlso: ??? Feature: BIG_CODECS Section: Internationalization -Retquires: CODEC_HEBREW +Requires: CODEC_HEBREW Name: Big Codecs (eg. CJK) SeeAlso: ??? Feature: CODEC_HEBREW Section: Internationalization -Retquires: CODECS COMPLEXTEXT +Requires: CODECS COMPLEXTEXT Name: Hebrew Codec SeeAlso: ??? Feature: UNICODETABLES Section: Internationalization -Retquires: +Requires: Name: Unicode property tables SeeAlso: ??? Feature: MIME Section: File I/O -Retquires: DIR IMAGEIO TEXTCODEC +Requires: DIR IMAGEIO TEXTCODEC Name: MIME SeeAlso: ??? Feature: RICHTEXT Section: Widgets -Retquires: STYLE LAYOUT STRINGLIST TEXTSTREAM +Requires: STYLE LAYOUT STRINGLIST TEXTSTREAM Name: RichText (HTML) display SeeAlso: ??? Feature: TEXTCUSTOMITEM Section: Widgets -Retquires: RICHTEXT MIME +Requires: RICHTEXT MIME Name: RichText (HTML) tables and images SeeAlso: ??? Feature: COMPLEXTEXT Section: Internationalization -Retquires: RICHTEXT +Requires: RICHTEXT Name: Complex scripts (eg. BiDi) SeeAlso: ??? Feature: DOM Section: File I/O -Retquires: XML MIME +Requires: XML MIME Name: Document Object Model SeeAlso: ??? Feature: SOUND Section: Kernel -Retquires: +Requires: Name: Playing sounds SeeAlso: ??? Feature: QWS_SOUNDSERVER Section: Qt/Embedded-specific -Retquires: SOUND DIR DNS +Requires: SOUND DIR DNS Name: Server to play sound SeeAlso: ??? Feature: PROPERTIES Section: Kernel -Retquires: VARIANT STRINGLIST ICONSET +Requires: VARIANT STRINGLIST ICONSET Name: Properties SeeAlso: ??? Feature: NETWORK Section: Networking -Retquires: +Requires: Name: Networking SeeAlso: ??? Feature: DNS Section: Networking -Retquires: NETWORK STRINGLIST TEXTSTREAM SPRINTF +Requires: NETWORK STRINGLIST TEXTSTREAM SPRINTF Name: DNS SeeAlso: ??? Feature: URL Section: Networking -Retquires: DIR +Requires: DIR Name: URL parser SeeAlso: ??? Feature: NETWORKPROTOCOL Section: Networking -Retquires: TEXTCODEC URL +Requires: TEXTCODEC URL Name: Network file access SeeAlso: ??? Feature: NETWORKPROTOCOL_FTP Section: Networking -Retquires: NETWORKPROTOCOL DNS TEXTDATE +Requires: NETWORKPROTOCOL DNS TEXTDATE Name: FTP file access SeeAlso: ??? Feature: NETWORKPROTOCOL_HTTP Section: Networking -Retquires: NETWORKPROTOCOL DNS +Requires: NETWORKPROTOCOL DNS Name: HTTP file access SeeAlso: ??? Feature: PROCESS Section: File I/O -Retquires: STRINGLIST REGEXP +Requires: STRINGLIST REGEXP Name: External process invocation. SeeAlso: ??? Feature: QWS_MULTIPROCESS Section: Qt/Embedded-specific -Retquires: NETWORK +Requires: NETWORK Name: Multi-process architecture SeeAlso: ??? Feature: COP Section: Networking -Retquires: DATASTREAM +Requires: DATASTREAM Name: QCop IPC SeeAlso: ??? Feature: QWS_KEYBOARD Section: Qt/Embedded-specific -Retquires: +Requires: Name: Console keyboard SeeAlso: ??? Feature: QWS_KBD_SL5000 Section: Qt/Embedded-specific -Retquires: QWS_KEYBOARD +Requires: QWS_KEYBOARD Name: Keyboard for SHARP Zaurus SL5xxx devices SeeAlso: ??? Feature: QWS_CURSOR Section: Qt/Embedded-specific -Retquires: CURSOR +Requires: CURSOR Name: Visible cursor SeeAlso: ??? Feature: QWS_ALPHA_CURSOR Section: Qt/Embedded-specific -Retquires: +Requires: Name: Alpha-blended cursor SeeAlso: ??? Feature: QWS_MACH64 Section: Qt/Embedded-specific -Retquires: +Requires: Name: Mach64 acceleration SeeAlso: ??? Feature: QWS_VOODOO3 Section: Qt/Embedded-specific -Retquires: +Requires: Name: Voodoo3 acceleration SeeAlso: ??? Feature: QWS_MATROX Section: Qt/Embedded-specific -Retquires: +Requires: Name: Matrox MGA acceleration SeeAlso: ??? Feature: QWS_REPEATER Section: Qt/Embedded-specific -Retquires: +Requires: Name: Repeater display SeeAlso: ??? Feature: QWS_VFB Section: Qt/Embedded-specific -Retquires: +Requires: Name: Virtual frame buffer SeeAlso: ??? Feature: QWS_TRANSFORMED Section: Qt/Embedded-specific -Retquires: QWS_LINUXFB +Requires: QWS_LINUXFB Name: Transformed frame buffer SeeAlso: ??? Feature: QWS_LINUXFB Section: Qt/Embedded-specific -Retquires: +Requires: Name: Linux framebuffer SeeAlso: ??? Feature: QWS_VNC Section: Qt/Embedded-specific -Retquires: NETWORK +Requires: NETWORK Name: Remote frame buffer (VNC) SeeAlso: ??? Feature: QWS_SHADOWFB Section: Qt/Embedded-specific -Retquires: +Requires: Name: Shadow frame buffer SeeAlso: ??? Feature: QWS_DEPTH_1 Section: Qt/Embedded-specific -Retquires: +Requires: Name: 1-bit monochrome SeeAlso: ??? Feature: QWS_DEPTH_4 Section: Qt/Embedded-specific -Retquires: +Requires: Name: 4-bit grayscale SeeAlso: ??? Feature: QWS_VGA_16 Section: Qt/Embedded-specific -Retquires: +Requires: Name: 4-bit VGA SeeAlso: ??? Feature: QWS_DEPTH_8GRAYSCALE Section: Qt/Embedded-specific -Retquires: +Requires: Name: 8-bit grayscale SeeAlso: ??? Feature: QWS_DEPTH_8 Section: Qt/Embedded-specific -Retquires: +Requires: Name: 8-bit color SeeAlso: ??? Feature: QWS_DEPTH_16 Section: Qt/Embedded-specific -Retquires: +Requires: Name: 15 or 16-bit color SeeAlso: ??? Feature: QWS_DEPTH_24 Section: Qt/Embedded-specific -Retquires: +Requires: Name: 24-bit color SeeAlso: ??? Feature: QWS_DEPTH_32 Section: Qt/Embedded-specific -Retquires: +Requires: Name: 32-bit color SeeAlso: ??? Feature: QWS_DEPTH_32_BGR Section: Qt/Embedded-specific -Retquires: QWS_DEPTH_32 +Requires: QWS_DEPTH_32 Name: 32-bit color, BGR order SeeAlso: ??? Feature: QWS_MANAGER Section: Qt/Embedded-specific -Retquires: +Requires: Name: Window Manager SeeAlso: ??? Feature: QWS_KDE2_WM_STYLE Section: Qt/Embedded-specific -Retquires: QWS_MANAGER +Requires: QWS_MANAGER Name: The "KDE2" style SeeAlso: ??? Feature: QWS_HYDRO_WM_STYLE Section: Qt/Embedded-specific -Retquires: QWS_MANAGER +Requires: QWS_MANAGER Name: The "Hydro" style SeeAlso: ??? Feature: QWS_BEOS_WM_STYLE Section: Qt/Embedded-specific -Retquires: QWS_MANAGER +Requires: QWS_MANAGER Name: The "BeOS" style SeeAlso: ??? Feature: QWS_KDE_WM_STYLE Section: Qt/Embedded-specific -Retquires: QWS_MANAGER +Requires: QWS_MANAGER Name: The "KDE" style SeeAlso: ??? Feature: QWS_WINDOWS_WM_STYLE Section: Qt/Embedded-specific -Retquires: QWS_MANAGER +Requires: QWS_MANAGER Name: The "Windows" style SeeAlso: ??? Feature: QWS_MOUSE_AUTO Section: Qt/Embedded-specific -Retquires: +Requires: Name: Autodetecting mouse driver SeeAlso: ??? Feature: QWS_MOUSE_MANUAL Section: Qt/Embedded-specific -Retquires: +Requires: Name: Non-autodetecting mouse driver SeeAlso: ??? Feature: QWS_SAVEFONTS Section: Qt/Embedded-specific -Retquires: +Requires: Name: Saving of fonts SeeAlso: ??? Feature: QWS_GFX_SPEED Section: Qt/Embedded-specific -Retquires: +Requires: Name: Favour code size over graphics speed SeeAlso: ??? Feature: QWS_PROPERTIES Section: Qt/Embedded-specific -Retquires: +Requires: Name: Qt/Embedded window system properties. SeeAlso: ??? Feature: CLIPBOARD Section: Kernel -Retquires: QWS_PROPERTIES MIME +Requires: QWS_PROPERTIES MIME Name: Cut and paste SeeAlso: ??? Feature: DRAGANDDROP Section: Kernel -Retquires: MIME QWS_PROPERTIES IMAGEIO_XPM +Requires: MIME QWS_PROPERTIES IMAGEIO_XPM Name: Drag and drop SeeAlso: ??? Feature: MIMECLIPBOARD Section: Kernel -Retquires: CLIPBOARD +Requires: CLIPBOARD Name: Cut and paste non-text SeeAlso: ??? Feature: DRAWUTIL Section: Kernel -Retquires: SPRINTF PALETTE +Requires: SPRINTF PALETTE Name: Drawing utility functions SeeAlso: ??? Feature: IMAGE_TRUECOLOR Section: Images -Retquires: +Requires: Name: TrueColor QImage SeeAlso: ??? Feature: IMAGE_SMOOTHSCALE Section: Images -Retquires: +Requires: Name: Smooth QImage scaling SeeAlso: ??? Feature: IMAGE_DITHER_TO_1 Section: Images -Retquires: +Requires: Name: Dither QImage to 1-bit image SeeAlso: ??? Feature: IMAGE_HEURISTIC_MASK Section: Images -Retquires: +Requires: Name: QImage::createHeuristicMask() SeeAlso: ??? Feature: IMAGE_MIRROR Section: Images -Retquires: +Requires: Name: QImage mirroring SeeAlso: ??? Feature: IMAGE_TEXT Section: Images -Retquires: STRINGLIST +Requires: STRINGLIST Name: Image file text strings SeeAlso: ??? Feature: IMAGE_16_BIT Section: Qt/Embedded-specific -Retquires: IMAGE_TRUECOLOR +Requires: IMAGE_TRUECOLOR Name: 16-bit QImage SeeAlso: ??? Feature: CURSOR Section: Kernel -Retquires: +Requires: Name: Cursors SeeAlso: ??? Feature: COLORNAMES Section: Painting -Retquires: +Requires: Name: Named colors SeeAlso: ??? Feature: TRANSFORMATIONS Section: Painting -Retquires: WMATRIX +Requires: WMATRIX Name: Scaling and rotation SeeAlso: ??? Feature: PIXMAP_TRANSFORMATION Section: Painting -Retquires: WMATRIX +Requires: WMATRIX Name: Pixmap transformations SeeAlso: ??? Feature: IMAGE_TRANSFORMATION Section: Painting -Retquires: PIXMAP_TRANSFORMATION +Requires: PIXMAP_TRANSFORMATION Name: Image transformations SeeAlso: ??? Feature: SVG Section: Painting -Retquires: DOM TRANSFORMATIONS SPRINTF +Requires: DOM TRANSFORMATIONS SPRINTF Name: Scalable Vector Graphics (SVG) SeeAlso: ??? Feature: BEZIER Section: Painting -Retquires: +Requires: Name: Bezier curves SeeAlso: ??? Feature: PRINTER Section: Painting -Retquires: TEXTSTREAM SPRINTF FONTDATABASE DATESTRING REGEXP_CAPTURE +Requires: TEXTSTREAM SPRINTF FONTDATABASE DATESTRING REGEXP_CAPTURE Name: Printing SeeAlso: ??? Feature: PICTURE Section: Painting -Retquires: DATASTREAM IMAGEIO +Requires: DATASTREAM IMAGEIO Name: QPicture SeeAlso: ??? Feature: LAYOUT Section: Kernel -Retquires: +Requires: Name: Automatic widget layout SeeAlso: ??? Feature: STYLE Section: Widgets -Retquires: DRAWUTIL +Requires: DRAWUTIL Name: QStyle SeeAlso: ??? Feature: WIDGET_TOPEXTRA Section: Kernel -Retquires: IMAGE_HEURISTIC_MASK +Requires: IMAGE_HEURISTIC_MASK Name: Window icon and caption SeeAlso: ??? Feature: DIALOG Section: Widgets -Retquires: +Requires: Name: Dialogs SeeAlso: ??? Feature: SEMIMODAL Section: Widgets -Retquires: DIALOG +Requires: DIALOG Name: Semi-modal dialogs SeeAlso: ??? Feature: FRAME Section: Widgets -Retquires: STYLE +Requires: STYLE Name: Framed widgets SeeAlso: ??? Feature: EFFECTS Section: Kernel -Retquires: +Requires: Name: Special widget effects (fading, scrolling) SeeAlso: ??? Feature: LABEL Section: Widgets -Retquires: FRAME +Requires: FRAME Name: QLabel SeeAlso: ??? Feature: TOOLBAR Section: Widgets -Retquires: MAINWINDOW +Requires: MAINWINDOW Name: Toolbars SeeAlso: ??? Feature: BUTTON Section: Widgets -Retquires: +Requires: Name: Buttons SeeAlso: ??? Feature: CHECKBOX Section: Widgets -Retquires: BUTTON STYLE +Requires: BUTTON STYLE Name: Check-boxes SeeAlso: ??? Feature: RADIOBUTTON Section: Widgets -Retquires: BUTTON STYLE +Requires: BUTTON STYLE Name: Radio-buttons SeeAlso: ??? Feature: TOOLBUTTON Section: Widgets -Retquires: BUTTON ICONSET STYLE +Requires: BUTTON ICONSET STYLE Name: Tool-buttons SeeAlso: ??? Feature: GRID Section: Widgets -Retquires: LAYOUT FRAME +Requires: LAYOUT FRAME Name: Grid layout widgets SeeAlso: ??? Feature: GROUPBOX Section: Widgets -Retquires: FRAME LAYOUT +Requires: FRAME LAYOUT Name: Group boxes SeeAlso: ??? Feature: BUTTONGROUP Section: Widgets -Retquires: GROUPBOX BUTTON RADIOBUTTON +Requires: GROUPBOX BUTTON RADIOBUTTON Name: Button groups SeeAlso: ??? Feature: HGROUPBOX Section: Widgets -Retquires: GROUPBOX +Requires: GROUPBOX Name: Horizontal group boxes SeeAlso: ??? Feature: VGROUPBOX Section: Widgets -Retquires: HGROUPBOX +Requires: HGROUPBOX Name: Vertical group boxes SeeAlso: ??? Feature: HBUTTONGROUP Section: Widgets -Retquires: BUTTONGROUP +Requires: BUTTONGROUP Name: Horizontal button groups SeeAlso: ??? Feature: VBUTTONGROUP Section: Widgets -Retquires: HBUTTONGROUP +Requires: HBUTTONGROUP Name: Vertical button groups SeeAlso: ??? Feature: HBOX Section: Widgets -Retquires: LAYOUT FRAME +Requires: LAYOUT FRAME Name: Horizontal box layout widgets SeeAlso: ??? Feature: VBOX Section: Widgets -Retquires: HBOX +Requires: HBOX Name: Vertical box layout widgets SeeAlso: ??? Feature: MAINWINDOW Section: Widgets -Retquires: STRINGLIST POPUPMENU TITLEBAR RESIZEHANDLER TOOLBUTTON STATUSBAR +Requires: STRINGLIST POPUPMENU TITLEBAR RESIZEHANDLER TOOLBUTTON STATUSBAR Name: Main-windows SeeAlso: ??? Feature: RESIZEHANDLER Section: Widgets -Retquires: FRAME +Requires: FRAME Name: Internal resize handler SeeAlso: ??? Feature: MENUDATA Section: Widgets -Retquires: ICONSET VARIANT +Requires: ICONSET VARIANT Name: Menu-oriented widgets SeeAlso: ??? Feature: POPUPMENU Section: Widgets -Retquires: MENUDATA FRAME +Requires: MENUDATA FRAME Name: Popup-menus SeeAlso: ??? Feature: MENUBAR Section: Widgets -Retquires: POPUPMENU +Requires: POPUPMENU Name: Menu bars SeeAlso: ??? Feature: PUSHBUTTON Section: Widgets -Retquires: BUTTON STYLE +Requires: BUTTON STYLE Name: Push-buttons SeeAlso: ??? Feature: PROGRESSBAR Section: Widgets -Retquires: FRAME +Requires: FRAME Name: Progress bars SeeAlso: ??? Feature: RANGECONTROL Section: Widgets -Retquires: +Requires: Name: Range-control widgets SeeAlso: ??? Feature: SCROLLBAR Section: Widgets -Retquires: RANGECONTROL STYLE +Requires: RANGECONTROL STYLE Name: Scroll bars SeeAlso: ??? Feature: SLIDER Section: Widgets -Retquires: RANGECONTROL STYLE +Requires: RANGECONTROL STYLE Name: Sliders SeeAlso: ??? Feature: DIAL Section: Widgets -Retquires: RANGECONTROL STYLE +Requires: RANGECONTROL STYLE Name: Dials SeeAlso: ??? Feature: SPINWIDGET Section: Widgets -Retquires: FRAME +Requires: FRAME Name: Spinbox control widget SeeAlso: ??? Feature: SCROLLVIEW Section: Widgets -Retquires: SCROLLBAR FRAME +Requires: SCROLLBAR FRAME Name: Scrollable view widgets SeeAlso: ??? Feature: ICONVIEW Section: Widgets -Retquires: SCROLLVIEW IMAGEIO_XPM IMAGE_HEURISTIC_MASK +Requires: SCROLLVIEW IMAGEIO_XPM IMAGE_HEURISTIC_MASK Name: QIconView SeeAlso: ??? Feature: GRIDVIEW Section: Widgets -Retquires: SCROLLVIEW +Requires: SCROLLVIEW Name: QGridView SeeAlso: ??? Feature: TEXTVIEW Section: Widgets -Retquires: TEXTEDIT +Requires: TEXTEDIT Name: QTextView SeeAlso: ??? Feature: TEXTEDIT Section: Widgets -Retquires: RICHTEXT SCROLLVIEW +Requires: RICHTEXT SCROLLVIEW Name: Rich text edit SeeAlso: ??? Feature: SYNTAXHIGHLIGHTER Section: Widgets -Retquires: TEXTEDIT +Requires: TEXTEDIT Name: Rich text syntax highlighting SeeAlso: ??? Feature: SPLASHSCREEN Section: Widgets -Retquires: IMAGEIO +Requires: IMAGEIO Name: Splash screen widget SeeAlso: ??? Feature: TABLEVIEW Section: Widgets -Retquires: SCROLLBAR +Requires: SCROLLBAR Name: Table-like widgets SeeAlso: ??? Feature: LINEEDIT Section: Widgets -Retquires: FRAME +Requires: FRAME Name: Single-line edits SeeAlso: ??? Feature: MULTILINEEDIT Section: Widgets -Retquires: TEXTEDIT +Requires: TEXTEDIT Name: Multi-line edits SeeAlso: ??? Feature: SPINBOX Section: Widgets -Retquires: RANGECONTROL SPINWIDGET LINEEDIT VALIDATOR +Requires: RANGECONTROL SPINWIDGET LINEEDIT VALIDATOR Name: Spin boxes SeeAlso: ??? Feature: SPLITTER Section: Widgets -Retquires: FRAME LAYOUT +Requires: FRAME LAYOUT Name: Splitters SeeAlso: ??? Feature: STATUSBAR Section: Widgets -Retquires: LAYOUT STYLE +Requires: LAYOUT STYLE Name: Status bars SeeAlso: ??? Feature: TABBAR Section: Widgets -Retquires: TOOLBUTTON +Requires: TOOLBUTTON Name: Tab-bars SeeAlso: ??? Feature: TABWIDGET Section: Widgets -Retquires: TABBAR WIDGETSTACK +Requires: TABBAR WIDGETSTACK Name: Tab widgets SeeAlso: ??? Feature: TOOLTIP Section: Widgets -Retquires: LABEL +Requires: LABEL Name: Tool tips SeeAlso: ??? Feature: VALIDATOR Section: Widgets -Retquires: +Requires: Name: Input validators SeeAlso: ??? Feature: WHATSTHIS Section: Widgets -Retquires: TOOLTIP TOOLBUTTON +Requires: TOOLTIP TOOLBUTTON Name: "What's this" help SeeAlso: ??? Feature: WIDGETSTACK Section: Widgets -Retquires: FRAME +Requires: FRAME Name: Widget stacks SeeAlso: ??? Feature: TEXTBROWSER Section: Widgets -Retquires: TEXTVIEW MIME +Requires: TEXTVIEW MIME Name: QTextBrowser SeeAlso: ??? Feature: LISTBOX Section: Widgets -Retquires: SCROLLVIEW STRINGLIST +Requires: SCROLLVIEW STRINGLIST Name: QListBox SeeAlso: ??? Feature: ACCEL Section: Kernel -Retquires: SPRINTF +Requires: SPRINTF Name: Keyboard accelerators and shortcuts SeeAlso: ??? Feature: SIZEGRIP Section: Widgets -Retquires: STYLE +Requires: STYLE Name: QSizeGrip SeeAlso: ??? Feature: HEADER Section: Widgets -Retquires: STYLE ICONSET +Requires: STYLE ICONSET Name: QHeader SeeAlso: ??? Feature: TITLEBAR Section: Kernel -Retquires: STYLE +Requires: STYLE Name: Internal titlebar widget SeeAlso: ??? Feature: LCDNUMBER Section: Widgets -Retquires: FRAME +Requires: FRAME Name: QLCDNumber SeeAlso: ??? Feature: ACTION Section: Kernel -Retquires: TOOLBUTTON COMBOBOX +Requires: TOOLBUTTON COMBOBOX Name: QAction SeeAlso: ??? Feature: COMBOBOX Section: Widgets -Retquires: LISTBOX LINEEDIT POPUPMENU +Requires: LISTBOX LINEEDIT POPUPMENU Name: QComboBox SeeAlso: ??? Feature: LISTVIEW Section: Widgets -Retquires: SCROLLVIEW HEADER LINEEDIT +Requires: SCROLLVIEW HEADER LINEEDIT Name: QListView SeeAlso: ??? Feature: STYLE_WINDOWS Section: Widgets -Retquires: STYLE +Requires: STYLE Name: Windows style SeeAlso: ??? Feature: STYLE_MOTIF Section: Widgets -Retquires: STYLE +Requires: STYLE Name: Motif style SeeAlso: ??? Feature: STYLE_INTERLACE Section: Widgets -Retquires: STYLE_MOTIF +Requires: STYLE_MOTIF Name: Interlace-friendly style SeeAlso: ??? Feature: STYLE_COMPACT Section: Widgets -Retquires: STYLE_WINDOWS +Requires: STYLE_WINDOWS Name: Compact Windows style SeeAlso: ??? Feature: STYLE_PLATINUM Section: Widgets -Retquires: STYLE_WINDOWS +Requires: STYLE_WINDOWS Name: Platinum style SeeAlso: ??? Feature: STYLE_AQUA Section: Widgets -Retquires: STYLE_WINDOWS IMAGE_TRANSFORMATION +Requires: STYLE_WINDOWS IMAGE_TRANSFORMATION Name: Aqua style SeeAlso: ??? Feature: STYLE_CDE Section: Widgets -Retquires: STYLE_MOTIF TRANSFORMATIONS +Requires: STYLE_MOTIF TRANSFORMATIONS Name: CDE style SeeAlso: ??? Feature: STYLE_SGI Section: Widgets -Retquires: STYLE_MOTIF TRANSFORMATIONS BUTTON SCROLLBAR SLIDER LINEEDIT MENUBAR +Requires: STYLE_MOTIF TRANSFORMATIONS BUTTON SCROLLBAR SLIDER LINEEDIT MENUBAR Name: SGI style SeeAlso: ??? Feature: STYLE_MOTIFPLUS Section: Widgets -Retquires: STYLE_MOTIF TRANSFORMATIONS BUTTON SCROLLBAR SLIDER +Requires: STYLE_MOTIF TRANSFORMATIONS BUTTON SCROLLBAR SLIDER Name: Motif-plus style SeeAlso: ??? Feature: COLORDIALOG Section: Widgets -Retquires: DIALOG LABEL PUSHBUTTON LINEEDIT VALIDATOR GRIDVIEW LAYOUT +Requires: DIALOG LABEL PUSHBUTTON LINEEDIT VALIDATOR GRIDVIEW LAYOUT Name: QColorDialog SeeAlso: ??? Feature: MESSAGEBOX Section: Widgets -Retquires: DIALOG PUSHBUTTON LABEL +Requires: DIALOG PUSHBUTTON LABEL Name: QMessageBox SeeAlso: ??? Feature: TABDIALOG Section: Widgets -Retquires: DIALOG PUSHBUTTON LAYOUT TABWIDGET +Requires: DIALOG PUSHBUTTON LAYOUT TABWIDGET Name: QTabDialog SeeAlso: ??? Feature: WIZARD Section: Widgets -Retquires: DIALOG WIDGETSTACK PUSHBUTTON LAYOUT LABEL +Requires: DIALOG WIDGETSTACK PUSHBUTTON LAYOUT LABEL Name: QWizard SeeAlso: ??? Feature: FILEDIALOG Section: Widgets -Retquires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX SEMIMODAL REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING +Requires: MESSAGEBOX LISTVIEW NETWORKPROTOCOL COMBOBOX SEMIMODAL REGEXP_CAPTURE TOOLBUTTON BUTTONGROUP VBOX SPLITTER PROGRESSBAR WIDGETSTACK DATESTRING Name: QFileDialog SeeAlso: ??? Feature: FONTDIALOG Section: Widgets -Retquires: DIALOG FONTDATABASE COMBOBOX LABEL CHECKBOX PUSHBUTTON VGROUPBOX VALIDATOR +Requires: DIALOG FONTDATABASE COMBOBOX LABEL CHECKBOX PUSHBUTTON VGROUPBOX VALIDATOR Name: QFontDialog SeeAlso: ??? Feature: PRINTDIALOG Section: Widgets -Retquires: DIALOG LISTVIEW PRINTER COMBOBOX LABEL BUTTONGROUP SPINBOX RADIOBUTTON PUSHBUTTON DIR +Requires: DIALOG LISTVIEW PRINTER COMBOBOX LABEL BUTTONGROUP SPINBOX RADIOBUTTON PUSHBUTTON DIR Name: QPrintDialog SeeAlso: ??? Feature: PROGRESSDIALOG Section: Widgets -Retquires: SEMIMODAL LABEL PUSHBUTTON PROGRESSBAR +Requires: SEMIMODAL LABEL PUSHBUTTON PROGRESSBAR Name: QProgressDialog SeeAlso: ??? Feature: INPUTDIALOG Section: Widgets -Retquires: DIALOG COMBOBOX LABEL PUSHBUTTON SPINBOX WIDGETSTACK LAYOUT +Requires: DIALOG COMBOBOX LABEL PUSHBUTTON SPINBOX WIDGETSTACK LAYOUT Name: QInputDialog SeeAlso: ??? Feature: ERRORMESSAGE Section: Widgets -Retquires: DIALOG PUSHBUTTON LABEL CHECKBOX TEXTVIEW +Requires: DIALOG PUSHBUTTON LABEL CHECKBOX TEXTVIEW Name: QErrorMessage SeeAlso: ??? Feature: SESSIONMANAGER Section: Kernel -Retquires: STRINGLIST +Requires: STRINGLIST Name: Session management SeeAlso: ??? Feature: DATETIMEEDIT Section: Widgets -Retquires: RICHTEXT SPINWIDGET DATESTRING +Requires: RICHTEXT SPINWIDGET DATESTRING Name: QDateTimeEdit SeeAlso: ??? Feature: TEXTCODECPLUGIN Section: Internationalization -Retquires: COMPONENT TEXTCODEC +Requires: COMPONENT TEXTCODEC Name: QTextCodecPlugin SeeAlso: ??? Feature: IMAGEFORMATPLUGIN Section: Images -Retquires: COMPONENT IMAGEIO +Requires: COMPONENT IMAGEIO Name: QImageFormatPlugin SeeAlso: ??? Feature: WIDGETPLUGIN Section: Widgets -Retquires: COMPONENT ICONSET +Requires: COMPONENT ICONSET Name: QWidgetPlugin SeeAlso: ??? Feature: DIRECTPAINTER Section: Painting -Retquires: +Requires: Name: QDirectPainter SeeAlso: ??? Feature: DIALOGBUTTONS Section: Widgets -Retquires: LAYOUT STYLE PUSHBUTTON +Requires: LAYOUT STYLE PUSHBUTTON Name: Experimental internal class SeeAlso: ??? diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index c28331893..103c3b429 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -369,7 +369,7 @@ TQToolBar::TQToolBar( TQMainWindow * parent, const char * name ) /*! \internal - Common initialization code. Retquires that \c mw and \c o are set. + Common initialization code. Requires that \c mw and \c o are set. Does not call TQMainWindow::addDockWindow(). */ void TQToolBar::init() diff --git a/tools/linguist/book/linguist-programmer.leaf b/tools/linguist/book/linguist-programmer.leaf index d1c1d33dc..ecf2689a5 100644 --- a/tools/linguist/book/linguist-programmer.leaf +++ b/tools/linguist/book/linguist-programmer.leaf @@ -149,7 +149,7 @@ or QObject::tr("&Quit") \endcode -\section2 Distinguishing Identical Strings That Retquire Different +\section2 Distinguishing Identical Strings That Require Different Translations \index Translation Contexts diff --git a/tools/linguist/book/linguist-translator.leaf b/tools/linguist/book/linguist-translator.leaf index f20c270e0..7a71b6aeb 100644 --- a/tools/linguist/book/linguist-translator.leaf +++ b/tools/linguist/book/linguist-translator.leaf @@ -141,7 +141,7 @@ navigate using the Translation menu. If you want to go to a different context entirely, click the context you want to work on in the Context list, then click the source text in the Source Text area. -\section2 Phrases That Retquire Multiple Translations Depending on Context +\section2 Phrases That Require Multiple Translations Depending on Context \index Contexts!for Translation \index Comments!for Translators diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index f2f422c1c..a56001132 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -344,7 +344,7 @@ void Main::testAll() c += section[*it]; c += "\n"; - c += "Retquires: "; + c += "Requires: "; c += dependencies[*it].join(" "); c += "\n"; @@ -445,7 +445,7 @@ void Main::loadFeatures(const TQString& filename) TQString value = line.mid(colon+1).stripWhiteSpace(); if ( tag == "Feature" ) feature = value; - else if ( tag == "Retquires" ) + else if ( tag == "Requires" ) deps = TQStringList::split(TQChar(' '),value); else if ( tag == "Name" ) lab = value; @@ -630,7 +630,7 @@ void Main::showInfo(TQListViewItem* i) TQString i = choice->info(); TQStringList deps = dependencies[choice->id]; if ( !deps.isEmpty() ) { - i += "

Retquires:

    "; + i += "

    Requires:

      "; for (TQStringList::ConstIterator it = deps.begin(); it != deps.end(); ++it) { -- cgit v1.2.1