diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
| commit | eaa7ee2e0bbca40ba3173c4304f81957e8964291 (patch) | |
| tree | 4f793aa48a5080aedc94ce6e519c3b86708f2b88 /tqtinterface | |
| parent | 79a9d7a46a20d4a0923bc06fc471fdc2176ef865 (diff) | |
| download | experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.tar.gz experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.zip | |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
Diffstat (limited to 'tqtinterface')
685 files changed, 5864 insertions, 5875 deletions
diff --git a/tqtinterface/qt4/ChangeLog.immodule b/tqtinterface/qt4/ChangeLog.immodule index 7a10a3c..c4526ee 100644 --- a/tqtinterface/qt4/ChangeLog.immodule +++ b/tqtinterface/qt4/ChangeLog.immodule @@ -111,7 +111,7 @@ * src/kernel/tqapplication_x11.cpp - Remove redundant 'class TQInputContext' declaration - (postIMEvent): Fix the event receiving order inversion problem - - (x11_apply_settings): Replace TQString::tqfind() which is deprecated + - (x11_apply_settings): Replace TQString::find() which is deprecated in TQt4 with TQString::startsWith() - (postEvent): Fix invalid TQIMEvent compression that ignores IMStart boundary @@ -163,11 +163,11 @@ * plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp - (identifierName, language): Change return type from TQCString to TQString - - (createImSelPopup): Replace TQString::tqfind() which is deprecated in + - (createImSelPopup): Replace TQString::find() which is deprecated in TQt4 with TQString::startsWith() * plugins/src/inputmethods/imsw-none/tqnoneinputcontextplugin.cpp - - (create): Replace TQString::tqfind() which is deprecated in TQt4 with + - (create): Replace TQString::find() which is deprecated in TQt4 with TQString::startsWith() * plugins/src/inputmethods/xim/tqximinputcontext.h @@ -180,7 +180,7 @@ - (identifierName): * Change return type from TQCString to TQString * Move implementation from qximinputcontext.h - - (language): Replace TQString::tqfind() which is deprecated in TQt4 with + - (language): Replace TQString::find() which is deprecated in TQt4 with TQString::startsWith() 2004-08-19 YamaKen <yamaken@bp.iij4u.or.jp> diff --git a/tqtinterface/qt4/INSTALL b/tqtinterface/qt4/INSTALL index 6756944..5a3c80f 100644 --- a/tqtinterface/qt4/INSTALL +++ b/tqtinterface/qt4/INSTALL @@ -94,7 +94,7 @@ the directories where you choose to install Qt. At this point you have binaries created in $QTDIR (eg. $QTDIR/lib/ - tqcontains libtqt.so). If, however, you would like to have your Qt + contains libtqt.so). If, however, you would like to have your Qt installed in a non-local installation you can run configure with options splitting Qt into different areas for example: diff --git a/tqtinterface/qt4/LICENSE.GPL3 b/tqtinterface/qt4/LICENSE.GPL3 index 63af70b..7f1ee26 100644 --- a/tqtinterface/qt4/LICENSE.GPL3 +++ b/tqtinterface/qt4/LICENSE.GPL3 @@ -288,7 +288,7 @@ in one of these ways: copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to tqfind the + clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. @@ -395,9 +395,9 @@ that material) supplement the terms of this License with terms: All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, tqcontains a notice stating that it is +received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further -restriction, you may remove that term. If a license document tqcontains +restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does @@ -406,7 +406,7 @@ not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating -where to tqfind the applicable terms. +where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; diff --git a/tqtinterface/qt4/README b/tqtinterface/qt4/README index cb023db..9743143 100644 --- a/tqtinterface/qt4/README +++ b/tqtinterface/qt4/README @@ -48,7 +48,7 @@ How to get the release: Qt Open Source Edition: Download the .tar.gz archive from ftp.trolltech.com. For faster download times, use ftpsearch and search -for qt-x11-free-3.3.8 to tqfind it on a mirror ftp site +for qt-x11-free-3.3.8 to find it on a mirror ftp site near you. Qt Professional Edition, Qt Enterprise Edition: Holders of valid diff --git a/tqtinterface/qt4/bin/findtr b/tqtinterface/qt4/bin/findtr index dbdca4d..73c0e07 100755 --- a/tqtinterface/qt4/bin/findtr +++ b/tqtinterface/qt4/bin/findtr @@ -37,7 +37,7 @@ msgstr "" $scope = ""; if ( $#ARGV < 0 ) { - print STDERR "Usage: tqfindtr sourcefile ... >project.po\n"; + print STDERR "Usage: findtr sourcefile ... >project.po\n"; exit 1; } diff --git a/tqtinterface/qt4/bin/qt20fix b/tqtinterface/qt4/bin/qt20fix index 4036738..bf70671 100755 --- a/tqtinterface/qt4/bin/qt20fix +++ b/tqtinterface/qt4/bin/qt20fix @@ -62,7 +62,7 @@ sub parseline{ # -# this is the big array of globals and their tqreplacements. add stuff +# this is the big array of globals and their replacements. add stuff # at will. # @@ -236,7 +236,7 @@ while( <STDIN> ) { next unless ( $currentfile[$line-1] =~ /\b$variable\b/ ); if ( $currentfile[$line-1] =~ s/([^a-zA-Z0-9])::$variable\b/$1$globals{$variable}/ || $currentfile[$line-1] =~ s/([^a-zA-Z0-9:])$variable\b/$1$globals{$variable}/ ) { - print "$file:$line:tqreplaced \`$variable\' with \`$globals{$variable}\'\n"; + print "$file:$line:replaced \`$variable\' with \`$globals{$variable}\'\n"; $changes++; $totalchanges++ } diff --git a/tqtinterface/qt4/changes-3.3.8 b/tqtinterface/qt4/changes-3.3.8 index ba1c293..28c99ad 100644 --- a/tqtinterface/qt4/changes-3.3.8 +++ b/tqtinterface/qt4/changes-3.3.8 @@ -94,7 +94,7 @@ General Fixes Stability fixes for networks with missing DNS settings. - QFileDialog - Ensured that files are not accidentally tqreplaced or lost during drag + Ensured that files are not accidentally replaced or lost during drag and drop operations. - QFtp @@ -132,7 +132,7 @@ General Fixes setDocument() no longer crashes when 0 is passed as an argument. Fixed rendering of HTML tables with a fixed pixel width. Fixed a potential crash when using undo/redo functionality. - Fixed a regression when searching for space using QTextEdit::tqfind(). + Fixed a regression when searching for space using QTextEdit::find(). - SQL plugins Ensured that mysql_server_end() is only called once in the MySQL plugin. diff --git a/tqtinterface/qt4/config.tests/unix/checkavail b/tqtinterface/qt4/config.tests/unix/checkavail index 1dd59c9..43cec94 100755 --- a/tqtinterface/qt4/config.tests/unix/checkavail +++ b/tqtinterface/qt4/config.tests/unix/checkavail @@ -69,7 +69,7 @@ do SUCCESS=no if [ "$VERBOSE" = "yes" ] then - echo " Could not tqfind $LIBNAME anywhere in $LIBDIRS" + echo " Could not find $LIBNAME anywhere in $LIBDIRS" fi break fi @@ -99,7 +99,7 @@ then SUCCESS=no if [ "$VERBOSE" = "yes" ] then - echo " Could not tqfind $INCLUDE anywhere in $INCLUDEDIRS" + echo " Could not find $INCLUDE anywhere in $INCLUDEDIRS" fi break fi diff --git a/tqtinterface/qt4/config.tests/unix/cups.test b/tqtinterface/qt4/config.tests/unix/cups.test index 5f31f1d..0b97e2b 100755 --- a/tqtinterface/qt4/config.tests/unix/cups.test +++ b/tqtinterface/qt4/config.tests/unix/cups.test @@ -45,7 +45,7 @@ else done if [ -z "$F" ]; then CUPS=no - [ "VERBOSE" = "yes" ] && echo " Could not tqfind CUPS lib anywhere in $LIBDIRS" + [ "VERBOSE" = "yes" ] && echo " Could not find CUPS lib anywhere in $LIBDIRS" fi done fi @@ -67,7 +67,7 @@ then done if [ -z "$F" ]; then CUPS=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $I anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $I anywhere in $INCDIRS" fi done fi diff --git a/tqtinterface/qt4/config.tests/unix/nis.test b/tqtinterface/qt4/config.tests/unix/nis.test index 835a187..2dc4c5a 100755 --- a/tqtinterface/qt4/config.tests/unix/nis.test +++ b/tqtinterface/qt4/config.tests/unix/nis.test @@ -50,7 +50,7 @@ else done if [ -z "$F" ]; then NIS=no - [ "VERBOSE" = "yes" ] && echo " Could not tqfind NIS lib anywhere in $LIBDIRS" + [ "VERBOSE" = "yes" ] && echo " Could not find NIS lib anywhere in $LIBDIRS" fi done fi @@ -72,7 +72,7 @@ then done if [ -z "$F" ]; then NIS=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $I anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $I anywhere in $INCDIRS" fi done fi diff --git a/tqtinterface/qt4/config.tests/unix/stl/stltest.cpp b/tqtinterface/qt4/config.tests/unix/stl/stltest.cpp index e5b00e7..979d5c4 100644 --- a/tqtinterface/qt4/config.tests/unix/stl/stltest.cpp +++ b/tqtinterface/qt4/config.tests/unix/stl/stltest.cpp @@ -27,14 +27,14 @@ int main() std::cout << "stltest: vector failed capacity check, expected >= 5, got " << v1.capacity(); ++rval; } - std::vector<int>::iterator v1it = std::tqfind( v1.begin(), v1.end(), 99 ); + std::vector<int>::iterator v1it = std::find( v1.begin(), v1.end(), 99 ); if ( v1it != v1.end() ) { - std::cout << "stltest: tqfind failed, expected end(), got " << *v1it; + std::cout << "stltest: find failed, expected end(), got " << *v1it; ++rval; } - v1it = std::tqfind( v1.begin(), v1.end(), 3 ); + v1it = std::find( v1.begin(), v1.end(), 3 ); if ( v1it == v1.end() ) { - std::cout << "stltest: tqfind failed, expected to tqfind element, got end()"; + std::cout << "stltest: find failed, expected to find element, got end()"; ++rval; } std::vector<int> v2; diff --git a/tqtinterface/qt4/config.tests/x11/opengl.test b/tqtinterface/qt4/config.tests/x11/opengl.test index 463df62..328a7a8 100755 --- a/tqtinterface/qt4/config.tests/x11/opengl.test +++ b/tqtinterface/qt4/config.tests/x11/opengl.test @@ -63,7 +63,7 @@ for L in $LIBS; do echo "The Qt OpenGL module requires Qt to be configured with -thread." echo else - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $L lib anywhere in $LIBDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $L lib anywhere in $LIBDIRS" fi break fi @@ -87,7 +87,7 @@ if [ "$OPENGL" = "yes" ]; then done if [ -z "$F" ]; then OPENGL=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $I anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $I anywhere in $INCDIRS" break fi done diff --git a/tqtinterface/qt4/config.tests/x11/sm.test b/tqtinterface/qt4/config.tests/x11/sm.test index a1ad33b..ad99d0e 100755 --- a/tqtinterface/qt4/config.tests/x11/sm.test +++ b/tqtinterface/qt4/config.tests/x11/sm.test @@ -35,7 +35,7 @@ if [ "$SM" = "yes" ]; then done if [ -z "$F" ]; then SM=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi diff --git a/tqtinterface/qt4/config.tests/x11/xcursor.test b/tqtinterface/qt4/config.tests/x11/xcursor.test index 0f8a71e..514e33c 100755 --- a/tqtinterface/qt4/config.tests/x11/xcursor.test +++ b/tqtinterface/qt4/config.tests/x11/xcursor.test @@ -39,7 +39,7 @@ for LIBDIR in $LIBDIRS; do done if [ -z "$F" ]; then XCURSOR=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind Xcursor lib anywhere in $LIBDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find Xcursor lib anywhere in $LIBDIRS" fi # check for Xcursor.h @@ -60,7 +60,7 @@ if [ "$XCURSOR" = "yes" ]; then if [ -z "$F" ] then XCURSOR=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi @@ -71,7 +71,7 @@ if [ "$XCURSOR" = "yes" ]; then if [ -z "$XCURSOR_MAJOR" -o -z "$XCURSOR_MINOR" ]; then XCURSOR=no [ "$VERBOSE" = "yes" ] && \ - echo " Could not tqfind Xcursor version." + echo " Could not find Xcursor version." elif [ "$XCURSOR_MAJOR" != "1" ]; then XCURSOR=no [ "$VERBOSE" = "yes" ] && \ diff --git a/tqtinterface/qt4/config.tests/x11/xfreetype.test b/tqtinterface/qt4/config.tests/x11/xfreetype.test index 16a93cb..5cabc32 100755 --- a/tqtinterface/qt4/config.tests/x11/xfreetype.test +++ b/tqtinterface/qt4/config.tests/x11/xfreetype.test @@ -54,7 +54,7 @@ for LIB in $LIBS; do done if [ -z "$F" ]; then XFT=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind Xft lib anywhere in $LIBDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find Xft lib anywhere in $LIBDIRS" fi LIBXFT="-l$F -lfreetype" @@ -78,7 +78,7 @@ if [ "$XFT" = "yes" ]; then done if [ -z "$F" ]; then XFT=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi @@ -94,7 +94,7 @@ if [ "$XFT" = "yes" ]; then fi fi -# tqfind XftFreetype.h if using Xft1 +# find XftFreetype.h if using Xft1 if [ "$XFT" = "yes" ] && [ "$XFT2" = "no" ]; then INC="X11/Xft/XftFreetype.h" XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` @@ -109,7 +109,7 @@ if [ "$XFT" = "yes" ] && [ "$XFT2" = "no" ]; then done if [ -z "$F" ]; then XFT=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi @@ -142,7 +142,7 @@ if [ "$XFT" = "yes" ]; then done if [ -z "$F" ]; then XFT=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi @@ -162,7 +162,7 @@ if [ "$XFT" = "yes" ] && [ "$XFT2" = "yes" ]; then done if [ -z "$F" ]; then XFT=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi diff --git a/tqtinterface/qt4/config.tests/x11/xinerama.test b/tqtinterface/qt4/config.tests/x11/xinerama.test index 428e0f1..dc01558 100755 --- a/tqtinterface/qt4/config.tests/x11/xinerama.test +++ b/tqtinterface/qt4/config.tests/x11/xinerama.test @@ -40,7 +40,7 @@ done if [ -z "$F" ]; then XINERAMA=no if [ "$VERBOSE" = "yes" ]; then - echo " Could not tqfind Xinerama lib anywhere in $LIBDIRS" + echo " Could not find Xinerama lib anywhere in $LIBDIRS" fi fi @@ -60,7 +60,7 @@ if [ "$XINERAMA" = "yes" ]; then if [ -z "$F" ]; then XINERAMA=no if [ "$VERBOSE" = "yes" ]; then - echo " Could not tqfind $INC anywhere in $INCDIRS" + echo " Could not find $INC anywhere in $INCDIRS" fi fi fi diff --git a/tqtinterface/qt4/config.tests/x11/xinput.test b/tqtinterface/qt4/config.tests/x11/xinput.test index d63fb7f..c8b3e08 100755 --- a/tqtinterface/qt4/config.tests/x11/xinput.test +++ b/tqtinterface/qt4/config.tests/x11/xinput.test @@ -39,7 +39,7 @@ for LIBDIR in $LIBDIRS; do done if [ -z "$F" ]; then XINPUT=no - [ "VERBOSE" = "yes" ] && echo " Could not tqfind XInput lib anywhere in $LIBDIRS" + [ "VERBOSE" = "yes" ] && echo " Could not find XInput lib anywhere in $LIBDIRS" fi # check for XInput.h and the IRIX wacom.h @@ -59,7 +59,7 @@ if [ "$XINPUT" = "yes" ]; then done if [ -z "$F" ]; then XINPUT=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $I anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $I anywhere in $INCDIRS" fi done fi diff --git a/tqtinterface/qt4/config.tests/x11/xkb.test b/tqtinterface/qt4/config.tests/x11/xkb.test index 2d150d7..5560b08 100755 --- a/tqtinterface/qt4/config.tests/x11/xkb.test +++ b/tqtinterface/qt4/config.tests/x11/xkb.test @@ -71,7 +71,7 @@ if [ "$XKB" = "yes" ]; then if [ -z "$F" ]; then XKB=no if [ "$VERBOSE" = "yes" ]; then - echo " Could not tqfind $INC anywhere in $INCDIRS" + echo " Could not find $INC anywhere in $INCDIRS" fi fi fi diff --git a/tqtinterface/qt4/config.tests/x11/xrandr.test b/tqtinterface/qt4/config.tests/x11/xrandr.test index 1464069..66a05c5 100755 --- a/tqtinterface/qt4/config.tests/x11/xrandr.test +++ b/tqtinterface/qt4/config.tests/x11/xrandr.test @@ -39,7 +39,7 @@ for LIBDIR in $LIBDIRS; do done if [ -z "$F" ]; then XRANDR=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind XRandR lib anywhere in $LIBDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find XRandR lib anywhere in $LIBDIRS" fi # check for Xrandr.h and randr.h @@ -63,7 +63,7 @@ if [ "$XRANDR" = "yes" ]; then if [ -z "$F" ] then XRANDR=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi @@ -74,7 +74,7 @@ if [ "$XRANDR" = "yes" ]; then if [ -z "$XRANDR_MAJOR" -o -z "$XRANDR_MINOR" ]; then XRANDR=no [ "$VERBOSE" = "yes" ] && \ - echo " Could not tqfind XRandR version." + echo " Could not find XRandR version." elif [ "$XRANDR_MAJOR" != "1" -o "$XRANDR_MINOR" -lt "1" ]; then XRANDR=no [ "$VERBOSE" = "yes" ] && \ diff --git a/tqtinterface/qt4/config.tests/x11/xrender.test b/tqtinterface/qt4/config.tests/x11/xrender.test index 5655299..64ccc20 100755 --- a/tqtinterface/qt4/config.tests/x11/xrender.test +++ b/tqtinterface/qt4/config.tests/x11/xrender.test @@ -39,7 +39,7 @@ for LIBDIR in $LIBDIRS; do done if [ -z "$F" ]; then XRENDER=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind XRender lib anywhere in $LIBDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find XRender lib anywhere in $LIBDIRS" fi # check for headers @@ -58,7 +58,7 @@ if [ "$XRENDER" = "yes" ]; then if [ -z "$F" ] then XRENDER=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $INC anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $INC anywhere in $INCDIRS" fi fi diff --git a/tqtinterface/qt4/config.tests/x11/xshape.test b/tqtinterface/qt4/config.tests/x11/xshape.test index 447d12c..4fae606 100755 --- a/tqtinterface/qt4/config.tests/x11/xshape.test +++ b/tqtinterface/qt4/config.tests/x11/xshape.test @@ -40,7 +40,7 @@ for I in $INCS; do done if [ -z "$F" ]; then XSHAPE=no - [ "$VERBOSE" = "yes" ] && echo " Could not tqfind $I anywhere in $INCDIRS" + [ "$VERBOSE" = "yes" ] && echo " Could not find $I anywhere in $INCDIRS" fi done diff --git a/tqtinterface/qt4/configure b/tqtinterface/qt4/configure index 8a952c0..5cb5733 100755 --- a/tqtinterface/qt4/configure +++ b/tqtinterface/qt4/configure @@ -3156,7 +3156,7 @@ if [ "$CFG_INCREMENTAL" = "yes" ]; then [ -r "$outpath/.qmake.incremental" ] && echo "include($outpath/.qmake.incremental)" >>$CACHEFILE.tmp fi -# tqreplace .qmake.cache if it differs from the newly created temp file +# replace .qmake.cache if it differs from the newly created temp file if cmp -s $CACHEFILE.tmp $CACHEFILE; then rm -f $CACHEFILE.tmp else @@ -3498,7 +3498,7 @@ for file in .projects .projects.3; do cat >${OUTDIR}/Makefile <<EOF # ${OUTDIR}/Makefile: generated by configure # -# WARNING: This makefile will be tqreplaced with a real makefile. +# WARNING: This makefile will be replaced with a real makefile. # All changes made to this file will be lost. all clean install qmake Makefile: FORCE diff --git a/tqtinterface/qt4/extensions/extensions.pro b/tqtinterface/qt4/extensions/extensions.pro index 6e254d1..2d01491 100644 --- a/tqtinterface/qt4/extensions/extensions.pro +++ b/tqtinterface/qt4/extensions/extensions.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -tqcontains( TQT_PRODUCT, qt-(enterprise|internal|eval) ) { +contains( TQT_PRODUCT, qt-(enterprise|internal|eval) ) { win32: SUBDIRS = activeqt x11: SUBDIRS = motif } diff --git a/tqtinterface/qt4/extensions/nsplugin/src/npwin.cpp b/tqtinterface/qt4/extensions/nsplugin/src/npwin.cpp index fe2548e..fc25212 100644 --- a/tqtinterface/qt4/extensions/nsplugin/src/npwin.cpp +++ b/tqtinterface/qt4/extensions/nsplugin/src/npwin.cpp @@ -325,7 +325,7 @@ void NPN_tqStatus(NPP instance, const char *message) g_pNavigatorFuncs->status(instance, message); } -/* returns the user agent string of Navigator, which tqcontains version info +/* returns the user agent string of Navigator, which contains version info */ const char* NPN_UserAgent(NPP instance) { diff --git a/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp b/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp index 987e6a8..5dc6684 100644 --- a/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp +++ b/tqtinterface/qt4/extensions/nsplugin/src/qnp.cpp @@ -294,7 +294,7 @@ static jref plugin_java_class = 0; ** NPP_GetJavaClass is called during initialization to ask your plugin ** what its associated Java class is. If you don't have one, just return ** NULL. Otherwise, use the javah-generated "use_" function to both -** initialize your class and return it. If you can't tqfind your class, an +** initialize your class and return it. If you can't find your class, an ** error will be signalled by "use_" and will cause the Navigator to ** complain to the user. */ @@ -1688,12 +1688,12 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) TQApplication::sendPostedEvents(); TQWidgetIntDict *mapper = &static_d->mapper; - TQWidget* qnpxt = mapper->tqfind( event->xany.window ); - if ( !qnpxt && TQWidget::tqfind( event->xany.window) == 0 ) { + TQWidget* qnpxt = mapper->find( event->xany.window ); + if ( !qnpxt && TQWidget::find( event->xany.window) == 0 ) { // event is not for TQt, try Xt Widget w = XtWindowToWidget( TQPaintDevice::x11AppDisplay(), event->xany.window ); - while ( w && ! ( qnpxt = mapper->tqfind( XtWindow( w ) ) ) ) { + while ( w && ! ( qnpxt = mapper->find( XtWindow( w ) ) ) ) { if ( XtIsShell( w ) ) { break; } @@ -1796,7 +1796,7 @@ Boolean qnpxt_event_dispatcher( XEvent *event ) TQWidget *qw = 0; Widget xw = XtWindowToWidget( TQPaintDevice::x11AppDisplay(), event->xany.window ); - while ( xw && !( qw = mapper->tqfind( XtWindow( xw ) ) ) ) + while ( xw && !( qw = mapper->find( XtWindow( xw ) ) ) ) xw = XtParent( xw ); while ( qw && qw != TQApplication::activeModalWidget() ) @@ -1933,7 +1933,7 @@ void TQNPXt::unregisterWidget( TQWidget* w ) void qnpxt_socknot_handler( XtPointer pointer, int *, XtInputId *id ) { TQNPXt *eventloop = (TQNPXt *) pointer; - TQSocketNotifier *socknot = static_d->socknotDict.tqfind( *id ); + TQSocketNotifier *socknot = static_d->socknotDict.find( *id ); if ( ! socknot ) // this shouldn't happen return; eventloop->setSocketNotifierPending( socknot ); diff --git a/tqtinterface/qt4/include/private/qt4_qwidget_p.h b/tqtinterface/qt4/include/private/qt4_qwidget_p.h index c0f6ec7..f2f21d4 100644 --- a/tqtinterface/qt4/include/private/qt4_qwidget_p.h +++ b/tqtinterface/qt4/include/private/qt4_qwidget_p.h @@ -111,7 +111,7 @@ struct QTLWExtra { uint validWMState : 1; // is WM_STATE valid? uint waitingForMapNotify : 1; // show() has been called, haven't got the MapNotify yet WId parentWinId; // tqparent window Id (valid after reparenting) - WId userTimeWindow; // window id that tqcontains user-time timestamp when WM supports a _NET_WM_USER_TIME_WINDOW atom + WId userTimeWindow; // window id that contains user-time timestamp when WM supports a _NET_WM_USER_TIME_WINDOW atom QPoint fullScreenOffset; #ifndef QT_NO_XSYNC WId syncUpdateCounter; diff --git a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp index 21a99b1..4a120d9 100644 --- a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp +++ b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblemenu.cpp @@ -81,7 +81,7 @@ TQString TQAccessiblePopup::text( Text t, int control ) const TQMenuItem *item = 0; if ( control ) { id = popupMenu()->idAt( control - 1 ); - item = popupMenu()->tqfindItem( id ); + item = popupMenu()->findItem( id ); } switch ( t ) { @@ -110,7 +110,7 @@ TQAccessible::Role TQAccessiblePopup::role( int control ) const if ( !control ) return PopupMenu; - TQMenuItem *item = popupMenu()->tqfindItem( popupMenu()->idAt( control -1 ) ); + TQMenuItem *item = popupMenu()->findItem( popupMenu()->idAt( control -1 ) ); if ( item && item->isSeparator() ) return Separator; return MenuItem; @@ -123,7 +123,7 @@ TQAccessible::State TQAccessiblePopup::state( int control ) const return (State)s; int id = popupMenu()->idAt( control -1 ); - TQMenuItem *item = popupMenu()->tqfindItem( id ); + TQMenuItem *item = popupMenu()->findItem( id ); if ( !item ) return (State)s; @@ -145,7 +145,7 @@ bool TQAccessiblePopup::doDefaultAction( int control ) return FALSE; int id = popupMenu()->idAt( control -1 ); - TQMenuItem *item = popupMenu()->tqfindItem( id ); + TQMenuItem *item = popupMenu()->findItem( id ); if ( !item || !item->isEnabled() ) return FALSE; @@ -159,7 +159,7 @@ bool TQAccessiblePopup::setFocus( int control ) return FALSE; int id = popupMenu()->idAt( control -1 ); - TQMenuItem *item = popupMenu()->tqfindItem( id ); + TQMenuItem *item = popupMenu()->findItem( id ); if ( !item || !item->isEnabled() ) return FALSE; @@ -268,7 +268,7 @@ TQAccessible::Role TQAccessibleMenuBar::role( int control ) const if ( !control ) return MenuBar; - TQMenuItem *item = menuBar()->tqfindItem( menuBar()->idAt( control -1 ) ); + TQMenuItem *item = menuBar()->findItem( menuBar()->idAt( control -1 ) ); if ( item && item->isSeparator() ) return Separator; return MenuItem; @@ -281,7 +281,7 @@ TQAccessible::State TQAccessibleMenuBar::state( int control ) const return (State)s; int id = menuBar()->idAt( control -1 ); - TQMenuItem *item = menuBar()->tqfindItem( id ); + TQMenuItem *item = menuBar()->findItem( id ); if ( !item ) return (State)s; @@ -301,7 +301,7 @@ bool TQAccessibleMenuBar::doDefaultAction( int control ) return FALSE; int id = menuBar()->idAt( control -1 ); - TQMenuItem *item = menuBar()->tqfindItem( id ); + TQMenuItem *item = menuBar()->findItem( id ); if ( !item || !item->isEnabled() ) return FALSE; @@ -315,7 +315,7 @@ bool TQAccessibleMenuBar::setFocus( int control ) return FALSE; int id = menuBar()->idAt( control -1 ); - TQMenuItem *item = menuBar()->tqfindItem( id ); + TQMenuItem *item = menuBar()->findItem( id ); if ( !item || !item->isEnabled() ) return FALSE; diff --git a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp index 6741bf0..224ee09 100644 --- a/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp +++ b/tqtinterface/qt4/plugins/src/accessible/widgets/qaccessiblewidget.cpp @@ -81,7 +81,7 @@ TQString hotKey( const TQString &text ) TQString n = text; int fa = 0; bool ac = FALSE; - while ( ( fa = n.tqfind( "&", fa ) ) != -1 ) { + while ( ( fa = n.find( "&", fa ) ) != -1 ) { if ( n.at(fa+1) != '&' ) { ac = TRUE; break; @@ -134,7 +134,7 @@ int TQAccessibleWidget::controlAt( int x, int y ) const { TQWidget *w = widget(); TQPoint gp = w->mapToGlobal( TQPoint( 0, 0 ) ); - if ( !TQRect( gp.x(), gp.y(), w->width(), w->height() ).tqcontains( x, y ) ) + if ( !TQRect( gp.x(), gp.y(), w->width(), w->height() ).contains( x, y ) ) return -1; TQPoint rp = w->mapFromGlobal( TQPoint( x, y ) ); @@ -148,7 +148,7 @@ int TQAccessibleWidget::controlAt( int x, int y ) const TQWidget *child = 0; int index = 1; while ( ( child = (TQWidget*)it.current() ) ) { - if ( !child->isTopLevel() && !child->isHidden() && child->tqgeometry().tqcontains( rp ) ) { + if ( !child->isTopLevel() && !child->isHidden() && child->tqgeometry().contains( rp ) ) { delete list; return index; } @@ -244,7 +244,7 @@ int TQAccessibleWidget::navigate( NavDirection dir, int startControl ) const return -1; TQObjectList *list = w->queryList( "TQWidget", 0, FALSE, FALSE ); - int index = list->tqfindRef( w2 ); + int index = list->findRef( w2 ); delete list; return ( index != -1 ) ? index+1 : -1; } @@ -654,9 +654,9 @@ TQAccessibleSpinWidget::TQAccessibleSpinWidget( TQObject *o ) int TQAccessibleSpinWidget::controlAt( int x, int y ) const { TQPoint tl = widget()->mapFromGlobal( TQPoint( x, y ) ); - if ( ((TQSpinWidget*)widget())->upRect().tqcontains( tl ) ) + if ( ((TQSpinWidget*)widget())->upRect().contains( tl ) ) return 1; - else if ( ((TQSpinWidget*)widget())->downRect().tqcontains( tl ) ) + else if ( ((TQSpinWidget*)widget())->downRect().contains( tl ) ) return 2; return -1; @@ -832,7 +832,7 @@ TQScrollBar *TQAccessibleScrollBar::scrollBar() const int TQAccessibleScrollBar::controlAt( int x, int y ) const { for ( int i = 1; i <= childCount(); i++ ) { - if ( rect(i).tqcontains( x,y ) ) + if ( rect(i).contains( x,y ) ) return i; } return 0; @@ -1029,7 +1029,7 @@ TQSlider *TQAccessibleSlider::slider() const int TQAccessibleSlider::controlAt( int x, int y ) const { for ( int i = 1; i <= childCount(); i++ ) { - if ( rect(i).tqcontains( x,y ) ) + if ( rect(i).contains( x,y ) ) return i; } return 0; @@ -1331,7 +1331,7 @@ int TQAccessibleHeader::controlAt( int x, int y ) const { TQPoint point = header()->mapFromGlobal( TQPoint( x, y ) ); for ( int i = 0; i < header()->count(); i++ ) { - if ( header()->sectionRect( i ).tqcontains( point ) ) + if ( header()->sectionRect( i ).contains( point ) ) return i+1; } return -1; @@ -1675,7 +1675,7 @@ TQComboBox *TQAccessibleComboBox::comboBox() const int TQAccessibleComboBox::controlAt( int x, int y ) const { for ( int i = childCount(); i >= 0; --i ) { - if ( rect( i ).tqcontains( x, y ) ) + if ( rect( i ).contains( x, y ) ) return i; } return -1; @@ -1976,7 +1976,7 @@ TQString TQAccessibleTitleBar::text( Text t, int control ) const case 5: return TQTitleBar::tr("Closes the window"); default: - return TQTitleBar::tr("Displays the name of the window and tqcontains controls to manipulate it"); + return TQTitleBar::tr("Displays the name of the window and contains controls to manipulate it"); } default: break; @@ -2353,7 +2353,7 @@ TQMemArray<int> TQAccessibleListBox::selection() const \brief The TQAccessibleListView class implements the TQAccessibleInterface for list views. */ -static TQListViewItem *tqfindLVItem( TQListView* listView, int control ) +static TQListViewItem *findLVItem( TQListView* listView, int control ) { int id = 1; TQListViewItemIterator it( listView ); @@ -2402,7 +2402,7 @@ int TQAccessibleListView::itemAt( int x, int y ) const /*! \reimp */ TQRect TQAccessibleListView::tqitemRect( int control ) const { - TQListViewItem *item = tqfindLVItem( listView(), control ); + TQListViewItem *item = findLVItem( listView(), control ); if ( !item ) return TQRect(); return listView()->tqitemRect( item ); @@ -2427,7 +2427,7 @@ TQString TQAccessibleListView::text( Text t, int control ) const if ( !control || t != Name ) return TQAccessibleScrollView::text( t, control ); - TQListViewItem *item = tqfindLVItem( listView(), control ); + TQListViewItem *item = findLVItem( listView(), control ); if ( !item ) return TQString::null; return item->text( 0 ); @@ -2446,7 +2446,7 @@ TQAccessible::State TQAccessibleListView::state( int control ) const { int state = TQAccessibleScrollView::state( control ); TQListViewItem *item; - if ( !control || !( item = tqfindLVItem( listView(), control ) ) ) + if ( !control || !( item = findLVItem( listView(), control ) ) ) return (State)state; if ( item->isSelectable() ) { @@ -2507,7 +2507,7 @@ bool TQAccessibleListView::setFocus( int control ) if ( !control || !res ) return res; - TQListViewItem *item = tqfindLVItem( listView(), control ); + TQListViewItem *item = findLVItem( listView(), control ); if ( !item ) return FALSE; listView()->setCurrentItem( item ); @@ -2522,7 +2522,7 @@ bool TQAccessibleListView::setSelected( int control, bool on, bool extend ) listView()->selectionMode() != TQListView::Multi ) ) return FALSE; - TQListViewItem *item = tqfindLVItem( listView(), control ); + TQListViewItem *item = findLVItem( listView(), control ); if ( !item ) return FALSE; if ( !extend ) { @@ -2578,7 +2578,7 @@ TQMemArray<int> TQAccessibleListView::selection() const \brief The TQAccessibleIconView class implements the TQAccessibleInterface for icon views. */ -static TQIconViewItem *tqfindIVItem( TQIconView *iconView, int control ) +static TQIconViewItem *findIVItem( TQIconView *iconView, int control ) { int id = 1; TQIconViewItem *item = iconView->firstItem(); @@ -2608,14 +2608,14 @@ TQIconView *TQAccessibleIconView::iconView() const /*! \reimp */ int TQAccessibleIconView::itemAt( int x, int y ) const { - TQIconViewItem *item = iconView()->tqfindItem( TQPoint( x, y ) ); + TQIconViewItem *item = iconView()->findItem( TQPoint( x, y ) ); return iconView()->index( item ) + 1; } /*! \reimp */ TQRect TQAccessibleIconView::tqitemRect( int control ) const { - TQIconViewItem *item = tqfindIVItem( iconView(), control ); + TQIconViewItem *item = findIVItem( iconView(), control ); if ( !item ) return TQRect(); @@ -2634,7 +2634,7 @@ TQString TQAccessibleIconView::text( Text t, int control ) const if ( !control || t != Name ) return TQAccessibleScrollView::text( t, control ); - TQIconViewItem *item = tqfindIVItem( iconView(), control ); + TQIconViewItem *item = findIVItem( iconView(), control ); if ( !item ) return TQString::null; return item->text(); @@ -2653,7 +2653,7 @@ TQAccessible::State TQAccessibleIconView::state( int control ) const { int state = TQAccessibleScrollView::state( control ); TQIconViewItem *item; - if ( !control || !( item = tqfindIVItem( iconView(), control ) ) ) + if ( !control || !( item = findIVItem( iconView(), control ) ) ) return (State)state; if ( item->isSelectable() ) { @@ -2695,7 +2695,7 @@ bool TQAccessibleIconView::setFocus( int control ) if ( !control || !res ) return res; - TQIconViewItem *item = tqfindIVItem( iconView(), control ); + TQIconViewItem *item = findIVItem( iconView(), control ); if ( !item ) return FALSE; iconView()->setCurrentItem( item ); @@ -2710,7 +2710,7 @@ bool TQAccessibleIconView::setSelected( int control, bool on, bool extend ) iconView()->selectionMode() != TQIconView::Multi ) ) return FALSE; - TQIconViewItem *item = tqfindIVItem( iconView(), control ); + TQIconViewItem *item = findIVItem( iconView(), control ); if ( !item ) return FALSE; if ( !extend ) { diff --git a/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp b/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp index a3caede..721bd6d 100644 --- a/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp +++ b/tqtinterface/qt4/plugins/src/inputmethods/imsw-multi/tqmultiinputcontext.cpp @@ -372,7 +372,7 @@ TQPopupMenu *TQMultiInputContext::createImSelPopup() void TQMultiInputContext::changeInputMethodWithMenuId( int menuid ) { - TQString *key = keyDict.tqfind( (long)menuid ); + TQString *key = keyDict.find( (long)menuid ); changeInputMethod( (*key) ); } diff --git a/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp b/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp index 412ece8..f0d746c 100644 --- a/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp +++ b/tqtinterface/qt4/plugins/src/inputmethods/xim/tqximinputcontext_x11.cpp @@ -254,9 +254,9 @@ extern "C" { delete [] str; if (drawstruct->chg_length < 0) - qic->composingText.tqreplace(drawstruct->chg_first, UINT_MAX, s); + qic->composingText.replace(drawstruct->chg_first, UINT_MAX, s); else - qic->composingText.tqreplace(drawstruct->chg_first, drawstruct->chg_length, s); + qic->composingText.replace(drawstruct->chg_first, drawstruct->chg_length, s); if ( qic->selectedChars.size() < qic->composingText.length() ) { // expand the selectedChars array if the compose string is longer @@ -619,7 +619,7 @@ bool TQXIMInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event ) * event into a filtered KeyPress event, in which case our * keywidget is still zero. */ - TQETWidget *widget = (TQETWidget*)TQWidget::tqfind( (WId)event->xany.window ); + TQETWidget *widget = (TQETWidget*)TQWidget::find( (WId)event->xany.window ); if ( ! keywidget ) { keywidget = (TQETWidget*)TQWidget::keyboardGrabber(); if ( keywidget ) { diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro b/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro index ed1cd58..ec176df 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/ibase/ibase.pro @@ -11,7 +11,7 @@ SOURCES = main.cpp \ unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*gds.* ):!tqcontains( LIBS, .*libfb.* ) { + !contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ) { LIBS *= -lfbclient } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro b/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro index 0d2cc7c..1469a93 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/mysql/mysql.pro @@ -11,7 +11,7 @@ SOURCES = main.cpp \ unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*mysql.* ) { + !contains( LIBS, .*mysql.* ) { LIBS *= -lmysqlclient } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro b/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro index ba9058e..735c85b 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/odbc/odbc.pro @@ -9,14 +9,14 @@ SOURCES = main.cpp \ ../../../../src/sql/drivers/odbc/tqsql_odbc.cpp mac { - !tqcontains( LIBS, .*odbc.* ) { + !contains( LIBS, .*odbc.* ) { LIBS *= -liodbc } } unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*odbc.* ) { + !contains( LIBS, .*odbc.* ) { LIBS *= -lodbc } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro b/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro index 1ab6808..57f47b6 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/psql/psql.pro @@ -9,7 +9,7 @@ SOURCES = main.cpp \ ../../../../src/sql/drivers/psql/tqsql_psql.cpp unix { OBJECTS_DIR = .obj - !tqcontains( LIBS, .*pq.* ) { + !contains( LIBS, .*pq.* ) { LIBS *= -lpq } } diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro b/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro index a7e1652..616b23f 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/sqldrivers.pro @@ -1,10 +1,10 @@ TEMPLATE = subdirs -tqcontains(sql-plugins, psql) : SUBDIRS += psql -tqcontains(sql-plugins, mysql) : SUBDIRS += mysql -tqcontains(sql-plugins, odbc) : SUBDIRS += odbc -tqcontains(sql-plugins, tds) : SUBDIRS += tds -tqcontains(sql-plugins, oci) : SUBDIRS += oci -tqcontains(sql-plugins, db2) : SUBDIRS += db2 -tqcontains(sql-plugins, sqlite) : SUBDIRS += sqlite -tqcontains(sql-plugins, ibase) : SUBDIRS += ibase +contains(sql-plugins, psql) : SUBDIRS += psql +contains(sql-plugins, mysql) : SUBDIRS += mysql +contains(sql-plugins, odbc) : SUBDIRS += odbc +contains(sql-plugins, tds) : SUBDIRS += tds +contains(sql-plugins, oci) : SUBDIRS += oci +contains(sql-plugins, db2) : SUBDIRS += db2 +contains(sql-plugins, sqlite) : SUBDIRS += sqlite +contains(sql-plugins, ibase) : SUBDIRS += ibase diff --git a/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro b/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro index 51d696e..51a6ff0 100644 --- a/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro +++ b/tqtinterface/qt4/plugins/src/sqldrivers/sqlite/sqlite.pro @@ -23,7 +23,7 @@ win32 { # } } -!tqcontains( LIBS, .*sqlite.* ) { +!contains( LIBS, .*sqlite.* ) { INCLUDEPATH += ../../../../src/3rdparty/sqlite HEADERS += ../../../../src/3rdparty/sqlite/btree.h \ diff --git a/tqtinterface/qt4/plugins/src/styles/cde/cde.pro b/tqtinterface/qt4/plugins/src/styles/cde/cde.pro index 6aa8abc..38ca906 100644 --- a/tqtinterface/qt4/plugins/src/styles/cde/cde.pro +++ b/tqtinterface/qt4/plugins/src/styles/cde/cde.pro @@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqcdestyle.h SOURCES = main.cpp \ ../../../../src/styles/tqcdestyle.cpp -!tqcontains(styles, motif) { +!contains(styles, motif) { HEADERS += ../../../../include/tqmotifstyle.h SOURCES += ../../../../src/styles/tqmotifstyle.cpp } diff --git a/tqtinterface/qt4/plugins/src/styles/compact/compact.pro b/tqtinterface/qt4/plugins/src/styles/compact/compact.pro index ce5af7a..72d0328 100644 --- a/tqtinterface/qt4/plugins/src/styles/compact/compact.pro +++ b/tqtinterface/qt4/plugins/src/styles/compact/compact.pro @@ -9,7 +9,7 @@ HEADERS = ../../../../include/tqcompactstyle.h SOURCES = main.cpp \ ../../../../src/styles/tqcompactstyle.cpp -!tqcontains(styles, windows) { +!contains(styles, windows) { HEADERS += ../../../../include/tqwindowsstyle.h SOURCES += ../../../../src/styles/tqwindowsstyle.cpp } diff --git a/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro b/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro index f97bdcc..be1862d 100644 --- a/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro +++ b/tqtinterface/qt4/plugins/src/styles/motifplus/motifplus.pro @@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqmotifplusstyle.h SOURCES = main.cpp \ ../../../../src/styles/tqmotifplusstyle.cpp -!tqcontains(styles, motif) { +!contains(styles, motif) { HEADERS += ../../../../include/tqmotifstyle.h SOURCES += ../../../../src/styles/tqmotifstyle.cpp } diff --git a/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro b/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro index 486faeb..f8aa607 100644 --- a/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro +++ b/tqtinterface/qt4/plugins/src/styles/platinum/platinum.pro @@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqplatinumstyle.h SOURCES = main.cpp \ ../../../../src/styles/tqplatinumstyle.cpp -!tqcontains(styles, windows) { +!contains(styles, windows) { HEADERS += ../../../../include/tqwindowsstyle.h SOURCES += ../../../../src/styles/tqwindowsstyle.cpp } diff --git a/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro b/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro index 11f32db..ec23e29 100644 --- a/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro +++ b/tqtinterface/qt4/plugins/src/styles/sgi/sgi.pro @@ -8,7 +8,7 @@ HEADERS = ../../../../include/tqsgistyle.h SOURCES = main.cpp \ ../../../../src/styles/tqsgistyle.cpp -!tqcontains(styles, motif) { +!contains(styles, motif) { HEADERS += ../../../../include/tqmotifstyle.h SOURCES += ../../../../src/styles/tqmotifstyle.cpp } diff --git a/tqtinterface/qt4/plugins/src/styles/styles.pro b/tqtinterface/qt4/plugins/src/styles/styles.pro index 8268056..9fa6a22 100644 --- a/tqtinterface/qt4/plugins/src/styles/styles.pro +++ b/tqtinterface/qt4/plugins/src/styles/styles.pro @@ -1,11 +1,11 @@ TEMPLATE = subdirs -tqcontains(style-plugins, windows) :SUBDIRS += windows -tqcontains(style-plugins, motif) :SUBDIRS += motif -tqcontains(style-plugins, platinum) :SUBDIRS += platinum -tqcontains(style-plugins, motifplus) :SUBDIRS += motifplus -tqcontains(style-plugins, cde) :SUBDIRS += cde -tqcontains(style-plugins, sgi) :SUBDIRS += sgi -tqcontains(style-plugins, compact) :SUBDIRS += compact -tqcontains(style-plugins, aqua) :SUBDIRS += aqua -tqcontains(style-plugins, mac) :SUBDIRS += mac -tqcontains(style-plugins, windowsxp) :SUBDIRS += windowsxp +contains(style-plugins, windows) :SUBDIRS += windows +contains(style-plugins, motif) :SUBDIRS += motif +contains(style-plugins, platinum) :SUBDIRS += platinum +contains(style-plugins, motifplus) :SUBDIRS += motifplus +contains(style-plugins, cde) :SUBDIRS += cde +contains(style-plugins, sgi) :SUBDIRS += sgi +contains(style-plugins, compact) :SUBDIRS += compact +contains(style-plugins, aqua) :SUBDIRS += aqua +contains(style-plugins, mac) :SUBDIRS += mac +contains(style-plugins, windowsxp) :SUBDIRS += windowsxp diff --git a/tqtinterface/qt4/qmake/CHANGES b/tqtinterface/qt4/qmake/CHANGES index b751524..ca786ee 100644 --- a/tqtinterface/qt4/qmake/CHANGES +++ b/tqtinterface/qt4/qmake/CHANGES @@ -53,7 +53,7 @@ 2) library dependencies, when on .pro depends on another library - it will automatically build that other library (unix makefiles only) 3) automatic detection of configurations for Qt, if CONFIG qt is specified - it will tqfind the settings for the most recent Qt itself. + it will find the settings for the most recent Qt itself. Project Builder for Mac OS X is now a supported backend for qmake. diff --git a/tqtinterface/qt4/qmake/book/qmake-advanced.leaf b/tqtinterface/qt4/qmake/book/qmake-advanced.leaf index ab94a46..d1b8c4b 100644 --- a/tqtinterface/qt4/qmake/book/qmake-advanced.leaf +++ b/tqtinterface/qt4/qmake/book/qmake-advanced.leaf @@ -64,7 +64,7 @@ is not already defined. \section2 The '~=' operator -This operator tqreplaces any values that match the regexp with the +This operator replaces any values that match the regexp with the specified value. It is used like this: \code @@ -193,7 +193,7 @@ variable by prefixing $$ to the variable name. For example: MY_DEFINES = $$DEFINES \endcode -Now the MY_DEFINES variable tqcontains what is in the DEFINES variable at +Now the MY_DEFINES variable contains what is in the DEFINES variable at this point in the project file. This is also equivalent to: \code @@ -204,7 +204,7 @@ The second notation allows you to adjoin the variable expansion to another value without separating by space. \e qmake will allow a variable to contain anything (including $(VALUE), which will be placed directly into the Makefile, and allow it to expand as appropriate, usually an environment -variable). However, if you require an environment variable to be tqreplaced +variable). However, if you require an environment variable to be replaced immediately then you may use the $$() notation. For example: \code @@ -235,7 +235,7 @@ list. If the value of \e variablename is not long this will return an empty string. \e variablename is the only required field, if not specified position will default to the first value in the list (0). -\section2 tqfind( variablename, substr ) +\section2 find( variablename, substr ) This will place all the values in \e variablename that match \e substr. \e substr may be a regular expression as well, and will be matched @@ -244,11 +244,11 @@ accordingly. \code MY_VAR = one two three four MY_VAR2 = $$join(MY_VAR, " -L", -L) -Lfive - MY_VAR3 = $$member(MY_VAR, 2) $$tqfind(MY_VAR, t.*) + MY_VAR3 = $$member(MY_VAR, 2) $$find(MY_VAR, t.*) \endcode MY_VAR2 will contain '-Lone -Ltwo -Lthree -Lfour -Lfive', and MYVAR3 will -tqcontains 'three two three'. +contains 'three two three'. \section2 system( program_and_args ) @@ -258,7 +258,7 @@ platform for example. \code UNAME = $$system(uname -s) - tqcontains( UNAME, [lL]inux ):message( This looks like Linux ($$UNAME) to me ) + contains( UNAME, [lL]inux ):message( This looks like Linux ($$UNAME) to me ) \endcode \section1 Test Functions @@ -268,14 +268,14 @@ tests. These tests may be used in place of scopes (as described above), in some cases it is more usefull to use the test function by itself ignoring its test value. -\section2 tqcontains( variablename, value ) +\section2 contains( variablename, value ) If \e value is in the list of values stored in the variable called \e variablename, then the settings inside the scope will be processed. For example: \code - tqcontains( CONFIG, thread ) { + contains( CONFIG, thread ) { DEFINES += QT_THREAD_SUPPORT } \endcode @@ -396,6 +396,6 @@ headers. \section2 infile( filename, var, val ) This function will succeed if the file \e filename (when parsed -by qmake itself) tqcontains the variable \e var with a value of +by qmake itself) contains the variable \e var with a value of \e val. You may also not pass in a third argument (\e val) and the function will only test if \e var has been assigned to in the file. diff --git a/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf b/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf index 5d803de..8eccfcc 100644 --- a/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf +++ b/tqtinterface/qt4/qmake/book/qmake-commandreference.leaf @@ -66,7 +66,7 @@ The following options can be specified on the command line to \e qmake: \e qmake will go over these features and give some useful help. \endlist -There are also warning options that can help to tqfind problems in your +There are also warning options that can help to find problems in your project file: \list @@ -355,7 +355,7 @@ this syntax is not fully supported by \QD. \target LEXSOURCES \section3 LEXSOURCES -This variable tqcontains a list of lex source files. All +This variable contains a list of lex source files. All dependencies, headers and source files will automatically be added to the project for building these lex files. @@ -369,12 +369,12 @@ LEXSOURCES = lexer.l \target LIBS \section3 LIBS -This variable tqcontains a list of libraries to be linked into the project. +This variable contains a list of libraries to be linked into the project. If you are more comfortable with the Unix convension of -L/-l flags you are free to use them in a cross-platform manner and qmake will do the correct thing with these libraries on Windows (namely this means passing the full path of the library to the linker). The only limitation to this is the -library must exist, for qmake to tqfind which directory a -l lib lives in. +library must exist, for qmake to find which directory a -l lib lives in. For example: @@ -467,7 +467,7 @@ This is mainly used in Qt's build system for building the examples. \target SOURCES \section3 SOURCES -This variable tqcontains the name of all source files in the project. +This variable contains the name of all source files in the project. For example: @@ -484,7 +484,7 @@ See also \link #HEADERS HEADERS \endlink \section3 SUBDIRS This variable, when used with the 'subdirs' -\link #TEMPLATE TEMPLATE \endlink tqcontains the names of all subdirectories +\link #TEMPLATE TEMPLATE \endlink contains the names of all subdirectories to look for a project file. For example: @@ -516,7 +516,7 @@ unix and 'myapp.exe' on windows. \target TEMPLATE \section3 TEMPLATE -This variable tqcontains the name of the template to use when +This variable contains the name of the template to use when generating the project. The allowed values are: \list @@ -548,7 +548,7 @@ the command line rather than use the \c -t option. \section3 VERSION -This variable tqcontains the version number of the library if the +This variable contains the version number of the library if the 'lib' \link #TEMPLATE TEMPLATE \endlink is specified. For example: @@ -559,7 +559,7 @@ VERSION = 1.2.3 \section3 DISTFILES -This variable tqcontains a list of files to be included in the dist +This variable contains a list of files to be included in the dist target. This feature is supported by UnixMake specs only. For example: @@ -572,7 +572,7 @@ DISTFILES += ../program.txt \target YACCSOURCES \section3 YACCSOURCES -This variable tqcontains a list of yacc source files to be included +This variable contains a list of yacc source files to be included in the project. All dependencies, headers and source files will automatically be included in the project. @@ -613,7 +613,7 @@ modified. \target LEXIMPLS \section3 LEXIMPLS -This variable tqcontains a list of lex implementation files. The value +This variable contains a list of lex implementation files. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -622,7 +622,7 @@ needs to be modified. \target LEXOBJECTS \section3 LEXOBJECTS -This variable tqcontains the names of intermediate lex object +This variable contains the names of intermediate lex object files.The value of this variable is typically handled by \e qmake and rarely needs to be modified. @@ -658,7 +658,7 @@ handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to \target MAKEFILE_GENERATOR \section3 MAKEFILE_GENERATOR -This variable tqcontains the name of the makefile generator to use +This variable contains the name of the makefile generator to use when generating a makefile. The value of this variable is typically handled internally by \e qmake and rarely needs to be modified. @@ -668,7 +668,7 @@ handled internally by \e qmake and rarely needs to be modified. This variable is generated from the \link #SOURCES SOURCES \endlink variable. The extension of each source file will have been -tqreplaced by .o (Unix) or .obj (Win32). The value of this variable is +replaced by .o (Unix) or .obj (Win32). The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -676,7 +676,7 @@ rarely needs to be modified. \section3 OBJTQMOC This variable is set by \e qmake if files can be found that -contain the Q_OBJECT macro. \c OBJTQMOC tqcontains the +contain the Q_OBJECT macro. \c OBJTQMOC contains the name of all intermediate tqmoc object files. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -693,7 +693,7 @@ UNIX - gcc 3.3 and up). On other platforms, this variable has different meaning, as noted below. -This variable tqcontains a list of header files that require some +This variable contains a list of header files that require some sort of pre-compilation step (such as with tqmoc). The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -701,7 +701,7 @@ modified. \target QMAKE \section3 QMAKE -This variable tqcontains the name of the \e qmake program +This variable contains the name of the \e qmake program itself and is placed in generated makefiles. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -711,7 +711,7 @@ modified. \target QMAKESPEC_systemvariable \section3 QMAKESPEC -This variable tqcontains the name of the \e qmake +This variable contains the name of the \e qmake configuration to use when generating makefiles. The value of this variable is typically handled by \e qmake and rarely needs to be modified. Use the \link #QMAKESPEC QMAKESPEC \endlink environment variable instead. @@ -751,7 +751,7 @@ modified. \e {This is used on Unix platforms only} -This variable tqcontains the command for invoking the program which +This variable contains the command for invoking the program which creates, modifies and extracts archives. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -761,7 +761,7 @@ and rarely needs to be modified. \target TQMAKE_CFLAGS_DEBUG \section3 TQMAKE_CFLAGS_DEBUG -This variable tqcontains the flags for the C compiler in debug mode.The value of this variable is +This variable contains the flags for the C compiler in debug mode.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -771,7 +771,7 @@ and rarely needs to be modified. \target TQMAKE_CFLAGS_MT \section3 TQMAKE_CFLAGS_MT -This variable tqcontains the compiler flags for creating a +This variable contains the compiler flags for creating a multi-threaded application or when the version of Qt that you link against is a multi-threaded statically linked library. The value of this variable is typically handled by \e qmake or @@ -783,7 +783,7 @@ this variable is typically handled by \e qmake or \target TQMAKE_CFLAGS_MT_DBG \section3 TQMAKE_CFLAGS_MT_DBG -This variable tqcontains the compiler flags for creating a debuggable +This variable contains the compiler flags for creating a debuggable multi-threaded application or when the version of Qt that you link against is a debuggable multi-threaded statically linked library. The value of this variable is typically handled by \e qmake or @@ -797,7 +797,7 @@ value of this variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable tqcontains the compiler flags for creating a +This variable contains the compiler flags for creating a multi-threaded dll or when the version of Qt that you link against is a multi-threaded dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and @@ -811,7 +811,7 @@ rarely needs to be modified. \e {This is used on Windows only} -This variable tqcontains the compiler flags for creating a debuggable +This variable contains the compiler flags for creating a debuggable multi-threaded dll or when the version of Qt that you link against is a debuggable multi-threaded statically linked library. The value of this variable is typically handled by \e qmake or @@ -823,7 +823,7 @@ The value of this variable is typically handled by \e qmake or \target TQMAKE_CFLAGS_RELEASE \section3 TQMAKE_CFLAGS_RELEASE -This variable tqcontains the compiler flags for creating a non-debuggable +This variable contains the compiler flags for creating a non-debuggable application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -836,7 +836,7 @@ rarely needs to be modified. \e {This is used on Unix platforms only} -This variable tqcontains the compiler flags for creating a shared +This variable contains the compiler flags for creating a shared library. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -847,7 +847,7 @@ to be modified. \target TQMAKE_CFLAGS_THREAD \section3 TQMAKE_CFLAGS_THREAD -This variable tqcontains the compiler flags for creating a multi-threaded +This variable contains the compiler flags for creating a multi-threaded application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -880,7 +880,7 @@ to be modified. \target QMAKE_CLEAN \section3 QMAKE_CLEAN -This variable tqcontains any files which are not generated files (such as tqmoc and uic +This variable contains any files which are not generated files (such as tqmoc and uic generated files) and object files that should be removed when using "make clean". @@ -888,7 +888,7 @@ generated files) and object files that should be removed when using "make clean" \target TQMAKE_CXXFLAGS_DEBUG \section3 TQMAKE_CXXFLAGS_DEBUG -This variable tqcontains the C++ compiler flags for creating a debuggable +This variable contains the C++ compiler flags for creating a debuggable application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -898,7 +898,7 @@ to be modified. \target TQMAKE_CXXFLAGS_MT \section3 TQMAKE_CXXFLAGS_MT -This variable tqcontains the C++ compiler flags for creating a multi-threaded +This variable contains the C++ compiler flags for creating a multi-threaded application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -909,7 +909,7 @@ to be modified. \target TQMAKE_CXXFLAGS_MT_DBG \section3 TQMAKE_CXXFLAGS_MT_DBG -This variable tqcontains the C++ compiler flags for creating a debuggable multi-threaded +This variable contains the C++ compiler flags for creating a debuggable multi-threaded application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -922,7 +922,7 @@ to be modified. \c {This is used on Windows only} -This variable tqcontains the C++ compiler flags for creating a multi-threaded +This variable contains the C++ compiler flags for creating a multi-threaded dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -935,7 +935,7 @@ to be modified. \c {This is used on Windows only} -This variable tqcontains the C++ compiler flags for creating a multi-threaded debuggable +This variable contains the C++ compiler flags for creating a multi-threaded debuggable dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -946,7 +946,7 @@ to be modified. \target TQMAKE_CXXFLAGS_RELEASE \section3 TQMAKE_CXXFLAGS_RELEASE -This variable tqcontains the C++ compiler flags for creating an +This variable contains the C++ compiler flags for creating an application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -957,7 +957,7 @@ to be modified. \target TQMAKE_CXXFLAGS_SHLIB \section3 TQMAKE_CXXFLAGS_SHLIB -This variable tqcontains the C++ compiler flags for creating a +This variable contains the C++ compiler flags for creating a shared library. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -968,7 +968,7 @@ to be modified. \target TQMAKE_CXXFLAGS_THREAD \section3 TQMAKE_CXXFLAGS_THREAD -This variable tqcontains the C++ compiler flags for creating a +This variable contains the C++ compiler flags for creating a multi-threaded application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -979,7 +979,7 @@ to be modified. \target TQMAKE_CXXFLAGS_WARN_OFF \section3 TQMAKE_CXXFLAGS_WARN_OFF -This variable tqcontains the C++ compiler flags for suppressing compiler warnings. +This variable contains the C++ compiler flags for suppressing compiler warnings. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -988,7 +988,7 @@ This variable tqcontains the C++ compiler flags for suppressing compiler warning \target TQMAKE_CXXFLAGS_WARN_ON \section3 TQMAKE_CXXFLAGS_WARN_ON -This variable tqcontains C++ compiler flags for generating compiler warnings. +This variable contains C++ compiler flags for generating compiler warnings. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -998,7 +998,7 @@ This variable tqcontains C++ compiler flags for generating compiler warnings. \target QMAKE_EXTENSION_SHLIB \section3 QMAKE_EXTENSION_SHLIB -This variable tqcontains the extention for shared libraries. The value of this +This variable contains the extention for shared libraries. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1008,7 +1008,7 @@ and rarely needs to be modified. \target QMAKE_FAILED_REQUIREMENTS \section3 QMAKE_FAILED_REQUIREMENTS -This variable tqcontains the list of requirements that were failed to be met when +This variable contains the list of requirements that were failed to be met when \e qmake was used. For example, the sql module is needed and wasn't compiled into Qt. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1019,7 +1019,7 @@ and rarely needs to be modified. \target QMAKE_FILETAGS \section3 QMAKE_FILETAGS -This variable tqcontains the file tags needed to be entered into the makefile, such as SOURCES +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 \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1029,7 +1029,7 @@ and HEADERS. The value of this variable is typically handled by \e qmake or \target QMAKE_INCDIR \section3 QMAKE_INCDIR -This variable tqcontains the location of all known header files to be added to +This variable contains the location of all known header files to be added to INCLUDEPATH when building an application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1063,7 +1063,7 @@ This list will go before all builtin dependencies. \target QMAKE_INCDIR_OPENGL \section3 QMAKE_INCDIR_OPENGL -This variable tqcontains the location of OpenGL header files to be added +This variable contains the location of OpenGL header files to be added to INCLUDEPATH when building an application with OpenGL support. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1073,7 +1073,7 @@ value of this variable is typically handled by \e qmake or \target QMAKE_INCDIR_QT \section3 QMAKE_INCDIR_QT -This variable tqcontains the location of all known header file +This variable contains the location of all known header file paths to be added to INCLUDEPATH when building a Qt application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1084,7 +1084,7 @@ of this variable is typically handled by \e qmake or \target QMAKE_INCDIR_THREAD \section3 QMAKE_INCDIR_THREAD -This variable tqcontains the location of all known header file +This variable contains the location of all known header file paths to be added to INCLUDEPATH when building a multi-threaded application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1097,7 +1097,7 @@ The value of this variable is typically handled by \e qmake or \e {This is used on Unix platforms only} -This variable tqcontains the location of X11 header file paths to be +This variable contains the location of X11 header file paths to be added to INCLUDEPATH when building a X11 application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1109,7 +1109,7 @@ value of this variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable tqcontains link flags when building console +This variable contains link flags when building console programs. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1119,7 +1119,7 @@ programs. The value of this variable is typically handled by \e {This is used on Windows only} -This variable tqcontains link flags when building console +This variable contains link flags when building console dlls. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1130,7 +1130,7 @@ dlls. The value of this variable is typically handled by \section3 QMAKE_LFLAGS_DEBUG -This variable tqcontains link flags when building debuggable applications. The +This variable contains link flags when building debuggable applications. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1140,7 +1140,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_LFLAGS_PLUGIN -This variable tqcontains link flags when building plugins. The value +This variable contains link flags when building plugins. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1150,7 +1150,7 @@ of this variable is typically handled by \e qmake or \section3 QMAKE_LFLAGS_QT_DLL -This variable tqcontains link flags when building programs that +This variable contains link flags when building programs that use the Qt library built as a dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1161,7 +1161,7 @@ typically handled by \e qmake or \section3 QMAKE_LFLAGS_RELEASE -This variable tqcontains link flags when building applications for +This variable contains link flags when building applications for release. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1171,7 +1171,7 @@ release. The value of this variable is typically handled by \section3 QMAKE_LFLAGS_SHAPP -This variable tqcontains link flags when building applications which are using +This variable contains link flags when building applications which are using the 'app' template. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1181,7 +1181,7 @@ the 'app' template. The value of this variable is typically handled by \section3 QMAKE_LFLAGS_SHLIB -This variable tqcontains link flags when building shared libraries +This variable contains link flags when building shared libraries The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1200,7 +1200,7 @@ qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. \section3 QMAKE_LFLAGS_THREAD -This variable tqcontains link flags when building multi-threaded projects. +This variable contains link flags when building multi-threaded projects. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1212,7 +1212,7 @@ The value of this variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable tqcontains link flags when building windows projects. +This variable contains link flags when building windows projects. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1221,14 +1221,14 @@ The value of this variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable tqcontains link flags when building windows dll projects. +This variable contains link flags when building windows dll projects. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. \section3 QMAKE_LIBDIR -This variable tqcontains the location of all known library +This variable contains the location of all known library directories.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1241,7 +1241,7 @@ directories.The value of this variable is typically handled by \e {This is used on Unix platforms only} -This variable tqcontains the location of all library +This variable contains the location of all library directory with -L prefixed. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1252,23 +1252,23 @@ directory with -L prefixed. The value of this variable is typically handled by This variable tells \e qmake where to search for files it cannot open. With this you may tell \e qmake where it may look for things -like SOURCES, and if it tqfinds an entry in SOURCES that cannot be +like SOURCES, and if it finds an entry in SOURCES that cannot be opened it will look through the entire VPATH list to see if it can -tqfind the file on its own. +find the file on its own. See also \link #DEPENDPATH DEPENDPATH \endlink. \target DEPENDPATH \section3 DEPENDPATH -This variable tqcontains the list of all directories to look in to +This variable contains the list of all directories to look in to resolve dependencies. This will be used when crawling through 'included' files. \section3 QMAKE_LIBDIR_OPENGL -This variable tqcontains the location of the OpenGL library +This variable contains the location of the OpenGL library directory.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1279,7 +1279,7 @@ directory.The value of this variable is typically handled by \section3 QMAKE_LIBDIR_QT -This variable tqcontains the location of the Qt library +This variable contains the location of the Qt library directory.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1292,14 +1292,14 @@ directory.The value of this variable is typically handled by \e {This is used on Unix platforms only} -This variable tqcontains the location of the X11 library +This variable contains the location of the X11 library directory.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. \section3 QMAKE_LIBS -This variable tqcontains all project libraries. The value of this +This variable contains all project libraries. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1308,7 +1308,7 @@ variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable tqcontains all project libraries that should be linked against +This variable contains all project libraries that should be linked against when building a console application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1318,7 +1318,7 @@ variable is typically handled by \e qmake or \section3 QMAKE_LIBS_OPENGL -This variable tqcontains all OpenGL libraries. The value of this +This variable contains all OpenGL libraries. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1328,7 +1328,7 @@ variable is typically handled by \e qmake or \section3 QMAKE_LIBS_OPENGL_QT -This variable tqcontains all OpenGL Qt libraries.The value of this +This variable contains all OpenGL Qt libraries.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1338,7 +1338,7 @@ variable is typically handled by \e qmake or \section3 QMAKE_LIBS_QT -This variable tqcontains all Qt libraries.The value of this +This variable contains all Qt libraries.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1350,7 +1350,7 @@ variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable tqcontains all Qt libraries when Qt is built as a dll. The +This variable contains all Qt libraries when Qt is built as a dll. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1360,7 +1360,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_LIBS_QT_OPENGL -This variable tqcontains all the libraries needed to link against if +This variable contains all the libraries needed to link against if OpenGL support is turned on. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1369,7 +1369,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_LIBS_QT_THREAD -This variable tqcontains all the libraries needed to link against if +This variable contains all the libraries needed to link against if thread support is turned on. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1382,7 +1382,7 @@ value of this variable is typically handled by \e qmake or \e {This is used with Borland compilers only} -This variable tqcontains the runtime library needed to link against when +This variable contains the runtime library needed to link against when building an application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1395,7 +1395,7 @@ value of this variable is typically handled by \e qmake or \e {This is used with Borland compilers only} -This variable tqcontains the runtime library needed to link against when +This variable contains the runtime library needed to link against when building a multi-threaded application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1406,7 +1406,7 @@ value of this variable is typically handled by \e qmake or \e {This is used on Unix platforms only} -This variable tqcontains all libraries that need to be linked against +This variable contains all libraries that need to be linked against when building a multi-threaded application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1419,7 +1419,7 @@ value of this variable is typically handled by \e qmake or \e {This is used on Windows only} -This variable tqcontains all windows libraries.The value of this +This variable contains all windows libraries.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1431,7 +1431,7 @@ variable is typically handled by \e qmake or \e {This is used on Unix platforms only} -This variable tqcontains all X11 libraries.The value of this +This variable contains all X11 libraries.The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1443,7 +1443,7 @@ variable is typically handled by \e qmake or \e {This is used on Unix platforms only} -This variable tqcontains all X11 session management libraries. The +This variable contains all X11 session management libraries. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1461,7 +1461,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_LINK_SHLIB_CMD -This variable tqcontains the command to execute when creating a +This variable contains the command to execute when creating a shared library. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1469,7 +1469,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_POST_LINK -This variable tqcontains the command to execute after linking the TARGET +This variable contains the command to execute after linking the TARGET together. This variable is normally empty and therefore nothing is executed, additionally some backends will not support this - mostly only Makefile backends. @@ -1478,7 +1478,7 @@ Makefile backends. \section3 QMAKE_PRE_LINK -This variable tqcontains the command to execute before linking the TARGET +This variable contains the command to execute before linking the TARGET together. This variable is normally empty and therefore nothing is executed, additionally some backends will not support this - mostly only Makefile backends. @@ -1487,7 +1487,7 @@ Makefile backends. \section3 QMAKE_LN_SHLIB -This variable tqcontains the command to execute when creating a link +This variable contains the command to execute when creating a link to a shared library. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1498,7 +1498,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_MAKEFILE -This variable tqcontains the name of the makefile to create. The +This variable contains the name of the makefile to create. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1509,7 +1509,7 @@ value of this variable is typically handled by \e qmake or \section3 QMAKE_TQMOC_SRC -This variable tqcontains the names of all tqmoc source files to +This variable contains the names of all tqmoc source files to generate and include in the project. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1517,7 +1517,7 @@ typically handled by \e qmake or \section3 QMAKE_QMAKE -This variable tqcontains the location of qmake if it is not in the path. +This variable contains the location of qmake if it is not in the path. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1565,14 +1565,14 @@ The value of this variable is typically handled by \e qmake or \section3 QMAKE_TARGET -This variable tqcontains the name of the project target. The value of +This variable contains the name of the project target. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. \section3 QMAKE_UIC -This variable tqcontains the location of uic if it is not in the path. +This variable contains the location of uic if it is not in the path. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1587,7 +1587,7 @@ paths. For example: \section3 RC_FILE -This variable tqcontains the name of the resource file for the application. +This variable contains the name of the resource file for the application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1597,7 +1597,7 @@ The value of this variable is typically handled by \e qmake or \section3 RES_FILE -This variable tqcontains the name of the resource file for the application. +This variable contains the name of the resource file for the application. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1605,7 +1605,7 @@ The value of this variable is typically handled by \e qmake or \section3 SRCTQMOC This variable is set by \e qmake if files can be found that -contain the Q_OBJECT macro. \c SRCTQMOC tqcontains the +contain the Q_OBJECT macro. \c SRCTQMOC contains the name of all the generated tqmoc files. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1634,7 +1634,7 @@ modified. \section3 UICIMPLS -This variable tqcontains a list of the generated implementation files by UIC. +This variable contains a list of the generated implementation files by UIC. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1646,7 +1646,7 @@ modified. \section3 UICOBJECTS This variable is generated from the UICIMPLS variable. The extension of each -file will have been tqreplaced by .o (Unix) or .obj (Win32). The value of this variable is +file will have been replaced by .o (Unix) or .obj (Win32). The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1654,7 +1654,7 @@ rarely needs to be modified. \section3 VER_MAJ -This variable tqcontains the major version number of the library, if the +This variable contains the major version number of the library, if the 'lib' \link #TEMPLATE template \endlink is specified. @@ -1663,7 +1663,7 @@ This variable tqcontains the major version number of the library, if the \section3 VER_MIN -This variable tqcontains the minor version number of the library, if the +This variable contains the minor version number of the library, if the 'lib' \link #TEMPLATE template \endlink is specified. @@ -1672,7 +1672,7 @@ This variable tqcontains the minor version number of the library, if the \section3 VER_PAT -This variable tqcontains the patch version number of the library, if the +This variable contains the patch version number of the library, if the 'lib' \link #TEMPLATE template \endlink is specified. @@ -1744,7 +1744,7 @@ See also \link #Extensions File Extensions \endlink. \section3 YACCIMPLS -This variable tqcontains a list of yacc source files. The value of +This variable contains a list of yacc source files. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1753,7 +1753,7 @@ this variable is typically handled by \e qmake or \section3 YACCOBJECTS -This variable tqcontains a list of yacc object files. The value of +This variable contains a list of yacc object files. The value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified. @@ -1799,17 +1799,17 @@ exists( $(QTDIR)/lib/libqt-mt* ) { } \endcode -\section2 tqcontains( variablename, value ) +\section2 contains( variablename, value ) This function will succeed if the variable \e variablename -tqcontains the value \e value. You can check the return value of this +contains the value \e value. You can check the return value of this function using a scope. For example: \code -tqcontains( drivers, network ) { - # drivers tqcontains 'network' +contains( drivers, network ) { + # drivers contains 'network' message( "Configuring for network build..." ) HEADERS += network.h SOURCES += network.cpp @@ -1819,7 +1819,7 @@ tqcontains( drivers, network ) { \section2 count( variablename, number ) This function will succeed if the variable \e variablename -tqcontains \e number elements, otherwise it will fail. You can check +contains \e number elements, otherwise it will fail. You can check the return value of this function using a scope. @@ -1835,7 +1835,7 @@ count( MYVAR, 3 ) { \section2 infile( filename, var, val ) This function will succeed if the file \e filename (when parsed -by qmake itself) tqcontains the variable \e var with a value of +by qmake itself) contains the variable \e var with a value of \e val. You may also not pass in a third argument (\e val) and the function will only test if \e var has been assigned to in the file. @@ -1935,7 +1935,7 @@ QMAKE_VERS = $$[QMAKE_VERSION] \section2 QMAKESPEC \e qmake requires a platform and compiler description file which -tqcontains many default values used to generate appropriate makefiles. +contains many default values used to generate appropriate makefiles. The standard Qt distribution comes with many of these files, located in the 'mkspecs' subdirectory of the Qt installation. @@ -1998,10 +1998,10 @@ for you. \section2 Cache File The cache file (mentioned above in the options) is a special file \e qmake -will read to tqfind settings not specified in the \c qmake.conf file, the +will read to find settings not specified in the \c qmake.conf file, the .pro file, or the command line. If \c -nocache is not specified, \e qmake -will try to tqfind a file called \c .qmake.cache in tqparent directories. If -it fails to tqfind this file, it will silently ignore this step of +will try to find a file called \c .qmake.cache in tqparent directories. If +it fails to find this file, it will silently ignore this step of processing. \target LibDepend @@ -2013,7 +2013,7 @@ lets the platform pull them in. In many cases, however, this is not sufficent. For example when statically linking a library there are no libraries linked against, and therefore no dependencies to those libraries are created - however an application that later links -against this library will need to know where to tqfind the symbols that +against this library will need to know where to find the symbols that the linked in library will require. To help with this situation \e qmake will follow a library's dependencies when it feels appropriate, however this behaviour must be enabled in \e qmake. To enable requires @@ -2043,11 +2043,11 @@ the meta information created above: \endcode When this is turned on \e qmake will process all libraries linked to, -and tqfind their meta information. With this meta information \e qmake +and find their meta information. With this meta information \e qmake will figure out what is relevant to linking, specifically it will add to your list of DEFINES as well as LIBS. Once \e qmake has processed this file, it will then look through the newly introduced LIBS and -tqfind their dependent .prl files, and continue until all libraries have +find their dependent .prl files, and continue until all libraries have been resolved. At this point the makefile is created as usual, and the libraries are linked explicity against your program. @@ -2115,7 +2115,7 @@ fill in an "object" in qmake for example: mytarget2.commands = @echo Building $$mytarget.target \endcode -The information above defines a qmake target called mytarget which tqcontains +The information above defines a qmake target called mytarget which contains a Makefile target called .buildfile, .buildfile is generated by 'touch .buildfile', and finally that this Makefile target depends on the qmake target mytarget2. Additionally we've defined the qmake target mytarget2 diff --git a/tqtinterface/qt4/qmake/book/qmake-concepts.leaf b/tqtinterface/qt4/qmake/book/qmake-concepts.leaf index 2aa9325..8275a23 100644 --- a/tqtinterface/qt4/qmake/book/qmake-concepts.leaf +++ b/tqtinterface/qt4/qmake/book/qmake-concepts.leaf @@ -7,7 +7,7 @@ for development projects across different platforms. \e qmake simplifies the generation of makefiles so that only a few lines of information are needed to create a makefile. \e qmake can be used for any software project whether it is written in Qt or not, although it -also tqcontains additional features to support Qt development. +also contains additional features to support Qt development. \e qmake generates a makefile based on the information in a project file. Project files are created by the developer. Project files are @@ -22,7 +22,7 @@ without having to change the project file. Before \e qmake can be used to build makefiles, the QMAKESPEC environment variable must be set to the platform-compiler combination that is being used on the system. The QMAKESPEC environment variable -tells qmake where to look to tqfind platform and compiler specific +tells qmake where to look to find platform and compiler specific information. This ensures that the right libraries are used, and that the generated makefile uses the correct syntax. A list of the currently supported platform-compiler combinations can be found in @@ -35,7 +35,7 @@ If you are using gcc on Solaris then you would set your QMAKESPEC environment variable to \e solaris-g++. Inside each of the directories in qt/mkspecs, there is a \e qmake.conf -file which tqcontains the platform and compiler specific information. +file which contains the platform and compiler specific information. These settings are applied to any project that is built using \e qmake and should not be modified unless you're an expert. For example, if all your applications had to link against a particular library, you @@ -91,7 +91,7 @@ automatically). \i DEFINES - A list of any additional pre-processor defines needed for the application. \i INCLUDEPATH - A list of any additional include paths needed for the application. \i DEPENDPATH - The dependency search path for the application. -\i VPATH - The search path to tqfind supplied files. +\i VPATH - The search path to find supplied files. \i DEF_FILE - Windows only: A .def file to be linked against for the application. \i RC_FILE - Windows only: A resource file for the application. \i RES_FILE - Windows only: A resource file to be linked against for the application. @@ -114,7 +114,7 @@ CONFIG += qt warn_on release For items that are single valued, e.g. the template or the destination directory, we use "="; but for multi-valued items we use "+=" to \e -add to the existing items of that type. Using "=" tqreplaces the item's +add to the existing items of that type. Using "=" replaces the item's value with the new value, for example if we wrote \c{DEFINES=QT_DLL}, all other definitions would be deleted. @@ -137,10 +137,10 @@ into the specified subdirectories and generate a makefile for the project file in the directory and call make on it. The only system variable that is recognised for this template is the -\e SUBDIRS variable. This variable tqcontains a list of all the +\e SUBDIRS variable. This variable contains a list of all the subdirectories that contain project files to be processed. It is essential that the project file in the sub directory has the same name -as the subdirectory, so that \e qmake can tqfind it. For +as the subdirectory, so that \e qmake can find it. For example, if the subdirectory is called 'myapp' then the project file in that directory should be called \e myapp.pro in that directory. diff --git a/tqtinterface/qt4/qmake/book/qmake-pch.leaf b/tqtinterface/qt4/qmake/book/qmake-pch.leaf index bebd881..60ea1f4 100644 --- a/tqtinterface/qt4/qmake/book/qmake-pch.leaf +++ b/tqtinterface/qt4/qmake/book/qmake-pch.leaf @@ -97,7 +97,7 @@ For example: \target EXAMPLE_PROJECT \section1 Example project -You can tqfind the following source code in the +You can find the following source code in the \e{qt/qmake/examples/precompile} directory: \Bold mydialog.ui diff --git a/tqtinterface/qt4/qmake/book/qmake-quick.leaf b/tqtinterface/qt4/qmake/book/qmake-quick.leaf index 15b832e..135e9fa 100644 --- a/tqtinterface/qt4/qmake/book/qmake-quick.leaf +++ b/tqtinterface/qt4/qmake/book/qmake-quick.leaf @@ -5,7 +5,7 @@ \e qmake uses information stored in project (.pro) files to determine what should go in the makefiles it generates. -A basic project file tqcontains information about the application, for +A basic project file contains information about the application, for example, which files are needed to compile the application, and which configuration settings to use. @@ -63,7 +63,7 @@ application's configuration. \endcode The "+=" is used here, because we add our configuration options to any -that are already present. This is safer than using "=" which tqreplaces +that are already present. This is safer than using "=" which replaces all options with just those specified. The \e qt part of the CONFIG line tells \e qmake that the application @@ -76,7 +76,7 @@ set the compiler flags so that warnings are output. The \e release part of the CONFIG line tells \e qmake that the application must be built as a release application. During -development, programmers may prefer to tqreplace \e release with \e +development, programmers may prefer to replace \e release with \e debug, which is discussed later. \omit diff --git a/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf b/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf index b5a3434..dd6ec16 100644 --- a/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf +++ b/tqtinterface/qt4/qmake/book/qmake-tutorial.leaf @@ -16,7 +16,7 @@ your application, and you have created the following files: \i main.cpp \endlist -You will tqfind these files in \e {qt/qmake/examples/tutorial}. The +You will find these files in \e {qt/qmake/examples/tutorial}. The only other thing you know about the setup of the application is that it's written in Qt. First, using your favorite plain text editor, create a file called \e hello.pro in \e {qt/qmake/tutorial}. The @@ -158,7 +158,7 @@ Use \e qmake as before to generate a makefile. You may not want to create a makefile if a certain file doesn't exist. We can check if a file exists by using the exists() function. We can stop \e qmake from processing by using the error() function. This -works in the same way as scopes. Simply tqreplace the scope condition +works in the same way as scopes. Simply replace the scope condition with the function. A check for a main.cpp file looks like this: \code diff --git a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp index 8e3ec21..e749a0d 100644 --- a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp +++ b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.cpp @@ -93,13 +93,13 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) if((*val_it).startsWith("-L")) { TQString dir((*val_it).right((*val_it).length() - 2)); fixEnvVariables(dir); - if(project->variables()["DEPENDPATH"].tqfindIndex(dir) == -1 && - project->variables()["INCLUDEPATH"].tqfindIndex(dir) == -1) + if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 && + project->variables()["INCLUDEPATH"].findIndex(dir) == -1) project->variables()["INCLUDEPATH"].append(dir); } else if((*val_it).startsWith("-l")) { TQString lib("lib" + (*val_it).right((*val_it).length() - 2) + "." + project->first("TQMAKE_EXTENSION_SHLIB")); - if(project->variables()["LIBRARIES"].tqfindIndex(lib) == -1) + if(project->variables()["LIBRARIES"].findIndex(lib) == -1) project->variables()["LIBRARIES"].append(lib); } else if((*val_it) == "-framework") { @@ -107,23 +107,23 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) if(val_it == extra_objs.end()) break; TQString frmwrk = (*val_it) + ".framework"; - if(project->variables()["FRAMEWORKS"].tqfindIndex(frmwrk) == -1) + if(project->variables()["FRAMEWORKS"].findIndex(frmwrk) == -1) project->variables()["FRAMEWORKS"].append(frmwrk); } else if((*val_it).left(1) != "-") { TQString lib=(*val_it); - int s = lib.tqfindRev('/'); + int s = lib.findRev('/'); if(s != -1) { TQString dir = lib.left(s); lib = lib.right(lib.length() - s - 1); fixEnvVariables(dir); - if(project->variables()["DEPENDPATH"].tqfindIndex(dir) == -1 && - project->variables()["INCLUDEPATH"].tqfindIndex(dir) == -1) + if(project->variables()["DEPENDPATH"].findIndex(dir) == -1 && + project->variables()["INCLUDEPATH"].findIndex(dir) == -1) project->variables()["INCLUDEPATH"].append(dir); } project->variables()["LIBRARIES"].append(lib); } } - //let metrowerks tqfind the files & set the files to the type I expect + //let metrowerks find the files & set the files to the type I expect TQDict<void> seen(293); TQString paths[] = { TQString("SRCTQMOC"), TQString("FORMS"), TQString("UICDECLS"), TQString("UICIMPLS"), TQString("SOURCES"),TQString("HEADERS"), @@ -134,15 +134,15 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) //establish file types seen.insert((*val_it), (void *)1); createFork((*val_it)); //the file itself - TQStringList &d = tqfindDependencies((*val_it)); //depends + TQStringList &d = findDependencies((*val_it)); //depends for(TQStringList::Iterator dep_it = d.begin(); dep_it != d.end(); ++dep_it) { - if(!seen.tqfind((*dep_it))) { + if(!seen.find((*dep_it))) { seen.insert((*dep_it), (void *)1); createFork((*dep_it)); } } //now chop it - int s = (*val_it).tqfindRev('/'); + int s = (*val_it).findRev('/'); if(s != -1) { TQString dir = (*val_it).left(s); (*val_it) = (*val_it).right((*val_it).length() - s - 1); @@ -179,7 +179,7 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) project->variables()["CODEWARRIOR_PREFIX_HEADER"].append(pre_pref + "_prefix.h"); } - TQString xmlfile = tqfindTemplate(project->first("TQMAKE_XML_TEMPLATE")); + TQString xmlfile = findTemplate(project->first("TQMAKE_XML_TEMPLATE")); TQFile file(xmlfile); if(!file.open(IO_ReadOnly )) { fprintf(stderr, "Cannot open XML file: %s\n", @@ -193,8 +193,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) TQString line; while ( !xml.eof() ) { line = xml.readLine(); - while((rep = line.tqfind(TQRegExp("\\$\\$[!a-zA-Z0-9_-]*"))) != -1) { - TQString torep = line.mid(rep, line.tqfind(TQRegExp("[^\\$!a-zA-Z0-9_-]"), rep) - rep); + while((rep = line.find(TQRegExp("\\$\\$[!a-zA-Z0-9_-]*"))) != -1) { + TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$!a-zA-Z0-9_-]"), rep) - rep); TQString variable = torep.right(torep.length()-2); t << line.left(rep); //output the left side @@ -202,7 +202,7 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) if(variable == "CODEWARRIOR_HEADERS" || variable == "CODEWARRIOR_SOURCES" || variable == "CODEWARRIOR_LIBRARIES" || variable == "CODEWARRIOR_TQPREPROCESS" || variable == "CODEWARRIOR_TQPREPROCESSOUT") { - TQString outcmd=variable.right(variable.length() - variable.tqfindRev('_') - 1); + TQString outcmd=variable.right(variable.length() - variable.findRev('_') - 1); TQStringList args; if(outcmd == "TQPREPROCESS") args << "UICS" << "TQMOCS"; @@ -249,8 +249,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) variable == "CODEWARRIOR_LIBRARIES_LINKORDER" || variable == "CODEWARRIOR_TQPREPROCESS_LINKORDER" || variable == "CODEWARRIOR_TQPREPROCESSOUT_LINKORDER") { - TQString outcmd=variable.mid(variable.tqfind('_')+1, - variable.tqfindRev('_')-(variable.tqfind('_')+1)); + TQString outcmd=variable.mid(variable.find('_')+1, + variable.findRev('_')-(variable.find('_')+1)); TQStringList args; if(outcmd == "TQPREPROCESS") args << "UICS" << "TQMOCS"; @@ -276,8 +276,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) variable == "CODEWARRIOR_LIBRARIES_GROUP" || variable == "CODEWARRIOR_TQPREPROCESS_GROUP" || variable == "CODEWARRIOR_TQPREPROCESSOUT_GROUP") { - TQString outcmd = variable.mid(variable.tqfind('_')+1, - variable.tqfindRev('_')-(variable.tqfind('_')+1)); + TQString outcmd = variable.mid(variable.find('_')+1, + variable.findRev('_')-(variable.find('_')+1)); TQStringList args; if(outcmd == "TQPREPROCESS") args << "UICS" << "TQMOCS"; @@ -315,7 +315,7 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) } } else if(variable == "CODEWARRIOR_DEPENDPATH" || variable == "CODEWARRIOR_INCLUDEPATH" || variable == "CODEWARRIOR_FRAMEWORKPATH") { - TQString arg=variable.right(variable.length()-variable.tqfind('_')-1); + TQString arg=variable.right(variable.length()-variable.find('_')-1); TQStringList list; if(arg == "INCLUDEPATH") { list = project->variables()[arg]; @@ -463,9 +463,9 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) TQTextStream tqmocs( TQT_TQIODEVICE(&tqmocfile) ); TQStringList &list = project->variables()["SRCTQMOC"]; for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - TQString src = tqfindMocSource((*it)); - if(src.tqfindRev('/') != -1) - src = src.right(src.length() - src.tqfindRev('/') - 1); + TQString src = findMocSource((*it)); + if(src.findRev('/') != -1) + src = src.right(src.length() - src.findRev('/') - 1); tqmocs << src << endl; } tqmocfile.close(); @@ -483,8 +483,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) TQStringList &list = project->variables()["FORMS"]; for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { TQString ui = (*it); - if(ui.tqfindRev('/') != -1) - ui = ui.right(ui.length() - ui.tqfindRev('/') - 1); + if(ui.findRev('/') != -1) + ui = ui.right(ui.length() - ui.findRev('/') - 1); uics << ui << endl; } uicfile.close(); @@ -500,8 +500,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t) TQTextStream prefix( TQT_TQIODEVICE(&prefixfile) ); TQStringList &list = project->variables()["DEFINES"]; for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { - if((*it).tqfind('=') != -1) { - int x = (*it).tqfind('='); + if((*it).find('=') != -1) { + int x = (*it).find('='); prefix << "#define " << (*it).left(x) << " " << (*it).right((*it).length() - x - 1) << endl; } else { prefix << "#define " << (*it) << endl; @@ -527,11 +527,11 @@ MetrowerksMakefileGenerator::init() TQStringList &configs = project->variables()["CONFIG"]; if(project->isActiveConfig("qt")) { - if(configs.tqfindIndex("tqmoc")) configs.append("tqmoc"); + if(configs.findIndex("tqmoc")) configs.append("tqmoc"); if ( !( (project->first("TARGET") == "qt") || (project->first("TARGET") == "qte") || (project->first("TARGET") == "qt-mt") ) ) project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"]; - if(configs.tqfindIndex("tqmoc")) + if(configs.findIndex("tqmoc")) configs.append("tqmoc"); if ( !project->isActiveConfig("debug") ) project->variables()["DEFINES"].append("TQT_NO_DEBUG"); @@ -607,7 +607,7 @@ MetrowerksMakefileGenerator::init() TQString -MetrowerksMakefileGenerator::tqfindTemplate(const TQString &file) +MetrowerksMakefileGenerator::findTemplate(const TQString &file) { TQString ret; if(!TQFile::exists(ret = file) && @@ -658,7 +658,7 @@ bool MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool ) { v = "Absolute"; - if(p.tqfind(':') != -1) //guess its macish already + if(p.find(':') != -1) //guess its macish already return TRUE; static TQString st_volume; @@ -691,7 +691,7 @@ MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool ) p += "/"; if(TQDir::isRelativePath(p)) { if(p.startsWith("{")) { - int eoc = p.tqfind('}'); + int eoc = p.find('}'); if(eoc == -1) return FALSE; volume = p.mid(1, eoc - 1); @@ -706,7 +706,7 @@ MetrowerksMakefileGenerator::fixifyToMacPath(TQString &p, TQString &v, bool ) p = TQDir::cleanDirPath(p); if(!volume.isEmpty()) v = volume; - p.tqreplace("/", ":"); + p.replace("/", ":"); if(p.right(1) != ":") p += ':'; return TRUE; @@ -728,15 +728,15 @@ MetrowerksMakefileGenerator::processPrlFiles() if(opt.startsWith("-L")) { TQString r = opt.right(opt.length() - 2), l = r; fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.tqreplace( "\"", ""), - l.tqreplace( "\"", ""))); + libdirs.append(new MakefileDependDir(r.replace( "\"", ""), + l.replace( "\"", ""))); } else if(opt.left(2) == "-l") { TQString lib = opt.right(opt.length() - 2), prl; for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) { prl = mdd->local_dir + Option::dir_sep + "lib" + lib; if(processPrlFile(prl)) { if(prl.startsWith(mdd->local_dir)) - prl.tqreplace(0, mdd->local_dir.length(), mdd->real_dir); + prl.replace(0, mdd->local_dir.length(), mdd->real_dir); TQRegExp reg("^.*lib(" + lib + "[^.]*)\\." + project->first("TQMAKE_EXTENSION_SHLIB") + "$"); if(reg.exactMatch(prl)) @@ -781,7 +781,7 @@ MetrowerksMakefileGenerator::processPrlVariable(const TQString &var, const TQStr bool append = TRUE; if((*it).startsWith("-")) { if((*it).startsWith("-l") || (*it).startsWith("-L")) { - append = out.tqfindIndex((*it)) == -1; + append = out.findIndex((*it)) == -1; } else if((*it).startsWith("-framework")) { ++it; for(TQStringList::ConstIterator outit = out.begin(); @@ -796,7 +796,7 @@ MetrowerksMakefileGenerator::processPrlVariable(const TQString &var, const TQStr } } } else if(TQFile::exists((*it))) { - append = out.tqfindIndex((*it)); + append = out.findIndex((*it)); } if(append) out.append((*it)); diff --git a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h index bd28500..35d8765 100644 --- a/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h +++ b/tqtinterface/qt4/qmake/generators/mac/metrowerks_xml.h @@ -52,7 +52,7 @@ class MetrowerksMakefileGenerator : public MakefileGenerator bool writeSubDirs(TQTextStream &); bool writeMakefile(TQTextStream &); - TQString tqfindTemplate(const TQString &file); + TQString findTemplate(const TQString &file); void init(); public: MetrowerksMakefileGenerator(TQMakeProject *p); diff --git a/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp b/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp index 7e072e2..ce1167f 100644 --- a/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp +++ b/tqtinterface/qt4/qmake/generators/mac/pbuilder_pbx.cpp @@ -143,23 +143,23 @@ ProjectBuilderMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct) TQString project_key = keyFor(pbxproj + "_PROJECTREF"); if(project->isActiveConfig("flat")) { TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE); - if(flat_file.tqfind(Option::dir_sep) != -1) { + if(flat_file.find(Option::dir_sep) != -1) { TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); name = dirs.back(); } } else { TQString flat_file = fileFixify(name, oldpwd, Option::output_dir, TRUE); - if(TQDir::isRelativePath(flat_file) && flat_file.tqfind(Option::dir_sep) != -1) { + if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) { TQString last_grp("TQMAKE_PBX_HEIR_GROUP"); TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); name = dirs.back(); for(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) { TQString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp)); if(dir_it == dirs.begin()) { - if(!groups.tqcontains(new_grp)) + if(!groups.contains(new_grp)) project->variables()["TQMAKE_PBX_GROUPS"].append(new_grp_key); } else { - if(!groups[last_grp].tqcontains(new_grp_key)) + if(!groups[last_grp].contains(new_grp_key)) groups[last_grp] += new_grp_key; } last_grp = new_grp; @@ -432,13 +432,13 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) TQString src_key = keyFor(file), name = file; if(project->isActiveConfig("flat")) { TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE); - if(flat_file.tqfind(Option::dir_sep) != -1) { + if(flat_file.find(Option::dir_sep) != -1) { TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); name = dirs.back(); } } else { TQString flat_file = fileFixify(file, TQDir::currentDirPath(), Option::output_dir, TRUE); - if(TQDir::isRelativePath(flat_file) && flat_file.tqfind(Option::dir_sep) != -1) { + if(TQDir::isRelativePath(flat_file) && flat_file.find(Option::dir_sep) != -1) { TQString last_grp("TQMAKE_PBX_" + src_group + "_HEIR_GROUP"); TQStringList dirs = TQStringList::split(Option::dir_sep, flat_file); name = dirs.back(); @@ -446,10 +446,10 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) for(TQStringList::Iterator dir_it = dirs.begin(); dir_it != dirs.end(); ++dir_it) { TQString new_grp(last_grp + Option::dir_sep + (*dir_it)), new_grp_key(keyFor(new_grp)); if(dir_it == dirs.begin()) { - if(!src_list.tqcontains(new_grp_key)) + if(!src_list.contains(new_grp_key)) src_list.append(new_grp_key); } else { - if(!groups[last_grp].tqcontains(new_grp_key)) + if(!groups[last_grp].contains(new_grp_key)) groups[last_grp] += new_grp_key; } last_grp = new_grp; @@ -513,12 +513,12 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) } TQString src_group_key = keyFor(src_group); - if(root_group_list.tqfindIndex(src_group_key) == -1) + if(root_group_list.findIndex(src_group_key) == -1) root_group_list += src_group_key; TQStringList &group = groups[src_group]; for(TQStringList::Iterator src_it = src_list.begin(); src_it != src_list.end(); ++src_it) { - if(group.tqfindIndex((*src_it)) == -1) + if(group.findIndex((*src_it)) == -1) group += (*src_it); } } @@ -710,7 +710,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) } if(!library.isEmpty()) { if(name.isEmpty()) { - int slsh = library.tqfindRev(Option::dir_sep); + int slsh = library.findRev(Option::dir_sep); if(slsh != -1) name = library.right(library.length() - slsh - 1); } @@ -923,7 +923,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) else lib = project->first("TARGET_"); } - int slsh = lib.tqfindRev(Option::dir_sep); + int slsh = lib.findRev(Option::dir_sep); if(slsh != -1) lib = lib.right(lib.length() - slsh - 1); t << "\t\t\t" << "isa = PBXLibraryReference;" << "\n" @@ -994,8 +994,8 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) if(plist_in_file.open(IO_ReadOnly)) { TQTextStream plist_in(&plist_in_file); TQString plist_in_text = plist_in.read(); - plist_in_text = plist_in_text.tqreplace("@ICON@", (project->isEmpty("RC_FILE") ? TQString("") : project->first("RC_FILE").section(Option::dir_sep, -1))); - plist_in_text = plist_in_text.tqreplace("@EXECUTABLE@", project->first("TQMAKE_ORIG_TARGET")); + plist_in_text = plist_in_text.replace("@ICON@", (project->isEmpty("RC_FILE") ? TQString("") : project->first("RC_FILE").section(Option::dir_sep, -1))); + plist_in_text = plist_in_text.replace("@EXECUTABLE@", project->first("TQMAKE_ORIG_TARGET")); TQFile plist_out_file("Info.plist"); if(plist_out_file.open(IO_WriteOnly | IO_Translate)) { TQTextStream plist_out(&plist_out_file); @@ -1094,7 +1094,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) read_plist = true; TQTextStream stream(&plist); while(!stream.eof()) - t << stream.readLine().tqreplace('"', "\\\"") << endl; + t << stream.readLine().replace('"', "\\\"") << endl; } } if(!read_plist) { @@ -1255,7 +1255,7 @@ TQString ProjectBuilderMakefileGenerator::fixQuotes(const TQString &val) { TQString ret(val); - ret = ret.tqreplace(TQRegExp("('|\\\\|\")"), "\\\\1"); + ret = ret.replace(TQRegExp("('|\\\\|\")"), "\\\\1"); return ret; } @@ -1264,7 +1264,7 @@ ProjectBuilderMakefileGenerator::fixEnvs(const TQString &file) { TQRegExp reg_var("\\$\\((.*)\\)"); for(int rep = 0; (rep = reg_var.search(file, rep)) != -1; ) { - if(project->variables()["TQMAKE_PBX_VARS"].tqfindIndex(reg_var.cap(1)) == -1) + if(project->variables()["TQMAKE_PBX_VARS"].findIndex(reg_var.cap(1)) == -1) project->variables()["TQMAKE_PBX_VARS"].append(reg_var.cap(1)); rep += reg_var.matchedLength(); } @@ -1293,7 +1293,7 @@ ProjectBuilderMakefileGenerator::keyFor(const TQString &block) return block; #endif TQString ret; - if(!keys.tqcontains(block)) { + if(!keys.contains(block)) { ret = TQT_TQSTRING(qtMD5(block.utf8()).left(24)).upper(); keys.insert(block, ret); } else { @@ -1346,7 +1346,7 @@ ProjectBuilderMakefileGenerator::pbuilderVersion() const else version_plist = "/Developer/Applications/Project Builder.app/Contents/version.plist"; } else { - version_plist = version_plist.tqreplace(TQRegExp("\""), ""); + version_plist = version_plist.replace(TQRegExp("\""), ""); } TQFile version_file(version_plist); if (version_file.open(IO_ReadOnly)) { @@ -1371,7 +1371,7 @@ ProjectBuilderMakefileGenerator::pbuilderVersion() const } version_file.close(); } else { debug_msg(1, "pbuilder: version.plist: Failure to open %s", version_plist.latin1()); } - if(version.isEmpty() && version_plist.tqcontains("Xcode")) { + if(version.isEmpty() && version_plist.contains("Xcode")) { ret = "39"; } else { if(version.startsWith("2.")) diff --git a/tqtinterface/qt4/qmake/generators/makefile.cpp b/tqtinterface/qt4/qmake/generators/makefile.cpp index 5036889..0dc64a3 100644 --- a/tqtinterface/qt4/qmake/generators/makefile.cpp +++ b/tqtinterface/qt4/qmake/generators/makefile.cpp @@ -111,7 +111,7 @@ static char *gimme_buffer(off_t s) bool MakefileGenerator::generateMocList(const TQString &fn_target) { - if(!tqfindMocDestination(fn_target).isEmpty()) + if(!findMocDestination(fn_target).isEmpty()) return TRUE; TQString fn_local = Option::fixPathToLocalOS(fileFixify(fn_target, TQDir::currentDirPath(), Option::output_dir)); @@ -192,9 +192,9 @@ MakefileGenerator::generateMocList(const TQString &fn_target) debug_msg(2, "Mocgen: %s:%d Found TQMOC symbol %s", fn_target.latin1(), line_count, big_buffer+x); - int ext_pos = fn_target.tqfindRev('.'); + int ext_pos = fn_target.findRev('.'); int ext_len = fn_target.length() - ext_pos; - int dir_pos = fn_target.tqfindRev(Option::dir_sep, ext_pos); + int dir_pos = fn_target.findRev(Option::dir_sep, ext_pos); TQString tqmocFile; if(!project->isEmpty("TQMOC_DIR")) tqmocFile = project->first("TQMOC_DIR"); @@ -210,7 +210,7 @@ MakefileGenerator::generateMocList(const TQString &fn_target) if(cpp_ext) { tqmocFile += Option::cpp_tqmoc_mod + fn_target.mid(dir_pos+1, ext_pos - dir_pos-1) + Option::cpp_tqmoc_ext; project->variables()["_SRCTQMOC"].append(tqmocFile); - } else if(project->variables()["HEADERS"].tqfindIndex(fn_target) != -1) { + } else if(project->variables()["HEADERS"].findIndex(fn_target) != -1) { for(TQStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) { if((fn_target.right(ext_len) == (*hit))) { @@ -249,7 +249,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons return TRUE; setProcessedDependencies(f, TRUE); - TQStringList &fndeps = tqfindDependencies(f); + TQStringList &fndeps = findDependencies(f); TQString fn = fileFixify(f, TQDir::currentDirPath(), Option::output_dir); fn = Option::fixPathToLocalOS(fn, FALSE); TQString fix_env_fn = Option::fixPathToLocalOS(fn); @@ -261,10 +261,10 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons return FALSE; //shouldn't happen TQString fndir, fix_env_fndir; - int dl = fn.tqfindRev(Option::dir_sep); + int dl = fn.findRev(Option::dir_sep); if(dl != -1) fndir = fn.left(dl+1); - dl = fix_env_fn.tqfindRev(Option::dir_sep); + dl = fix_env_fn.findRev(Option::dir_sep); if(dl != -1) fix_env_fndir = fix_env_fn.left(dl + 1); @@ -417,7 +417,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons if(where == "in implementation") { TQString cpp = fn.left(fn.length() - Option::ui_ext.length()) + Option::cpp_ext.first(); - outdeps = &tqfindDependencies(cpp); + outdeps = &findDependencies(cpp); } } } @@ -457,7 +457,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons fqn = inc; goto handle_fqn; } else { - if((Option::target_mode == Option::TARG_MAC9_MODE && inc.tqfind(':')) || + if((Option::target_mode == Option::TARG_MAC9_MODE && inc.find(':')) || (Option::target_mode == Option::TARG_WIN_MODE && inc[1] != ':') || ((Option::target_mode == Option::TARG_UNIX_MODE || Option::target_mode == Option::TARG_TQNX6_MODE || @@ -477,13 +477,13 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons //however these can be turned off at runtime, I'm not sure how //reliable these will be, most likely when problems arise turn it off //and see if they go away.. - if(depHeuristics.tqcontains(inc)) { + if(depHeuristics.contains(inc)) { fqn = depHeuristics[inc]; from_source_dir = FALSE; } else if(Option::mkfile::do_dep_heuristics) { //some heuristics.. //is it a file from a .ui? TQString inc_file = inc.section(Option::dir_sep, -1); - int extn = inc_file.tqfindRev('.'); + int extn = inc_file.findRev('.'); if(extn != -1 && (inc_file.right(inc_file.length()-extn) == Option::cpp_ext.first() || inc_file.right(inc_file.length()-extn) == Option::h_ext.first())) { @@ -513,7 +513,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons TQStringList ll = project->variables()["LEXSOURCES"]; for(TQStringList::Iterator it = ll.begin(); it != ll.end(); ++it) { TQString s = (*it), d; - int slsh = s.tqfindRev(Option::dir_sep); + int slsh = s.findRev(Option::dir_sep); if(slsh != -1) { d = s.left(slsh + 1); s = s.right(s.length() - slsh - 1); @@ -536,7 +536,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons TQStringList yl = project->variables()["YACCSOURCES"]; for(TQStringList::Iterator it = yl.begin(); it != yl.end(); ++it) { TQString s = (*it), d; - int slsh = s.tqfindRev(Option::dir_sep); + int slsh = s.findRev(Option::dir_sep); if(slsh != -1) { d = s.left(slsh + 1); s = s.right(s.length() - slsh - 1); @@ -560,13 +560,13 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons TQStringList &l = project->variables()[tqmocs[tqmoc]]; for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { TQString file = Option::fixPathToTargetOS((*it)); - if(file.section(Option::dir_sep, -(inc.tqcontains('/')+1)) == inc) { + if(file.section(Option::dir_sep, -(inc.contains('/')+1)) == inc) { fqn = (*it); if(tqmocs[tqmoc] == "_HDRTQMOC") { //Since it is include, no need to link it in as well project->variables()["_SRCTQMOC"].append((*it)); l.remove(it); - } else if(!tqfindMocSource(fqn).endsWith(fileFixify(fn))) { + } else if(!findMocSource(fqn).endsWith(fileFixify(fn))) { /* Not really a very good test, but this will at least avoid confusion if it really does happen (since tmake/qmake previously didn't even allow this the test is mostly accurate) */ @@ -580,7 +580,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons } } } - fqn = tqfindDependency(inc); //all else fails.. + fqn = findDependency(inc); //all else fails.. cache_fqn: if(from_source_dir) { fqn = fileFixify(fqn); @@ -596,7 +596,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons if(from_source_dir) fqn = fileFixify(fqn); debug_msg(4, "Resolved dependency of %s to %s", inc.latin1(), fqn.latin1()); - if(outdeps && outdeps->tqfindIndex(fqn) == -1) + if(outdeps && outdeps->findIndex(fqn) == -1) outdeps->append(fqn); } //read past new line now.. @@ -607,9 +607,9 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons if(recurse) { for(TQStringList::Iterator fnit = fndeps.begin(); fnit != fndeps.end(); ++fnit) { generateDependencies(dirs, (*fnit), recurse); - TQStringList &deplist = tqfindDependencies((*fnit)); + TQStringList &deplist = findDependencies((*fnit)); for(TQStringList::Iterator it = deplist.begin(); it != deplist.end(); ++it) - if(fndeps.tqfindIndex((*it)) == -1 && (*it) != fn) + if(fndeps.findIndex((*it)) == -1 && (*it) != fn) fndeps.append((*it)); } } @@ -624,9 +624,9 @@ MakefileGenerator::initOutPaths() return; init_opath_already = TRUE; TQMap<TQString, TQStringList> &v = project->variables(); - if(!v.tqcontains("TQMAKE_ABSOLUTE_SOURCE_PATH")) { + if(!v.contains("TQMAKE_ABSOLUTE_SOURCE_PATH")) { if(Option::mkfile::do_cache && !Option::mkfile::cachefile.isEmpty() && - v.tqcontains("TQMAKE_ABSOLUTE_SOURCE_ROOT")) { + v.contains("TQMAKE_ABSOLUTE_SOURCE_ROOT")) { TQString root = v["TQMAKE_ABSOLUTE_SOURCE_ROOT"].first(); root = Option::fixPathToTargetOS( root ); if(!root.isEmpty()) { @@ -746,7 +746,7 @@ MakefileGenerator::init() TQString cache_file(".qmake.internal.cache"); if(!project->isEmpty("TQMAKE_INTERNAL_CACHE_FILE")) cache_file = Option::fixPathToLocalOS(project->first("TQMAKE_INTERNAL_CACHE_FILE")); - if(cache_file.tqfind(TQDir::separator()) == -1) //guess they know what they are doing.. + if(cache_file.find(TQDir::separator()) == -1) //guess they know what they are doing.. cache_file.prepend(Option::output_dir + TQDir::separator()); if((Option::qmake_mode == Option::TQMAKE_GENERATE_PROJECT || Option::mkfile::do_deps || Option::mkfile::do_tqmocs) && !noIO()) { @@ -759,8 +759,8 @@ MakefileGenerator::init() incDirs += v["INCLUDEPATH"]; for(TQStringList::Iterator it = incDirs.begin(); it != incDirs.end(); ++it) { TQString r = (*it), l = Option::fixPathToLocalOS((*it)); - deplist.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + deplist.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } debug_msg(1, "Dependency Directories: %s", incDirs.join(" :: ").latin1()); if(Option::output.name() != "-" && project->isActiveConfig("qmake_cache")) { @@ -773,7 +773,7 @@ MakefileGenerator::init() enum { CacheInfo, CacheDepend, CacheMoc } state = CacheInfo; while (!cachet.eof()) { line = cachet.readLine().stripWhiteSpace(); - int sep = line.tqfind('='); + int sep = line.find('='); if(line == "[depend]") { state = CacheDepend; } else if(line == "[tqmocable]") { @@ -819,7 +819,7 @@ MakefileGenerator::init() if(found) { debug_msg(2, "Dependencies (cached): %s -> %s", file.latin1(), files.join(" :: ").latin1()); - tqfindDependencies(file) = files; + findDependencies(file) = files; setProcessedDependencies(file, TRUE); } } @@ -827,7 +827,7 @@ MakefileGenerator::init() void *found = cache_found_files[file]; if(found != (void *)2) { if(found) { - cache_found_files.tqreplace(file, (void *)2); + cache_found_files.replace(file, (void *)2); } else { TQFileInfo fi(fileFixify(file, TQDir::currentDirPath(), Option::output_dir)); if(fi.exists() && fi.lastModified() < cachefi.lastModified()) { @@ -837,7 +837,7 @@ MakefileGenerator::init() } } if(found && line != "*qmake_ignore*") { - int ext_len = file.length() - file.tqfindRev('.'); + int ext_len = file.length() - file.findRev('.'); bool cpp_ext = FALSE; for(TQStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) { @@ -846,7 +846,7 @@ MakefileGenerator::init() } if(cpp_ext) { project->variables()["_SRCTQMOC"].append(line); - } else if(project->variables()["HEADERS"].tqfindIndex(file) != -1) { + } else if(project->variables()["HEADERS"].findIndex(file) != -1) { for(TQStringList::Iterator hit = Option::h_ext.begin(); hit != Option::h_ext.end(); ++hit) { if((file.right(ext_len) == (*hit))) { @@ -903,8 +903,8 @@ MakefileGenerator::init() } if(!found) { TQString dir, regex = (*val_it), real_dir; - if(regex.tqfindRev(Option::dir_sep) != -1) { - dir = regex.left(regex.tqfindRev(Option::dir_sep) + 1); + if(regex.findRev(Option::dir_sep) != -1) { + dir = regex.left(regex.findRev(Option::dir_sep) + 1); real_dir = fileFixify(Option::fixPathToLocalOS(dir), TQDir::currentDirPath(), Option::output_dir); regex = regex.right(regex.length() - dir.length()); @@ -912,10 +912,10 @@ MakefileGenerator::init() if(real_dir.isEmpty() || TQFile::exists(real_dir)) { TQDir d(real_dir, regex); if(!d.count()) { - debug_msg(1, "%s:%d Failure to tqfind %s in vpath (%s)", + debug_msg(1, "%s:%d Failure to find %s in vpath (%s)", __FILE__, __LINE__, (*val_it).latin1(), vpath.join("::").latin1()); - warn_msg(WarnLogic, "Failure to tqfind: %s", (*val_it).latin1()); + warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1()); continue; } else { for(int i = 0; i < (int)d.count(); i++) { @@ -931,7 +931,7 @@ MakefileGenerator::init() __FILE__, __LINE__, real_dir.latin1(), TQDir::separator(), regex.latin1(), real_dir.latin1()); - warn_msg(WarnLogic, "Failure to tqfind: %s", (*val_it).latin1()); + warn_msg(WarnLogic, "Failure to find: %s", (*val_it).latin1()); } } } @@ -955,13 +955,13 @@ MakefileGenerator::init() tqmoc_*.cpp files */ if(found_cache_tqmoc) { TQString fixed_file(fileFixify((*val_it), TQDir::currentDirPath(), Option::output_dir)); - TQString tqmoc = tqfindMocDestination(fixed_file); + TQString tqmoc = findMocDestination(fixed_file); if(!tqmoc.isEmpty()) { for(TQStringList::Iterator cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) { if(fixed_file.endsWith((*cppit))) { - TQStringList &deps = tqfindDependencies(fixed_file); - if(!deps.tqcontains(tqmoc)) + TQStringList &deps = findDependencies(fixed_file); + if(!deps.contains(tqmoc)) deps.append(tqmoc); break; } @@ -1034,10 +1034,10 @@ MakefileGenerator::init() if( ! project->isActiveConfig("lex_included")) { v["SOURCES"].append(impl); // attribute deps of lex file to impl file - TQStringList &lexdeps = tqfindDependencies((*it)); - TQStringList &impldeps = tqfindDependencies(impl); + TQStringList &lexdeps = findDependencies((*it)); + TQStringList &impldeps = findDependencies(impl); for(TQStringList::ConstIterator d = lexdeps.begin(); d != lexdeps.end(); ++d) { - if(!impldeps.tqcontains(*d)) + if(!impldeps.contains(*d)) impldeps.append(*d); } lexdeps.clear(); @@ -1066,12 +1066,12 @@ MakefileGenerator::init() decls.append(decl); impls.append(impl); v["SOURCES"].append(impl); - TQStringList &impldeps = tqfindDependencies(impl); + TQStringList &impldeps = findDependencies(impl); impldeps.append(decl); // attribute deps of yacc file to impl file - TQStringList &yaccdeps = tqfindDependencies((*it)); + TQStringList &yaccdeps = findDependencies((*it)); for(TQStringList::ConstIterator d = yaccdeps.begin(); d != yaccdeps.end(); ++d) { - if(!impldeps.tqcontains(*d)) + if(!impldeps.contains(*d)) impldeps.append(*d); } if( project->isActiveConfig("lex_included")) { @@ -1079,10 +1079,10 @@ MakefileGenerator::init() TQString lexsrc = fi.baseName(TRUE) + Option::lex_ext; if(fi.dirPath() != ".") lexsrc.prepend(fi.dirPath() + Option::dir_sep); - if(v["LEXSOURCES"].tqfindIndex(lexsrc) != -1) { + if(v["LEXSOURCES"].findIndex(lexsrc) != -1) { TQString trg = dir + fi.baseName(TRUE) + Option::lex_mod + Option::cpp_ext.first(); impldeps.append(trg); - impldeps += tqfindDependencies(lexsrc); + impldeps += findDependencies(lexsrc); depends[lexsrc].clear(); } } @@ -1109,7 +1109,7 @@ MakefileGenerator::init() if( d == ".") d = TQDir::currentDirPath(); d = fileFixify(d, TQDir::currentDirPath(), Option::output_dir); - if(!includepath.tqcontains(d)) + if(!includepath.contains(d)) includepath.append(d); } else { if(decl.isEmpty() && !project->isEmpty("UI_HEADERS_DIR")) @@ -1120,7 +1120,7 @@ MakefileGenerator::init() if( d == ".") d = TQDir::currentDirPath(); d = fileFixify(d, TQDir::currentDirPath(), Option::output_dir); - if(!includepath.tqcontains(d)) + if(!includepath.contains(d)) includepath.append(d); } if(impl.isEmpty() && !project->isEmpty("UI_SOURCES_DIR")) @@ -1139,9 +1139,9 @@ MakefileGenerator::init() if(Option::output_dir != TQDir::currentDirPath() && project->isEmpty("UI_DIR") && project->isEmpty("UI_HEADERS_DIR")) { TQString decl_fixed = fileFixify(decl, TQDir::currentDirPath(), Option::output_dir); - if(!includepath.tqcontains(decl_fixed)) + if(!includepath.contains(decl_fixed)) includepath.append(decl_fixed); - if(!includepath.tqcontains(decl)) + if(!includepath.contains(decl)) project->variables()["INCLUDEPATH"].append(decl); } decl = fileFixify(decl, TQDir::currentDirPath(), Option::output_dir); @@ -1152,7 +1152,7 @@ MakefileGenerator::init() logicWarn(decl, "HEADERS"); decls.append(decl); impls.append(impl); - tqfindDependencies(impl).append(decl); + findDependencies(impl).append(decl); TQString tqmocable = Option::h_tqmoc_mod + fi.baseName(TRUE) + Option::h_tqmoc_ext; if(!v["TQMOC_DIR"].isEmpty()) @@ -1182,8 +1182,8 @@ MakefileGenerator::init() TQString imgfile = project->first("TQMAKE_IMAGE_COLLECTION"); Option::fixPathToTargetOS(imgfile); if(!project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) { - if(imgfile.tqfind(Option::dir_sep) != -1) - imgfile = imgfile.right(imgfile.tqfindRev(Option::dir_sep) + 1); + if(imgfile.find(Option::dir_sep) != -1) + imgfile = imgfile.right(imgfile.findRev(Option::dir_sep) + 1); imgfile.prepend( (project->isEmpty("UI_DIR") ? project->first("UI_SOURCES_DIR") : project->first("UI_DIR")) ); v["TQMAKE_IMAGE_COLLECTION"] = TQStringList(imgfile); @@ -1196,7 +1196,7 @@ MakefileGenerator::init() warn_msg(WarnLogic, "Failure to open: %s", (*it).latin1()); continue; } - tqfindDependencies(imgfile).append(fileFixify((*it))); + findDependencies(imgfile).append(fileFixify((*it))); } } v["OBJECTS"] += (v["IMAGEOBJECTS"] = createObjectList("TQMAKE_IMAGE_COLLECTION")); @@ -1242,15 +1242,15 @@ MakefileGenerator::init() bool MakefileGenerator::processPrlFile(TQString &file) { - bool ret = FALSE, try_tqreplace_file=FALSE; + bool ret = FALSE, try_replace_file=FALSE; TQString meta_file, orig_file = file; if(TQMakeMetaInfo::libExists(file)) { - try_tqreplace_file = TRUE; + try_replace_file = TRUE; meta_file = file; file = ""; } else { TQString tmp = file; - int ext = tmp.tqfindRev('.'); + int ext = tmp.findRev('.'); if(ext != -1) tmp = tmp.left(ext); meta_file = tmp; @@ -1259,7 +1259,7 @@ MakefileGenerator::processPrlFile(TQString &file) if(!TQMakeMetaInfo::libExists(fileFixify(meta_file, TQDir::currentDirPath(), Option::output_dir)) && project->isActiveConfig("qt")) { TQString stem = meta_file, dir, extn; - int slsh = stem.tqfindRev('/'), hadlib = 0; + int slsh = stem.findRev('/'), hadlib = 0; if(slsh != -1) { dir = stem.left(slsh + 1); stem = stem.right(stem.length() - slsh - 1); @@ -1268,7 +1268,7 @@ MakefileGenerator::processPrlFile(TQString &file) hadlib = 1; stem = stem.right(stem.length() - 3); } - int dot = stem.tqfind('.'); + int dot = stem.find('.'); if(dot != -1) { extn = stem.right(stem.length() - dot); stem = stem.left(dot); @@ -1282,11 +1282,11 @@ MakefileGenerator::processPrlFile(TQString &file) if(hadlib) meta_file += "lib"; meta_file += stem + extn; - try_tqreplace_file = TRUE; + try_replace_file = TRUE; } } TQString real_meta_file = Option::fixPathToLocalOS(meta_file); - if(project->variables()["TQMAKE_PRL_INTERNAL_FILES"].tqfindIndex(TQMakeMetaInfo::tqfindLib(meta_file)) != -1) { + if(project->variables()["TQMAKE_PRL_INTERNAL_FILES"].findIndex(TQMakeMetaInfo::findLib(meta_file)) != -1) { ret = TRUE; } else if(!meta_file.isEmpty()) { TQString f = fileFixify(real_meta_file, TQDir::currentDirPath(), Option::output_dir); @@ -1302,9 +1302,9 @@ MakefileGenerator::processPrlFile(TQString &file) TQMap<TQString, TQStringList> &vars = libinfo.variables(); for( TQMap<TQString, TQStringList>::Iterator it = vars.begin(); it != vars.end(); ++it) processPrlVariable(it.key(), it.data()); - if(try_tqreplace_file && !libinfo.isEmpty("TQMAKE_PRL_TARGET")) { + if(try_replace_file && !libinfo.isEmpty("TQMAKE_PRL_TARGET")) { TQString dir; - int slsh = real_meta_file.tqfindRev(Option::dir_sep); + int slsh = real_meta_file.findRev(Option::dir_sep); if(slsh != -1) dir = real_meta_file.left(slsh+1); file = libinfo.first("TQMAKE_PRL_TARGET"); @@ -1314,12 +1314,12 @@ MakefileGenerator::processPrlFile(TQString &file) } } if(ret) { - TQString mf = TQMakeMetaInfo::tqfindLib(meta_file); + TQString mf = TQMakeMetaInfo::findLib(meta_file); project->variables()["TQMAKE_PRL_INTERNAL_FILES"].append(mf); project->variables()["TQMAKE_INTERNAL_INCLUDED_FILES"].append(mf); } } - if(try_tqreplace_file && file.isEmpty()) { + if(try_replace_file && file.isEmpty()) { #if 0 warn_msg(WarnLogic, "Found prl [%s] file with no target [%s]!", meta_file.latin1(), orig_file.latin1()); @@ -1338,14 +1338,14 @@ MakefileGenerator::processPrlVariable(const TQString &var, const TQStringList &l where = project->first("TQMAKE_INTERNAL_PRL_LIBS"); TQStringList &out = project->variables()[where]; for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - if( out.tqfindIndex((*it)) == -1) + if( out.findIndex((*it)) == -1) out.append((*it)); } } else if(var == "TQMAKE_PRL_DEFINES") { TQStringList &out = project->variables()["DEFINES"]; for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - if(out.tqfindIndex((*it)) == -1 && - project->variables()["PRL_EXPORT_DEFINES"].tqfindIndex((*it)) == -1) + if(out.findIndex((*it)) == -1 && + project->variables()["PRL_EXPORT_DEFINES"].findIndex((*it)) == -1) out.append((*it)); } } @@ -1382,7 +1382,7 @@ void MakefileGenerator::writePrlFile(TQTextStream &t) { TQString target = project->first("TARGET"); - int slsh = target.tqfindRev(Option::dir_sep); + int slsh = target.findRev(Option::dir_sep); if(slsh != -1) target = target.right(target.length() - slsh - 1); TQString bdir = Option::output_dir; @@ -1424,17 +1424,17 @@ MakefileGenerator::write() { usePlatformDir(); init(); - tqfindLibraries(); + findLibraries(); if((Option::qmake_mode == Option::TQMAKE_GENERATE_MAKEFILE || //write prl Option::qmake_mode == Option::TQMAKE_GENERATE_PRL) && project->variables()["TQMAKE_FAILED_RETQUIREMENTS"].isEmpty() && project->isActiveConfig("create_prl") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("plugin")) { TQString prl = var("TARGET"); - int slsh = prl.tqfindRev(Option::dir_sep); + int slsh = prl.findRev(Option::dir_sep); if(slsh != -1) prl = prl.right(prl.length() - slsh); - int dot = prl.tqfind('.'); + int dot = prl.find('.'); if(dot != -1) prl = prl.left(dot); prl += Option::prl_ext; @@ -1490,7 +1490,7 @@ MakefileGenerator::usePlatformDir() + (filePath.isEmpty() ? pltDir : slashPltDir)); filePath = project->first("TQMAKE_LIBS_QT"); - int fpi = filePath.tqfindRev(sep); + int fpi = filePath.findRev(sep); if (fpi == -1) project->variables()["TQMAKE_LIBS_QT"].prepend(pltDir + sep); else @@ -1499,7 +1499,7 @@ MakefileGenerator::usePlatformDir() + filePath.mid(fpi)); filePath = project->first("TQMAKE_LIBS_TQT_THREAD"); - fpi = filePath.tqfindRev(sep); + fpi = filePath.findRev(sep); if (fpi == -1) project->variables()["TQMAKE_LIBS_TQT_THREAD"].prepend(pltDir + sep); else @@ -1508,7 +1508,7 @@ MakefileGenerator::usePlatformDir() + filePath.mid(fpi)); filePath = project->first("TQMAKE_LIBS_TQT_ENTRY"); - fpi = filePath.tqfindRev(sep); + fpi = filePath.findRev(sep); if (fpi == -1) project->variables()["TQMAKE_LIBS_TQT_ENTRY"].prepend(pltDir + sep); else @@ -1533,7 +1533,7 @@ MakefileGenerator::writeObj(TQTextStream &t, const TQString &obj, const TQString if(!doDepends()) { TQString sdep, odep = (*sit) + " "; - TQStringList deps = tqfindDependencies((*sit)); + TQStringList deps = findDependencies((*sit)); for(TQStringList::Iterator dit = deps.begin(); dit != deps.end(); dit++) { if((*dit).endsWith(Option::cpp_tqmoc_ext)) odep += (*dit) + " "; @@ -1543,7 +1543,7 @@ MakefileGenerator::writeObj(TQTextStream &t, const TQString &obj, const TQString t << (*sit) << ": " << sdep << endl << (*oit) << ": " << odep ; } else { - t << (*oit) << ": " << (*sit) << " " << tqfindDependencies((*sit)).join(" \\\n\t\t"); + t << (*oit) << ": " << (*sit) << " " << findDependencies((*sit)).join(" \\\n\t\t"); } TQString comp, cimp; @@ -1563,15 +1563,15 @@ MakefileGenerator::writeObj(TQTextStream &t, const TQString &obj, const TQString if(!project->isEmpty("OBJECTS_DIR")) { use_implicit_rule = FALSE; } else { - int dot = (*sit).tqfindRev('.'); + int dot = (*sit).findRev('.'); if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit))) use_implicit_rule = FALSE; } } if (!use_implicit_rule && !project->isEmpty(comp)) { TQString p = var(comp), srcf(*sit); - p.tqreplace(stringSrc, srcf); - p.tqreplace(stringObj, (*oit)); + p.replace(stringSrc, srcf); + p.replace(stringObj, (*oit)); t << "\n\t" << p; } t << endl << endl; @@ -1587,11 +1587,11 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui) TQString decl, impl; { TQString tmp = (*it), impl_dir, decl_dir; - decl = tmp.tqreplace(TQRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first()); - int dlen = decl.tqfindRev(Option::dir_sep) + 1; + decl = tmp.replace(TQRegExp("\\" + Option::ui_ext + "$"), Option::h_ext.first()); + int dlen = decl.findRev(Option::dir_sep) + 1; tmp = (*it); - impl = tmp.tqreplace(TQRegExp("\\" + Option::ui_ext + "$"), Option::cpp_ext.first()); - int ilen = decl.tqfindRev(Option::dir_sep) + 1; + impl = tmp.replace(TQRegExp("\\" + Option::ui_ext + "$"), Option::cpp_ext.first()); + int ilen = decl.findRev(Option::dir_sep) + 1; if(!project->isEmpty("UI_DIR")) { impl_dir = project->first("UI_DIR"); decl = project->first("UI_DIR") + decl.right(decl.length() - dlen); @@ -1619,14 +1619,14 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui) createDir(impl_dir); createDir(decl_dir); } - TQStringList deps = tqfindDependencies((*it)); + TQStringList deps = findDependencies((*it)); deps.remove(decl); //avoid circular dependencies.. t << decl << ": " << (*it) << " "; t << deps.join(" \\\n\t\t") << "\n\t" << "$(UIC) " << (*it) << " -o " << decl << endl << endl; TQString mildDecl = decl; - int k = mildDecl.tqfindRev(Option::dir_sep); + int k = mildDecl.findRev(Option::dir_sep); if ( k != -1 ) mildDecl = mildDecl.mid( k + 1 ); t << impl << ": " << decl << " " << (*it) << " "; @@ -1646,24 +1646,24 @@ MakefileGenerator::writeMocObj(TQTextStream &t, const TQString &obj, const TQStr TQStringList::Iterator oit = objl.begin(), sit = srcl.begin(); TQString stringSrc("$src"), stringObj("$obj"); for( ;sit != srcl.end() && oit != objl.end(); oit++, sit++) { - TQString hdr = tqfindMocSource((*sit)); + TQString hdr = findMocSource((*sit)); t << (*oit) << ": " - << (*sit) << " " << tqfindDependencies((*sit)).join(" \\\n\t\t") << " " - << hdr << " " << tqfindDependencies(hdr).join(" \\\n\t\t"); + << (*sit) << " " << findDependencies((*sit)).join(" \\\n\t\t") << " " + << hdr << " " << findDependencies(hdr).join(" \\\n\t\t"); bool use_implicit_rule = !project->isEmpty("TQMAKE_RUN_CXX_IMP"); if(use_implicit_rule) { if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("TQMOC_DIR")) { use_implicit_rule = FALSE; } else { - int dot = (*sit).tqfindRev('.'); + int dot = (*sit).findRev('.'); if(dot == -1 || ((*sit).left(dot) + Option::obj_ext != (*oit))) use_implicit_rule = FALSE; } } if (!use_implicit_rule && !project->isEmpty("TQMAKE_RUN_CXX")) { TQString p = var("TQMAKE_RUN_CXX"), srcf(*sit); - p.tqreplace(stringSrc, srcf); - p.tqreplace(stringObj, (*oit)); + p.replace(stringSrc, srcf); + p.replace(stringObj, (*oit)); t << "\n\t" << p; } t << endl << endl; @@ -1676,7 +1676,7 @@ MakefileGenerator::writeMocSrc(TQTextStream &t, const TQString &src) { TQStringList &l = project->variables()[src]; for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { - TQString m = Option::fixPathToTargetOS(tqfindMocDestination(*it)); + TQString m = Option::fixPathToTargetOS(findMocDestination(*it)); if ( !m.isEmpty()) { TQString deps; if(!project->isActiveConfig("no_tqmocdepend")) @@ -1718,14 +1718,14 @@ MakefileGenerator::writeYaccSrc(TQTextStream &t, const TQString &src) if(!project->isActiveConfig("yacc_no_name_mangle")) { mangle = fi.baseName(TRUE); if(!project->isEmpty("TQMAKE_YACCFLAGS_MANGLE")) - yaccflags += " " + var("TQMAKE_YACCFLAGS_MANGLE").tqreplace(stringBase, mangle); + yaccflags += " " + var("TQMAKE_YACCFLAGS_MANGLE").replace(stringBase, mangle); else yaccflags += " -p " + mangle; } TQString out_h = default_out_h, out_c = default_out_c; if(!mangle.isEmpty()) { - out_h.tqreplace(stringBase, mangle); - out_c.tqreplace(stringBase, mangle); + out_h.replace(stringBase, mangle); + out_c.replace(stringBase, mangle); } t << impl << ": " << (*it) << "\n\t" @@ -1765,9 +1765,9 @@ MakefileGenerator::writeLexSrc(TQTextStream &t, const TQString &src) } TQString out_c = default_out_c; if(!stub.isEmpty()) - out_c.tqreplace(stringBase, stub); + out_c.replace(stringBase, stub); - t << impl << ": " << (*it) << " " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t" + t << impl << ": " << (*it) << " " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t" << ( "$(LEX) " + lexflags + " " ) << (*it) << "\n\t" << "-$(DEL_FILE) " << impl << " " << "\n\t" << "-$(MOVE) " << out_c << " " << impl << endl << endl; @@ -1790,15 +1790,15 @@ MakefileGenerator::writeImageObj(TQTextStream &t, const TQString &obj) if(!project->isEmpty("OBJECTS_DIR") || !project->isEmpty("UI_DIR") || !project->isEmpty("UI_SOURCES_DIR")) { use_implicit_rule = FALSE; } else { - int dot = src.tqfindRev('.'); + int dot = src.findRev('.'); if(dot == -1 || (src.left(dot) + Option::obj_ext != (*oit))) use_implicit_rule = FALSE; } } if(!use_implicit_rule && !project->isEmpty("TQMAKE_RUN_CXX")) { TQString p = var("TQMAKE_RUN_CXX"), srcf(src); - p.tqreplace(stringSrc, srcf); - p.tqreplace(stringObj, (*oit)); + p.replace(stringSrc, srcf); + p.replace(stringObj, (*oit)); t << "\n\t" << p; } t << endl << endl; @@ -1813,17 +1813,17 @@ MakefileGenerator::writeImageSrc(TQTextStream &t, const TQString &src) for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { TQString gen = project->first("MAKEFILE_GENERATOR"); if ( gen == "MSVC" ) { - t << (*it) << ": " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t" + t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t" << "$(UIC) -o " << (*it) << " -embed " << project->first("TQMAKE_ORIG_TARGET") - << " -f <<\n" << tqfindDependencies((*it)).join(" ") << "\n<<" << endl << endl; + << " -f <<\n" << findDependencies((*it)).join(" ") << "\n<<" << endl << endl; } else if ( gen == "BMAKE" ) { - t << (*it) << ": " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t" + t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t" << "$(UIC) " << " -embed " << project->first("TQMAKE_ORIG_TARGET") - << " -f &&|\n" << tqfindDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl; + << " -f &&|\n" << findDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl; } else { - t << (*it) << ": " << tqfindDependencies((*it)).join(" \\\n\t\t") << "\n\t" + t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t" << "$(UIC) " << " -embed " << project->first("TQMAKE_ORIG_TARGET") - << " " << tqfindDependencies((*it)).join(" ") << " -o " << (*it) << endl << endl; + << " " << findDependencies((*it)).join(" ") << " -o " << (*it) << endl << endl; } } } @@ -1836,7 +1836,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) TQStringList &l = project->variables()[installs]; for(TQStringList::Iterator it = l.begin(); it != l.end(); ++it) { TQString pvar = (*it) + ".path"; - if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_path") == -1 && + if(project->variables()[(*it) + ".CONFIG"].findIndex("no_path") == -1 && project->variables()[pvar].isEmpty()) { warn_msg(WarnLogic, "%s is not defined: install target not created\n", pvar.latin1()); continue; @@ -1867,7 +1867,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) for(TQStringList::Iterator wild_it = tmp.begin(); wild_it != tmp.end(); ++wild_it) { TQString wild = Option::fixPathToLocalOS((*wild_it), FALSE), wild_var = fileFixify(wild); TQString dirstr = TQDir::currentDirPath(), filestr = wild; - int slsh = filestr.tqfindRev(Option::dir_sep); + int slsh = filestr.findRev(Option::dir_sep); if(slsh != -1) { dirstr = filestr.left(slsh+1); filestr = filestr.right(filestr.length() - slsh - 1); @@ -1967,7 +1967,7 @@ MakefileGenerator::writeInstalls(TQTextStream &t, const TQString &installs) } t << endl; - if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_default_install") == -1) { + if(project->variables()[(*it) + ".CONFIG"].findIndex("no_default_install") == -1) { all_installs += TQString("install_") + (*it) + " "; if(!uninst.isEmpty()) all_uninstalls += "uninstall_" + (*it) + " "; @@ -2037,7 +2037,7 @@ MakefileGenerator::createObjectList(const TQString &var) TQFileInfo fi(Option::fixPathToLocalOS((*it))); if(objdir.isEmpty() && project->isActiveConfig("object_with_source")) { TQString fName = Option::fixPathToTargetOS((*it), FALSE); - int dl = fName.tqfindRev(Option::dir_sep); + int dl = fName.findRev(Option::dir_sep); if(dl != -1) dir = fName.left(dl + 1); } else { @@ -2218,7 +2218,7 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, if(!in_d.isEmpty() || !out_d.isEmpty() || force_fix || !canon) key.prepend(in_d + "--" + out_d + "--" + TQString::number((int)force_fix) + "--" + TQString::number((int)canon) + "-"); - if(fileFixed.tqcontains(key)) + if(fileFixed.contains(key)) return fileFixed[key]; TQString file = file0; @@ -2294,7 +2294,7 @@ MakefileGenerator::fileFixify(const TQString& file0, const TQString &out_d, file = file.right(file.length() - (match_dir.length() + 1)); } else { for(int i = 1; i <= depth; i++) { - int sl = match_dir.tqfindRev(Option::dir_sep); + int sl = match_dir.findRev(Option::dir_sep); if(sl == -1) break; match_dir = match_dir.left(sl); @@ -2337,13 +2337,13 @@ void MakefileGenerator::logicWarn(const TQString &f, const TQString &w) if(!(Option::warn_level & WarnLogic)) return; TQString file = f; - int slsh = f.tqfindRev(Option::dir_sep); + int slsh = f.findRev(Option::dir_sep); if(slsh != -1) file = file.right(file.length() - slsh - 1); TQStringList &l = project->variables()[w]; for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { TQString file2((*val_it)); - slsh = file2.tqfindRev(Option::dir_sep); + slsh = file2.findRev(Option::dir_sep); if(slsh != -1) file2 = file2.right(file2.length() - slsh - 1); if(file2 == file) { @@ -2359,8 +2359,8 @@ MakefileGenerator::dependencyKey(const TQString &file) const { TQString key = file; Option::fixPathToTargetOS(key); - if(key.tqfind(Option::dir_sep)) - key = key.right(key.length() - key.tqfindRev(Option::dir_sep) - 1); + if(key.find(Option::dir_sep)) + key = key.right(key.length() - key.findRev(Option::dir_sep) - 1); return key; } @@ -2374,13 +2374,13 @@ bool MakefileGenerator::processedDependencies(const TQString &file) { TQString key = dependencyKey(file); - if(!depProcessed.tqcontains(key)) + if(!depProcessed.contains(key)) return FALSE; return depProcessed[key]; } TQStringList -&MakefileGenerator::tqfindDependencies(const TQString &file) +&MakefileGenerator::findDependencies(const TQString &file) { return depends[dependencyKey(file)]; } @@ -2401,9 +2401,9 @@ MakefileGenerator::specdir() TQFileInfo fi(spec); TQString absSpec(fi.absFilePath()); absSpec = Option::fixPathToTargetOS(absSpec); - //tqreplace what you can + //replace what you can if(absSpec.startsWith(qdir)) { - absSpec.tqreplace(0, qdir.length(), "$(TQTDIR)"); + absSpec.replace(0, qdir.length(), "$(TQTDIR)"); spec = absSpec; } } @@ -2436,7 +2436,7 @@ MakefileGenerator::openOutput(TQFile &file) const file.setName(Option::output_dir + file.name()); //pwd when qmake was run if(project->isEmpty("TQMAKE_MAKEFILE")) project->variables()["TQMAKE_MAKEFILE"].append(file.name()); - int slsh = file.name().tqfindRev(Option::dir_sep); + int slsh = file.name().findRev(Option::dir_sep); if(slsh != -1) createDir(file.name().left(slsh)); if(file.open(IO_WriteOnly | IO_Translate)) { @@ -2478,13 +2478,13 @@ MakefileGenerator::create(TQMakeProject *proj) mkfile = new UnixMakefileGenerator(proj); } else if(gen == "MSVC") { // Visual Studio =< v6.0 - if(proj->first("TEMPLATE").tqfind(TQRegExp("^vc.*")) != -1) + if(proj->first("TEMPLATE").find(TQRegExp("^vc.*")) != -1) mkfile = new DspMakefileGenerator(proj); else mkfile = new NmakeMakefileGenerator(proj); } else if(gen == "MSVC.NET") { // Visual Studio >= v7.0 - if(proj->first("TEMPLATE").tqfind(TQRegExp("^vc.*")) != -1) + if(proj->first("TEMPLATE").find(TQRegExp("^vc.*")) != -1) mkfile = new VcprojGenerator(proj); else mkfile = new NmakeMakefileGenerator(proj); diff --git a/tqtinterface/qt4/qmake/generators/makefile.h b/tqtinterface/qt4/qmake/generators/makefile.h index c736a94..a33daff 100644 --- a/tqtinterface/qt4/qmake/generators/makefile.h +++ b/tqtinterface/qt4/qmake/generators/makefile.h @@ -88,9 +88,9 @@ protected: TQString cleanFilePath(const TQString &file) const; bool generateMocList(const TQString &fn); - TQString tqfindMocSource(const TQString &tqmoc_file) const; - TQString tqfindMocDestination(const TQString &src_file) const; - virtual TQStringList &tqfindDependencies(const TQString &file); + TQString findMocSource(const TQString &tqmoc_file) const; + TQString findMocDestination(const TQString &src_file) const; + virtual TQStringList &findDependencies(const TQString &file); void setNoIO(bool o); bool noIO() const; @@ -119,8 +119,8 @@ protected: virtual void writePrlFile(TQTextStream &); //make sure libraries are found - virtual bool tqfindLibraries(); - virtual TQString tqfindDependency(const TQString &); + virtual bool findLibraries(); + virtual TQString findDependency(const TQString &); void setProcessedDependencies(const TQString &file, bool b); bool processedDependencies(const TQString &file); @@ -146,19 +146,19 @@ public: virtual bool openOutput(TQFile &) const; }; -inline TQString MakefileGenerator::tqfindMocSource(const TQString &tqmoc_file) const +inline TQString MakefileGenerator::findMocSource(const TQString &tqmoc_file) const { TQString tmp = cleanFilePath(tqmoc_file); - if (tqmocablesFromTQMOC.tqcontains(tmp)) + if (tqmocablesFromTQMOC.contains(tmp)) return tqmocablesFromTQMOC[tmp]; else return TQString(""); } -inline TQString MakefileGenerator::tqfindMocDestination(const TQString &src_file) const +inline TQString MakefileGenerator::findMocDestination(const TQString &src_file) const { TQString tmp = cleanFilePath(src_file); - if (tqmocablesToTQMOC.tqcontains(tmp)) + if (tqmocablesToTQMOC.contains(tmp)) return tqmocablesToTQMOC[tmp]; else return TQString(""); @@ -179,10 +179,10 @@ inline bool MakefileGenerator::noIO() const inline TQString MakefileGenerator::defaultInstall(const TQString &) { return TQString(""); } -inline bool MakefileGenerator::tqfindLibraries() +inline bool MakefileGenerator::findLibraries() { return TRUE; } -inline TQString MakefileGenerator::tqfindDependency(const TQString &) +inline TQString MakefileGenerator::findDependency(const TQString &) { return TQString(""); } inline MakefileGenerator::~MakefileGenerator() diff --git a/tqtinterface/qt4/qmake/generators/projectgenerator.cpp b/tqtinterface/qt4/qmake/generators/projectgenerator.cpp index c608057..b52383e 100644 --- a/tqtinterface/qt4/qmake/generators/projectgenerator.cpp +++ b/tqtinterface/qt4/qmake/generators/projectgenerator.cpp @@ -87,7 +87,7 @@ ProjectGenerator::init() TQString builtin_regex = project_builtin_regx(); TQStringList dirs = Option::projfile::project_dirs; if(Option::projfile::do_pwd) { - if(!v["INCLUDEPATH"].tqcontains(".")) + if(!v["INCLUDEPATH"].contains(".")) v["INCLUDEPATH"] += "."; dirs.prepend(TQDir::currentDirPath()); } @@ -113,7 +113,7 @@ ProjectGenerator::init() regex = builtin_regex; } else { TQString file = (*pd); - int s = file.tqfindRev(Option::dir_sep); + int s = file.findRev(Option::dir_sep); if(s != -1) dir = file.left(s+1); if(addFile(file)) { @@ -125,7 +125,7 @@ ProjectGenerator::init() regex = (*pd); } if(!regex.isEmpty()) { - int s = regex.tqfindRev(Option::dir_sep); + int s = regex.findRev(Option::dir_sep); if(s != -1) { dir = regex.left(s+1); regex = regex.right(regex.length() - (s+1)); @@ -147,7 +147,7 @@ ProjectGenerator::init() } } } - if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].tqcontains(dir)) { + if(add_depend && !dir.isEmpty() && !v["DEPENDPATH"].contains(dir)) { TQFileInfo fi(dir); if(fi.absFilePath() != TQDir::currentDirPath()) v["DEPENDPATH"] += fileFixify(dir); @@ -167,7 +167,7 @@ ProjectGenerator::init() newdir = fileFixify(newdir); TQStringList &subdirs = v["SUBDIRS"]; if(TQFile::exists(fi.filePath() + TQDir::separator() + fi.fileName() + ".pro") && - !subdirs.tqcontains(newdir)) { + !subdirs.contains(newdir)) { subdirs.append(newdir); } else { TQDir d(newdir, "*.pro"); @@ -180,7 +180,7 @@ ProjectGenerator::init() nd += TQDir::separator(); nd += d[i]; fileFixify(nd); - if(d[i] != "." && d[i] != ".." && !subdirs.tqcontains(nd) && !out_file.endsWith(nd)) + if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd) && !out_file.endsWith(nd)) subdirs.append(nd); } } @@ -189,14 +189,14 @@ ProjectGenerator::init() d.setFilter(TQDir::Dirs); for(int i = 0; i < (int)d.count(); i++) { TQString nd = fileFixify(newdir + TQDir::separator() + d[i]); - if(d[i] != "." && d[i] != ".." && !dirs.tqcontains(nd)) + if(d[i] != "." && d[i] != ".." && !dirs.contains(nd)) dirs.append(nd); } } } } else { //regexp TQString regx = (*pd), dir; - int s = regx.tqfindRev(Option::dir_sep); + int s = regx.findRev(Option::dir_sep); if(s != -1) { dir = regx.left(s+1); regx = regx.right(regx.length() - (s+1)); @@ -210,7 +210,7 @@ ProjectGenerator::init() if(fi.fileName() != "." && fi.fileName() != "..") { newdir = fileFixify(newdir); if(TQFile::exists(fi.filePath() + TQDir::separator() + fi.fileName() + ".pro") && - !subdirs.tqcontains(newdir)) { + !subdirs.contains(newdir)) { subdirs.append(newdir); } else { TQDir d(newdir, "*.pro"); @@ -218,13 +218,13 @@ ProjectGenerator::init() for(int i = 0; i < (int)d.count(); i++) { TQString nd = newdir + TQDir::separator() + d[i]; fileFixify(nd); - if(d[i] != "." && d[i] != ".." && !subdirs.tqcontains(nd)) { + if(d[i] != "." && d[i] != ".." && !subdirs.contains(nd)) { if(newdir + d[i] != Option::output_dir + Option::output.name()) subdirs.append(nd); } } } - if(Option::projfile::do_recursive && !dirs.tqcontains(newdir)) + if(Option::projfile::do_recursive && !dirs.contains(newdir)) dirs.append(newdir); } } @@ -250,18 +250,18 @@ ProjectGenerator::init() TQStringList &l = v[srcs[i]]; for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ++val_it) { if(generateDependencies(deplist, (*val_it), TRUE)) { - TQStringList &tmp = tqfindDependencies((*val_it)); + TQStringList &tmp = findDependencies((*val_it)); if(!tmp.isEmpty()) { for(TQStringList::Iterator dep_it = tmp.begin(); dep_it != tmp.end(); ++dep_it) { TQString file_dir = (*dep_it).section(Option::dir_sep, 0, -2), file_no_path = (*dep_it).section(Option::dir_sep, -1); if(!file_dir.isEmpty()) { for(MakefileDependDir *mdd = deplist.first(); mdd; mdd = deplist.next()) { - if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].tqcontains(mdd->real_dir)) + if(mdd->local_dir == file_dir && !v["INCLUDEPATH"].contains(mdd->real_dir)) v["INCLUDEPATH"] += mdd->real_dir; } } - if(no_qt_files && file_no_path.tqfind(TQRegExp("^q[a-z_0-9].h$")) != -1) + if(no_qt_files && file_no_path.find(TQRegExp("^q[a-z_0-9].h$")) != -1) no_qt_files = FALSE; TQString h_ext; for(TQStringList::Iterator hit = Option::h_ext.begin(); @@ -299,8 +299,8 @@ ProjectGenerator::init() file_no_path.startsWith(Option::lex_mod)) { addConfig("lex_included"); } - if(!h.tqcontains((*dep_it))) { - if(generateMocList((*dep_it)) && !tqfindMocDestination((*dep_it)).isEmpty()) + if(!h.contains((*dep_it))) { + if(generateMocList((*dep_it)) && !findMocDestination((*dep_it)).isEmpty()) h += (*dep_it); } } @@ -311,7 +311,7 @@ ProjectGenerator::init() if(h.isEmpty()) addConfig("tqmoc", FALSE); - //if we tqfind a file that matches an forms it needn't be included in the project + //if we find a file that matches an forms it needn't be included in the project TQStringList &u = v["INTERFACES"]; TQString no_ui[] = { "SOURCES", "HEADERS", TQString::null }; { @@ -320,10 +320,10 @@ ProjectGenerator::init() for(TQStringList::Iterator val_it = l.begin(); val_it != l.end(); ) { bool found = FALSE; for(TQStringList::Iterator ui_it = u.begin(); ui_it != u.end(); ++ui_it) { - TQString s1 = (*val_it).right((*val_it).length() - ((*val_it).tqfindRev(Option::dir_sep) + 1)); - if(s1.tqfindRev('.') != -1) - s1 = s1.left(s1.tqfindRev('.')) + Option::ui_ext; - TQString u1 = (*ui_it).right((*ui_it).length() - ((*ui_it).tqfindRev(Option::dir_sep) + 1)); + TQString s1 = (*val_it).right((*val_it).length() - ((*val_it).findRev(Option::dir_sep) + 1)); + if(s1.findRev('.') != -1) + s1 = s1.left(s1.findRev('.')) + Option::ui_ext; + TQString u1 = (*ui_it).right((*ui_it).length() - ((*ui_it).findRev(Option::dir_sep) + 1)); if(s1 == u1) { found = TRUE; break; @@ -380,7 +380,7 @@ ProjectGenerator::addConfig(const TQString &cfg, bool add) TQString where = "CONFIG"; if(!add) where = "CONFIG_REMOVE"; - if(!project->variables()[where].tqcontains(cfg)) { + if(!project->variables()[where].contains(cfg)) { project->variables()[where] += cfg; return TRUE; } @@ -393,7 +393,7 @@ ProjectGenerator::addFile(TQString file) { file = fileFixify(file, TQDir::currentDirPath()); TQString dir; - int s = file.tqfindRev(Option::dir_sep); + int s = file.findRev(Option::dir_sep); if(s != -1) dir = file.left(s+1); if(file.mid(dir.length(), Option::h_tqmoc_mod.length()) == Option::h_tqmoc_mod) @@ -431,7 +431,7 @@ ProjectGenerator::addFile(TQString file) } TQString newfile = fileFixify(file); - if(!where.isEmpty() && !project->variables()[where].tqcontains(file)) { + if(!where.isEmpty() && !project->variables()[where].contains(file)) { project->variables()[where] += newfile; return TRUE; } @@ -464,7 +464,7 @@ ProjectGenerator::getWritableVar(const TQString &v, bool fixPath) // ### Commented out for now so that project generation works. // Sam: it had to do with trailing \'s (ie considered continuation lines) if(fixPath) - join = join.tqreplace("\\", "/"); + join = join.replace("\\", "/"); #else TQ_UNUSED(fixPath); #endif @@ -482,7 +482,7 @@ ProjectGenerator::openOutput(TQFile &file) const } if(!outdir.isEmpty() || file.name().isEmpty()) { TQString dir = TQDir::currentDirPath(); - int s = dir.tqfindRev('/'); + int s = dir.findRev('/'); if(s != -1) dir = dir.right(dir.length() - (s + 1)); file.setName(outdir + dir + ".pro"); diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp b/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp index 4bee06b..82d7ef6 100644 --- a/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp +++ b/tqtinterface/qt4/qmake/generators/unix/unixmake.cpp @@ -67,7 +67,7 @@ UnixMakefileGenerator::init() project->variables()["MAKEFILE"].append("Makefile"); if(project->isEmpty("TQMAKE")) project->variables()["TQMAKE"].append("qmake"); - if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].tqfindIndex("qmake_all") == -1) + if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].findIndex("qmake_all") == -1) project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].append("qmake_all"); return; /* subdirs is done */ } @@ -100,7 +100,7 @@ UnixMakefileGenerator::init() //If the TARGET looks like a path split it into DESTDIR and the resulting TARGET if(!project->isEmpty("TARGET")) { TQString targ = project->first("TARGET"); - int slsh = TQMAX(targ.tqfindRev('/'), targ.tqfindRev(Option::dir_sep)); + int slsh = TQMAX(targ.findRev('/'), targ.findRev(Option::dir_sep)); if(slsh != -1) { if(project->isEmpty("DESTDIR")) project->values("DESTDIR").append(""); @@ -122,7 +122,7 @@ UnixMakefileGenerator::init() project->variables()["TQMAKE_LIBS"] += project->variables()["LIBS"]; if ( (!project->isEmpty("TQMAKE_LIB_FLAG") && !project->isActiveConfig("staticlib") ) || (project->isActiveConfig("qt") && project->isActiveConfig( "plugin" ) )) { - if(configs.tqfindIndex("dll") == -1) configs.append("dll"); + if(configs.findIndex("dll") == -1) configs.append("dll"); } else if ( !project->isEmpty("TQMAKE_APP_FLAG") || project->isActiveConfig("dll") ) { configs.remove("staticlib"); } @@ -157,9 +157,9 @@ UnixMakefileGenerator::init() project->variables()["TQMAKE_LIBDIR_FLAGS"] += varGlue( "TQMAKE_LIBDIR", "-L", " -L", "" ); } if ( project->isActiveConfig("qtopia") ) { - if(configs.tqfindIndex("qtopialib") == -1) + if(configs.findIndex("qtopialib") == -1) configs.append("qtopialib"); - if(configs.tqfindIndex("qtopiainc") == -1) + if(configs.findIndex("qtopiainc") == -1) configs.append("qtopiainc"); } if ( project->isActiveConfig("qtopiainc") ) @@ -174,7 +174,7 @@ UnixMakefileGenerator::init() project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_ACCESSIBILITY_SUPPORT"); if ( project->isActiveConfig("tablet") ) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_TABLET_SUPPORT"); - if(configs.tqfindIndex("tqmoc")) configs.append("tqmoc"); + if(configs.findIndex("tqmoc")) configs.append("tqmoc"); project->variables()["INCLUDEPATH"] += project->variables()["TQMAKE_INCDIR_QT"]; if ( !project->isActiveConfig("debug") ) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG"); @@ -205,15 +205,15 @@ UnixMakefileGenerator::init() project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_OPENGL"]; } if ( extern_libs && (project->isActiveConfig("qt") || project->isActiveConfig("opengl")) ) { - if(configs.tqfindIndex("x11lib") == -1) + if(configs.findIndex("x11lib") == -1) configs.append("x11lib"); - if ( project->isActiveConfig("opengl") && configs.tqfindIndex("x11inc") == -1 ) + if ( project->isActiveConfig("opengl") && configs.findIndex("x11inc") == -1 ) configs.append("x11inc"); } if ( project->isActiveConfig("x11") ) { - if(configs.tqfindIndex("x11lib") == -1) + if(configs.findIndex("x11lib") == -1) configs.append("x11lib"); - if(configs.tqfindIndex("x11inc") == -1) + if(configs.findIndex("x11inc") == -1) configs.append("x11inc"); } if ( project->isActiveConfig("x11inc") ) @@ -387,11 +387,11 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin for(TQStringList::ConstIterator it = lst->begin(); it != lst->end(); ++it) { if((*it).startsWith("-")) { if((*it).startsWith("-L")) { - if(ret.tqfindIndex((*it)) == -1) + if(ret.findIndex((*it)) == -1) ret.append((*it)); } else if((*it).startsWith("-l")) { while(1) { - TQStringList::Iterator idx = ret.tqfind((*it)); + TQStringList::Iterator idx = ret.find((*it)); if(idx == ret.end()) break; ret.remove(idx); @@ -439,7 +439,7 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin } else { #if 1 while(1) { - TQStringList::Iterator idx = ret.tqfind((*it)); + TQStringList::Iterator idx = ret.find((*it)); if(idx == ret.end()) break; ret.remove(idx); @@ -449,7 +449,7 @@ UnixMakefileGenerator::combineSetLFlags(const TQStringList &list1, const TQStrin } } else /*if(TQFile::exists((*it)))*/ { while(1) { - TQStringList::Iterator idx = ret.tqfind((*it)); + TQStringList::Iterator idx = ret.find((*it)); if(idx == ret.end()) break; ret.remove(idx); @@ -472,7 +472,7 @@ UnixMakefileGenerator::processPrlVariable(const TQString &var, const TQStringLis } TQString -UnixMakefileGenerator::tqfindDependency(const TQString &dep) +UnixMakefileGenerator::findDependency(const TQString &dep) { TQStringList::Iterator it; { @@ -498,21 +498,21 @@ UnixMakefileGenerator::tqfindDependency(const TQString &dep) for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { TQString out = tmp_out; TQFileInfo fi(Option::fixPathToLocalOS((*input))); - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); if(out.endsWith(dep)) return out; } } } } - return MakefileGenerator::tqfindDependency(dep); + return MakefileGenerator::findDependency(dep); } TQStringList -&UnixMakefileGenerator::tqfindDependencies(const TQString &file) +&UnixMakefileGenerator::findDependencies(const TQString &file) { - TQStringList &ret = MakefileGenerator::tqfindDependencies(file); + TQStringList &ret = MakefileGenerator::findDependencies(file); // Note: The TQMAKE_IMAGE_COLLECTION file have all images // as dependency, so don't add precompiled header then if(doPrecompiledHeaders() && !project->isEmpty("PRECOMPILED_HEADER") @@ -521,13 +521,13 @@ TQStringList header_prefix += project->first("TQMAKE_PRECOMP_PREFIX"); if(file.endsWith(".c")) { TQString precomp_h = header_prefix + "c"; - if(!ret.tqcontains(precomp_h)) + if(!ret.contains(precomp_h)) ret += precomp_h; } else { for(TQStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) { if(file.endsWith(*it)) { TQString precomp_h = header_prefix + "c++"; - if(!ret.tqcontains(precomp_h)) + if(!ret.contains(precomp_h)) ret += precomp_h; break; } @@ -538,7 +538,7 @@ TQStringList } bool -UnixMakefileGenerator::tqfindLibraries() +UnixMakefileGenerator::findLibraries() { TQPtrList<MakefileDependDir> libdirs; libdirs.setAutoDelete(TRUE); @@ -551,8 +551,8 @@ UnixMakefileGenerator::tqfindLibraries() if(opt.startsWith("-L")) { TQString r = opt.right(opt.length() - 2), l = r; fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + libdirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } else if(opt.startsWith("-l")) { stub = opt.mid(2); } else if(project->isActiveConfig("macx") && opt.startsWith("-framework")) { @@ -569,7 +569,7 @@ UnixMakefileGenerator::tqfindLibraries() } else { extn = dir = ""; stub = opt; - int slsh = opt.tqfindRev(Option::dir_sep); + int slsh = opt.findRev(Option::dir_sep); if(slsh != -1) { dir = opt.left(slsh); stub = opt.mid(slsh+1); @@ -657,8 +657,8 @@ UnixMakefileGenerator::processPrlFiles() if(opt.startsWith("-L")) { TQString r = opt.right(opt.length() - 2), l = r; fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + libdirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } else if(opt.startsWith("-l") && !processed[opt]) { TQString lib = opt.right(opt.length() - 2); for(MakefileDependDir *mdd = libdirs.first(); mdd; mdd = libdirs.next() ) { @@ -674,7 +674,7 @@ UnixMakefileGenerator::processPrlFiles() TQString prl = mdd->local_dir + Option::dir_sep + "lib" + lib; if(processPrlFile(prl)) { if(prl.startsWith(mdd->local_dir)) - prl.tqreplace(0, mdd->local_dir.length(), mdd->real_dir); + prl.replace(0, mdd->local_dir.length(), mdd->real_dir); opt = linkLib(prl, lib); processed.insert(opt, (void*)1); ret = TRUE; @@ -750,7 +750,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) if(project->isActiveConfig("create_prl") && !project->isActiveConfig("no_install_prl") && !project->isEmpty("TQMAKE_INTERNAL_PRL_FILE")) { TQString dst_prl = project->first("TQMAKE_INTERNAL_PRL_FILE"); - int slsh = dst_prl.tqfindRev('/'); + int slsh = dst_prl.findRev('/'); if(slsh != -1) dst_prl = dst_prl.right(dst_prl.length() - slsh - 1); dst_prl = root + targetdir + dst_prl; @@ -761,10 +761,10 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) } if(project->isActiveConfig("create_libtool") && !project->isActiveConfig("compile_libtool")) { TQString src_lt = var("TQMAKE_ORIG_TARGET"); - int slsh = src_lt.tqfindRev(Option::dir_sep); + int slsh = src_lt.findRev(Option::dir_sep); if(slsh != -1) src_lt = src_lt.right(src_lt.length() - slsh); - int dot = src_lt.tqfind('.'); + int dot = src_lt.find('.'); if(dot != -1) src_lt = src_lt.left(dot); src_lt += Option::libtool_ext; @@ -784,10 +784,10 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) } if(project->isActiveConfig("create_pc")) { TQString src_pc = var("TQMAKE_ORIG_TARGET"); - int slsh = src_pc.tqfindRev(Option::dir_sep); + int slsh = src_pc.findRev(Option::dir_sep); if(slsh != -1) src_pc = src_pc.right(src_pc.length() - slsh); - int dot = src_pc.tqfind('.'); + int dot = src_pc.find('.'); if(dot != -1) src_pc = src_pc.left(dot); src_pc += ".pc"; @@ -885,7 +885,7 @@ UnixMakefileGenerator::defaultInstall(const TQString &t) } else if(Option::target_mode == Option::TARG_UNIX_MODE || Option::target_mode == Option::TARG_MACX_MODE) { TQString link = Option::fixPathToTargetOS(destdir + (*it), FALSE); - int lslash = link.tqfindRev(Option::dir_sep); + int lslash = link.findRev(Option::dir_sep); if(lslash != -1) link = link.right(link.length() - (lslash + 1)); TQString dst_link = root + targetdir + link; diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake.h b/tqtinterface/qt4/qmake/generators/unix/unixmake.h index 3b83317..a3a76de 100644 --- a/tqtinterface/qt4/qmake/generators/unix/unixmake.h +++ b/tqtinterface/qt4/qmake/generators/unix/unixmake.h @@ -70,9 +70,9 @@ protected: virtual void processPrlVariable(const TQString &, const TQStringList &); virtual void processPrlFiles(); - virtual bool tqfindLibraries(); - virtual TQString tqfindDependency(const TQString &); - virtual TQStringList &tqfindDependencies(const TQString &); + virtual bool findLibraries(); + virtual TQString findDependency(const TQString &); + virtual TQStringList &findDependencies(const TQString &); virtual void init(); void writeMakeParts(TQTextStream &); diff --git a/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp b/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp index dc56d1e..b4a8a8b 100644 --- a/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp +++ b/tqtinterface/qt4/qmake/generators/unix/unixmake2.cpp @@ -221,7 +221,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) { bool increment = FALSE; for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) { - if((*objit).tqfind(TQRegExp((*incrit), TRUE, TRUE)) != -1) { + if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) { increment = TRUE; incrs_out.append((*objit)); break; @@ -254,7 +254,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) for(TQStringList::Iterator objit = objs.begin(); objit != objs.end(); ++objit) { bool increment = FALSE; for(TQStringList::Iterator incrit = incrs.begin(); incrit != incrs.end(); ++incrit) { - if((*objit).tqfind(TQRegExp((*incrit), TRUE, TRUE)) != -1) { + if((*objit).find(TQRegExp((*incrit), TRUE, TRUE)) != -1) { increment = TRUE; incrs_out.append((*objit)); break; @@ -371,7 +371,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) } if(!d_file.isEmpty()) { d_file = odir + ".deps/" + d_file + ".d"; - TQStringList deps = tqfindDependencies((*it)).grep(TQRegExp(Option::cpp_tqmoc_ext + "$")); + TQStringList deps = findDependencies((*it)).grep(TQRegExp(Option::cpp_tqmoc_ext + "$")); if(!deps.isEmpty()) t << d_file << ": " << deps.join(" ") << endl; t << var("TQMAKE_CFLAGS_USE_PRECOMPILE") << " " << d_file << endl; @@ -399,7 +399,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) TQMakeMetaInfo libinfo; if(libinfo.readLib((*it)) && !libinfo.isEmpty("TQMAKE_PRL_BUILD_DIR")) { TQString dir; - int slsh = (*it).tqfindRev(Option::dir_sep); + int slsh = (*it).findRev(Option::dir_sep); if(slsh != -1) dir = (*it).left(slsh + 1); TQString targ = dir + libinfo.first("TQMAKE_PRL_TARGET"); @@ -416,9 +416,9 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) if(do_incremental) { //incremental target TQString incr_target = var("TARGET") + "_incremental"; - if(incr_target.tqfind(Option::dir_sep) != -1) + if(incr_target.find(Option::dir_sep) != -1) incr_target = incr_target.right(incr_target.length() - - (incr_target.tqfindRev(Option::dir_sep) + 1)); + (incr_target.findRev(Option::dir_sep) + 1)); TQString incr_deps, incr_objs; if(project->first("TQMAKE_INCREMENTAL_STYLE") == "ld") { TQString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext; @@ -494,11 +494,11 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) TQString destdir = project->first("DESTDIR"), incr_deps; if(do_incremental) { TQString s_ext = project->variables()["TQMAKE_EXTENSION_SHLIB"].first(); - TQString incr_target = TQT_TQSTRING(var("TQMAKE_ORIG_TARGET").tqreplace( - TQRegExp("\\." + s_ext), "")).tqreplace(TQRegExp("^lib"), "") + "_incremental"; - if(incr_target.tqfind(Option::dir_sep) != -1) + TQString incr_target = TQT_TQSTRING(var("TQMAKE_ORIG_TARGET").replace( + TQRegExp("\\." + s_ext), "")).replace(TQRegExp("^lib"), "") + "_incremental"; + if(incr_target.find(Option::dir_sep) != -1) incr_target = incr_target.right(incr_target.length() - - (incr_target.tqfindRev(Option::dir_sep) + 1)); + (incr_target.findRev(Option::dir_sep) + 1)); if(project->first("TQMAKE_INCREMENTAL_STYLE") == "ld") { TQString incr_target_dir = var("OBJECTS_DIR") + incr_target + Option::obj_ext; @@ -508,7 +508,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) << "ld -r -o " << incr_target_dir << " " << link_deps << endl; //communicated below TQStringList &cmd = project->variables()["TQMAKE_LINK_SHLIB_CMD"]; - cmd.first().tqreplace("$(OBJECTS) $(OBJTQMOC)", + cmd.first().replace("$(OBJECTS) $(OBJTQMOC)", "$(INCREMENTAL_OBJECTS) $(INCREMENTAL_OBJTQMOC)"); //ick cmd.append(incr_target_dir); deps.prepend(incr_target_dir + " "); @@ -651,7 +651,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) t << var("DESTDIR") << "$(TARGET): " << var("PRE_TARGETDEPS") << " $(UICDECLS) " << var("POST_TARGETDEPS") << valList(build) << "\n\t"; ar = project->variables()["TQMAKE_AR_CMD"].first(); - ar = TQT_TQSTRING(ar.tqreplace("$(OBJTQMOC)", "")).tqreplace("$(OBJECTS)", + ar = TQT_TQSTRING(ar.replace("$(OBJTQMOC)", "")).replace("$(OBJECTS)", build.join(" ")); } else { t << (*libit) << ": " << valList(build) << "\n\t"; @@ -906,7 +906,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) outfile += header_prefix + "c++"; compiler = "$(CXX) "; } - t << outfile << ": " << precomph << " " << tqfindDependencies(precomph).join(" \\\n\t\t") + t << outfile << ": " << precomph << " " << findDependencies(precomph).join(" \\\n\t\t") << "\n\t" << "test -d " << outdir << " || mkdir -p " << outdir << "\n\t" << compiler << flags << " $(INCPATH) " << precomph << " -o " << outfile << endl << endl; } @@ -940,7 +940,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) dep = (*dep_it); deps += " " + dep; } - if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1) + if(project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1) deps += TQString(" ") + "FORCE"; t << targ << ":" << deps << "\n\t" << cmd << endl << endl; @@ -961,17 +961,17 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out, cmd = tmp_cmd, deps; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - cmd.tqreplace("${TQMAKE_FILE_OUT}", out); - cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + cmd.replace("${TQMAKE_FILE_OUT}", out); + cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3) - cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); + cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); if(!tmp_dep.isEmpty()) { char buff[256]; TQString dep_cmd = tmp_dep; - dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) { while(!feof(proc)) { int read_in = int(fread(buff, 1, 255, proc)); @@ -1020,7 +1020,7 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct) subdirs.append(sd); sd->makefile = "$(MAKEFILE)"; if((*it).right(4) == ".pro") { - int slsh = file.tqfindRev(Option::dir_sep); + int slsh = file.findRev(Option::dir_sep); if(slsh != -1) { sd->directory = file.left(slsh+1); sd->profile = file.mid(slsh+1); @@ -1036,22 +1036,22 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct) sd->directory = sd->directory.left(sd->directory.length() - 1); if(!sd->profile.isEmpty()) { TQString basename = sd->directory; - int new_slsh = basename.tqfindRev(Option::dir_sep); + int new_slsh = basename.findRev(Option::dir_sep); if(new_slsh != -1) basename = basename.mid(new_slsh+1); if(sd->profile != basename + ".pro") sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro } sd->target = "sub-" + (*it); - sd->target.tqreplace('/', '-'); - sd->target.tqreplace('.', '_'); + sd->target.replace('/', '-'); + sd->target.replace('.', '_'); } } TQPtrListIterator<SubDir> it(subdirs); TQString ofile = Option::output.name(); - if(ofile.tqfindRev(Option::dir_sep) != -1) - ofile = ofile.right(ofile.length() - ofile.tqfindRev(Option::dir_sep) -1); + if(ofile.findRev(Option::dir_sep) != -1) + ofile = ofile.right(ofile.length() - ofile.findRev(Option::dir_sep) -1); t << "MAKEFILE = " << var("MAKEFILE") << endl; t << "TQMAKE = " << var("TQMAKE") << endl; t << "DEL_FILE = " << var("TQMAKE_DEL_FILE") << endl; @@ -1173,7 +1173,7 @@ UnixMakefileGenerator::writeSubdirs(TQTextStream &t, bool direct) dep = (*dep_it); deps += " " + dep; } - if(project->variables()[(*qut_it) + ".CONFIG"].tqfindIndex("phony") != -1) + if(project->variables()[(*qut_it) + ".CONFIG"].findIndex("phony") != -1) deps += TQString(" ") + "FORCE"; t << targ << ":" << deps << "\n"; if(!cmd.isEmpty()) @@ -1220,7 +1220,7 @@ void UnixMakefileGenerator::init2() project->variables()["TARGET_la"] = TQT_TQSTRING(project->first("DESTDIR") + "lib" + project->first("TARGET") + Option::libtool_ext); if ( !project->variables()["TQMAKE_AR_CMD"].isEmpty() ) - project->variables()["TQMAKE_AR_CMD"].first().tqreplace("(TARGET)","(TARGETA)"); + project->variables()["TQMAKE_AR_CMD"].first().replace("(TARGET)","(TARGETA)"); else project->variables()["TQMAKE_AR_CMD"].append("$(AR) $(TARGETA) $(OBJECTS) $(OBJTQMOC)"); if( project->isActiveConfig("compile_libtool") ) { @@ -1396,9 +1396,9 @@ void UnixMakefileGenerator::init2() TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1) + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1) project->variables()["OBJCOMP"] += out; } } @@ -1409,10 +1409,10 @@ TQString UnixMakefileGenerator::libtoolFileName() { TQString ret = var("TARGET"); - int slsh = ret.tqfindRev(Option::dir_sep); + int slsh = ret.findRev(Option::dir_sep); if(slsh != -1) ret = ret.right(ret.length() - slsh); - int dot = ret.tqfind('.'); + int dot = ret.find('.'); if(dot != -1) ret = ret.left(dot); ret += Option::libtool_ext; @@ -1425,7 +1425,7 @@ void UnixMakefileGenerator::writeLibtoolFile() { TQString fname = libtoolFileName(), lname = fname; - int slsh = lname.tqfindRev(Option::dir_sep); + int slsh = lname.findRev(Option::dir_sep); if(slsh != -1) lname = lname.right(lname.length() - slsh - 1); TQFile ft(fname); @@ -1494,12 +1494,12 @@ TQString UnixMakefileGenerator::pkgConfigFileName() { TQString ret = var("TARGET"); - int slsh = ret.tqfindRev(Option::dir_sep); + int slsh = ret.findRev(Option::dir_sep); if(slsh != -1) ret = ret.right(ret.length() - slsh); if(ret.startsWith("lib")) ret = ret.mid(3); - int dot = ret.tqfind('.'); + int dot = ret.find('.'); if(dot != -1) ret = ret.left(dot); ret += Option::pkgcfg_ext; @@ -1545,7 +1545,7 @@ UnixMakefileGenerator::pkgConfigFixPath(TQString path) const { TQString prefix = pkgConfigPrefix(); if(path.startsWith(prefix)) - path = path.tqreplace(prefix, "${prefix}"); + path = path.replace(prefix, "${prefix}"); return path; } @@ -1553,7 +1553,7 @@ void UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for libtqt so far { TQString fname = pkgConfigFileName(), lname = fname; - int slsh = lname.tqfindRev(Option::dir_sep); + int slsh = lname.findRev(Option::dir_sep); if(slsh != -1) lname = lname.right(lname.length() - slsh - 1); TQFile ft(fname); @@ -1588,7 +1588,7 @@ UnixMakefileGenerator::writePkgConfigFile() // ### does make sense only for TQString desc = project->first("TQMAKE_PKGCONFIG_DESCRIPTION"); if(desc.isEmpty()) { desc = project->first("TARGET").lower(); - desc.tqreplace(0, 1, TQT_TQCHAR(desc[0]).upper()); + desc.replace(0, 1, TQT_TQCHAR(desc[0]).upper()); if(project->first("TEMPLATE") == "lib") { if(project->isActiveConfig("plugin")) desc += " Plugin"; @@ -1632,7 +1632,7 @@ void UnixMakefileGenerator::writeTMOCFile() { TQString fname = TMOCFileName(), lname = fname; - int slsh = lname.tqfindRev(Option::dir_sep); + int slsh = lname.findRev(Option::dir_sep); if(slsh != -1) lname = lname.right(lname.length() - slsh - 1); TQFile ft(fname); @@ -1672,7 +1672,7 @@ void UnixMakefileGenerator::writeTMOCFile2() { TQString fname = TMOCFileName2(), lname = fname; - int slsh = lname.tqfindRev(Option::dir_sep); + int slsh = lname.findRev(Option::dir_sep); if(slsh != -1) lname = lname.right(lname.length() - slsh - 1); TQFile ft(fname); diff --git a/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp b/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp index 640afdd..31ab882 100644 --- a/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/borland_bmake.cpp @@ -97,8 +97,8 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) TQStringList &incs = project->variables()["INCLUDEPATH"]; for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { TQString inc = (*incit); - inc.tqreplace(TQRegExp("\\\\*$"), ""); - inc.tqreplace("\"", ""); + inc.replace(TQRegExp("\\\\*$"), ""); + inc.replace("\"", ""); t << " -I\"" << inc << "\""; } t << " -I\"" << specdir() << "\"" @@ -296,7 +296,7 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) deps += " " + dep; } if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() && - project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1) + project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1) deps += TQString(" ") + "FORCE"; t << "\n\n" << targ << ":" << deps << "\n\t" << cmd; @@ -319,17 +319,17 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out, cmd = tmp_cmd, deps; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - cmd.tqreplace("${TQMAKE_FILE_OUT}", out); - cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + cmd.replace("${TQMAKE_FILE_OUT}", out); + cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3) - cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); + cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); if(!tmp_dep.isEmpty()) { char buff[256]; TQString dep_cmd = tmp_dep; - dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) { while(!feof(proc)) { int read_in = int(fread(buff, 1, 255, proc)); @@ -391,11 +391,11 @@ BorlandMakefileGenerator::init() if (project->isActiveConfig("shared")) project->variables()["DEFINES"].append("TQT_DLL"); if (project->isActiveConfig("qt_dll")) - if(configs.tqfindIndex("qt") == -1) configs.append("qt"); + if(configs.findIndex("qt") == -1) configs.append("qt"); if ( project->isActiveConfig("qtopia") ) { - if(configs.tqfindIndex("qtopialib") == -1) + if(configs.findIndex("qtopialib") == -1) configs.append("qtopialib"); - if(configs.tqfindIndex("qtopiainc") == -1) + if(configs.findIndex("qtopiainc") == -1) configs.append("qtopiainc"); } if ( project->isActiveConfig("qt") ) { @@ -403,9 +403,9 @@ BorlandMakefileGenerator::init() project->variables()["CONFIG"].append("dll"); project->variables()["DEFINES"].append("TQT_PLUGIN"); } - if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) && - ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 || - project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) || + if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) && + ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 || + project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) || (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) { project->variables()["TQMAKE_TQT_DLL"].append("1"); if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) @@ -492,15 +492,15 @@ BorlandMakefileGenerator::init() else project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"]; if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) { - int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); + int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); if ( hver == -1 ) - hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qtmt"); + hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qtmt"); if(hver != -1) { TQString ver; ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver); TQStringList &libs = project->variables()["TQMAKE_LIBS"]; for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) - (*libit).tqreplace(TQRegExp("qt(mt)?\\.lib"), ver); + (*libit).replace(TQRegExp("qt(mt)?\\.lib"), ver); } } if ( project->isActiveConfig( "activeqt" ) ) { @@ -618,7 +618,7 @@ BorlandMakefileGenerator::init() exit(666); } project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; - project->variables()["RES_FILE"].first().tqreplace(".rc",".res"); + project->variables()["RES_FILE"].first().replace(".rc",".res"); project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; } @@ -654,9 +654,9 @@ BorlandMakefileGenerator::init() TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1) + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1) project->variables()["OBJCOMP"] += out; } } diff --git a/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp b/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp index c4f8736..4053e5d 100644 --- a/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/mingw_make.cpp @@ -50,7 +50,7 @@ MingwMakefileGenerator::MingwMakefileGenerator(TQMakeProject *p) : Win32Makefile } bool -MingwMakefileGenerator::tqfindLibraries() // todo - pascal +MingwMakefileGenerator::findLibraries() // todo - pascal { return TRUE; } @@ -119,8 +119,8 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) TQStringList &incs = project->variables()["INCLUDEPATH"]; for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { TQString inc = (*incit); - inc.tqreplace(TQRegExp("\\\\$"), ""); - inc.tqreplace(TQRegExp("\""), ""); + inc.replace(TQRegExp("\\\\$"), ""); + inc.replace(TQRegExp("\""), ""); t << " -I" << "\"" << inc << "\""; } t << " -I" << "\"" << specdir() << "\"" << endl; @@ -130,7 +130,7 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) t << "LIBS = "; if ( !project->variables()["TQMAKE_LIBDIR"].isEmpty() ) t << varGlue("TQMAKE_LIBDIR","-L\"","\" -L\"","\"") << " "; - t << var("TQMAKE_LIBS").tqreplace(TQRegExp("(\\slib|^lib)")," -l") << endl; + t << var("TQMAKE_LIBS").replace(TQRegExp("(\\slib|^lib)")," -l") << endl; } else { t << "LIB = " << var("TQMAKE_LIB") << endl; @@ -160,11 +160,11 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) t << "####### Output directory" << endl << endl; if (! project->variables()["OBJECTS_DIR"].isEmpty()) - t << "OBJECTS_DIR = " << var("OBJECTS_DIR").tqreplace(TQRegExp("\\\\$"),"") << endl; + t << "OBJECTS_DIR = " << var("OBJECTS_DIR").replace(TQRegExp("\\\\$"),"") << endl; else t << "OBJECTS_DIR = . " << endl; if (! project->variables()["TQMOC_DIR"].isEmpty()) - t << "TQMOC_DIR = " << var("TQMOC_DIR").tqreplace(TQRegExp("\\\\$"),"") << endl; + t << "TQMOC_DIR = " << var("TQMOC_DIR").replace(TQRegExp("\\\\$"),"") << endl; else t << "TQMOC_DIR = . " << endl; t << endl; @@ -264,9 +264,9 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) if(!project->variables()["RC_FILE"].isEmpty()) { t << var("RES_FILE") << ": " << var("RC_FILE") << "\n\t" - << var("TQMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").tqreplace(TQRegExp("\\.rc"),".o") << " --include-dir=" << TQFileInfo(var("RC_FILE")).dirPath() << endl << endl; + << var("TQMAKE_RC") << " -i " << var("RC_FILE") << " -o " << var("RC_FILE").replace(TQRegExp("\\.rc"),".o") << " --include-dir=" << TQFileInfo(var("RC_FILE")).dirPath() << endl << endl; } - project->variables()["RES_FILE"].first().tqreplace(TQRegExp("\\.rc"),".o"); + project->variables()["RES_FILE"].first().replace(TQRegExp("\\.rc"),".o"); t << "tqmocables: $(SRCTQMOC)" << endl << endl; @@ -283,9 +283,9 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) << var("PROJECT") << ".pro $(SOURCES) $(HEADERS) $(DIST) $(FORMS)" << endl << endl; t << "clean:" - << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").tqreplace(TQRegExp("\\.obj"),".o") + << varGlue("OBJECTS","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(TQRegExp("\\.obj"),".o") << varGlue("SRCTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") - << varGlue("OBJTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").tqreplace(TQRegExp("\\.obj"),".o") + << varGlue("OBJTQMOC" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","").replace(TQRegExp("\\.obj"),".o") << varGlue("UICDECLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << varGlue("UICIMPLS" ,"\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ","") << "\n\t-$(DEL_FILE) $(TARGET)" @@ -335,17 +335,17 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out, cmd = tmp_cmd, deps; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - cmd.tqreplace("${TQMAKE_FILE_OUT}", out); - cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + cmd.replace("${TQMAKE_FILE_OUT}", out); + cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3) - cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); + cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); if(!tmp_dep.isEmpty()) { char buff[256]; TQString dep_cmd = tmp_dep; - dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) { while(!feof(proc)) { int read_in = int(fread(buff, 1, 255, proc)); @@ -410,7 +410,7 @@ MingwMakefileGenerator::init() project->variables()["DEFINES"].append("TQT_DLL"); if (project->isActiveConfig("qt_dll")) - if (configs.tqfindIndex("qt") == -1) + if (configs.findIndex("qt") == -1) configs.append("qt"); if ( project->isActiveConfig("qt") ) { @@ -419,9 +419,9 @@ MingwMakefileGenerator::init() if(project->isActiveConfig("qt")) project->variables()["DEFINES"].append("TQT_PLUGIN"); } - if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) && - ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 || - project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) || + if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) && + ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 || + project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) || (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) { project->variables()["TQMAKE_TQT_DLL"].append("1"); if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) @@ -457,7 +457,7 @@ MingwMakefileGenerator::init() if ( project->isActiveConfig("debug") ) { if ( project->isActiveConfig("thread") ) { // use the DLL RT even here - if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) { + if ( project->variables()["DEFINES"].contains("TQT_DLL") ) { project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLLDBG"]; project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLLDBG"]; } else { @@ -470,7 +470,7 @@ MingwMakefileGenerator::init() project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_DEBUG"]; } else { if ( project->isActiveConfig("thread") ) { - if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) { + if ( project->variables()["DEFINES"].contains("TQT_DLL") ) { project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLL"]; project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLL"]; } else { @@ -507,16 +507,16 @@ MingwMakefileGenerator::init() else project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"]; if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) { - int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); + int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); if ( hver == -1 ) - hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt"); + hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt"); if(hver != -1) { TQString ver; ver.sprintf("-lqt%s" TQTDLL_POSTFIX "%d", (project->isActiveConfig("thread") ? "-mt" : ""), hver); TQStringList &libs = project->variables()["TQMAKE_LIBS"]; -// @@@HGTODO maybe we must change the tqreplace regexp if we understand what's going on +// @@@HGTODO maybe we must change the replace regexp if we understand what's going on for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) - (*libit).tqreplace(TQRegExp("-lqt(-mt)?"), ver); + (*libit).replace(TQRegExp("-lqt(-mt)?"), ver); } } if ( project->isActiveConfig( "activeqt" ) ) { @@ -641,10 +641,10 @@ MingwMakefileGenerator::init() #if 0 if ( !project->variables()["VERSION"].isEmpty() ) { TQString version = project->variables()["VERSION"][0]; - int firstDot = version.tqfind( "." ); + int firstDot = version.find( "." ); TQString major = version.left( firstDot ); TQString minor = version.right( version.length() - firstDot - 1 ); - minor.tqreplace( ".", "" ); + minor.replace( ".", "" ); project->variables()["TQMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); } #endif @@ -656,7 +656,7 @@ MingwMakefileGenerator::init() exit(666); } project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; - project->variables()["RES_FILE"].first().tqreplace(".rc",".o"); + project->variables()["RES_FILE"].first().replace(".rc",".o"); project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; } @@ -688,9 +688,9 @@ MingwMakefileGenerator::init() TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1) + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1) project->variables()["OBJCOMP"] += out; } } @@ -709,8 +709,8 @@ MingwMakefileGenerator::writeSubDirs(TQTextStream &t) while ( -1 != (pos = rx.search( qs, pos))) { TQString qsMatch = rx.cap(2); - qsMatch.tqreplace("\n\t"," && \\\n\t"); - qs.tqreplace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch ); + qsMatch.replace("\n\t"," && \\\n\t"); + qs.replace(pos+rx.cap(1).length(), rx.cap(2).length(), qsMatch ); pos += (rx.cap(1).length()+qsMatch.length()); } t << qs ; diff --git a/tqtinterface/qt4/qmake/generators/win32/mingw_make.h b/tqtinterface/qt4/qmake/generators/win32/mingw_make.h index 5d437fb..db5a580 100644 --- a/tqtinterface/qt4/qmake/generators/win32/mingw_make.h +++ b/tqtinterface/qt4/qmake/generators/win32/mingw_make.h @@ -50,7 +50,7 @@ class MingwMakefileGenerator : public Win32MakefileGenerator bool writeMakefile(TQTextStream &); void init(); - virtual bool tqfindLibraries(); + virtual bool findLibraries(); public: MingwMakefileGenerator(TQMakeProject *p); diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp index e50c136..52fa2af 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.cpp @@ -81,7 +81,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) } if (dspfile.startsWith("\"") && dspfile.endsWith("\"")) dspfile = dspfile.mid(1, dspfile.length() - 2); - TQString dspfile_loc = tqfindTemplate(dspfile); + TQString dspfile_loc = findTemplate(dspfile); TQFile file(dspfile_loc); if(!file.open(IO_ReadOnly)) { @@ -101,11 +101,11 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) if (usePCH) { // Created files TQString origTarget = project->first("TQMAKE_ORIG_TARGET"); - origTarget.tqreplace(TQRegExp("-"), "_"); + origTarget.replace(TQRegExp("-"), "_"); precompObj = "\"$(IntDir)\\" + origTarget + Option::obj_ext + "\""; precompPch = "\"$(IntDir)\\" + origTarget + ".pch\""; // Add PRECOMPILED_HEADER to HEADERS - if (!project->variables()["HEADERS"].tqcontains(precompH)) + if (!project->variables()["HEADERS"].contains(precompH)) project->variables()["HEADERS"] += precompH; // Add precompile compiler options project->variables()["PRECOMPILED_FLAGS_REL"] = TQString("/Yu\"" + namePCH + "\" /FI\"" + namePCH + "\" "); @@ -118,8 +118,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString line; while ( !dsp.eof() ) { line = dsp.readLine(); - while((rep = line.tqfind(TQRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) { - TQString torep = line.mid(rep, line.tqfind(TQRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep); + while((rep = line.find(TQRegExp("\\$\\$[a-zA-Z0-9_-]*"))) != -1) { + TQString torep = line.mid(rep, line.find(TQRegExp("[^\\$a-zA-Z0-9_-]"), rep) - rep); TQString variable = torep.right(torep.length()-2); t << line.left(rep); //output the left side @@ -129,7 +129,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) continue; TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; TQStringList list = project->variables()["SOURCES"] + project->variables()["DEF_FILE"]; if(!project->isActiveConfig("flat")) @@ -142,16 +142,16 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) t << "# SUBTRACT CPP /FI\"" << namePCH << "\" /Yu\"" << namePCH << "\" /Fp" << endl; if ( project->isActiveConfig("tqmoc") && (*it).endsWith(Option::cpp_tqmoc_ext)) { TQString base = (*it); - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); - TQString build = "\n\n# Begin Custom Build - Moc'ing " + tqfindMocSource((*it)) + + TQString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" - "\t" + tqmocpath + tqfindMocSource((*it)) + " -o " + + "\t" + tqmocpath + findMocSource((*it)) + " -o " + (*it) + "\n\n" "# End Custom Build\n\n"; - t << "USERDEP_" << base << "=\".\\" << tqfindMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; + t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" @@ -183,8 +183,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) // Create unique baseID TQString base = (*it); { - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); } if (usePCH && precompH.endsWith(*it)) { TQString basicBuildCmd = TQString("\tcl.exe /TP /W3 /FD /c /D \"WIN32\" /Yc /Fp\"%1\" /Fo\"%2\" %3 %4 %5 %6 %7 %8 %9 /D \"") @@ -218,15 +218,15 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) compilePCH = precompPch + " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; - TQStringList &tmp = tqfindDependencies(precompH); + TQStringList &tmp = findDependencies(precompH); if(!tmp.isEmpty()) // Got Deps for PCH customDependencies += tmp; } - if (project->isActiveConfig("tqmoc") && !tqfindMocDestination((*it)).isEmpty()) { + if (project->isActiveConfig("tqmoc") && !findMocDestination((*it)).isEmpty()) { TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; - buildCmds += "\t" + tqmocpath + (*it) + " -o " + tqfindMocDestination((*it)) + " \\\n"; - createTQMOC = "\"" + tqfindMocDestination((*it)) + "\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; + buildCmds += "\t" + tqmocpath + (*it) + " -o " + findMocDestination((*it)) + " \\\n"; + createTQMOC = "\"" + findMocDestination((*it)) + "\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n $(BuildCmds)\n\n"; customDependencies += "\"$(TQTDIR)\\bin\\tqmoc.exe\""; } if (!createTQMOC.isEmpty() || !compilePCH.isEmpty()) { @@ -276,11 +276,11 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString ext = variable == "MSVCDSP_FORMSOURCES" ? ".cpp" : ".h"; for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { TQString base = (*it); - int dot = base.tqfindRev("."); - base.tqreplace( dot, base.length() - dot, ext ); + int dot = base.findRev("."); + base.replace( dot, base.length() - dot, ext ); TQString fname = base; - int lbs = fname.tqfindRev( "\\" ); + int lbs = fname.findRev( "\\" ); TQString fpath; if ( lbs != -1 ) fpath = fname.left( lbs + 1 ); @@ -309,10 +309,10 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) list.sort(); for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) { TQString sify = *it; - sify.tqreplace('/', '\\' ); + sify.replace('/', '\\' ); TQString base = (*it); - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); // beginGroupForFile(sify, t); t << "# Begin Source File\n\nSOURCE=" << sify << endl; @@ -325,7 +325,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) continue; TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; TQStringList list = project->variables()["SRCTQMOC"]; if(!project->isActiveConfig("flat")) @@ -335,16 +335,16 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) t << "# Begin Source File\n\nSOURCE=" << (*it) << endl; if ( project->isActiveConfig("tqmoc") && (*it).endsWith(Option::cpp_tqmoc_ext)) { TQString base = (*it); - TQT_TQSTRING(base.tqreplace(TQRegExp("\\..*$"), "")).upper(); - base.tqreplace(TQRegExp("[^a-zA-Z]"), "_"); + TQT_TQSTRING(base.replace(TQRegExp("\\..*$"), "")).upper(); + base.replace(TQRegExp("[^a-zA-Z]"), "_"); - TQString build = "\n\n# Begin Custom Build - Moc'ing " + tqfindMocSource((*it)) + + TQString build = "\n\n# Begin Custom Build - Moc'ing " + findMocSource((*it)) + "...\n" "InputPath=.\\" + (*it) + "\n\n" "\"" + (*it) + "\"" " : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n" - "\t" + tqmocpath + tqfindMocSource((*it)) + " -o " + + "\t" + tqmocpath + findMocSource((*it)) + " -o " + (*it) + "\n\n" "# End Custom Build\n\n"; - t << "USERDEP_" << base << "=\".\\" << tqfindMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; + t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\tqmoc.exe\"" << endl << endl; t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build << "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\"" @@ -381,7 +381,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString base = (*it); TQString uicpath = var("TQMAKE_UIC"); - uicpath = uicpath.tqreplace(TQRegExp("\\..*$"), "") + " "; + uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " "; if ( !imagesBuildDone ) { imagesBuildDone = TRUE; @@ -420,9 +420,9 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) << "# Prop Default_Filter \"ui\"\n"; TQString uicpath = var("TQMAKE_UIC"); - uicpath = uicpath.tqreplace(TQRegExp("\\..*$"), "") + " "; + uicpath = uicpath.replace(TQRegExp("\\..*$"), "") + " "; TQString tqmocpath = var( "TQMAKE_TQMOC" ); - tqmocpath = tqmocpath.tqreplace( TQRegExp( "\\..*$" ), "" ) + " "; + tqmocpath = tqmocpath.replace( TQRegExp( "\\..*$" ), "" ) + " "; TQStringList list = project->variables()["FORMS"]; if(!project->isActiveConfig("flat")) @@ -433,8 +433,8 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) t << "# Begin Source File\n\nSOURCE=" << base << endl; TQString fname = base; - fname.tqreplace(".ui", ""); - int lbs = fname.tqfindRev( "\\" ); + fname.replace(".ui", ""); + int lbs = fname.findRev( "\\" ); TQString fpath; if ( lbs != -1 ) fpath = fname.left( lbs + 1 ); @@ -502,7 +502,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString fname = (*it); // beginGroupForFile(fname, t); t << "# Begin Source File\n\nSOURCE=" << fname << endl; - fname.tqreplace(".l", Option::lex_mod + Option::cpp_ext.first()); + fname.replace(".l", Option::lex_mod + Option::cpp_ext.first()); TQString build = "\n\n# Begin Custom Build - Lex'ing " + (*it) + "...\n" "InputPath=.\\" + (*it) + "\n\n" @@ -535,7 +535,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) TQString fname = (*it); // beginGroupForFile(fname, t); t << "# Begin Source File\n\nSOURCE=" << fname << endl; - fname.tqreplace(".y", Option::yacc_mod); + fname.replace(".y", Option::yacc_mod); TQString build = "\n\n# Begin Custom Build - Yacc'ing " + (*it) + "...\n" "InputPath=.\\" + (*it) + "\n\n" @@ -630,11 +630,11 @@ DspMakefileGenerator::init() if (project->isActiveConfig("shared")) project->variables()["DEFINES"].append("TQT_DLL"); if (project->isActiveConfig("qt_dll")) - if(configs.tqfindIndex("qt") == -1) configs.append("qt"); + if(configs.findIndex("qt") == -1) configs.append("qt"); if ( project->isActiveConfig("qtopia") ) { - if(configs.tqfindIndex("qtopialib") == -1) + if(configs.findIndex("qtopialib") == -1) configs.append("qtopialib"); - if(configs.tqfindIndex("qtopiainc") == -1) + if(configs.findIndex("qtopiainc") == -1) configs.append("qtopiainc"); } if ( project->isActiveConfig("qt") ) { @@ -642,9 +642,9 @@ DspMakefileGenerator::init() project->variables()["CONFIG"].append("dll"); project->variables()["DEFINES"].append("TQT_PLUGIN"); } - if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) && - ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 || - project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) || + if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) && + ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 || + project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) || (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) { project->variables()["TQMAKE_TQT_DLL"].append("1"); if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) @@ -663,10 +663,10 @@ DspMakefileGenerator::init() } if ( !project->variables()["VERSION"].isEmpty() ) { TQString version = project->variables()["VERSION"][0]; - int firstDot = version.tqfind( "." ); + int firstDot = version.find( "." ); TQString major = version.left( firstDot ); TQString minor = version.right( version.length() - firstDot - 1 ); - minor.tqreplace( ".", "" ); + minor.replace( ".", "" ); project->variables()["MSVCDSP_VERSION"].append( "/VERSION:" + major + "." + minor ); } @@ -694,15 +694,15 @@ DspMakefileGenerator::init() else project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"]; if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) { - int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); + int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); if ( hver == -1 ) - hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt"); + hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt"); if(hver != -1) { TQString ver; ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver); TQStringList &libs = project->variables()["TQMAKE_LIBS"]; for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) - (*libit).tqreplace(TQRegExp("qt(-mt)?\\.lib"), ver); + (*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver); } } if ( project->isActiveConfig( "activeqt" ) ) { @@ -757,7 +757,7 @@ DspMakefileGenerator::init() project->variables()["MSVCDSP_MTDEFD"] += project->variables()["TQMAKE_CXXFLAGS_MT_DBG"]; project->variables()["MSVCDSP_MTDEF"] += project->variables()["TQMAKE_CXXFLAGS_MT"]; } - if ( !project->variables()["DEFINES"].tqcontains("TQT_DLL") && is_qt + if ( !project->variables()["DEFINES"].contains("TQT_DLL") && is_qt && project->first("TARGET") != "qtmain" ) project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\""); } @@ -775,7 +775,7 @@ DspMakefileGenerator::init() project->variables()["TQMAKE_LFLAGS_WINDOWS_ANY"] = project->variables()["TQMAKE_LFLAGS_WINDOWS_DLL"]; if ( !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) { TQString ver_xyz(project->first("VERSION")); - ver_xyz.tqreplace(".", ""); + ver_xyz.replace(".", ""); project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); } else { project->variables()["TARGET_EXT"].append(".dll"); @@ -840,15 +840,15 @@ DspMakefileGenerator::init() if ( msvcdsp_project.isEmpty() ) msvcdsp_project = Option::output.name(); - msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.tqfindRev( "\\" ) - 1 ); - msvcdsp_project = msvcdsp_project.left( msvcdsp_project.tqfindRev( "." ) ); - msvcdsp_project.tqreplace("-", ""); + msvcdsp_project = msvcdsp_project.right( msvcdsp_project.length() - msvcdsp_project.findRev( "\\" ) - 1 ); + msvcdsp_project = msvcdsp_project.left( msvcdsp_project.findRev( "." ) ); + msvcdsp_project.replace("-", ""); project->variables()["MSVCDSP_PROJECT"].append(msvcdsp_project); TQStringList &proj = project->variables()["MSVCDSP_PROJECT"]; for(it = proj.begin(); it != proj.end(); ++it) - (*it).tqreplace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); + (*it).replace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); if ( !project->variables()["TQMAKE_APP_FLAG"].isEmpty() ) { project->variables()["MSVCDSP_TEMPLATE"].append("win32app" + project->first( "DSP_EXTENSION" ) ); @@ -901,14 +901,14 @@ DspMakefileGenerator::init() TQStringList &libs = project->variables()["TQMAKE_LIBS"]; for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) { TQString lib = (*libit); - lib.tqreplace(TQRegExp("\""), ""); + lib.replace(TQRegExp("\""), ""); project->variables()["MSVCDSP_LIBS"].append(" \"" + lib + "\""); } TQStringList &incs = project->variables()["INCLUDEPATH"]; for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { TQString inc = (*incit); - inc.tqreplace("\"", ""); + inc.replace("\"", ""); if(inc.endsWith("\\")) // Remove trailing \'s from paths inc.truncate(inc.length()-1); if (inc.startsWith("\"") && inc.endsWith("\"")) @@ -941,12 +941,12 @@ DspMakefileGenerator::init() Option::fixPathToTargetOS(project->first("TARGET")); dest = project->first("TARGET"); if ( project->first("TARGET").startsWith("$(TQTDIR)") ) - dest.tqreplace( "$(TQTDIR)", getenv("TQTDIR") ); + dest.replace( "$(TQTDIR)", getenv("TQTDIR") ); project->variables()["MSVCDSP_TARGET"].append( TQString("/out:\"") + dest + "\""); if ( project->isActiveConfig("dll") ) { TQString imp = dest; - imp.tqreplace(".dll", ".lib"); + imp.replace(".dll", ".lib"); project->variables()["MSVCDSP_TARGET"].append(TQString(" /implib:\"") + imp + "\""); } } @@ -1028,7 +1028,7 @@ DspMakefileGenerator::init() TQString -DspMakefileGenerator::tqfindTemplate(const TQString &file) +DspMakefileGenerator::findTemplate(const TQString &file) { TQString ret; if(!TQFile::exists((ret = file)) && @@ -1046,7 +1046,7 @@ DspMakefileGenerator::processPrlVariable(const TQString &var, const TQStringList if(var == "TQMAKE_PRL_DEFINES") { TQStringList &out = project->variables()["MSVCDSP_DEFINES"]; for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - if(out.tqfindIndex((*it)) == -1) + if(out.findIndex((*it)) == -1) out.append((" /D \"" + *it + "\"")); } } else { @@ -1076,11 +1076,11 @@ DspMakefileGenerator::beginGroupForFile(TQString file, TQTextStream &t, TQString tempFile = file; if(tempFile.startsWith(currentGroup)) tempFile = tempFile.mid(currentGroup.length()); - int dirSep = currentGroup.tqfindRev( Option::dir_sep ); + int dirSep = currentGroup.findRev( Option::dir_sep ); while( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) { currentGroup.truncate( dirSep ); - dirSep = currentGroup.tqfindRev( Option::dir_sep ); + dirSep = currentGroup.findRev( Option::dir_sep ); if ( !tempFile.startsWith( currentGroup ) && dirSep != -1 ) t << "\n# End Group\n"; } @@ -1129,14 +1129,14 @@ DspMakefileGenerator::openOutput(TQFile &file) const if(TQDir::isRelativePath(file.name())) { TQString ofile; ofile = file.name(); - int slashtqfind = ofile.tqfindRev('\\'); - if (slashtqfind == -1) { - ofile = ofile.tqreplace(TQRegExp("-"), "_"); + int slashfind = ofile.findRev('\\'); + if (slashfind == -1) { + ofile = ofile.replace(TQRegExp("-"), "_"); } else { - int hypentqfind = ofile.tqfind('-', slashtqfind); - while (hypentqfind != -1 && slashtqfind < hypentqfind) { - ofile = ofile.tqreplace(hypentqfind, 1, "_"); - hypentqfind = ofile.tqfind('-', hypentqfind + 1); + int hypenfind = ofile.find('-', slashfind); + while (hypenfind != -1 && slashfind < hypenfind) { + ofile = ofile.replace(hypenfind, 1, "_"); + hypenfind = ofile.find('-', hypenfind + 1); } } file.setName(Option::fixPathToLocalOS(TQDir::currentDirPath() + Option::dir_sep + ofile)); diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h index fb1afb2..f35798d 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_dsp.h @@ -52,7 +52,7 @@ class DspMakefileGenerator : public Win32MakefileGenerator bool writeDspParts(TQTextStream &); bool writeMakefile(TQTextStream &); - TQString tqfindTemplate(const TQString &file); + TQString findTemplate(const TQString &file); void init(); public: @@ -63,7 +63,7 @@ public: protected: virtual void processPrlVariable(const TQString &, const TQStringList &); - virtual bool tqfindLibraries(); + virtual bool findLibraries(); TQString precompH, precompObj, precompPch; @@ -73,7 +73,7 @@ protected: inline DspMakefileGenerator::~DspMakefileGenerator() { } -inline bool DspMakefileGenerator::tqfindLibraries() -{ return Win32MakefileGenerator::tqfindLibraries("MSVCDSP_LIBS"); } +inline bool DspMakefileGenerator::findLibraries() +{ return Win32MakefileGenerator::findLibraries("MSVCDSP_LIBS"); } #endif /* __MSVC_DSP_H__ */ diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp index 6add6e7..ef12545 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.cpp @@ -80,16 +80,16 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t) } TQStringList -&NmakeMakefileGenerator::tqfindDependencies(const TQString &file) +&NmakeMakefileGenerator::findDependencies(const TQString &file) { - TQStringList &aList = MakefileGenerator::tqfindDependencies(file); + TQStringList &aList = MakefileGenerator::findDependencies(file); // Note: The TQMAKE_IMAGE_COLLECTION file have all images // as dependency, so don't add precompiled header then if (file == project->first("TQMAKE_IMAGE_COLLECTION")) return aList; for(TQStringList::Iterator it = Option::cpp_ext.begin(); it != Option::cpp_ext.end(); ++it) { if(file.endsWith(*it)) { - if(!precompObj.isEmpty() && !aList.tqcontains(precompObj)) + if(!precompObj.isEmpty() && !aList.contains(precompObj)) aList += precompObj; break; } @@ -229,7 +229,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) TQStringList &l = project->variables()[srcs[x]]; for(TQStringList::Iterator sit = l.begin(); sit != l.end(); ++sit) { TQString sep = "\\"; - if((*sit).tqfind(sep) == -1) + if((*sit).find(sep) == -1) sep = "/"; TQString dir = (*sit).section(sep, 0, -2); if(!dir.isEmpty() && !source_directories[dir]) @@ -242,9 +242,9 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) continue; for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) t << "{" << it.currentKey() << "}" << (*cppit) << "{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t" - << var("TQMAKE_RUN_CXX_IMP_BATCH").tqreplace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; + << var("TQMAKE_RUN_CXX_IMP_BATCH").replace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; t << "{" << it.currentKey() << "}" << ".c{" << var("OBJECTS_DIR") << "}" << Option::obj_ext << "::\n\t" - << var("TQMAKE_RUN_CC_IMP_BATCH").tqreplace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; + << var("TQMAKE_RUN_CC_IMP_BATCH").replace( TQRegExp( "\\$@" ), var("OBJECTS_DIR") ) << endl << "\t$<" << endl << "<<" << endl << endl; } } else { for(cppit = Option::cpp_ext.begin(); cppit != Option::cpp_ext.end(); ++cppit) @@ -357,7 +357,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) deps += " " + dep; } if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() && - project->variables()[(*it) + ".CONFIG"].tqfindIndex("phony") != -1) + project->variables()[(*it) + ".CONFIG"].findIndex("phony") != -1) deps += TQString(" ") + "FORCE"; t << "\n\n" << targ << ":" << deps << "\n\t" << cmd; @@ -379,17 +379,17 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out, cmd = tmp_cmd, deps; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - cmd.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - cmd.tqreplace("${TQMAKE_FILE_OUT}", out); - cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + cmd.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + cmd.replace("${TQMAKE_FILE_OUT}", out); + cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); for(TQStringList::Iterator it3 = vars.begin(); it3 != vars.end(); ++it3) - cmd.tqreplace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); + cmd.replace("$(" + (*it3) + ")", "$(TQMAKE_COMP_" + (*it3)+")"); if(!tmp_dep.isEmpty()) { char buff[256]; TQString dep_cmd = tmp_dep; - dep_cmd.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + dep_cmd.replace("${TQMAKE_FILE_NAME}", fi.filePath()); if(FILE *proc = TQT_POPEN(dep_cmd.latin1(), "r")) { while(!feof(proc)) { int read_in = int(fread(buff, 1, 255, proc)); @@ -423,7 +423,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) // precompiled header if(usePCH) { TQString precompRule = TQString("-c -Yc -Fp%1 -Fo%2").arg(precompPch).arg(precompObj); - t << precompObj << ": " << precompH << " " << tqfindDependencies(precompH).join(" \\\n\t\t") + t << precompObj << ": " << precompH << " " << findDependencies(precompH).join(" \\\n\t\t") << "\n\t" << ("$(CXX) " + precompRule + " $(CXXFLAGS) $(INCPATH) -TP ") << precompH << endl << endl; } } @@ -441,7 +441,7 @@ NmakeMakefileGenerator::var(const TQString &value) .arg(precompHInfo.fileName()) .arg(precompPch); TQString p = MakefileGenerator::var(value); - p.tqreplace("-c", precompRule); + p.replace("-c", precompRule); // Cannot use -Gm with -FI & -Yu, as this gives an // internal compiler error, on the newer compilers p.remove("-Gm"); @@ -490,11 +490,11 @@ NmakeMakefileGenerator::init() if (project->isActiveConfig("qt") && project->isActiveConfig("shared")) project->variables()["DEFINES"].append("TQT_DLL"); if (project->isActiveConfig("qt_dll")) - if(configs.tqfindIndex("qt") == -1) configs.append("qt"); + if(configs.findIndex("qt") == -1) configs.append("qt"); if ( project->isActiveConfig("qtopia") ) { - if(configs.tqfindIndex("qtopialib") == -1) + if(configs.findIndex("qtopialib") == -1) configs.append("qtopialib"); - if(configs.tqfindIndex("qtopiainc") == -1) + if(configs.findIndex("qtopiainc") == -1) configs.append("qtopiainc"); } if ( project->isActiveConfig("qt") ) { @@ -503,9 +503,9 @@ NmakeMakefileGenerator::init() if(project->isActiveConfig("qt")) project->variables()["DEFINES"].append("TQT_PLUGIN"); } - if ( (project->variables()["DEFINES"].tqfindIndex("TQT_NODLL") == -1) && - ((project->variables()["DEFINES"].tqfindIndex("TQT_MAKEDLL") != -1 || - project->variables()["DEFINES"].tqfindIndex("TQT_DLL") != -1) || + if ( (project->variables()["DEFINES"].findIndex("TQT_NODLL") == -1) && + ((project->variables()["DEFINES"].findIndex("TQT_MAKEDLL") != -1 || + project->variables()["DEFINES"].findIndex("TQT_DLL") != -1) || (getenv("TQT_DLL") && !getenv("TQT_NODLL"))) ) { project->variables()["TQMAKE_TQT_DLL"].append("1"); if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) @@ -534,7 +534,7 @@ NmakeMakefileGenerator::init() if ( project->isActiveConfig("debug") ) { if ( project->isActiveConfig("thread") ) { // use the DLL RT even here - if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) { + if ( project->variables()["DEFINES"].contains("TQT_DLL") ) { project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLLDBG"]; project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLLDBG"]; } else { @@ -547,7 +547,7 @@ NmakeMakefileGenerator::init() project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_DEBUG"]; } else { if ( project->isActiveConfig("thread") ) { - if ( project->variables()["DEFINES"].tqcontains("TQT_DLL") ) { + if ( project->variables()["DEFINES"].contains("TQT_DLL") ) { project->variables()["TQMAKE_CFLAGS"] += project->variables()["TQMAKE_CFLAGS_MT_DLL"]; project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_MT_DLL"]; } else { @@ -559,7 +559,7 @@ NmakeMakefileGenerator::init() project->variables()["TQMAKE_CXXFLAGS"] += project->variables()["TQMAKE_CXXFLAGS_RELEASE"]; project->variables()["TQMAKE_LFLAGS"] += project->variables()["TQMAKE_LFLAGS_RELEASE"]; } - if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].tqcontains("TQT_DLL") + if ( project->isActiveConfig("thread") && !project->variables()["DEFINES"].contains("TQT_DLL") && !is_qt && project->first("TARGET") != "qtmain") { project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:\"libc\""); } @@ -592,15 +592,15 @@ NmakeMakefileGenerator::init() else project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"]; if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) { - int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); + int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); if ( hver == -1 ) - hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt"); + hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt-mt"); if(hver != -1) { TQString ver; ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver); TQStringList &libs = project->variables()["TQMAKE_LIBS"]; for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) - (*libit).tqreplace(TQRegExp("qt(-mt)?\\.lib"), ver); + (*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver); } } if ( project->isActiveConfig( "activeqt" ) ) { @@ -714,10 +714,10 @@ NmakeMakefileGenerator::init() if ( !project->variables()["VERSION"].isEmpty() ) { TQString version = project->variables()["VERSION"][0]; - int firstDot = version.tqfind( "." ); + int firstDot = version.find( "." ); TQString major = version.left( firstDot ); TQString minor = version.right( version.length() - firstDot - 1 ); - minor.tqreplace( ".", "" ); + minor.replace( ".", "" ); project->variables()["TQMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); } if ( !project->variables()["RC_FILE"].isEmpty()) { @@ -727,7 +727,7 @@ NmakeMakefileGenerator::init() exit(666); } project->variables()["RES_FILE"] = project->variables()["RC_FILE"]; - project->variables()["RES_FILE"].first().tqreplace(".rc",".res"); + project->variables()["RES_FILE"].first().replace(".rc",".res"); project->variables()["POST_TARGETDEPS"] += project->variables()["RES_FILE"]; project->variables()["CLEAN_FILES"] += project->variables()["RES_FILE"]; } @@ -782,9 +782,9 @@ NmakeMakefileGenerator::init() TQFileInfo fi(Option::fixPathToLocalOS((*input))); TQString in = Option::fixPathToTargetOS((*input), FALSE), out = tmp_out; - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); - if(project->variables()[(*it) + ".CONFIG"].tqfindIndex("no_link") == -1) + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); + if(project->variables()[(*it) + ".CONFIG"].findIndex("no_link") == -1) project->variables()["OBJCOMP"] += out; } } diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h index 858f92c..adc29a0 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_nmake.h @@ -50,7 +50,7 @@ class NmakeMakefileGenerator : public Win32MakefileGenerator void init(); protected: - TQStringList &tqfindDependencies(const TQString &file); + TQStringList &findDependencies(const TQString &file); TQString var(const TQString &value); TQString precompH, precompObj, precompPch; bool usePCH; diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp index cedcb01..b114ced 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_objectmodel.cpp @@ -317,7 +317,7 @@ TQTextStream &operator<<( TQTextStream &strm, const XPair &prop ) { if ( !prop.value.isEmpty() ) { TQString outText = prop.value.join(prop.sep); - strm << prop.name << outText.tqreplace('\"', """) << "\""; + strm << prop.name << outText.replace('\"', """) << "\""; } return strm; } @@ -1883,7 +1883,7 @@ VCFilter::VCFilter() void VCFilter::addTQMOCstage( TQTextStream & /*strm*/, TQString filename ) { - TQString tqmocOutput = Project->tqfindMocDestination( filename ); + TQString tqmocOutput = Project->findMocDestination( filename ); TQString tqmocApp = Project->var( "TQMAKE_TQMOC" ); bool inputMoc = false; @@ -1891,7 +1891,7 @@ void VCFilter::addTQMOCstage( TQTextStream & /*strm*/, TQString filename ) // In specialcases we DO tqmoc .cpp files // when the result is an .tqmoc file tqmocOutput = filename; - filename = Project->tqfindMocSource( tqmocOutput ); + filename = Project->findMocSource( tqmocOutput ); inputMoc = true; } @@ -1923,7 +1923,7 @@ void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str ) TQString uiSources; // Determining the paths for the output files. - int slash = str.tqfindRev( '\\' ); + int slash = str.findRev( '\\' ); TQString pname = ( slash != -1 ) ? str.left( slash+1 ) : TQString( ".\\" ); if( !uiDir.isEmpty() ) { uiHeaders = uiDir; @@ -1942,7 +1942,7 @@ void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str ) uiSources += "\\"; // Determine the file name. - int dot = fname.tqfindRev( '.' ); + int dot = fname.findRev( '.' ); if( dot != -1 ) fname.truncate( dot ); @@ -2035,9 +2035,9 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str ) + " -f .imgcol -o " + collectionName; // The loop below is to avoid the resulting CommandLine buffer - // from being a size of between 2071-#char_tqreplaced and 2102, + // from being a size of between 2071-#char_replaced and 2102, // as this triggers a buffer overflow bug in VS2003. As we only - // the only tqreplacement we use in this buffer is one $(TQTDIR), + // the only replacement we use in this buffer is one $(TQTDIR), // we assume this can be upto 256 characters long, making the // lower-bound to be 1814 characters. So, if the buffer is // between 1814 and 2103 bytes, the buffer is "padded" til it's diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp index 5e80188..f646962 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.cpp @@ -109,7 +109,7 @@ DotNET which_dotnet_version() continue; TQStringList::iterator it; for(it = pathlist.begin(); it != pathlist.end(); ++it) { - if((*it).tqcontains(productPath)) { + if((*it).contains(productPath)) { ++installed; current_version = dotNetCombo[i].version; warnPath += TQString("%1 in path").arg(dotNetCombo[i].versionStr); @@ -142,7 +142,7 @@ const char* _slnHeader80 = "Microsoft Visual Studio Solution File, Format // The following UUID _may_ change for later servicepacks... // If so we need to search through the registry at // HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\7.0\Projects - // to tqfind the subkey that tqcontains a "PossibleProjectExtension" + // to find the subkey that contains a "PossibleProjectExtension" // containing "vcproj"... // Use the hardcoded value for now so projects generated on other // platforms are actually usable. @@ -233,7 +233,7 @@ TQUuid VcprojGenerator::getProjectUUID(const TQString &filename) if (uuid.isNull() || !validUUID) { uuid = TQUuid::createUuid(); fprintf(stderr, - "qmake couldn't create a GUID based on filepath, and we couldn't\ntqfind a valid GUID in the .pro file (Consider adding\n'GUID = %s' to the .pro file)\n", + "qmake couldn't create a GUID based on filepath, and we couldn't\nfind a valid GUID in the .pro file (Consider adding\n'GUID = %s' to the .pro file)\n", uuid.toString().upper().latin1()); } @@ -519,7 +519,7 @@ void VcprojGenerator::init() precompObj = origTarget + Option::obj_ext; precompPch = origTarget + ".pch"; // Add PRECOMPILED_HEADER to HEADERS - if (!project->variables()["HEADERS"].tqcontains(precompH)) + if (!project->variables()["HEADERS"].contains(precompH)) project->variables()["HEADERS"] += precompH; // Return to variable pool project->variables()["PRECOMPILED_OBJECT"] = precompObj; @@ -645,10 +645,10 @@ void VcprojGenerator::initConfiguration() RConf.linker.parseOptions(project->variables()["TQMAKE_LFLAGS_RELEASE"]); RConf.compiler.parseOptions(project->variables()["TQMAKE_CFLAGS_RELEASE"]); RConf.compiler.parseOptions(project->variables()["TQMAKE_CXXFLAGS_RELEASE"]); - if (!project->variables()["TQMAKE_CXXFLAGS_RELEASE"].tqcontains("Gm") - && project->variables()["TQMAKE_CXXFLAGS_DEBUG"].tqcontains("Gm")) + if (!project->variables()["TQMAKE_CXXFLAGS_RELEASE"].contains("Gm") + && project->variables()["TQMAKE_CXXFLAGS_DEBUG"].contains("Gm")) RConf.compiler.parseOption("-Gm-"); - if (RConf.compiler.PreprocessorDefinitions.tqfindIndex("TQT_NO_DEBUG") == -1) + if (RConf.compiler.PreprocessorDefinitions.findIndex("TQT_NO_DEBUG") == -1) RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG"; } else { DConf.IntermediateDirectory = @@ -733,7 +733,7 @@ void VcprojGenerator::initCompilerTool() for(it=RConf.compiler.PreprocessorDefinitions.begin(); it!=RConf.compiler.PreprocessorDefinitions.end(); ++it) - (*it).tqreplace('\"', """); + (*it).replace('\"', """); RConf.compiler.parseOptions( project->variables()["MSVCPROJ_INCPATH"] ); } @@ -741,7 +741,7 @@ void VcprojGenerator::initCompilerTool() void VcprojGenerator::initLibrarianTool() { VCConfiguration &RConf = vcProject.Configuration[0]; - RConf.librarian.OutputFile = project->first( "DESTDIR" ).tqreplace("&", "&"); + RConf.librarian.OutputFile = project->first( "DESTDIR" ).replace("&", "&"); if( RConf.librarian.OutputFile.isEmpty() ) RConf.librarian.OutputFile = ".\\"; @@ -813,8 +813,8 @@ void VcprojGenerator::initPostBuildEventTools() if ( !project->variables()["TQMAKE_POST_LINK"].isEmpty() ) { RConf.postBuild.Description = var("TQMAKE_POST_LINK"); RConf.postBuild.CommandLine = var("TQMAKE_POST_LINK"); - RConf.postBuild.Description.tqreplace(" && ", " && "); - RConf.postBuild.CommandLine.tqreplace(" && ", " && "); + RConf.postBuild.Description.replace(" && ", " && "); + RConf.postBuild.CommandLine.replace(" && ", " && "); } if ( !project->variables()["MSVCPROJ_COPY_DLL"].isEmpty() ) { if ( !RConf.postBuild.CommandLine.isEmpty() ) @@ -838,7 +838,7 @@ void VcprojGenerator::initPostBuildEventTools() idc + " "$(TargetPath)" -idl " + objdir + name + ".idl -version 1.0 && " + // call midl to create implementations of the .idl file project->first( "TQMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + - // call idc to tqreplace tlb... + // call idc to replace tlb... idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + // register server idc + " "$(TargetPath)" /regserver"; @@ -848,7 +848,7 @@ void VcprojGenerator::initPostBuildEventTools() ""$(TargetPath)" -dumpidl " + objdir + name + ".idl -version 1.0 && " + // call midl to create implementations of the .idl file project->first( "TQMAKE_IDL" ) + " /nologo " + objdir + name + ".idl /tlb " + objdir + name + ".tlb && " + - // call idc to tqreplace tlb... + // call idc to replace tlb... idc + " "$(TargetPath)" /tlb " + objdir + name + ".tlb && " + // call app to register ""$(TargetPath)" -regserver"; @@ -867,8 +867,8 @@ void VcprojGenerator::initPreLinkEventTools() inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode ) { if ( flat_mode ) { - TQString subX = x.mid( x.tqfindRev('\\')+1 ); - TQString subY = y.mid( y.tqfindRev('\\')+1 ); + TQString subX = x.mid( x.findRev('\\')+1 ); + TQString subY = y.mid( y.findRev('\\')+1 ); return TQString::compare(subX, subY) < 0; } @@ -877,8 +877,8 @@ inline bool XLessThanY( TQString &x, TQString &y, bool flat_mode ) int xSlashPos; int ySlashPos; for (;;) { - xSlashPos = x.tqfind('\\', xPos); - ySlashPos = y.tqfind('\\', yPos); + xSlashPos = x.find('\\', xPos); + ySlashPos = y.find('\\', yPos); if (xSlashPos == -1 && ySlashPos != -1) { return FALSE; @@ -954,7 +954,7 @@ void VcprojGenerator::initHeaderFiles() vcProject.HeaderFiles.Filter = "h;hpp;hxx;hm;inl"; vcProject.HeaderFiles.Files += project->variables()["HEADERS"]; if (usePCH) { // Generated PCH cpp file - if (!vcProject.HeaderFiles.Files.tqcontains(precompH)) + if (!vcProject.HeaderFiles.Files.contains(precompH)) vcProject.HeaderFiles.Files += precompH; } nonflatDir_BubbleSort( vcProject.HeaderFiles.Files, @@ -1106,7 +1106,7 @@ void VcprojGenerator::initOld() project->variables()["DEFINES"].append( "TQT_DLL" ); if ( project->isActiveConfig( "qt_dll" ) && - configs.tqfindIndex("qt") == -1 ) + configs.findIndex("qt") == -1 ) configs.append("qt"); if ( project->isActiveConfig( "qt" ) ) { @@ -1114,9 +1114,9 @@ void VcprojGenerator::initOld() project->variables()["CONFIG"].append( "dll" ); project->variables()["DEFINES"].append( "TQT_PLUGIN" ); } - if ( ( project->variables()["DEFINES"].tqfindIndex( "TQT_NODLL" ) == -1 ) && - (( project->variables()["DEFINES"].tqfindIndex( "TQT_MAKEDLL" ) != -1 || - project->variables()["DEFINES"].tqfindIndex( "TQT_DLL" ) != -1 ) || + if ( ( project->variables()["DEFINES"].findIndex( "TQT_NODLL" ) == -1 ) && + (( project->variables()["DEFINES"].findIndex( "TQT_MAKEDLL" ) != -1 || + project->variables()["DEFINES"].findIndex( "TQT_DLL" ) != -1 ) || ( getenv( "TQT_DLL" ) && !getenv( "TQT_NODLL" ))) ) { project->variables()["TQMAKE_TQT_DLL"].append( "1" ); if ( is_qt && !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) @@ -1140,10 +1140,10 @@ void VcprojGenerator::initOld() // Decode version, and add it to $$MSVCPROJ_VERSION -------------- if ( !project->variables()["VERSION"].isEmpty() ) { TQString version = project->variables()["VERSION"][0]; - int firstDot = version.tqfind( "." ); + int firstDot = version.find( "." ); TQString major = version.left( firstDot ); TQString minor = version.right( version.length() - firstDot - 1 ); - minor.tqreplace( TQRegExp( "\\." ), "" ); + minor.replace( TQRegExp( "\\." ), "" ); project->variables()["MSVCPROJ_VERSION"].append( "/VERSION:" + major + "." + minor ); } @@ -1164,9 +1164,9 @@ void VcprojGenerator::initOld() else project->variables()["TQMAKE_LIBS"] += project->variables()["TQMAKE_LIBS_QT"]; if ( !project->variables()["TQMAKE_TQT_DLL"].isEmpty() ) { - int hver = tqfindHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); + int hver = findHighestVersion(project->first("TQMAKE_LIBDIR_QT"), "qt"); if( hver==-1 ) { - hver = tqfindHighestVersion( project->first("TQMAKE_LIBDIR_QT"), "qt-mt" ); + hver = findHighestVersion( project->first("TQMAKE_LIBDIR_QT"), "qt-mt" ); } if(hver != -1) { @@ -1174,7 +1174,7 @@ void VcprojGenerator::initOld() ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver); TQStringList &libs = project->variables()["TQMAKE_LIBS"]; for(TQStringList::Iterator libit = libs.begin(); libit != libs.end(); ++libit) - (*libit).tqreplace(TQRegExp("qt(-mt)?\\.lib"), ver); + (*libit).replace(TQRegExp("qt(-mt)?\\.lib"), ver); } } if ( project->isActiveConfig( "activeqt" ) ) { @@ -1210,7 +1210,7 @@ void VcprojGenerator::initOld() if ( project->isActiveConfig("thread") ) { if(project->isActiveConfig("qt")) project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" ); - if ( !project->variables()["DEFINES"].tqcontains("TQT_DLL") && is_qt + if ( !project->variables()["DEFINES"].contains("TQT_DLL") && is_qt && project->first("TARGET") != "qtmain" ) project->variables()["TQMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); } @@ -1227,7 +1227,7 @@ void VcprojGenerator::initOld() if ( project->isActiveConfig("dll") ) { if ( !project->variables()["TQMAKE_LIB_FLAG"].isEmpty() ) { TQString ver_xyz(project->first("VERSION")); - ver_xyz.tqreplace(TQRegExp("\\."), ""); + ver_xyz.replace(TQRegExp("\\."), ""); project->variables()["TARGET_EXT"].append(ver_xyz + ".dll"); } else { project->variables()["TARGET_EXT"].append(".dll"); @@ -1258,10 +1258,10 @@ void VcprojGenerator::initOld() // /VERSION:x.yz ------------------------------------------------- if ( !project->variables()["VERSION"].isEmpty() ) { TQString version = project->variables()["VERSION"][0]; - int firstDot = version.tqfind( "." ); + int firstDot = version.find( "." ); TQString major = version.left( firstDot ); TQString minor = version.right( version.length() - firstDot - 1 ); - minor.tqreplace( ".", "" ); + minor.replace( ".", "" ); project->variables()["TQMAKE_LFLAGS"].append( "/VERSION:" + major + "." + minor ); } @@ -1270,7 +1270,7 @@ void VcprojGenerator::initOld() TQStringList &libList = project->variables()["TQMAKE_LIBS"]; for( it = libList.begin(); it != libList.end(); ) { TQString s = *it; - s.tqreplace("&", "&"); + s.replace("&", "&"); if( s.startsWith( "-l" ) ) { it = libList.remove( it ); it = libList.insert( it, s.mid( 2 ) + ".lib" ); @@ -1313,15 +1313,15 @@ void VcprojGenerator::initOld() if ( msvcproj_project.isEmpty() ) msvcproj_project = Option::output.name(); - msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.tqfindRev( "\\" ) - 1 ); - msvcproj_project = msvcproj_project.left( msvcproj_project.tqfindRev( "." ) ); - msvcproj_project.tqreplace(TQRegExp("-"), ""); + msvcproj_project = msvcproj_project.right( msvcproj_project.length() - msvcproj_project.findRev( "\\" ) - 1 ); + msvcproj_project = msvcproj_project.left( msvcproj_project.findRev( "." ) ); + msvcproj_project.replace(TQRegExp("-"), ""); project->variables()["MSVCPROJ_PROJECT"].append(msvcproj_project); TQStringList &proj = project->variables()["MSVCPROJ_PROJECT"]; for(it = proj.begin(); it != proj.end(); ++it) - (*it).tqreplace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); + (*it).replace(TQRegExp("\\.[a-zA-Z0-9_]*$"), ""); // SUBSYSTEM ----------------------------------------------------- if ( !project->variables()["TQMAKE_APP_FLAG"].isEmpty() ) { @@ -1353,7 +1353,7 @@ void VcprojGenerator::initOld() TQStringList strl = project->variables()["TQMAKE_LIBDIR"]; TQStringList::iterator stri; for ( stri = strl.begin(); stri != strl.end(); ++stri ) { - (*stri).tqreplace("&", "&"); + (*stri).replace("&", "&"); if ( !(*stri).startsWith("/LIBPATH:") ) (*stri).prepend( "/LIBPATH:" ); } @@ -1366,8 +1366,8 @@ void VcprojGenerator::initOld() TQStringList &incs = project->variables()["INCLUDEPATH"]; for(TQStringList::Iterator incit = incs.begin(); incit != incs.end(); ++incit) { TQString inc = (*incit); - inc.tqreplace("&", "&"); - inc.tqreplace(TQRegExp("\""), ""); + inc.replace("&", "&"); + inc.replace(TQRegExp("\""), ""); project->variables()["MSVCPROJ_INCPATH"].append("/I" + inc ); } project->variables()["MSVCPROJ_INCPATH"].append("/I" + specdir()); @@ -1377,7 +1377,7 @@ void VcprojGenerator::initOld() Option::fixPathToTargetOS(project->first("TARGET")); dest = project->first("TARGET") + project->first( "TARGET_EXT" ); if ( project->first("TARGET").startsWith("$(TQTDIR)") ) - dest.tqreplace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") ); + dest.replace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") ); project->variables()["MSVCPROJ_TARGET"] = dest; // DLL COPY ------------------------------------------------------ @@ -1491,20 +1491,20 @@ bool VcprojGenerator::openOutput(TQFile &file) const TQString VcprojGenerator::fixFilename(TQString ofile) const { - int slashtqfind = ofile.tqfindRev('\\'); - if (slashtqfind == -1) { - ofile = ofile.tqreplace('-', '_'); + int slashfind = ofile.findRev('\\'); + if (slashfind == -1) { + ofile = ofile.replace('-', '_'); } else { - int hypentqfind = ofile.tqfind('-', slashtqfind); - while (hypentqfind != -1 && slashtqfind < hypentqfind) { - ofile = ofile.tqreplace(hypentqfind, 1, '_'); - hypentqfind = ofile.tqfind('-', hypentqfind + 1); + int hypenfind = ofile.find('-', slashfind); + while (hypenfind != -1 && slashfind < hypenfind) { + ofile = ofile.replace(hypenfind, 1, '_'); + hypenfind = ofile.find('-', hypenfind + 1); } } return ofile; } -TQString VcprojGenerator::tqfindTemplate(TQString file) +TQString VcprojGenerator::findTemplate(TQString file) { TQString ret; if(!TQFile::exists((ret = file)) && @@ -1522,7 +1522,7 @@ void VcprojGenerator::processPrlVariable(const TQString &var, const TQStringList if(var == "TQMAKE_PRL_DEFINES") { TQStringList &out = project->variables()["MSVCPROJ_DEFINES"]; for(TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it) { - if(out.tqfindIndex((*it)) == -1) + if(out.findIndex((*it)) == -1) out.append((" /D " + *it )); } } else { diff --git a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h index 9042d31..96f701b 100644 --- a/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h +++ b/tqtinterface/qt4/qmake/generators/win32/msvc_vcproj.h @@ -57,7 +57,7 @@ class VcprojGenerator : public Win32MakefileGenerator bool writeMakefile(TQTextStream &); virtual void writeSubDirs(TQTextStream &t); - TQString tqfindTemplate(TQString file); + TQString findTemplate(TQString file); void init(); public: @@ -73,7 +73,7 @@ public: protected: virtual bool openOutput(TQFile &file) const; virtual void processPrlVariable(const TQString &, const TQStringList &); - virtual bool tqfindLibraries(); + virtual bool findLibraries(); virtual void outputVariables(); TQString fixFilename(TQString ofile) const; @@ -114,9 +114,9 @@ inline TQString VcprojGenerator::defaultMakefile() const return project->first("TARGET") + project->first("VCPROJ_EXTENSION"); } -inline bool VcprojGenerator::tqfindLibraries() +inline bool VcprojGenerator::findLibraries() { - return Win32MakefileGenerator::tqfindLibraries("MSVCVCPROJ_LIBS"); + return Win32MakefileGenerator::findLibraries("MSVCVCPROJ_LIBS"); } #endif /* __MSVC_VCPROJ_H__ */ diff --git a/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp b/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp index 1cf1cbe..30701bd 100644 --- a/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp +++ b/tqtinterface/qt4/qmake/generators/win32/winmakefile.cpp @@ -72,7 +72,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) subdirs.append(sd); sd->makefile = "$(MAKEFILE)"; if((*it).right(4) == ".pro") { - int slsh = file.tqfindRev(Option::dir_sep); + int slsh = file.findRev(Option::dir_sep); if(slsh != -1) { sd->directory = file.left(slsh+1); sd->profile = file.mid(slsh+1); @@ -86,15 +86,15 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) sd->directory = sd->directory.left(sd->directory.length() - 1); if(!sd->profile.isEmpty()) { TQString basename = sd->directory; - int new_slsh = basename.tqfindRev(Option::dir_sep); + int new_slsh = basename.findRev(Option::dir_sep); if(new_slsh != -1) basename = basename.mid(new_slsh+1); if(sd->profile != basename + ".pro") sd->makefile += "." + sd->profile.left(sd->profile.length() - 4); //no need for the .pro } sd->target = "sub-" + (*it); - sd->target.tqreplace('/', '-'); - sd->target.tqreplace('.', '_'); + sd->target.replace('/', '-'); + sd->target.replace('.', '_'); } } TQPtrListIterator<SubDir> it(subdirs); @@ -120,7 +120,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << "\n\t" << "$(TQMAKE) " << (*it)->profile << " " << buildArgs(); t << " -o " << (*it)->makefile; if(have_dir) { - int subLevels = it.current()->directory.tqcontains(Option::dir_sep) + 1; + int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; t << "\n\t" << "@cd .."; for(int i = 1; i < subLevels; i++ ) t << Option::dir_sep << ".."; @@ -136,7 +136,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << "\n\t" << "$(MAKE)"; t << " -f " << (*it)->makefile; if(have_dir) { - int subLevels = it.current()->directory.tqcontains(Option::dir_sep) + 1; + int subLevels = it.current()->directory.contains(Option::dir_sep) + 1; t << "\n\t" << "@cd .."; for(int i = 1; i < subLevels; i++ ) t << Option::dir_sep << ".."; @@ -154,7 +154,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << endl; } - if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].tqfindIndex("qmake_all") == -1) + if(project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].findIndex("qmake_all") == -1) project->variables()["TQMAKE_INTERNAL_TQMAKE_DEPS"].append("qmake_all"); writeMakeQmake(t); @@ -164,11 +164,11 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) bool have_dir = !(*it)->directory.isEmpty(); TQString subdir = (*it)->directory; TQString profile = (*it)->profile; - int subLevels = subdir.tqcontains(Option::dir_sep) + 1; + int subLevels = subdir.contains(Option::dir_sep) + 1; t << "\n\t"; if(have_dir) t << "cd " << subdir << "\n\t"; - int lastSlash = subdir.tqfindRev(Option::dir_sep); + int lastSlash = subdir.findRev(Option::dir_sep); if(lastSlash != -1) subdir = subdir.mid( lastSlash + 1 ); t << "$(TQMAKE) " @@ -202,7 +202,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) t << varGlue("TQMAKE_CLEAN","\n\t-$(DEL_FILE) ","\n\t-$(DEL_FILE) ", ""); if (!subdirs.isEmpty()) { for( it.toFirst(); it.current(); ++it) { - int subLevels = (*it)->directory.tqcontains(Option::dir_sep) + 1; + int subLevels = (*it)->directory.contains(Option::dir_sep) + 1; bool have_dir = !(*it)->directory.isEmpty(); if(have_dir) t << "\n\t" << "cd " << (*it)->directory; @@ -242,7 +242,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) deps += " " + dep; } if(!project->variables()["TQMAKE_NOFORCE"].isEmpty() && - project->variables()[(*sit) + ".CONFIG"].tqfindIndex("phony") != -1) + project->variables()[(*sit) + ".CONFIG"].findIndex("phony") != -1) deps += TQString(" ") + "FORCE"; t << targ << ":" << deps << "\n"; if(!cmd.isEmpty()) @@ -257,7 +257,7 @@ Win32MakefileGenerator::writeSubDirs(TQTextStream &t) int -Win32MakefileGenerator::tqfindHighestVersion(const TQString &d, const TQString &stem) +Win32MakefileGenerator::findHighestVersion(const TQString &d, const TQString &stem) { TQString bd = Option::fixPathToLocalOS(d, TRUE); if(!TQFile::exists(bd)) @@ -278,13 +278,13 @@ Win32MakefileGenerator::tqfindHighestVersion(const TQString &d, const TQString & TQMakeMetaInfo libinfo; if(libinfo.readLib(bd + dllStem)) { if(!libinfo.isEmpty("TQMAKE_PRL_VERSION")) - biggest = TQMAX(biggest, libinfo.first("TQMAKE_PRL_VERSION").tqreplace(".", "").toInt()); + biggest = TQMAX(biggest, libinfo.first("TQMAKE_PRL_VERSION").replace(".", "").toInt()); } return biggest; } TQString -Win32MakefileGenerator::tqfindDependency(const TQString &dep) +Win32MakefileGenerator::findDependency(const TQString &dep) { { TQStringList &qut = project->variables()["TQMAKE_EXTRA_WIN_TARGETS"]; @@ -309,19 +309,19 @@ Win32MakefileGenerator::tqfindDependency(const TQString &dep) for(TQStringList::Iterator input = inputs.begin(); input != inputs.end(); ++input) { TQString out = tmp_out; TQFileInfo fi(Option::fixPathToLocalOS((*input))); - out.tqreplace("${TQMAKE_FILE_BASE}", fi.baseName()); - out.tqreplace("${TQMAKE_FILE_NAME}", fi.filePath()); + out.replace("${TQMAKE_FILE_BASE}", fi.baseName()); + out.replace("${TQMAKE_FILE_NAME}", fi.filePath()); if(out.endsWith(dep)) return out; } } } } - return MakefileGenerator::tqfindDependency(dep); + return MakefileGenerator::findDependency(dep); } bool -Win32MakefileGenerator::tqfindLibraries(const TQString &where) +Win32MakefileGenerator::findLibraries(const TQString &where) { TQStringList &l = project->variables()[where]; @@ -331,7 +331,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { TQString r = (*libpathit), l = r; fixEnvVariables(l); - dirs.append(new MakefileDependDir(r.tqreplace("\"",""), l.tqreplace("\"",""))); + dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); } } dirs.setAutoDelete(TRUE); @@ -345,19 +345,19 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) } if(opt.startsWith("/LIBPATH:")) { TQString r = opt.mid(9), l = Option::fixPathToLocalOS(r); - dirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + dirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } else if(opt.startsWith("-L") || opt.startsWith("/L")) { TQString r = opt.mid(2), l = Option::fixPathToLocalOS(r); - dirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + dirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); remove = TRUE; //we eat this switch } else if(opt.startsWith("-l") || opt.startsWith("/l")) { TQString lib = opt.right(opt.length() - 2), out; if(!lib.isEmpty()) { for(MakefileDependDir *mdd = dirs.first(); mdd; mdd = dirs.next() ) { TQString extension; - int ver = tqfindHighestVersion(mdd->local_dir, lib); + int ver = findHighestVersion(mdd->local_dir, lib); if(ver > 0) extension += TQString::number(ver); extension += ".lib"; @@ -369,7 +369,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) } } if(out.isEmpty()) { - remove = TRUE; //just eat it since we cannot tqfind one.. + remove = TRUE; //just eat it since we cannot find one.. } else { modified_opt = TRUE; (*it) = out; @@ -377,11 +377,11 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) } else if(!TQFile::exists(Option::fixPathToLocalOS(opt))) { TQPtrList<MakefileDependDir> lib_dirs; TQString file = opt; - int slsh = file.tqfindRev(Option::dir_sep); + int slsh = file.findRev(Option::dir_sep); if(slsh != -1) { TQString r = file.left(slsh+1), l = r; fixEnvVariables(l); - lib_dirs.append(new MakefileDependDir(r.tqreplace("\"",""), l.tqreplace("\"",""))); + lib_dirs.append(new MakefileDependDir(r.replace("\"",""), l.replace("\"",""))); file = file.right(file.length() - slsh - 1); } else { lib_dirs = dirs; @@ -393,7 +393,7 @@ Win32MakefileGenerator::tqfindLibraries(const TQString &where) if(!file.at(file.length()-1).isNumber()) { for(MakefileDependDir *mdd = lib_dirs.first(); mdd; mdd = lib_dirs.next() ) { TQString lib_tmpl(file + "%1" + ".lib"); - int ver = tqfindHighestVersion(mdd->local_dir, file); + int ver = findHighestVersion(mdd->local_dir, file); if(ver != -1) { if(ver) lib_tmpl = lib_tmpl.arg(ver); @@ -437,8 +437,8 @@ Win32MakefileGenerator::processPrlFiles() for(TQStringList::Iterator libpathit = libpaths.begin(); libpathit != libpaths.end(); ++libpathit) { TQString r = (*libpathit), l = r; fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + libdirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } } for(bool ret = FALSE; TRUE; ret = FALSE) { @@ -454,8 +454,8 @@ Win32MakefileGenerator::processPrlFiles() if(opt.startsWith("/LIBPATH:")) { TQString r = opt.mid(9), l = r; fixEnvVariables(l); - libdirs.append(new MakefileDependDir(r.tqreplace("\"",""), - l.tqreplace("\"",""))); + libdirs.append(new MakefileDependDir(r.replace("\"",""), + l.replace("\"",""))); } } else { if(!processed[opt]) { diff --git a/tqtinterface/qt4/qmake/generators/win32/winmakefile.h b/tqtinterface/qt4/qmake/generators/win32/winmakefile.h index 67a4ee9..6233f4c 100644 --- a/tqtinterface/qt4/qmake/generators/win32/winmakefile.h +++ b/tqtinterface/qt4/qmake/generators/win32/winmakefile.h @@ -53,10 +53,10 @@ class Win32MakefileGenerator : public MakefileGenerator { protected: virtual void writeSubDirs(TQTextStream &t); - int tqfindHighestVersion(const TQString &dir, const TQString &stem); - bool tqfindLibraries(const TQString &); - TQString tqfindDependency(const TQString &); - virtual bool tqfindLibraries(); + int findHighestVersion(const TQString &dir, const TQString &stem); + bool findLibraries(const TQString &); + TQString findDependency(const TQString &); + virtual bool findLibraries(); virtual void processPrlFiles(); public: @@ -67,8 +67,8 @@ public: inline Win32MakefileGenerator::~Win32MakefileGenerator() { } -inline bool Win32MakefileGenerator::tqfindLibraries() -{ return tqfindLibraries("TQMAKE_LIBS"); } +inline bool Win32MakefileGenerator::findLibraries() +{ return findLibraries("TQMAKE_LIBS"); } diff --git a/tqtinterface/qt4/qmake/main.cpp b/tqtinterface/qt4/qmake/main.cpp index 3d7292b..84171e3 100644 --- a/tqtinterface/qt4/qmake/main.cpp +++ b/tqtinterface/qt4/qmake/main.cpp @@ -118,7 +118,7 @@ int main(int argc, char **argv) //setup pwd properly debug_msg(1, "Resetting dir to: %s", oldpwd.latin1()); TQDir::setCurrent(oldpwd); //reset the old pwd - int di = fn.tqfindRev(Option::dir_sep); + int di = fn.findRev(Option::dir_sep); if(di != -1) { debug_msg(1, "Changing dir to: %s", TQT_TQSTRING(fn.left(di)).latin1()); if(!TQDir::setCurrent(fn.left(di))) diff --git a/tqtinterface/qt4/qmake/meta.cpp b/tqtinterface/qt4/qmake/meta.cpp index 21e4e98..81b8809 100644 --- a/tqtinterface/qt4/qmake/meta.cpp +++ b/tqtinterface/qt4/qmake/meta.cpp @@ -53,9 +53,9 @@ bool TQMakeMetaInfo::readLib(const TQString &lib) { clear(); - TQString meta_file = tqfindLib(lib); + TQString meta_file = findLib(lib); - if(cache_vars.tqcontains(meta_file)) { + if(cache_vars.contains(meta_file)) { vars = cache_vars[meta_file]; return TRUE; } @@ -94,7 +94,7 @@ TQMakeMetaInfo::clear() TQString -TQMakeMetaInfo::tqfindLib(const TQString &lib) +TQMakeMetaInfo::findLib(const TQString &lib) { TQString ret = TQString::null; TQString extns[] = { Option::prl_ext, /*Option::pkgcfg_ext, Option::libtool_ext,*/ TQString::null }; @@ -136,7 +136,7 @@ TQMakeMetaInfo::readLibtoolFile(const TQString &f) if(lst.count() == 1 && (lst.first().startsWith("'") || lst.first().startsWith("\"")) && lst.first().endsWith(TQString(lst.first()[0]))) lst = TQString(lst.first().mid(1, lst.first().length() - 2)); - if(!vars.tqcontains("TQMAKE_PRL_TARGET") && + if(!vars.contains("TQMAKE_PRL_TARGET") && (it.key() == "dlname" || it.key() == "library_names" || it.key() == "old_library")) { TQString dir = v["libdir"].first(); if((dir.startsWith("'") || dir.startsWith("\"")) && dir.endsWith(TQString(dir[0]))) diff --git a/tqtinterface/qt4/qmake/meta.h b/tqtinterface/qt4/qmake/meta.h index e940b43..3903527 100644 --- a/tqtinterface/qt4/qmake/meta.h +++ b/tqtinterface/qt4/qmake/meta.h @@ -55,7 +55,7 @@ public: TQMakeMetaInfo(); bool readLib(const TQString &lib); - static TQString tqfindLib(const TQString &lib); + static TQString findLib(const TQString &lib); static bool libExists(const TQString &lib); TQString type() const; @@ -66,7 +66,7 @@ public: }; inline bool TQMakeMetaInfo::isEmpty(const TQString &v) -{ return !vars.tqcontains(v) || vars[v].isEmpty(); } +{ return !vars.contains(v) || vars[v].isEmpty(); } inline TQString TQMakeMetaInfo::type() const { return meta_type; } @@ -91,6 +91,6 @@ inline TQMap<TQString, TQStringList> &TQMakeMetaInfo::variables() { return vars; } inline bool TQMakeMetaInfo::libExists(const TQString &lib) -{ return !tqfindLib(lib).isNull(); } +{ return !findLib(lib).isNull(); } #endif /* __META_H__ */ diff --git a/tqtinterface/qt4/qmake/option.cpp b/tqtinterface/qt4/qmake/option.cpp index 1d44b72..04c1771 100644 --- a/tqtinterface/qt4/qmake/option.cpp +++ b/tqtinterface/qt4/qmake/option.cpp @@ -107,7 +107,7 @@ TQString Option::mkfile::qmakespec_commandline; static Option::TQMAKE_MODE default_mode(TQString progname) { - int s = progname.tqfindRev(Option::dir_sep); + int s = progname.findRev(Option::dir_sep); if(s != -1) progname = progname.right(progname.length() - (s + 1)); if(progname == "qmakegen") @@ -134,7 +134,7 @@ bool usage(const char *a0) "\t defaults to %s\n" "\t-makefile Put qmake into makefile generation mode%s\n" "\t In this mode qmake interprets files as project files to\n" - "\t be processed, if skipped qmake will try to tqfind a project\n" + "\t be processed, if skipped qmake will try to find a project\n" "\t file in your current working directory\n" "\n" "Warnings Options:\n" @@ -275,7 +275,7 @@ Option::internalParseCommandLine(int argc, char **argv, int skip) } } else { TQString arg = argv[x]; - if(arg.tqfind('=') != -1) { + if(arg.find('=') != -1) { if(before) Option::before_user_vars.append(arg); else @@ -382,7 +382,7 @@ Option::parseCommandLine(int argc, char **argv) //try REALLY hard to do it for them, lazy.. if(Option::mkfile::project_files.isEmpty()) { TQString pwd = TQDir::currentDirPath(), - proj = pwd + "/" + pwd.right(pwd.length() - (pwd.tqfindRev('/') + 1)) + ".pro"; + proj = pwd + "/" + pwd.right(pwd.length() - (pwd.findRev('/') + 1)) + ".pro"; if(TQFile::exists(proj)) { Option::mkfile::project_files.append(proj); } else { //last try.. @@ -456,7 +456,7 @@ void fixEnvVariables(TQString &x) TQRegExp reg_var("\\$\\(.*\\)"); reg_var.setMinimal( TRUE ); while((rep = reg_var.search(x)) != -1) - x.tqreplace(rep, reg_var.matchedLength(), TQString(getenv(TQT_TQSTRING(x.mid(rep + 2, reg_var.matchedLength() - 3)).latin1()))); + x.replace(rep, reg_var.matchedLength(), TQString(getenv(TQT_TQSTRING(x.mid(rep + 2, reg_var.matchedLength() - 3)).latin1()))); } static TQString fixPath(TQString x) { @@ -486,11 +486,11 @@ Option::fixPathToTargetOS(const TQString& in, bool fix_env, bool canonical) tmp = fixPath(tmp); TQString rep; if(Option::target_mode == TARG_MAC9_MODE) - tmp = TQT_TQSTRING(tmp.tqreplace('/', Option::dir_sep)).tqreplace('\\', Option::dir_sep); + tmp = TQT_TQSTRING(tmp.replace('/', Option::dir_sep)).replace('\\', Option::dir_sep); else if(Option::target_mode == TARG_WIN_MODE) - tmp = tmp.tqreplace('/', Option::dir_sep); + tmp = tmp.replace('/', Option::dir_sep); else - tmp = tmp.tqreplace('\\', Option::dir_sep); + tmp = tmp.replace('\\', Option::dir_sep); return tmp; } @@ -503,9 +503,9 @@ Option::fixPathToLocalOS(const TQString& in, bool fix_env, bool canonical) if(canonical) tmp = fixPath(tmp); #if defined(TQ_OS_WIN32) - return tmp.tqreplace('/', '\\'); + return tmp.replace('/', '\\'); #else - return tmp.tqreplace('\\', '/'); + return tmp.replace('\\', '/'); #endif } diff --git a/tqtinterface/qt4/qmake/project.cpp b/tqtinterface/qt4/qmake/project.cpp index 2278904..c3aeccd 100644 --- a/tqtinterface/qt4/qmake/project.cpp +++ b/tqtinterface/qt4/qmake/project.cpp @@ -211,7 +211,7 @@ bool TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place) { TQString s = t.simplifyWhiteSpace(); - int hash_mark = s.tqfind("#"); + int hash_mark = s.find("#"); if(hash_mark != -1) //good bye comments s = s.left(hash_mark); if(s.isEmpty()) /* blank_line */ @@ -228,7 +228,7 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place) } if(!(scope_flag & (0x01 << scope_block))) { /* adjust scope for each block which appears on a single line */ - for(int i = (s.tqcontains('{')-s.tqcontains('}')); i>0; i--) + for(int i = (s.contains('{')-s.contains('}')); i>0; i--) scope_flag &= ~(0x01 << (++scope_block)); debug_msg(1, "Project Parser: %s:%d : Ignored due to block being false.", parser.file.latin1(), parser.line_no); @@ -290,10 +290,10 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place) bool invert_test = (comp_scope.left(1) == "!"); if(invert_test) comp_scope = comp_scope.right(comp_scope.length()-1); - int lparen = comp_scope.tqfind('('); + int lparen = comp_scope.find('('); if(or_op == scope_failed) { if(lparen != -1) { /* if there is an lparen in the scope, it IS a function */ - int rparen = comp_scope.tqfindRev(')'); + int rparen = comp_scope.findRev(')'); if(rparen == -1) { TQCString error; error.sprintf("Function missing right paren: %s ('%s')", @@ -356,13 +356,13 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place) } SKIP_WS(d); - for( ; *d && op.tqfind('=') == -1; op += *(d++)) + for( ; *d && op.find('=') == -1; op += *(d++)) ; - op.tqreplace(TQRegExp("\\s"), ""); + op.replace(TQRegExp("\\s"), ""); SKIP_WS(d); - TQString vals(d); /* vals now tqcontains the space separated list of values */ - int rbraces = vals.tqcontains('}'), lbraces = vals.tqcontains('{'); + TQString vals(d); /* vals now contains the space separated list of values */ + int rbraces = vals.contains('}'), lbraces = vals.contains('{'); if(scope_block && rbraces - lbraces == 1) { debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.latin1(), parser.line_no, scope_block); @@ -420,14 +420,14 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place) } bool global = FALSE, case_sense = TRUE; if(func.count() == 4) { - global = func[3].tqfind('g') != -1; - case_sense = func[3].tqfind('i') == -1; + global = func[3].find('g') != -1; + case_sense = func[3].find('i') == -1; } TQRegExp regexp(func[1], case_sense); for(TQStringList::Iterator varit = varlist.begin(); varit != varlist.end(); ++varit) { - if((*varit).tqcontains(regexp)) { - (*varit) = (*varit).tqreplace(regexp, func[2]); + if((*varit).contains(regexp)) { + (*varit) = (*varit).replace(regexp, func[2]); if(!global) break; } @@ -443,7 +443,7 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place) valit != vallist.end(); ++valit) { if((*valit).isEmpty()) continue; - if((op == "*=" && !(*varlist.tqfind((*valit)))) || + if((op == "*=" && !(*varlist.find((*valit)))) || op == "=" || op == "+=") varlist.append((*valit)); else if(op == "-=") @@ -484,7 +484,7 @@ TQMakeProject::read(const TQString &file, TQMap<TQString, TQStringList> &place) line = t.readLine().stripWhiteSpace(); int prelen = line.length(); - int hash_mark = line.tqfind("#"); + int hash_mark = line.find("#"); if(hash_mark != -1) //good bye comments line = line.left(hash_mark); if(!line.isEmpty() && line.right(1) == "\\") { @@ -532,12 +532,12 @@ TQMakeProject::read(uchar cmd) base_vars["TEMPLATE_PREFIX"] = Option::user_template_prefix; if(cmd & ReadCache && Option::mkfile::do_cache) { /* parse the cache */ - if(Option::mkfile::cachefile.isEmpty()) { //tqfind it as it has not been specified + if(Option::mkfile::cachefile.isEmpty()) { //find it as it has not been specified TQString dir = TQDir::convertSeparators(Option::output_dir); while(!TQFile::exists((Option::mkfile::cachefile = dir + TQDir::separator() + ".qmake.cache"))) { - dir = dir.left(dir.tqfindRev(TQDir::separator())); - if(dir.isEmpty() || dir.tqfind(TQDir::separator()) == -1) { + dir = dir.left(dir.findRev(TQDir::separator())); + if(dir.isEmpty() || dir.find(TQDir::separator()) == -1) { Option::mkfile::cachefile = ""; break; } @@ -581,7 +581,7 @@ TQMakeProject::read(uchar cmd) } } if(!found_mkspec) { - fprintf(stderr, "Could not tqfind mkspecs for your TQMAKESPEC after trying:\n\t%s\n", + fprintf(stderr, "Could not find mkspecs for your TQMAKESPEC after trying:\n\t%s\n", mkspec_roots.join("\n\t").latin1()); return FALSE; } @@ -672,10 +672,10 @@ TQMakeProject::read(uchar cmd) // TQFileInfo fi(pfile); // fi.baseName(); TQString tmp = pfile; - if(tmp.tqfindRev('/') != -1) - tmp = tmp.right( tmp.length() - tmp.tqfindRev('/') - 1 ); - if(tmp.tqfindRev('.') != -1) - tmp = tmp.left(tmp.tqfindRev('.')); + if(tmp.findRev('/') != -1) + tmp = tmp.right( tmp.length() - tmp.findRev('/') - 1 ); + if(tmp.findRev('.') != -1) + tmp = tmp.left(tmp.findRev('.')); vars["TARGET"].append(tmp); } @@ -718,7 +718,7 @@ TQMakeProject::isActiveConfig(const TQString &x, bool regex, TQMap<TQString, TQS TQRegExp re(x, FALSE, TRUE); TQString spec = Option::mkfile::qmakespec.right(Option::mkfile::qmakespec.length() - - (Option::mkfile::qmakespec.tqfindRev(TQDir::separator())+1)); + (Option::mkfile::qmakespec.findRev(TQDir::separator())+1)); if((regex && re.exactMatch(spec)) || (!regex && spec == x)) return TRUE; #ifdef TQ_OS_UNIX @@ -730,8 +730,8 @@ TQMakeProject::isActiveConfig(const TQString &x, bool regex, TQMap<TQString, TQS if(l != -1) { buffer[l] = '\0'; TQString r = buffer; - if(r.tqfindRev('/') != -1) - r = r.mid(r.tqfindRev('/') + 1); + if(r.findRev('/') != -1) + r = r.mid(r.findRev('/') + 1); if((regex && re.exactMatch(r)) || (!regex && r == x)) return TRUE; } @@ -795,7 +795,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt return TRUE; //regular expression I guess TQString dirstr = TQDir::currentDirPath(); - int slsh = file.tqfindRev(Option::dir_sep); + int slsh = file.findRev(Option::dir_sep); if(slsh != -1) { dirstr = file.left(slsh+1); file = file.right(file.length() - slsh - 1); @@ -809,9 +809,9 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt return FALSE; } return system(args.first().latin1()) == 0; - } else if(func == "tqcontains") { + } else if(func == "contains") { if(args.count() != 2) { - fprintf(stderr, "%s:%d: tqcontains(var, val) requires two arguments.\n", parser.file.latin1(), + fprintf(stderr, "%s:%d: contains(var, val) requires two arguments.\n", parser.file.latin1(), parser.line_no); return FALSE; } @@ -832,11 +832,11 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt TQString file = args[0]; doVariableReplace(file, place); fixEnvVariables(file); - int di = file.tqfindRev(Option::dir_sep); + int di = file.findRev(Option::dir_sep); TQDir sunworkshop42workaround = TQDir::current(); TQString oldpwd = sunworkshop42workaround.currentDirPath(); if(di != -1) { - if(!TQDir::setCurrent(file.left(file.tqfindRev(Option::dir_sep)))) { + if(!TQDir::setCurrent(file.left(file.findRev(Option::dir_sep)))) { fprintf(stderr, "Cannot find directory: %s\n", TQT_TQSTRING(file.left(di)).latin1()); return FALSE; } @@ -893,12 +893,12 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt TQString file = args.first(); file = Option::fixPathToLocalOS(file); - file.tqreplace("\"", ""); + file.replace("\"", ""); doVariableReplace(file, place); if(func == "load") { if(!file.endsWith(Option::prf_ext)) file += Option::prf_ext; - if(file.tqfind(Option::dir_sep) == -1 || !TQFile::exists(file)) { + if(file.find(Option::dir_sep) == -1 || !TQFile::exists(file)) { bool found = FALSE; const TQString concat = TQDir::separator() + TQString("mkspecs") + TQDir::separator() + TQString("features"); @@ -976,11 +976,11 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt parser.file.latin1(), parser.line_no); debug_msg(1, "Project Parser: %s'ing file %s.", func.latin1(), file.latin1()); TQString orig_file = file; - int di = file.tqfindRev(Option::dir_sep); + int di = file.findRev(Option::dir_sep); TQDir sunworkshop42workaround = TQDir::current(); TQString oldpwd = sunworkshop42workaround.currentDirPath(); if(di != -1) { - if(!TQDir::setCurrent(file.left(file.tqfindRev(Option::dir_sep)))) { + if(!TQDir::setCurrent(file.left(file.findRev(Option::dir_sep)))) { fprintf(stderr, "Cannot find directory: %s\n", TQT_TQSTRING(file.left(di)).latin1()); return FALSE; } @@ -1018,9 +1018,9 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt TQString msg = args.first(); if((msg.startsWith("\"") || msg.startsWith("'")) && msg.endsWith(msg.left(1))) msg = msg.mid(1, msg.length()-2); - msg.tqreplace(TQString("${TQMAKE_FILE}"), parser.file.latin1()); - msg.tqreplace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no)); - msg.tqreplace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString()); + msg.replace(TQString("${TQMAKE_FILE}"), parser.file.latin1()); + msg.replace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no)); + msg.replace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString()); doVariableReplace(msg, place); fixEnvVariables(msg); fprintf(stderr, "Project %s: %s\n", func.upper().latin1(), msg.latin1()); @@ -1047,9 +1047,9 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt chk = chk.right(chk.length() - 1); bool test; - int lparen = chk.tqfind('('); + int lparen = chk.find('('); if(lparen != -1) { /* if there is an lparen in the chk, it IS a function */ - int rparen = chk.tqfindRev(')'); + int rparen = chk.findRev(')'); if(rparen == -1) { TQCString error; error.sprintf("Function (in REQUIRES) missing right paren: %s", chk.latin1()); @@ -1079,11 +1079,11 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt TQString TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringList> &place) { - for(int var_begin, var_last=0; (var_begin = str.tqfind("$$", var_last)) != -1; var_last = var_begin) { + for(int var_begin, var_last=0; (var_begin = str.find("$$", var_last)) != -1; var_last = var_begin) { if(var_begin >= (int)str.length() + 2) { break; } else if(var_begin != 0 && str[var_begin-1] == '\\') { - str.tqreplace(var_begin-1, 1, ""); + str.replace(var_begin-1, 1, ""); var_begin += 1; continue; } @@ -1111,7 +1111,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi if(as_env) { if(str[var_incr] != ')') { var_incr++; - warn_msg(WarnParser, "%s:%d: Unterminated env-variable tqreplacement '%s' (%s)", + warn_msg(WarnParser, "%s:%d: Unterminated env-variable replacement '%s' (%s)", parser.file.latin1(), parser.line_no, TQT_TQSTRING(str.mid(var_begin, TQMAX(var_incr - var_begin, (int)str.length()))).latin1(), str.latin1()); @@ -1122,7 +1122,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi } else if(as_prop) { if(str[var_incr] != ']') { var_incr++; - warn_msg(WarnParser, "%s:%d: Unterminated prop-variable tqreplacement '%s' (%s)", + warn_msg(WarnParser, "%s:%d: Unterminated prop-variable replacement '%s' (%s)", parser.file.latin1(), parser.line_no, TQT_TQSTRING(str.mid(var_begin, TQMAX(var_incr - var_begin, int(str.length())))).latin1(), str.latin1()); var_begin += var_incr; @@ -1147,7 +1147,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi } if(var_incr > (int)str.length() || (in_braces && str[var_incr] != '}')) { var_incr++; - warn_msg(WarnParser, "%s:%d: Unterminated variable tqreplacement '%s' (%s)", + warn_msg(WarnParser, "%s:%d: Unterminated variable replacement '%s' (%s)", parser.file.latin1(), parser.line_no, TQT_TQSTRING(str.mid(var_begin, TQMAX(var_incr - var_begin, (int)str.length()))).latin1(), str.latin1()); @@ -1157,27 +1157,27 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi var_incr++; } - TQString tqreplacement; + TQString replacement; if(as_env) { - tqreplacement = getenv(val); + replacement = getenv(val); } else if(as_prop) { if(prop) - tqreplacement = prop->value(val); + replacement = prop->value(val); } else if(args.isEmpty()) { if(val.left(1) == ".") - tqreplacement = ""; + replacement = ""; else if(val == "LITERAL_WHITESPACE") - tqreplacement = "\t"; + replacement = "\t"; else if(val == "LITERAL_DOLLAR") - tqreplacement = "$"; + replacement = "$"; else if(val == "LITERAL_HASH") - tqreplacement = "#"; + replacement = "#"; else if(val == "PWD") - tqreplacement = TQDir::currentDirPath(); + replacement = TQDir::currentDirPath(); else if(val == "DIR_SEPARATOR") - tqreplacement = Option::dir_sep; + replacement = Option::dir_sep; else - tqreplacement = place[varMap(val)].join(" "); + replacement = place[varMap(val)].join(" "); } else { TQStringList arg_list = split_arg_list(doVariableReplace(args, place)); debug_msg(1, "Running function: %s( %s )", val.latin1(), arg_list.join("::").latin1()); @@ -1200,9 +1200,9 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi if(end < start) end = start; for(int i = start; i <= end && (int)var.count() >= i; i++) { - if(!tqreplacement.isEmpty()) - tqreplacement += " "; - tqreplacement += var[i]; + if(!replacement.isEmpty()) + replacement += " "; + replacement += var[i]; } } } else if(val.lower() == "fromfile") { @@ -1212,7 +1212,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi } else { TQString file = arg_list[0]; file = Option::fixPathToLocalOS(file); - file.tqreplace("\"", ""); + file.replace("\"", ""); if(TQDir::isRelativePath(file)) { TQStringList include_roots; @@ -1230,10 +1230,10 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi } } TQString orig_file = file; - int di = file.tqfindRev(Option::dir_sep); + int di = file.findRev(Option::dir_sep); TQDir sunworkshop42workaround = TQDir::current(); TQString oldpwd = sunworkshop42workaround.currentDirPath(); - if(di != -1 && TQDir::setCurrent(file.left(file.tqfindRev(Option::dir_sep)))) + if(di != -1 && TQDir::setCurrent(file.left(file.findRev(Option::dir_sep)))) file = file.right(file.length() - di - 1); parser_info pi = parser; int sb = scope_block; @@ -1242,7 +1242,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi TQMap<TQString, TQStringList> tmp; bool r = read(file.latin1(), tmp); if(r) { - tqreplacement = tmp[arg_list[1]].join(" "); + replacement = tmp[arg_list[1]].join(" "); vars["TQMAKE_INTERNAL_INCLUDED_FILES"].append(orig_file); } else { warn_msg(WarnParser, "%s:%d: Failure to include file %s.", @@ -1257,14 +1257,14 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi } else if(val.lower() == "eval") { for(TQStringList::ConstIterator arg_it = arg_list.begin(); arg_it != arg_list.end(); ++arg_it) { - if(!tqreplacement.isEmpty()) - tqreplacement += " "; - tqreplacement += place[(*arg_it)].join(" "); + if(!replacement.isEmpty()) + replacement += " "; + replacement += place[(*arg_it)].join(" "); } } else if(val.lower() == "list") { static int x = 0; - tqreplacement.sprintf(".TQMAKE_INTERNAL_TMP_VAR_%d", x++); - TQStringList &lst = (*((TQMap<TQString, TQStringList>*)&place))[tqreplacement]; + replacement.sprintf(".TQMAKE_INTERNAL_TMP_VAR_%d", x++); + TQStringList &lst = (*((TQMap<TQString, TQStringList>*)&place))[replacement]; lst.clear(); for(TQStringList::ConstIterator arg_it = arg_list.begin(); arg_it != arg_list.end(); ++arg_it) @@ -1276,14 +1276,14 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi } else { TQString glue, before, after; if(arg_list.count() >= 2) - glue = arg_list[1].tqreplace("\"", "" ); + glue = arg_list[1].replace("\"", "" ); if(arg_list.count() >= 3) - before = arg_list[2].tqreplace("\"", "" ); + before = arg_list[2].replace("\"", "" ); if(arg_list.count() == 4) - after = arg_list[3].tqreplace("\"", "" ); + after = arg_list[3].replace("\"", "" ); const TQStringList &var = place[varMap(arg_list.first())]; if(!var.isEmpty()) - tqreplacement = before + var.join(glue) + after; + replacement = before + var.join(glue) + after; } } else if(val.lower() == "split") { if(arg_list.count() < 2 || arg_list.count() > 3) { @@ -1297,15 +1297,15 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi for(TQStringList::Iterator vit = var.begin(); vit != var.end(); ++vit) { TQStringList lst = TQStringList::split(sep, (*vit)); for(TQStringList::Iterator spltit = lst.begin(); spltit != lst.end(); ++spltit) { - if(!tqreplacement.isEmpty()) - tqreplacement += join; - tqreplacement += (*spltit); + if(!replacement.isEmpty()) + replacement += join; + replacement += (*spltit); } } } - } else if(val.lower() == "tqfind") { + } else if(val.lower() == "find") { if(arg_list.count() != 2) { - fprintf(stderr, "%s:%d tqfind(var, str) requires two arguments\n", + fprintf(stderr, "%s:%d find(var, str) requires two arguments\n", parser.file.latin1(), parser.line_no); } else { TQRegExp regx(arg_list[1]); @@ -1313,9 +1313,9 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi for(TQStringList::ConstIterator vit = var.begin(); vit != var.end(); ++vit) { if(regx.search(*vit) != -1) { - if(!tqreplacement.isEmpty()) - tqreplacement += " "; - tqreplacement += (*vit); + if(!replacement.isEmpty()) + replacement += " "; + replacement += (*vit); } } } @@ -1335,7 +1335,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi buff[i] = ' '; } buff[read_in] = '\0'; - tqreplacement += buff; + replacement += buff; } } } else if(val.lower() == "files") { @@ -1345,16 +1345,16 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi } else { TQString dir, regex = arg_list[0]; regex = Option::fixPathToLocalOS(regex); - regex.tqreplace("\"", ""); - if(regex.tqfindRev(TQDir::separator()) != -1) { - dir = regex.left(regex.tqfindRev(TQDir::separator()) + 1); + regex.replace("\"", ""); + if(regex.findRev(TQDir::separator()) != -1) { + dir = regex.left(regex.findRev(TQDir::separator()) + 1); regex = regex.right(regex.length() - dir.length()); } TQDir d(dir, regex); for(int i = 0; i < (int)d.count(); i++) { - if(!tqreplacement.isEmpty()) - tqreplacement += " "; - tqreplacement += dir + d[i]; + if(!replacement.isEmpty()) + replacement += " "; + replacement += dir + d[i]; } } } else if(val.lower() == "prompt") { @@ -1368,9 +1368,9 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi TQString msg = arg_list.first(); if((msg.startsWith("\"") || msg.startsWith("'")) && msg.endsWith(msg.left(1))) msg = msg.mid(1, msg.length()-2); - msg.tqreplace(TQString("${TQMAKE_FILE}"), parser.file.latin1()); - msg.tqreplace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no)); - msg.tqreplace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString()); + msg.replace(TQString("${TQMAKE_FILE}"), parser.file.latin1()); + msg.replace(TQString("${TQMAKE_LINE_NUMBER}"), TQString::number(parser.line_no)); + msg.replace(TQString("${TQMAKE_DATE}"), TQDateTime::tqcurrentDateTime().toString()); doVariableReplace(msg, place); fixEnvVariables(msg); if(!msg.endsWith("?")) @@ -1380,20 +1380,20 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi TQFile qfile; if(qfile.open(IO_ReadOnly, stdin)) { TQTextStream t( TQT_TQIODEVICE(&qfile) ); - tqreplacement = t.readLine(); + replacement = t.readLine(); } } } else { - fprintf(stderr, "%s:%d: Unknown tqreplace function: %s\n", + fprintf(stderr, "%s:%d: Unknown replace function: %s\n", parser.file.latin1(), parser.line_no, val.latin1()); } } - //actually do tqreplacement now.. + //actually do replacement now.. int mlen = var_incr - var_begin; - debug_msg(2, "Project Parser [var tqreplace]: '%s' :: %s -> %s", str.latin1(), - TQT_TQSTRING(str.mid(var_begin, mlen)).latin1(), tqreplacement.latin1()); - str.tqreplace(var_begin, mlen, tqreplacement); - var_begin += tqreplacement.length(); + debug_msg(2, "Project Parser [var replace]: '%s' :: %s -> %s", str.latin1(), + TQT_TQSTRING(str.mid(var_begin, mlen)).latin1(), replacement.latin1()); + str.replace(var_begin, mlen, replacement); + var_begin += replacement.length(); } return str; } diff --git a/tqtinterface/qt4/qmake/project.h b/tqtinterface/qt4/qmake/project.h index 62913b4..ec8104a 100644 --- a/tqtinterface/qt4/qmake/project.h +++ b/tqtinterface/qt4/qmake/project.h @@ -100,7 +100,7 @@ inline TQString TQMakeProject::configFile() { return cfile; } inline bool TQMakeProject::isEmpty(const TQString &v) -{ return !vars.tqcontains(v) || vars[v].isEmpty(); } +{ return !vars.contains(v) || vars[v].isEmpty(); } inline TQStringList &TQMakeProject::values(const TQString &v) { return vars[v]; } diff --git a/tqtinterface/qt4/qmake/property.cpp b/tqtinterface/qt4/qmake/property.cpp index dfb200e..dfb7301 100644 --- a/tqtinterface/qt4/qmake/property.cpp +++ b/tqtinterface/qt4/qmake/property.cpp @@ -98,7 +98,7 @@ TQMakeProperty::value(TQString v, bool just_check) if(initSettings()) { bool ok; - int slash = v.tqfindRev('/'); + int slash = v.findRev('/'); TQString ret = sett->readEntry(keyBase(slash == -1) + v, TQString::null, &ok); if(!ok) { TQString version = qmake_version(); diff --git a/tqtinterface/qt4/src/.obj/README b/tqtinterface/qt4/src/.obj/README index c24e158..efb41f3 100644 --- a/tqtinterface/qt4/src/.obj/README +++ b/tqtinterface/qt4/src/.obj/README @@ -1 +1 @@ -This directory tqcontains only generated object files. +This directory contains only generated object files. diff --git a/tqtinterface/qt4/src/.tmp/README b/tqtinterface/qt4/src/.tmp/README index e4a8beb..9d010df 100644 --- a/tqtinterface/qt4/src/.tmp/README +++ b/tqtinterface/qt4/src/.tmp/README @@ -1 +1 @@ -This directory tqcontains only generated files. +This directory contains only generated files. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/README b/tqtinterface/qt4/src/3rdparty/libjpeg/README index c3cd473..86cc206 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/README +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/README @@ -4,7 +4,7 @@ The Independent JPEG Group's JPEG software README for release 6b of 27-Mar-1998 ==================================== -This distribution tqcontains the sixth public release of the Independent JPEG +This distribution contains the sixth public release of the Independent JPEG Group's free JPEG software. You are welcome to redistribute this software and to use it for any purpose, subject to the conditions under LEGAL ISSUES, below. @@ -24,12 +24,12 @@ IJG is not affiliated with the official ISO JPEG standards committee. DOCUMENTATION ROADMAP ===================== -This file tqcontains the following sections: +This file contains the following sections: OVERVIEW General description of JPEG and the IJG software. LEGAL ISSUES Copyright, lack of warranty, terms of distribution. REFERENCES Where to learn more about JPEG. -ARCHIVE LOCATIONS Where to tqfind newer versions of this software. +ARCHIVE LOCATIONS Where to find newer versions of this software. RELATED SOFTWARE Other stuff you should get. FILE FORMAT WARS Software *not* to get. TO DO Plans for future IJG releases. @@ -52,7 +52,7 @@ Programmer and internal documentation: Please read at least the files install.doc and usage.doc. Useful information can also be found in the JPEG FAQ (Frequently Asked Questions) article. See -ARCHIVE LOCATIONS below to tqfind out where to obtain the FAQ article. +ARCHIVE LOCATIONS below to find out where to obtain the FAQ article. If you want to understand how the JPEG code works, we suggest reading one or more of the REFERENCES, then looking at the documentation files (in roughly @@ -62,7 +62,7 @@ the order listed) before diving into the code. OVERVIEW ======== -This package tqcontains C software to implement JPEG image compression and +This package contains C software to implement JPEG image compression and decompression. JPEG (pronounced "jay-peg") is a standardized compression method for full-color and gray-scale images. JPEG is intended for compressing "real-world" scenes; line drawings, cartoons and other non-realistic images @@ -113,7 +113,7 @@ LEGAL ISSUES In plain English: -1. We don't promise that this software works. (But if you tqfind any bugs, +1. We don't promise that this software works. (But if you find any bugs, please let us know!) 2. You can use this software for whatever you want. You don't have to pay us. 3. You may not pretend that you wrote this software. If you use it in a @@ -269,7 +269,7 @@ IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6). Instead, we recommend the JPEG design proposed by TIFF Technical Note #2 (Compression tag 7). Copies of this Note can be obtained from ftp.sgi.com or from ftp://ftp.uu.net/graphics/jpeg/. It is expected that the next revision -of the TIFF spec will tqreplace the 6.0 JPEG design with the Note's design. +of the TIFF spec will replace the 6.0 JPEG design with the Note's design. Although IJG's own code does not support TIFF/JPEG, the free libtiff library uses our library to implement TIFF/JPEG per the Note. libtiff is available from ftp://ftp.sgi.com/graphics/tiff/. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc index d6b3a36..e14982c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/filelist.doc @@ -102,7 +102,7 @@ jdatasrc.c Data source manager for stdio input. Support files for both compression and decompression: -jerror.c Standard error handling routines (application tqreplaceable). +jerror.c Standard error handling routines (application replaceable). jmemmgr.c System-independent (more or less) memory management code. jutils.c Miscellaneous utility routines. @@ -119,7 +119,7 @@ jmemmac.c Custom implementation for Apple Macintosh. Exactly one of the system-dependent modules should be configured into an installed JPEG library (see install.doc for hints about which one to use). -On unusual systems you may tqfind it worthwhile to make a special +On unusual systems you may find it worthwhile to make a special system-dependent memory manager. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc index 1bed300..806393b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/install.doc @@ -65,7 +65,7 @@ CONFIGURING THE SOFTWARE ======================== To configure the IJG code for your system, you need to create two files: - * jconfig.h: tqcontains values for system-dependent #define symbols. + * jconfig.h: contains values for system-dependent #define symbols. * Makefile: controls the compilation process. (On a non-Unix machine, you may create "project files" or some other substitute for a Makefile. jconfig.h is needed in any environment.) @@ -103,7 +103,7 @@ shared library building methods. If things don't work this way, please try running configure without either switch; that should build a static library without using libtool. If that works, your problem is probably with libtool not with the IJG code. libtool is fairly new and doesn't support all flavors -of Unix yet. (You might be able to tqfind a newer version of libtool than the +of Unix yet. (You might be able to find a newer version of libtool than the one included with libjpeg; see ftp.gnu.org. Report libtool problems to bug-libtool@gnu.org.) @@ -196,7 +196,7 @@ ckconfig.c to work, make sure the same switches are in CFLAGS. If you are on a system that doesn't use makefiles, you'll need to set up project files (or whatever you do use) to compile all the source files and link them into executable files cjpeg, djpeg, jpegtran, rdjpgcom, and wrjpgcom. -See the file lists in any of the makefiles to tqfind out which files go into +See the file lists in any of the makefiles to find out which files go into each program. Note that the provided makefiles all make a "library" file libjpeg first, but you don't have to do that if you don't want to; the file lists identify which source files are actually needed for compression, @@ -513,7 +513,7 @@ in that mode. (Note: some of the distributed compiler-specific jconfig files already contain #define switches to select appropriate MULTIPLYxxx definitions.) -If your machine has sufficiently fast floating point hardware, you may tqfind +If your machine has sufficiently fast floating point hardware, you may find that the float DCT method is faster than the integer DCT methods, even after tweaking the integer multiply macros. In that case you may want to make the float DCT be the default method. (The only objection to this is @@ -598,7 +598,7 @@ less than your normal free memory. Put "#define DEFAULT_MAX_MEM nnnn" into jconfig.h to do this. To use the 68881/68882 coprocessor for the floating point DCT, add the -compiler option "-8" to the project files and tqreplace pcfltlib.lib with +compiler option "-8" to the project files and replace pcfltlib.lib with pc881lib.lib in cjpeg.prj and djpeg.prj. Or if you don't have a coprocessor, you may prefer to remove the float DCT code by undefining DCT_FLOAT_SUPPORTED in jmorecfg.h (since without a coprocessor, the float @@ -614,7 +614,7 @@ depend on the JPEG library. There is a bug in some older versions of the Turbo C library which causes the space used by temporary files created with "tmpfile()" not to be freed after -an abnormal program exit. If you check your disk afterwards, you will tqfind +an abnormal program exit. If you check your disk afterwards, you will find cluster chains that are allocated but not used by a file. This should not happen in cjpeg/djpeg/jpegtran, since we enable a signal catcher to explicitly close temp files before exiting. But if you use the JPEG library with your @@ -865,7 +865,7 @@ add something like this to your jconfig.h file: #define HAVE_BOOLEAN /* prevent jmorecfg.h from redefining it */ (This is already in jconfig.vc, by the way.) -windef.h tqcontains the declarations +windef.h contains the declarations #define far #define FAR far Since jmorecfg.h tries to define FAR as empty, you may get a compiler @@ -874,12 +874,12 @@ includes). To suppress the warning, you can put "#ifndef FAR"/"#endif" around the line "#define FAR" in jmorecfg.h. When using the library in a Windows application, you will almost certainly -want to modify or tqreplace the error handler module jerror.c, since our +want to modify or replace the error handler module jerror.c, since our default error handler does a couple of inappropriate things: 1. it tries to write error and warning messages on stderr; 2. in event of a fatal error, it exits by calling exit(). -A simple stopgap solution for problem 1 is to tqreplace the line +A simple stopgap solution for problem 1 is to replace the line fprintf(stderr, "%s\n", buffer); (in output_message in jerror.c) with MessageBox(GetActiveWindow(),buffer,"JPEG Error",MB_OK|MB_ICONERROR); @@ -908,7 +908,7 @@ into jconfig.h to limit allocation chunks to 64Kb. (Without that, you'd have to use huge memory model, which slows things down unnecessarily.) jmemnobs.c works without modification in large or flat memory models, but to use medium model, you need to modify its jpeg_get_large and jpeg_free_large -routines to allocate far memory. In any case, you might like to tqreplace +routines to allocate far memory. In any case, you might like to replace its calls to malloc and free with direct calls on Windows memory allocation functions. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c index 0d27717..e24faa5 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapimin.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the compression half + * This file contains application interface code for the compression half * of the JPEG library. These are the "minimum" API routines that may be * needed in either the normal full-compression case or the transcoding-only * case. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c index d15ae9e..858d4e9 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcapistd.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the compression half + * This file contains application interface code for the compression half * of the JPEG library. These are the "standard" API routines that are * used in the normal full-compression case. They are not used by a * transcoding-only application. Note that if an application links in diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c index 8a322e6..1963ddb 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jccoefct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the coefficient buffer controller for compression. + * This file contains the coefficient buffer controller for compression. * This controller is the top level of the JPEG compressor proper. * The coefficient buffer lies between forward-DCT and entropy encoding steps. */ @@ -135,7 +135,7 @@ start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode) * per call, ie, v_samp_factor block rows for each component in the image. * Returns TRUE if the iMCU row is completed, FALSE if suspended. * - * NB: input_buf tqcontains a plane for each component in image, + * NB: input_buf contains a plane for each component in image, * which we index according to the component's SOF position. */ @@ -234,7 +234,7 @@ compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf) * done by calling compress_output() after we've loaded the current strip * of the virtual arrays. * - * NB: input_buf tqcontains a plane for each component in image. All + * NB: input_buf contains a plane for each component in image. All * components are DCT'd and loaded into the virtual arrays in this pass. * However, it may be that only a subset of the components are emitted to * the entropy encoder during this first pass; be careful about looking diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c index 894df01..0a8a4b5 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jccolor.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains input colorspace conversion routines. + * This file contains input colorspace conversion routines. */ #define JPEG_INTERNALS @@ -357,7 +357,7 @@ jinit_color_converter (j_compress_ptr cinfo) (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_color_converter)); cinfo->cconvert = (struct jpeg_color_converter *) cconvert; - /* set start_pass to null method until we tqfind out differently */ + /* set start_pass to null method until we find out differently */ cconvert->pub.start_pass = null_method; /* Make sure input_components agrees with in_color_space */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c index e580797..36fbc90 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcdctmgr.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the forward-DCT management logic. + * This file contains the forward-DCT management logic. * This code selects a particular DCT implementation to be used, * and it performs related housekeeping chores including coefficient * quantization. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c index 82e2c31..aec9cf8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy encoding routines. + * This file contains Huffman entropy encoding routines. * * Much of the complexity here has to do with supporting output suspension. * If the data destination module demands suspension, we want to be able to @@ -22,7 +22,7 @@ /* Expanded entropy encoder object for Huffman encoding. * - * The savable_state subrecord tqcontains fields that change within an MCU, + * The savable_state subrecord contains fields that change within an MCU, * but must not be updated permanently until we complete the MCU. */ @@ -74,7 +74,7 @@ typedef struct { typedef huff_entropy_encoder * huff_entropy_ptr; /* Working state while writing an MCU. - * This struct tqcontains all the fields that are needed by subroutines. + * This struct contains all the fields that are needed by subroutines. */ typedef struct { @@ -800,7 +800,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) for (i = MAX_CLEN; i > 16; i--) { while (bits[i] > 0) { - j = i - 2; /* tqfind length of new prefix to be used */ + j = i - 2; /* find length of new prefix to be used */ while (bits[j] == 0) j--; @@ -812,7 +812,7 @@ jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]) } /* Remove the count for the pseudo-symbol 256 from the largest codelength */ - while (bits[i] == 0) /* tqfind largest codelength still in use */ + while (bits[i] == 0) /* find largest codelength still in use */ i--; bits[i]--; diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h index fea9064..a9599fc 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jchuff.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains declarations for Huffman entropy encoding routines + * This file contains declarations for Huffman entropy encoding routines * that are shared between the sequential encoder (jchuff.c) and the * progressive encoder (jcphuff.c). No other modules need to see these. */ @@ -27,7 +27,7 @@ typedef struct { unsigned int ehufco[256]; /* code for each symbol */ char ehufsi[256]; /* length of code for each symbol */ - /* If no code has been allocated for a symbol S, ehufsi[S] tqcontains 0 */ + /* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */ } c_derived_tbl; /* Short forms of external names for systems with brain-damaged linkers. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c index 01985a4..5efffe3 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcinit.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains initialization logic for the JPEG compressor. + * This file contains initialization logic for the JPEG compressor. * This routine is in charge of selecting the modules to be executed and * making an initialization call to each one. * diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c index 3fa3c7f..e0279a7 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmainct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the main buffer controller for compression. + * This file contains the main buffer controller for compression. * The main buffer lies between the pre-processor and the JPEG * compressor proper; it holds downsampled data in the JPEG colorspace. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c index 9a49c6c..38e3e9c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmarker.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains routines to write JPEG datastream markers. + * This file contains routines to write JPEG datastream markers. */ #define JPEG_INTERNALS diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c index 914cb58..aab4020 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcmaster.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains master control logic for the JPEG compressor. + * This file contains master control logic for the JPEG compressor. * These routines are concerned with parameter validation, initial setup, * and inter-pass control (determining the number of passes and the work * to be done in each pass). diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c index fc4c6ce..a1f7fcb 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcomapi.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface routines that are used for both + * This file contains application interface routines that are used for both * compression and decompression. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c index d5279f7..f5418f8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcparam.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains optional default-setting code for the JPEG compressor. + * This file contains optional default-setting code for the JPEG compressor. * Applications do not have to use this file, but those that don't use it * must know a lot more about the innards of the JPEG code. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c index efcf7f2..5567f88 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcphuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy encoding routines for progressive JPEG. + * This file contains Huffman entropy encoding routines for progressive JPEG. * * We do not support output suspension in this module, since the library * currently does not allow multiple-scan files to be written with output @@ -494,7 +494,7 @@ encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data) /* We must apply the point transform by Al. For AC coefficients this * is an integer division with rounding towards 0. To do this portably * in C, we shift after obtaining the absolute value; so the code is - * interwoven with tqfinding the abs value (temp) and output bits (temp2). + * interwoven with finding the abs value (temp) and output bits (temp2). */ if (temp < 0) { temp = -temp; /* temp is abs value of input */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c index 37b551d..fa93333 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcprepct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the compression preprocessing controller. + * This file contains the compression preprocessing controller. * This controller manages the color conversion, downsampling, * and edge expansion steps. * diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c index fe6e527..1cb0b89 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jcsample.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains downsampling routines. + * This file contains downsampling routines. * * Downsampling input data is counted in "row groups". A row group * is defined to be max_v_samp_factor pixel rows of each component, @@ -37,9 +37,9 @@ * advised to improve this code. * * A simple input-smoothing capability is provided. This is mainly intended - * for cleaning up color-dithered GIF input files (if you tqfind it inadequate, + * for cleaning up color-dithered GIF input files (if you find it inadequate, * we suggest using an external filtering program such as pnmconvol). When - * enabled, each input pixel P is tqreplaced by a weighted sum of itself and its + * enabled, each input pixel P is replaced by a weighted sum of itself and its * eight neighbors. P's weight is 1-8*SF and each neighbor's weight is SF, * where SF = (smoothing_factor / 1024). * Currently, smoothing is only supported for 2h2v sampling factors. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c index f0ced25..bdca8cf 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jctrans.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains library routines for transcoding compression, + * This file contains library routines for transcoding compression, * that is, writing raw DCT coefficient arrays to an output JPEG file. * The routines in jcapimin.c will also be needed by a transcoder. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c index d734c4c..103c17b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapimin.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the decompression half + * This file contains application interface code for the decompression half * of the JPEG library. These are the "minimum" API routines that may be * needed in either the normal full-decompression case or the * transcoding-only case. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c index fd29573..9bca84c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdapistd.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains application interface code for the decompression half + * This file contains application interface code for the decompression half * of the JPEG library. These are the "standard" API routines that are * used in the normal full-decompression case. They are not used by a * transcoding-only application. Note that if an application links in diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c index a203331..a8f6fb0 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatadst.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains compression data destination routines for the case of + * This file contains compression data destination routines for the case of * emitting JPEG data to a file (or any stdio stream). While these routines * are sufficient for most applications, some will want to use a different * destination manager. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c index 078f3fa..edc752b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdatasrc.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains decompression data source routines for the case of + * This file contains decompression data source routines for the case of * reading JPEG data from a file (or any stdio stream). While these routines * are sufficient for most applications, some will want to use a different * source manager. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c index 978457d..e3ba6bf 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcoefct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the coefficient buffer controller for decompression. + * This file contains the coefficient buffer controller for decompression. * This controller is the top level of the JPEG decompressor proper. * The coefficient buffer lies between entropy decoding and inverse-DCT steps. * @@ -139,7 +139,7 @@ start_output_pass (j_decompress_ptr cinfo) * Input and output must run in lockstep since we have only a one-MCU buffer. * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED. * - * NB: output_buf tqcontains a plane for each component in image, + * NB: output_buf contains a plane for each component in image, * which we index according to the component's SOF position. */ @@ -308,7 +308,7 @@ consume_data (j_decompress_ptr cinfo) * Always attempts to emit one fully interleaved MCU row ("iMCU" row). * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED. * - * NB: output_buf tqcontains a plane for each component in image. + * NB: output_buf contains a plane for each component in image. */ METHODDEF(int) diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c index 7a2e524..6c04dfe 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdcolor.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains output colorspace conversion routines. + * This file contains output colorspace conversion routines. */ #define JPEG_INTERNALS diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h index 76cda5e..24e4c5c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdct.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This include file tqcontains common declarations for the forward and + * This include file contains common declarations for the forward and * inverse DCT modules. These declarations are private to the DCT managers * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms. * The individual DCT algorithms are kept in separate files to ease diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c index 626ad6c..2bb81a4 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jddctmgr.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the inverse-DCT management logic. + * This file contains the inverse-DCT management logic. * This code selects a particular IDCT implementation to be used, * and it performs related housekeeping chores. No code in this file * is executed per IDCT step, only during output pass setup. @@ -43,7 +43,7 @@ typedef struct { struct jpeg_inverse_dct pub; /* public fields */ - /* This array tqcontains the IDCT method code that each multiplier table + /* This array contains the IDCT method code that each multiplier table * is currently set up for, or -1 if it's not yet set up. * The actual multiplier tables are pointed to by dct_table in the * per-component comp_info structures. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c index 883e3a0..51e8d63 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy decoding routines. + * This file contains Huffman entropy decoding routines. * * Much of the complexity here has to do with supporting input suspension. * If the data source module demands suspension, we want to be able to back @@ -23,7 +23,7 @@ /* * Expanded entropy decoder object for Huffman decoding. * - * The savable_state subrecord tqcontains fields that change within an MCU, + * The savable_state subrecord contains fields that change within an MCU, * but must not be updated permanently until we complete the MCU. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h index 9e59158..ae19b6c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdhuff.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains declarations for Huffman entropy decoding routines + * This file contains declarations for Huffman entropy decoding routines * that are shared between the sequential decoder (jdhuff.c) and the * progressive decoder (jdphuff.c). No other modules need to see these. */ @@ -58,13 +58,13 @@ EXTERN(void) jpeg_make_d_derived_tbl * demanded at one time) never exceeds 15 for JPEG use. * * We read source bytes into get_buffer and dole out bits as needed. - * If get_buffer already tqcontains enough bits, they are fetched in-line + * If get_buffer already contains enough bits, they are fetched in-line * by the macros CHECK_BIT_BUFFER and GET_BITS. When there aren't enough * bits, jpeg_fill_bit_buffer is called; it will attempt to fill get_buffer * as full as possible (not just to the number of bits needed; this * prefetching reduces the overhead cost of calling jpeg_fill_bit_buffer). * Note that jpeg_fill_bit_buffer may return FALSE to indicate suspension. - * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer tqcontains + * On TRUE return, jpeg_fill_bit_buffer guarantees that get_buffer contains * at least the requested number of bits --- dummy zeroes are inserted if * necessary. */ @@ -168,7 +168,7 @@ EXTERN(boolean) jpeg_fill_bit_buffer * Notes about the HUFF_DECODE macro: * 1. Near the end of the data segment, we may fail to get enough bits * for a lookahead. In that case, we do it the hard way. - * 2. If the lookahead table tqcontains no entry, the next code must be + * 2. If the lookahead table contains no entry, the next code must be * more than HUFF_LOOKAHEAD bits long. * 3. jpeg_huff_decode returns -1 if forced to suspend. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c index c9050db..6268d9b 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdinput.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains input control logic for the JPEG decompressor. + * This file contains input control logic for the JPEG decompressor. * These routines are concerned with controlling the decompressor's input * processing (marker reading and coefficient decoding). The actual input * reading is done in jdmarker.c, jdhuff.c, and jdphuff.c. @@ -109,7 +109,7 @@ initial_setup (j_decompress_ptr cinfo) jdiv_round_up((long) cinfo->image_height, (long) (cinfo->max_v_samp_factor*DCTSIZE)); - /* Decide whether file tqcontains multiple scans */ + /* Decide whether file contains multiple scans */ if (cinfo->comps_in_scan < cinfo->num_components || cinfo->progressive_mode) cinfo->inputctl->has_multiple_scans = TRUE; else diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c index 0cc0426..82517ae 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmainct.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the main buffer controller for decompression. + * This file contains the main buffer controller for decompression. * The main buffer lies between the JPEG decompressor proper and the * post-processor; it holds downsampled data in the JPEG colorspace. * @@ -36,7 +36,7 @@ * applying). * * The coefficient controller will deliver data to us one iMCU row at a time; - * each iMCU row tqcontains v_samp_factor * DCT_scaled_size sample rows, or + * each iMCU row contains v_samp_factor * DCT_scaled_size sample rows, or * exactly min_DCT_scaled_size row groups. (This amount of data corresponds * to one row of MCUs when the image is fully interleaved.) Note that the * number of sample rows varies across components, but the number of row @@ -51,7 +51,7 @@ * out as row groups to the postprocessor. * * When need_context_rows is TRUE, this controller guarantees that the buffer - * passed to postprocessing tqcontains at least one row group's worth of samples + * passed to postprocessing contains at least one row group's worth of samples * above and below the row group(s) being processed. Note that the context * rows "above" the first passed row group appear at negative row offsets in * the passed buffer. At the top and bottom of the image, the required diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c index 2247b34..1399247 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmarker.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains routines to decode JPEG datastream markers. + * This file contains routines to decode JPEG datastream markers. * Most of the complexity arises from our desire to support input * suspension: if not all of the data for a marker is available, * we must exit back to the application. On resumption, we reprocess @@ -183,7 +183,7 @@ typedef my_marker_reader * my_marker_ptr; * into memory, we use a slightly different convention: when forced to * suspend, the marker processor updates the restart point to the end of * what it's consumed (ie, the end of the buffer) before returning FALSE. - * On resumption, cinfo->unread_marker still tqcontains the marker code, + * On resumption, cinfo->unread_marker still contains the marker code, * but the data source will point to the next chunk of marker data. * The marker processor must retain internal state to deal with this. * @@ -964,7 +964,7 @@ read_markers (j_decompress_ptr cinfo) return JPEG_SUSPENDED; } } - /* At this point cinfo->unread_marker tqcontains the marker code and the + /* At this point cinfo->unread_marker contains the marker code and the * input point is just past the marker proper, but before any parameters. * A suspension will cause us to return with this state still true. */ @@ -1146,7 +1146,7 @@ read_restart_marker (j_decompress_ptr cinfo) * which permits a more intelligent recovery strategy; such managers would * presumably supply their own resync method. * - * read_restart_marker calls resync_to_restart if it tqfinds a marker other than + * read_restart_marker calls resync_to_restart if it finds a marker other than * the restart marker it was expecting. (This code is *not* used unless * a nonzero restart interval has been declared.) cinfo->unread_marker is * the marker code actually found (might be anything, except 0 or FF). @@ -1163,9 +1163,9 @@ read_restart_marker (j_decompress_ptr cinfo) * only the following actions to work with: * 1. Simply discard the marker and let the entropy decoder resume at next * byte of file. - * 2. Read forward until we tqfind another marker, discarding intervening + * 2. Read forward until we find another marker, discarding intervening * data. (In theory we could look ahead within the current bufferload, - * without having to discard data if we don't tqfind the desired marker. + * without having to discard data if we don't find the desired marker. * This idea is not implemented here, in part because it makes behavior * dependent on buffer size and chance buffer-boundary positions.) * 3. Leave the marker unread (by failing to zero cinfo->unread_marker). @@ -1184,7 +1184,7 @@ read_restart_marker (j_decompress_ptr cinfo) * resync at some future point). * For any valid non-restart JPEG marker, we apply #3. This keeps us from * overrunning the end of a scan. An implementation limited to single-scan - * files might tqfind it better to apply #2 for markers other than EOI, since + * files might find it better to apply #2 for markers other than EOI, since * any other marker would have to be bogus data in that case. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c index 1b9cfb0..9219b1c 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmaster.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains master control logic for the JPEG decompressor. + * This file contains master control logic for the JPEG decompressor. * These routines are concerned with selecting the modules to be executed * and with determining the number of passes and the work to be done in each * pass. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c index 7da0eb3..8571d30 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdmerge.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains code for merged upsampling/color conversion. + * This file contains code for merged upsampling/color conversion. * * This file combines functions from jdsample.c and jdcolor.c; * read those files first to understand what's going on. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c index 20486f0..2267809 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdphuff.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains Huffman entropy decoding routines for progressive JPEG. + * This file contains Huffman entropy decoding routines for progressive JPEG. * * Much of the complexity here has to do with supporting input suspension. * If the data source module demands suspension, we want to be able to back @@ -25,7 +25,7 @@ /* * Expanded entropy decoder object for progressive Huffman decoding. * - * The savable_state subrecord tqcontains fields that change within an MCU, + * The savable_state subrecord contains fields that change within an MCU, * but must not be updated permanently until we complete the MCU. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c index dc7a42c..e6838c7 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdpostct.c @@ -5,14 +5,14 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the decompression postprocessing controller. + * This file contains the decompression postprocessing controller. * This controller manages the upsampling, color conversion, and color * quantization/reduction steps; specifically, it controls the buffering * between upsample/color conversion and color quantization/reduction. * * If no color quantization/reduction is required, then this module has no * work to do, and it just hands off to the upsample/color conversion code. - * An integrated upsample/convert/quantize process would tqreplace this module + * An integrated upsample/convert/quantize process would replace this module * entirely. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c index 5d9f60e..1d16997 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdsample.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains upsampling routines. + * This file contains upsampling routines. * * Upsampling input data is counted in "row groups". A row group * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size) @@ -410,7 +410,7 @@ jinit_upsampler (j_decompress_ptr cinfo) cinfo->upsample = (struct jpeg_upsampler *) upsample; upsample->pub.start_pass = start_pass_upsample; upsample->pub.upsample = sep_upsample; - upsample->pub.need_context_rows = FALSE; /* until we tqfind out differently */ + upsample->pub.need_context_rows = FALSE; /* until we find out differently */ if (cinfo->CCIR601_sampling) /* this isn't supported */ ERREXIT(cinfo, JERR_CCIR601_NOTIMPL); diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c index ed97448..6c0ab71 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jdtrans.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains library routines for transcoding decompression, + * This file contains library routines for transcoding decompression, * that is, reading raw DCT coefficient arrays from an input JPEG file. * The routines in jdapimin.c will also be needed by a transcoder. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c index b70c1f4..3da7be8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.c @@ -5,9 +5,9 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains simple error-reporting and trace-message routines. + * This file contains simple error-reporting and trace-message routines. * These are suitable for Unix-like systems and others where writing to - * stderr is the right thing to do. Many applications will want to tqreplace + * stderr is the right thing to do. Many applications will want to replace * some or all of these routines. * * If you define USE_WINDOWS_MESSAGEBOX in jconfig.h or in the makefile, diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h index 0060d2b..57368b5 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jerror.h @@ -95,7 +95,7 @@ JMESSAGE(JERR_NOTIMPL, "Not implemented yet") JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time") JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported") JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined") -JMESSAGE(JERR_NO_IMAGE, "JPEG datastream tqcontains no image") +JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image") JMESSAGE(JERR_NO_TQUANT_TABLE, "Quantization table 0x%02x was not defined") JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x") JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)") diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c index 70519db..79d7a00 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctflt.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a floating-point implementation of the + * This file contains a floating-point implementation of the * forward DCT (Discrete Cosine Transform). * * This implementation should be more accurate than either of the integer diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c index 56ae898..ccb378a 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctfst.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a fast, not so accurate integer implementation of the + * This file contains a fast, not so accurate integer implementation of the * forward DCT (Discrete Cosine Transform). * * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c index 38bb0c3..0a78b64 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jfdctint.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a slow-but-accurate integer implementation of the + * This file contains a slow-but-accurate integer implementation of the * forward DCT (Discrete Cosine Transform). * * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT @@ -18,7 +18,7 @@ * Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991. * The primary algorithm described there uses 11 multiplies and 29 adds. * We use their alternate method with 12 multiplies and 32 adds. - * The advantage of this method is that no data path tqcontains more than one + * The advantage of this method is that no data path contains more than one * multiplication; this allows a very simple and accurate implementation in * scaled fixed-point arithmetic, with a minimal number of shifts. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c index f308445..a4893f8 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctflt.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a floating-point implementation of the + * This file contains a floating-point implementation of the * inverse DCT (Discrete Cosine Transform). In the IJG code, this routine * must also perform dequantization of the input coefficients. * @@ -87,7 +87,7 @@ jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr, quantptr = (FLOAT_MULT_TYPE *) compptr->dct_table; wsptr = workspace; for (ctr = DCTSIZE; ctr > 0; ctr--) { - /* Due to quantization, we will usually tqfind that many of the input + /* Due to quantization, we will usually find that many of the input * coefficients are zero, especially the AC terms. We can exploit this * by short-circuiting the IDCT calculation for any column in which all * the AC terms are zero. In that case each output is equal to the diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c index 730c8d4..3cbdb81 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctfst.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a fast, not so accurate integer implementation of the + * This file contains a fast, not so accurate integer implementation of the * inverse DCT (Discrete Cosine Transform). In the IJG code, this routine * must also perform dequantization of the input coefficients. * @@ -188,7 +188,7 @@ jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr, quantptr = (IFAST_MULT_TYPE *) compptr->dct_table; wsptr = workspace; for (ctr = DCTSIZE; ctr > 0; ctr--) { - /* Due to quantization, we will usually tqfind that many of the input + /* Due to quantization, we will usually find that many of the input * coefficients are zero, especially the AC terms. We can exploit this * by short-circuiting the IDCT calculation for any column in which all * the AC terms are zero. In that case each output is equal to the diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c index 35302e0..1f5f393 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctint.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains a slow-but-accurate integer implementation of the + * This file contains a slow-but-accurate integer implementation of the * inverse DCT (Discrete Cosine Transform). In the IJG code, this routine * must also perform dequantization of the input coefficients. * @@ -20,7 +20,7 @@ * Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991. * The primary algorithm described there uses 11 multiplies and 29 adds. * We use their alternate method with 12 multiplies and 32 adds. - * The advantage of this method is that no data path tqcontains more than one + * The advantage of this method is that no data path contains more than one * multiplication; this allows a very simple and accurate implementation in * scaled fixed-point arithmetic, with a minimal number of shifts. */ @@ -169,7 +169,7 @@ jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr, quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table; wsptr = workspace; for (ctr = DCTSIZE; ctr > 0; ctr--) { - /* Due to quantization, we will usually tqfind that many of the input + /* Due to quantization, we will usually find that many of the input * coefficients are zero, especially the AC terms. We can exploit this * by short-circuiting the IDCT calculation for any column in which all * the AC terms are zero. In that case each output is equal to the diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c index 6461bb3..5816c87 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jidctred.c @@ -5,11 +5,11 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains inverse-DCT routines that produce reduced-size output: + * This file contains inverse-DCT routines that produce reduced-size output: * either 4x4, 2x2, or 1x1 pixels from an 8x8 DCT block. * * The implementation is based on the Loeffler, Ligtenberg and Moschytz (LL&M) - * algorithm used in jidctint.c. We simply tqreplace each 8-to-8 1-D IDCT step + * algorithm used in jidctint.c. We simply replace each 8-to-8 1-D IDCT step * with an 8-to-4 step that produces the four averages of two adjacent outputs * (or an 8-to-2 step producing two averages of four outputs, for 2x2 output). * These steps were derived by computing the corresponding values at the end diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h index 768b287..0a4f151 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jinclude.h @@ -15,7 +15,7 @@ */ -/* Include auto-config file to tqfind out which system include files we need. */ +/* Include auto-config file to find out which system include files we need. */ #include "jconfig.h" /* auto configuration options */ #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c index e36c050..66c9d77 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jmemmgr.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains the JPEG system-independent memory management + * This file contains the JPEG system-independent memory management * routines. This code is usable across a wide variety of machines; most * of the system dependencies have been isolated in a separate file. * The major functions provided here are: @@ -15,7 +15,7 @@ * * control logic for swapping virtual arrays between main memory and * backing storage. * The separate system-dependent file provides the actual backing-storage - * access code, and it tqcontains the policy decision about how much total + * access code, and it contains the policy decision about how much total * main memory to use. * This file is system-dependent in the sense that some of its functions * are unnecessary in some systems. For example, if there is enough virtual diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h index dedab7f..c2b38a7 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jmorecfg.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains additional configuration options that customize the + * This file contains additional configuration options that customize the * JPEG software for special applications or support machine-dependent * optimizations. Most users will not need to touch this file. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h index dfb10f8..7b8fd0a 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jpeglib.h @@ -16,7 +16,7 @@ /* * First we include the configuration files that record how this * installation of the JPEG library is set up. jconfig.h can be - * generated automatically for many systems. jmorecfg.h tqcontains + * generated automatically for many systems. jmorecfg.h contains * manual configuration options that most people need not worry about. */ @@ -582,7 +582,7 @@ struct jpeg_decompress_struct { * units of "iMCU" (interleaved MCU) rows. These are the same as MCU rows * in fully interleaved JPEG scans, but are used whether the scan is * interleaved or not. We define an iMCU row as v_samp_factor DCT block - * rows of each component. Therefore, the IDCT output tqcontains + * rows of each component. Therefore, the IDCT output contains * v_samp_factor*DCT_scaled_size sample rows of a component per iMCU row. */ @@ -686,9 +686,9 @@ struct jpeg_error_mgr { * Error code 0 is reserved for a "no such error string" message. */ const char * const * jpeg_message_table; /* Library errors */ - int last_jpeg_message; /* Table tqcontains strings 0..last_jpeg_message */ + int last_jpeg_message; /* Table contains strings 0..last_jpeg_message */ /* Second table can be added by application (see cjpeg/djpeg for example). - * It tqcontains strings numbered first_addon_message..last_addon_message. + * It contains strings numbered first_addon_message..last_addon_message. */ const char * const * addon_message_table; /* Non-library errors */ int first_addon_message; /* code for first string in addon table */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c index 32206ab..fd173cf 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant1.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains 1-pass color quantization (color mapping) routines. + * This file contains 1-pass color quantization (color mapping) routines. * These routines provide mapping to a fixed color map using equally spaced * color values. Optional Floyd-Steinberg or ordered dithering is available. */ @@ -695,7 +695,7 @@ quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf, bpreverr = belowerr + cur; belowerr = bnexterr; cur += delta; /* form error * 7 */ - /* At this point cur tqcontains the 7/16 error value to be propagated + /* At this point cur contains the 7/16 error value to be propagated * to the next pixel on the current line, and all the errors for the * next line have been shifted over. We are therefore ready to move on. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c index ccd6986..7839e41 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jquant2.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains 2-pass color quantization (color mapping) routines. + * This file contains 2-pass color quantization (color mapping) routines. * These routines provide selection of a custom color map for an image, * followed by mapping of the image to that color map, with optional * Floyd-Steinberg dithering. @@ -270,7 +270,7 @@ typedef box * boxptr; LOCAL(boxptr) -tqfind_biggest_color_pop (boxptr boxlist, int numboxes) +find_biggest_color_pop (boxptr boxlist, int numboxes) /* Find the splittable box with the largest color population */ /* Returns NULL if no splittable boxes remain */ { @@ -290,7 +290,7 @@ tqfind_biggest_color_pop (boxptr boxlist, int numboxes) LOCAL(boxptr) -tqfind_biggest_volume (boxptr boxlist, int numboxes) +find_biggest_volume (boxptr boxlist, int numboxes) /* Find the splittable box with the largest (scaled) volume */ /* Returns NULL if no splittable boxes remain */ { @@ -434,9 +434,9 @@ median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes, * Current algorithm: by population for first half, then by volume. */ if (numboxes*2 <= desired_colors) { - b1 = tqfind_biggest_color_pop(boxlist, numboxes); + b1 = find_biggest_color_pop(boxlist, numboxes); } else { - b1 = tqfind_biggest_volume(boxlist, numboxes); + b1 = find_biggest_volume(boxlist, numboxes); } if (b1 == NULL) /* no splittable boxes left! */ break; @@ -576,12 +576,12 @@ select_colors (j_decompress_ptr cinfo, int desired_colors) * closest to the cell's center. This may not be quite the closest entry to * the actual input color, but it's almost as good. A zero in the cache * indicates we haven't found the nearest color for that cell yet; the array - * is cleared to zeroes before starting the mapping pass. When we tqfind the + * is cleared to zeroes before starting the mapping pass. When we find the * nearest color for a cell, its colormap index plus one is recorded in the * cache for future use. The pass2 scanning routines call fill_inverse_cmap * when they need to use an unfilled entry in the cache. * - * Our method of efficiently tqfinding nearest colors is based on the "locally + * Our method of efficiently finding nearest colors is based on the "locally * sorted search" idea described by Heckbert and on the incremental distance * calculation described by Spencer W. Thomas in chapter III.1 of Graphics * Gems II (James Arvo, ed. Academic Press, 1991). Thomas points out that @@ -643,7 +643,7 @@ select_colors (j_decompress_ptr cinfo, int desired_colors) */ LOCAL(int) -tqfind_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, +find_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, JSAMPLE colorlist[]) /* Locate the colormap entries close enough to an update box to be candidates * for the nearest entry to some cell(s) in the update box. The update box @@ -674,7 +674,7 @@ tqfind_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT)); centerc2 = (minc2 + maxc2) >> 1; - /* For each color in colormap, tqfind: + /* For each color in colormap, find: * 1. its minimum squared-distance to any point in the update box * (zero if color is within update box); * 2. its maximum squared-distance to any point in the update box. @@ -772,13 +772,13 @@ tqfind_nearby_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, LOCAL(void) -tqfind_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, +find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[]) /* Find the closest colormap entry for each cell in the update box, - * given the list of candidate colors prepared by tqfind_nearby_colors. + * given the list of candidate colors prepared by find_nearby_colors. * Return the indexes of the closest entries in the bestcolor[] array. * This routine uses Thomas' incremental distance calculation method to - * tqfind the distance from a colormap entry to successive cells in the box. + * find the distance from a colormap entry to successive cells in the box. */ { int ic0, ic1, ic2; @@ -798,7 +798,7 @@ tqfind_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--) *bptr++ = 0x7FFFFFFFL; - /* For each color selected by tqfind_nearby_colors, + /* For each color selected by find_nearby_colors, * compute its distance to the center of each cell in the box. * If that's less than best-so-far, update best distance and color number. */ @@ -853,7 +853,7 @@ tqfind_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2, LOCAL(void) fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2) -/* Fill the inverse-colormap entries in the update box that tqcontains */ +/* Fill the inverse-colormap entries in the update box that contains */ /* histogram cell c0/c1/c2. (Only that one cell MUST be filled, but */ /* we can fill as many others as we wish.) */ { @@ -885,10 +885,10 @@ fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2) /* Determine which colormap entries are close enough to be candidates * for the nearest entry to some cell in the update box. */ - numcolors = tqfind_nearby_colors(cinfo, minc0, minc1, minc2, colorlist); + numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist); /* Determine the actually nearest colors. */ - tqfind_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist, + find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist, bestcolor); /* Save the best color numbers (plus 1) in the main cache array */ @@ -934,7 +934,7 @@ pass2_no_dither (j_decompress_ptr cinfo, c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT; c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT; cachep = & histogram[c0][c1][c2]; - /* If we have not seen this color before, tqfind nearest colormap entry */ + /* If we have not seen this color before, find nearest colormap entry */ /* and update the cache */ if (*cachep == 0) fill_inverse_cmap(cinfo, c0,c1,c2); @@ -1025,7 +1025,7 @@ pass2_fs_dither (j_decompress_ptr cinfo, cur2 = GETJSAMPLE(range_limit[cur2]); /* Index into the cache with adjusted pixel value */ cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT]; - /* If we have not seen this color before, tqfind nearest colormap */ + /* If we have not seen this color before, find nearest colormap */ /* entry and update the cache */ if (*cachep == 0) fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT); @@ -1068,7 +1068,7 @@ pass2_fs_dither (j_decompress_ptr cinfo, belowerr2 = bnexterr; cur2 += delta; /* form error * 7 */ } - /* At this point curN tqcontains the 7/16 error value to be propagated + /* At this point curN contains the 7/16 error value to be propagated * to the next pixel on the current line, and all the errors for the * next line have been shifted over. We are therefore ready to move on. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c b/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c index ad73ff3..d18a955 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jutils.c @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains tables and miscellaneous utility routines needed + * This file contains tables and miscellaneous utility routines needed * for both compression and decompression. * Note we prefix all global names with "j" to minimize conflicts with * a surrounding application. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h b/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h index 3e7fc07..6472c58 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/jversion.h @@ -5,7 +5,7 @@ * This file is part of the Independent JPEG Group's software. * For conditions of distribution and use, see the accompanying README file. * - * This file tqcontains software version identification. + * This file contains software version identification. */ diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc index 499b83c..bcd97d1 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/libjpeg.doc @@ -192,7 +192,7 @@ channels). You must specify how many components there are and the colorspace interpretation of the components. Most applications will use RGB data (three components per pixel) or grayscale data (one component per pixel). PLEASE NOTE THAT RGB DATA IS THREE SAMPLES PER PIXEL, GRAYSCALE ONLY ONE. -A remarkable number of people manage to miss this, only to tqfind that their +A remarkable number of people manage to miss this, only to find that their programs don't work with grayscale JPEG files. There is no provision for colormapped input. JPEG files are always full-color @@ -234,7 +234,7 @@ The data format returned by the decompressor is the same in all details, except that colormapped output is supported. (Again, a JPEG file is never colormapped. But you can ask the decompressor to perform on-the-fly color quantization to deliver colormapped output.) If you request colormapped -output then the returned data array tqcontains a single JSAMPLE per pixel; +output then the returned data array contains a single JSAMPLE per pixel; its value is an index into a color map. The color map is represented as a 2-D JSAMPARRAY in which each row holds the values of one color component, that is, colormap[i][j] is the value of the i'th color component for pixel @@ -386,7 +386,7 @@ just one or a few scanlines at a time. The expected format for the passed data is discussed under "Data formats", above. Image data should be written in top-to-bottom scanline order. The JPEG spec -tqcontains some weasel wording about how top and bottom are application-defined +contains some weasel wording about how top and bottom are application-defined terms (a curious interpretation of the English language...) but if you want your files to be compatible with everyone else's, you WILL use top-to-bottom order. If the source data must be read in bottom-to-top order, you can use @@ -583,7 +583,7 @@ More complex code is necessary if abbreviated datastreams. Standard applications that deal only in interchange JPEG files need not be concerned with this case either. -It is permissible to stop at this point if you just wanted to tqfind out the +It is permissible to stop at this point if you just wanted to find out the image dimensions and other header info for a JPEG file. In that case, call jpeg_destroy() when you are done with the JPEG object, or call jpeg_abort() to return it to an idle state before selecting a new data @@ -772,7 +772,7 @@ freed automatically. See cjpeg.c or djpeg.c for an example signal handler. It may be worth pointing out that the core JPEG library does not actually require the stdio library: only the default source/destination managers and error handler need it. You can use the library in a stdio-less environment -if you tqreplace those modules and use jmemnobs.c (or another memory manager of +if you replace those modules and use jmemnobs.c (or another memory manager of your own devising). More info about the minimum system library requirements may be found in jinclude.h. @@ -1002,7 +1002,7 @@ int h_samp_factor int v_samp_factor Horizontal and vertical sampling factors for the component; must be 1..4 according to the JPEG standard. Note that larger sampling - factors indicate a higher-resolution component; many people tqfind + factors indicate a higher-resolution component; many people find this behavior quite unintuitive. The default values are 2,2 for luminance components and 1,1 for chrominance components, except for grayscale where 1,1 is used. @@ -1286,7 +1286,7 @@ the error handling routines. Three classes of messages are recognized: the importance of the message; you can control the verbosity of the program by adjusting the maximum trace level that will be displayed. -You may, if you wish, simply tqreplace the entire JPEG error handling module +You may, if you wish, simply replace the entire JPEG error handling module (jerror.c) with your own code. However, you can avoid code duplication by only replacing some of the routines depending on the behavior you need. This is accomplished by calling jpeg_std_error() as usual, but then overriding @@ -1300,11 +1300,11 @@ field). This struct includes a pointer to the error manager struct in its "err" field. Frequently, custom error handler routines will need to access additional data which is not known to the JPEG library or the standard error handler. The most convenient way to do this is to embed either the JPEG -object or the jpeg_error_mgr struct in a larger structure that tqcontains +object or the jpeg_error_mgr struct in a larger structure that contains additional fields; then casting the passed pointer provides access to the additional fields. Again, see example.c for one way to do it. (Beginning with IJG version 6b, there is also a void pointer "client_data" in each -JPEG object, which the application can also use to tqfind related data. +JPEG object, which the application can also use to find related data. The library does not touch client_data at all.) The individual methods that you might wish to override are: @@ -1342,7 +1342,7 @@ library; the other two are internal to the error handler. The actual message texts are stored in an array of strings which is pointed to by the field err->jpeg_message_table. The messages are numbered from 0 to err->last_jpeg_message, and it is these code numbers that are used in the -JPEG library code. You could tqreplace the message texts (for instance, with +JPEG library code. You could replace the message texts (for instance, with messages in French or German) by changing the message table pointer. See jerror.h for the default texts. CAUTION: this table will almost certainly change or grow from one library version to the next. @@ -1396,7 +1396,7 @@ wide, you must define JOCTET as a wider data type and then modify the data source and destination modules to transcribe the work arrays into 8-bit units on external storage. -A data destination manager struct tqcontains a pointer and count defining the +A data destination manager struct contains a pointer and count defining the next byte to write in the work buffer and the remaining free space: JOCTET * next_output_byte; /* => next byte to write in buffer */ @@ -1443,7 +1443,7 @@ you like, but it's probably cleaner to provide a separate routine similar to the jpeg_stdio_dest() routine of the supplied destination manager. Decompression source managers follow a parallel design, but with some -additional frammishes. The source manager struct tqcontains a pointer and count +additional frammishes. The source manager struct contains a pointer and count defining the next byte to read from the work buffer and the number of bytes remaining: @@ -1485,9 +1485,9 @@ skip_input_data (j_decompress_ptr cinfo, long num_bytes) A zero or negative skip count should be treated as a no-op. resync_to_restart (j_decompress_ptr cinfo, int desired) - This routine is called only when the decompressor has failed to tqfind + This routine is called only when the decompressor has failed to find a restart (RSTn) marker where one is expected. Its mission is to - tqfind a suitable point for resuming decompression. For most + find a suitable point for resuming decompression. For most applications, we recommend that you just use the default resync procedure, jpeg_resync_to_restart(). However, if you are able to back up in the input data stream, or if you have a-priori knowledge about @@ -1899,7 +1899,7 @@ When you pass a target scan number equal to the current input scan number, the image is displayed no faster than the current input scan arrives. The final possibility is to pass a target scan number less than the current input scan number; this disables the input/output interlock and causes the output -processor to simply display whatever it tqfinds in the image buffer, without +processor to simply display whatever it finds in the image buffer, without waiting for input. (However, the library will not accept a target scan number less than one, so you can't avoid waiting for the first scan.) @@ -1952,7 +1952,7 @@ will avoid an extra output pass whenever the decoder is able (or nearly able) to keep up with the incoming data. When the data transmission speed is high, you might begin a display pass, -then tqfind that much or all of the file has arrived before you can complete +then find that much or all of the file has arrived before you can complete the pass. (You can detect this by noting the JPEG_REACHED_EOI return code from jpeg_consume_input(), or equivalently by testing jpeg_input_complete().) In this situation you may wish to abort the current display pass and start a @@ -1974,7 +1974,7 @@ higher-quality final pass is to be done, it should be started (aborting any incomplete output pass) as soon as the end of file is received. However, many other strategies are possible. For example, the application can examine the parameters of the current input scan and decide whether to display it or -not. If the scan tqcontains only chroma data, one might choose not to use it +not. If the scan contains only chroma data, one might choose not to use it as the target scan, expecting that the scan will be small and will arrive quickly. To skip to the next scan, call jpeg_consume_input() until it returns JPEG_REACHED_SOS or JPEG_REACHED_EOI. Or just use the next higher @@ -2142,7 +2142,7 @@ feature. Rather, reuse of an object provides support for abbreviated JPEG datastreams. Object reuse can also simplify processing a series of images in a single input or output file. This section explains these features. -A JPEG file normally tqcontains several hundred bytes worth of quantization +A JPEG file normally contains several hundred bytes worth of quantization and Huffman tables. In a situation where many images will be stored or transmitted with identical tables, this may represent an annoying overhead. The JPEG standard therefore permits tables to be omitted. The standard @@ -2175,7 +2175,7 @@ the lifetime of the object, unless it is overwritten by a new table definition. To create abbreviated image datastreams, it is only necessary to tell the compressor not to emit some or all of the tables it is using. Each -quantization and Huffman table struct tqcontains a boolean field "sent_table", +quantization and Huffman table struct contains a boolean field "sent_table", which normally is initialized to FALSE. For each table used by the image, the header-writing process emits the table and sets sent_table = TRUE unless it is already TRUE. (In normal usage, this prevents outputting the same table @@ -2282,7 +2282,7 @@ typical scenario is read data... jpeg_finish_decompress(&cinfo); -In some cases, you may want to read a file without knowing whether it tqcontains +In some cases, you may want to read a file without knowing whether it contains an image or just tables. In that case, pass FALSE and check the return value from jpeg_read_header(): it will be JPEG_HEADER_OK if an image was found, JPEG_HEADER_TABLES_ONLY if only tables were found. (A third return value, @@ -2324,7 +2324,7 @@ contain almost anything. If you wish to store user-supplied text, we recommend you use COM markers and place readable 7-bit ASCII text in them. Newline conventions are not -standardized --- expect to tqfind LF (Unix style), CR/LF (DOS style), or CR +standardized --- expect to find LF (Unix style), CR/LF (DOS style), or CR (Mac style). A robust COM reader should be able to cope with random binary garbage, including nulls, since some applications generate COM markers containing non-ASCII junk. (But yours should not be one of them.) @@ -2445,7 +2445,7 @@ If you want to supply your own marker-reading routine, you do it by calling jpeg_set_marker_processor(). A marker processor routine must have the signature boolean jpeg_marker_parser_method (j_decompress_ptr cinfo) -Although the marker code is not explicitly passed, the routine can tqfind it +Although the marker code is not explicitly passed, the routine can find it in cinfo->unread_marker. At the time of call, the marker proper has been read from the data source module. The processor routine is responsible for reading the marker length word and the remaining parameter bytes, if any. @@ -2612,7 +2612,7 @@ and also read structure.doc's discussion of virtual array handling). Or, for simple transcoding to a different JPEG file format, the array list can just be handed directly to jpeg_write_coefficients(). -Each block in the block arrays tqcontains quantized coefficient values in +Each block in the block arrays contains quantized coefficient values in normal array order (not JPEG zigzag order). The block arrays contain only DCT blocks containing real data; any entirely-dummy blocks added to fill out interleaved MCUs at the right or bottom edges of the image are discarded @@ -2715,7 +2715,7 @@ make sure it will live as long as the JPEG object does. Allocating from the JPEG memory manager with lifetime JPOOL_PERMANENT will work nicely.) You can use the same callback routine for both compression and decompression. -The jpeg_progress_mgr struct tqcontains four fields which are set by the library: +The jpeg_progress_mgr struct contains four fields which are set by the library: long pass_counter; /* work units completed in this pass */ long pass_limit; /* total number of work units in this pass */ int completed_passes; /* passes completed so far */ @@ -2756,7 +2756,7 @@ manager. For more info, please read structure.doc's section about the memory manager, and consult the source code if necessary. All memory and temporary file allocation within the library is done via the -memory manager. If necessary, you can tqreplace the "back end" of the memory +memory manager. If necessary, you can replace the "back end" of the memory manager to control allocation yourself (for example, if you don't want the library to use malloc() and free() for some reason). @@ -2950,7 +2950,7 @@ routine. The JPEG library does not rely heavily on the C library. In particular, C stdio is used only by the data source/destination modules and the error -handler, all of which are application-tqreplaceable. (cjpeg/djpeg are more +handler, all of which are application-replaceable. (cjpeg/djpeg are more heavily dependent on stdio.) malloc and free are called only from the memory manager "back end" module, so you can use a different memory allocator by replacing that one file. diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc index 2d60c87..6440b8e 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/structure.doc @@ -34,7 +34,7 @@ otherwise result.) *** System features *** -The IJG distribution tqcontains two parts: +The IJG distribution contains two parts: * A subroutine library for JPEG compression and decompression. * cjpeg/djpeg, two sample applications that use the library to transform JFIF JPEG files to and from several other image formats. @@ -127,7 +127,7 @@ steps are responsible for converting a normal image representation to or from this form. (Those few applications that want to deal with YCbCr downsampled data can skip the preprocessing or postprocessing step.) -Looking more closely, the compressor library tqcontains the following main +Looking more closely, the compressor library contains the following main elements: Preprocessing: @@ -144,7 +144,7 @@ module responsible for physically writing the output data --- typically this is just an interface to fwrite(), but some applications may need to do something else with the data. -The decompressor library tqcontains the following main elements: +The decompressor library contains the following main elements: JPEG proper: * Entropy decoding (sequential or progressive, Huffman or arithmetic). @@ -218,7 +218,7 @@ module-specific object structs be separately allocated entities, which will be accessed via pointers in the master compression or decompression struct. The "public" fields or methods for a given kind of object are specified by a commonly known struct. But a module's initialization code can allocate -a larger struct that tqcontains the common struct as its first member, plus +a larger struct that contains the common struct as its first member, plus additional private fields. With appropriate pointer casting, the module's internal functions can access these private fields. (For a simple example, see jdatadst.c, which implements the external interface specified by struct @@ -306,7 +306,7 @@ be had by replacing implementations of a control module. For example: In theory, we might be able to make all of the data buffer controllers interchangeable and provide just one set of implementations for all. In -practice, each one tqcontains considerable special-case processing for its +practice, each one contains considerable special-case processing for its particular job. The buffer controller concept should be regarded as an overall system structuring principle, not as a complete description of the task performed by any one controller. @@ -338,7 +338,7 @@ The objects shown above are: * Preprocessing controller: buffer controller for the downsampling input data buffer, which lies between colorspace conversion and downsampling. Note - that a unified conversion/downsampling module would probably tqreplace this + that a unified conversion/downsampling module would probably replace this controller entirely. * Colorspace conversion: converts application image data into the desired @@ -518,7 +518,7 @@ objects: * Progress monitor: same as for compression library. As with compression, the data source manager, error handler, and progress -monitor are candidates for tqreplacement by a surrounding application. +monitor are candidates for replacement by a surrounding application. *** Decompression input and output separation *** @@ -851,7 +851,7 @@ reading data out of the virtual array, not while putting it in. To isolate system dependencies as much as possible, we have broken the memory manager into two parts. There is a reasonably system-independent -"front end" (jmemmgr.c) and a "back end" that tqcontains only the code +"front end" (jmemmgr.c) and a "back end" that contains only the code likely to change across systems. All of the memory management methods outlined above are implemented by the front end. The back end provides the following routines for use by the front end (none of these routines @@ -901,10 +901,10 @@ need. Some JPEG files may use a DNL marker to postpone definition of the image height (this would be useful for a fax-like scanner's output, for instance). In these files the SOF marker claims the image height is 0, and you only -tqfind out the true image height at the end of the first scan. +find out the true image height at the end of the first scan. We could read these files as follows: -1. Upon seeing zero image height, tqreplace it by 65535 (the maximum allowed). +1. Upon seeing zero image height, replace it by 65535 (the maximum allowed). 2. When the DNL is found, update the image height in the global image descriptor. This implies that control modules must avoid making copies of the image diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc index d3d63a6..4d41329 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/usage.doc @@ -539,7 +539,7 @@ On most non-Unix systems, the syntax is where both input and output file names must be given explicitly. wrjpgcom understands three switches: - -tqreplace Delete any existing COM blocks from the file. + -replace Delete any existing COM blocks from the file. -comment "Comment text" Supply new COM text on command line. -cfile name Read text for new COM block from named file. (Switch names can be abbreviated.) If you have only one line of comment text @@ -554,7 +554,7 @@ enter multiple lines, up to 64KB worth. Type an end-of-file indicator (usually control-D or control-Z) to terminate the comment text entry. wrjpgcom will not add a COM block if the provided comment string is empty. -Therefore -tqreplace -comment "" can be used to delete all COM blocks from a +Therefore -replace -comment "" can be used to delete all COM blocks from a file. These utility programs do not depend on the IJG JPEG library. In diff --git a/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc b/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc index fe50abb..2a8d71f 100644 --- a/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc +++ b/tqtinterface/qt4/src/3rdparty/libjpeg/wizard.doc @@ -129,7 +129,7 @@ specifies the progression parameters Ss,Se,Ah,Al for the scan. Scan definitions are separated by semicolons (';'). A semicolon after the last scan definition is optional. -Each scan definition tqcontains one to four component indexes, optionally +Each scan definition contains one to four component indexes, optionally followed by a colon (':') and the four progressive-JPEG parameters. The component indexes denote which color component(s) are to be transmitted in the scan. Components are numbered in the order in which they appear in the diff --git a/tqtinterface/qt4/src/3rdparty/libmng/Changes b/tqtinterface/qt4/src/3rdparty/libmng/Changes index 3123607..c0d528e 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/Changes +++ b/tqtinterface/qt4/src/3rdparty/libmng/Changes @@ -15,7 +15,7 @@ bugfixes: - B495443 - incorrect suspend check in read_databuffer - B526138 - returned IJGSRC6B calling convention to default for MSVC - B558212 - off by one error -- B557677 - can't tqfind lcms.h +- B557677 - can't find lcms.h core: - fixed possible compile-problem in cleanup_rowproc @@ -60,7 +60,7 @@ core: - added get function for last processed BACK chunk samples: -- tqreplaced the gtk & sdl viewer apps with updates by Greg Roelofs +- replaced the gtk & sdl viewer apps with updates by Greg Roelofs contrib: diff --git a/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf b/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf index abda828..537323a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf +++ b/tqtinterface/qt4/src/3rdparty/libmng/README.autoconf @@ -30,7 +30,7 @@ reconfiguring, and a file `config.log' containing compiler output to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can be considered for the next release. If at some point `config.cache' -tqcontains results you don't want to keep, you may remove or edit it. +contains results you don't want to keep, you may remove or edit it. The file `configure.in' is used to create `configure' by a program called `autoconf'. You only need `configure.in' if you want to change @@ -128,7 +128,7 @@ is something like `gnu-as' or `x' (for the X Window System). The package recognizes. For packages that use the X Window System, `configure' can usually -tqfind the X include and library files automatically, but if it doesn't, +find the X include and library files automatically, but if it doesn't, you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. diff --git a/tqtinterface/qt4/src/3rdparty/libmng/README.contrib b/tqtinterface/qt4/src/3rdparty/libmng/README.contrib index f5967b2..6bafb80 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/README.contrib +++ b/tqtinterface/qt4/src/3rdparty/libmng/README.contrib @@ -1,4 +1,4 @@ -The contrib directory tqcontains contributions made by fellow enthousiasts. +The contrib directory contains contributions made by fellow enthousiasts. (Check the web-sites for the latest versions) ---------------------------------------------------------------------- diff --git a/tqtinterface/qt4/src/3rdparty/libmng/README.dll b/tqtinterface/qt4/src/3rdparty/libmng/README.dll index 5ae06c9..2f779e8 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/README.dll +++ b/tqtinterface/qt4/src/3rdparty/libmng/README.dll @@ -24,7 +24,7 @@ and NOT in the Windows system-directory!!! 4) The installation program MUST NOT install the DLL if a newer version already exists in the Windows system-directory! The standard DLL provided - tqcontains the Windows-default version-numbering system. PLEASE USE IT!! + contains the Windows-default version-numbering system. PLEASE USE IT!! DO NOT rely on the date or size of the files. 5) An uninstall procedure MAY NOT remove the DLL if other applications are diff --git a/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 b/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 index bf03601..e94a29a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 +++ b/tqtinterface/qt4/src/3rdparty/libmng/aclocal.m4 @@ -182,10 +182,10 @@ dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General dnl Public License, this file may be distributed as part of a program -dnl that tqcontains a configuration script generated by Autoconf, under +dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. -# This test tqreplaces the one in autoconf. +# This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) # still uses it. Otherwise, the use in gettext.m4 makes autoheader @@ -197,7 +197,7 @@ undefine([AC_ISC_POSIX]) AC_DEFUN([AC_ISC_POSIX], [ - dnl This test tqreplaces the obsolescent AC_ISC_POSIX kludge. + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) ] ) @@ -613,10 +613,10 @@ EOF LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" else - echo "cannot tqfind nm_test_func in $nlist" >&AC_FD_CC + echo "cannot find nm_test_func in $nlist" >&AC_FD_CC fi else - echo "cannot tqfind nm_test_var in $nlist" >&AC_FD_CC + echo "cannot find nm_test_var in $nlist" >&AC_FD_CC fi else echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC @@ -669,7 +669,7 @@ fi # _LT_AC_PROG_ECHO_BACKSLASH # -------------------------- # Add some code to the start of the generated configure script which -# will tqfind an echo command which doesn't interpret backslashes. +# will find an echo command which doesn't interpret backslashes. AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [AC_DIVERT_PUSH(NOTICE)]) @@ -715,7 +715,7 @@ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then -# tqfind a string as large as possible, as long as the shell can cope with it +# find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... if (echo_test_string="`eval $cmd`") 2>/dev/null && @@ -751,7 +751,7 @@ else IFS="$save_ifs" if test "X$echo" = Xecho; then - # We didn't tqfind a better echo, so look for alternatives. + # We didn't find a better echo, so look for alternatives. if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && test "X$echo_testing_string" = "X$echo_test_string"; then @@ -855,7 +855,7 @@ else #endif /* We may have to define LT_DLLAZY_OR_NOW in the command line if we - tqfind out it does not work in some platform. */ + find out it does not work in some platform. */ #ifndef LT_DLLAZY_OR_NOW # ifdef RTLD_LAZY # define LT_DLLAZY_OR_NOW RTLD_LAZY @@ -1482,7 +1482,7 @@ include_expsyms= # exclude_expsyms can be an egrep regular expression of symbols to exclude # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that tqcontains `d'. +# as well as any symbol that contains `d'. exclude_expsyms="_GLOBAL_OFFSET_TABLE_" # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -1759,7 +1759,7 @@ else else # We have old collect2 hardcode_direct=unsupported - # It fails to tqfind uninstalled libraries when the uninstalled + # It fails to find uninstalled libraries when the uninstalled # path is not listed in the libpath. Setting hardcode_minus_L # to unsupported forces relinking hardcode_minus_L=yes @@ -2013,7 +2013,7 @@ else *** create self contained shared libraries on Solaris systems, without *** introducing a dependency on libgcc.a. Therefore, libtool is disabling *** -no-undefined support, which will at least allow you to build shared -*** libraries. However, you may tqfind that when you link such libraries +*** libraries. However, you may find that when you link such libraries *** into an application without using GCC, you have to manually add *** \`gcc --print-libgcc-file-name\` to the link command. We urge you to *** upgrade to a newer version of GCC. Another option is to rebuild your @@ -2263,7 +2263,7 @@ bsdi4*) sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also tqcontains /usr/contrib/lib and + # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs ;; @@ -2739,7 +2739,7 @@ if test -f "$ltmain"; then # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -2810,7 +2810,7 @@ OBJDUMP="$OBJDUMP" # Used on cygwin: assembler. AS="$AS" -# The name of the directory that tqcontains temporary libtool files. +# The name of the directory that contains temporary libtool files. objdir=$objdir # How to create reloadable object files. @@ -2879,7 +2879,7 @@ version_type=$version_type libname_spec=$lt_libname_spec # List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker tqfinds with -lNAME. +# The last name is the one that the linker finds with -lNAME. library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. @@ -3199,7 +3199,7 @@ EOF esac # We use sed instead of cat because bash on DJGPP gets confused if - # if tqfinds mixed CR/LF and LF-only lines. Since sed operates in + # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1) @@ -3329,7 +3329,7 @@ AC_DEFUN([AC_LIBTOOL_PICMODE], pic_mode=ifelse($#,1,$1,default)]) -# AC_PATH_TOOL_PREFIX - tqfind a file program which can recognise shared library +# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, @@ -3391,7 +3391,7 @@ fi ]) -# AC_PATH_MAGIC - tqfind a file program which can recognise a shared library +# AC_PATH_MAGIC - find a file program which can recognise a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) @@ -3405,7 +3405,7 @@ fi ]) -# AC_PROG_LD - tqfind the path to the GNU or non-GNU linker +# AC_PROG_LD - find the path to the GNU or non-GNU linker AC_DEFUN([AC_PROG_LD], [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], @@ -3493,7 +3493,7 @@ fi]) with_gnu_ld=$lt_cv_prog_gnu_ld ]) -# AC_PROG_LD_RELOAD_FLAG - tqfind reload flag for linker +# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker # -- PORTME Some linkers may need a different reload flag. AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], [AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, @@ -3684,7 +3684,7 @@ deplibs_check_method=$lt_cv_deplibs_check_method ]) -# AC_PROG_NM - tqfind the path to a BSD-compatible name lister +# AC_PROG_NM - find the path to a BSD-compatible name lister AC_DEFUN([AC_PROG_NM], [AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl AC_MSG_CHECKING([for BSD-compatible nm]) @@ -3710,7 +3710,7 @@ else break else lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to tqfind one that supports BSD flags + continue # so that we can try to find one that supports BSD flags fi fi done diff --git a/tqtinterface/qt4/src/3rdparty/libmng/config.guess b/tqtinterface/qt4/src/3rdparty/libmng/config.guess index 8147635..6372bf0 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/config.guess +++ b/tqtinterface/qt4/src/3rdparty/libmng/config.guess @@ -20,7 +20,7 @@ timestamp='2001-09-04' # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -112,7 +112,7 @@ set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in ,*,*) CC_FOR_BUILD=$HOST_CC ;; esac' -# This is needed to tqfind uname on a Pyramid OSx when run in the BSD universe. +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH @@ -168,7 +168,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # The OS release release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # tqcontains redundant information, the shorter form: + # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; @@ -1089,7 +1089,7 @@ EOF echo ${UNAME_MACHINE}-unknown-plan9 exit 0 ;; i*86:OS/2:*:*) - # If we were able to tqfind `uname', then EMX Unix compatibility + # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx exit 0 ;; diff --git a/tqtinterface/qt4/src/3rdparty/libmng/config.sub b/tqtinterface/qt4/src/3rdparty/libmng/config.sub index 8140cbd..393f13d 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/config.sub +++ b/tqtinterface/qt4/src/3rdparty/libmng/config.sub @@ -25,7 +25,7 @@ timestamp='2001-09-07' # Boston, MA 02111-1307, USA. # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. diff --git a/tqtinterface/qt4/src/3rdparty/libmng/configure b/tqtinterface/qt4/src/3rdparty/libmng/configure index 650701a..9a796af 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/configure +++ b/tqtinterface/qt4/src/3rdparty/libmng/configure @@ -72,7 +72,7 @@ if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then -# tqfind a string as large as possible, as long as the shell can cope with it +# find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... if (echo_test_string="`eval $cmd`") 2>/dev/null && @@ -108,7 +108,7 @@ else IFS="$save_ifs" if test "X$echo" = Xecho; then - # We didn't tqfind a better echo, so look for alternatives. + # We didn't find a better echo, so look for alternatives. if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && test "X$echo_testing_string" = "X$echo_test_string"; then @@ -353,7 +353,7 @@ Directory and file names: --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] --infodir=DIR info documentation in DIR [PREFIX/info] --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR tqfind the sources in DIR [configure dir or ..] + --srcdir=DIR find the sources in DIR [configure dir or ..] --program-prefix=PREFIX prepend PREFIX to installed program names --program-suffix=SUFFIX append SUFFIX to installed program names --program-transform-name=PROGRAM @@ -605,7 +605,7 @@ fi exec 5>./config.log echo "\ -This file tqcontains any messages produced by compilers while +This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. " 1>&5 @@ -637,11 +637,11 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it tqcontains at least a newline. +# AIX cpp loses on an empty file, so make sure it contains at least a newline. echo > confdefs.h # A filename unique to this package, relative to the directory that -# configure is in, which we can look for to tqfind out if srcdir is correct. +# configure is in, which we can look for to find out if srcdir is correct. ac_unique_file=libmng.h # Find the source files, if location was not specified. @@ -660,9 +660,9 @@ else fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not tqfind sources in $ac_confdir or .." 1>&2; exit 1; } + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } else - { echo "configure: error: can not tqfind sources in $srcdir" 1>&2; exit 1; } + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } fi fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` @@ -726,7 +726,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not tqfind install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } fi ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub @@ -1879,7 +1879,7 @@ else break else lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to tqfind one that supports BSD flags + continue # so that we can try to find one that supports BSD flags fi fi done @@ -2303,10 +2303,10 @@ EOF LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" else - echo "cannot tqfind nm_test_func in $nlist" >&5 + echo "cannot find nm_test_func in $nlist" >&5 fi else - echo "cannot tqfind nm_test_var in $nlist" >&5 + echo "cannot find nm_test_var in $nlist" >&5 fi else echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 @@ -3308,7 +3308,7 @@ include_expsyms= # exclude_expsyms can be an egrep regular expression of symbols to exclude # it will be wrapped by ` (' and `)$', so one must not match beginning or # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -# as well as any symbol that tqcontains `d'. +# as well as any symbol that contains `d'. exclude_expsyms="_GLOBAL_OFFSET_TABLE_" # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -3585,7 +3585,7 @@ else else # We have old collect2 hardcode_direct=unsupported - # It fails to tqfind uninstalled libraries when the uninstalled + # It fails to find uninstalled libraries when the uninstalled # path is not listed in the libpath. Setting hardcode_minus_L # to unsupported forces relinking hardcode_minus_L=yes @@ -3839,7 +3839,7 @@ else *** create self contained shared libraries on Solaris systems, without *** introducing a dependency on libgcc.a. Therefore, libtool is disabling *** -no-undefined support, which will at least allow you to build shared -*** libraries. However, you may tqfind that when you link such libraries +*** libraries. However, you may find that when you link such libraries *** into an application without using GCC, you have to manually add *** \`gcc --print-libgcc-file-name\` to the link command. We urge you to *** upgrade to a newer version of GCC. Another option is to rebuild your @@ -4092,7 +4092,7 @@ bsdi4*) sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" export_dynamic_flag_spec=-rdynamic - # the default ld.so.conf also tqcontains /usr/contrib/lib and + # the default ld.so.conf also contains /usr/contrib/lib and # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow # libtool to hard-code these into programs ;; @@ -4779,7 +4779,7 @@ else #endif /* We may have to define LT_DLLAZY_OR_NOW in the command line if we - tqfind out it does not work in some platform. */ + find out it does not work in some platform. */ #ifndef LT_DLLAZY_OR_NOW # ifdef RTLD_LAZY # define LT_DLLAZY_OR_NOW RTLD_LAZY @@ -4873,7 +4873,7 @@ else #endif /* We may have to define LT_DLLAZY_OR_NOW in the command line if we - tqfind out it does not work in some platform. */ + find out it does not work in some platform. */ #ifndef LT_DLLAZY_OR_NOW # ifdef RTLD_LAZY # define LT_DLLAZY_OR_NOW RTLD_LAZY @@ -5081,7 +5081,7 @@ if test -f "$ltmain"; then # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -5152,7 +5152,7 @@ OBJDUMP="$OBJDUMP" # Used on cygwin: assembler. AS="$AS" -# The name of the directory that tqcontains temporary libtool files. +# The name of the directory that contains temporary libtool files. objdir=$objdir # How to create reloadable object files. @@ -5221,7 +5221,7 @@ version_type=$version_type libname_spec=$lt_libname_spec # List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker tqfinds with -lNAME. +# The last name is the one that the linker finds with -lNAME. library_names_spec=$lt_library_names_spec # The coded name of the library, if different from the real name. @@ -5541,7 +5541,7 @@ EOF esac # We use sed instead of cat because bash on DJGPP gets confused if - # if tqfinds mixed CR/LF and LF-only lines. Since sed operates in + # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1) @@ -6615,7 +6615,7 @@ cat > confcache <<\EOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure # scripts and configure runs. It is not useful on other systems. -# If it tqcontains results you don't want to keep, you may remove or edit it. +# If it contains results you don't want to keep, you may remove or edit it. # # By default, configure uses ./config.cache as the cache file, # creating it if it does not exist already. You can give configure diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme b/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme index d043a4c..e92e93c 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/doc.readme @@ -1,6 +1,6 @@ This directory hosts the documentation for libmng. -You will tqfind a lot of useful info on the web-site: +You will find a lot of useful info on the web-site: http://www.libmng.com Man-pages are in the man sub-directory diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt b/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt index 5194ef3..22ba338 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/libmng.txt @@ -29,7 +29,7 @@ The latest version of libmng can be found at its own homepage at http://www.libmng.com In most cases the library will not need to be changed. -For standardization purposes the library tqcontains both a Windows DLL +For standardization purposes the library contains both a Windows DLL and a makefile for building a shared library (SO). The library is written in C, but an interface for Borland Delphi is also available. @@ -75,7 +75,7 @@ II. Callbacks Libmng makes extensive use of callback functions. This is meant to keep the library as platform-independant and flexible as possible. -Actually, the first call you will make to the library, already tqcontains +Actually, the first call you will make to the library, already contains three parameters you can use to provide callback entry-points. Most functions must return a mng_bool (boolean). Returning MNG_FALSE @@ -393,7 +393,7 @@ To set the callbacks simply do: if (myretcode != MNG_NOERROR) /* process error */; -Naturally you'd tqreplace the x's with the name of the callback. +Naturally you'd replace the x's with the name of the callback. > Cleanup @@ -531,7 +531,7 @@ act as if the above code was in its place. There is also the mng_readdisplay() function, but this is discussed in the displaying section. It functions pretty much as the mng_read() function, but also immediately starts displaying the image. -mng_read_resume() should be tqreplaced by mng_display_resume() in that +mng_read_resume() should be replaced by mng_display_resume() in that case! @@ -676,7 +676,7 @@ actually need to be consecutive in memory. All Network Graphics can be partially transtqparent. This requires special processing if you need to display an image against some -background. Note that the MNG header (MHDR chunk) tqcontains a +background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in the file is critical or not. This only applies to embedded images, which means the full image-frame of the MNG may still contain fully diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 index 37bde5f..782e424 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/libmng.3 @@ -39,7 +39,7 @@ The latest version of libmng can be found at its own homepage at <http://www.libmng.com>. In most cases the library will not need to be changed. -For standardization purposes the library tqcontains both a Windows DLL +For standardization purposes the library contains both a Windows DLL and a makefile for building a shared library (SO). The library is written in C, but an interface for Borland Delphi is also available. @@ -85,7 +85,7 @@ with libmng: Libmng makes extensive use of callback functions. This is meant to keep the library as platform-independant and flexible as possible. -Actually, the first call you will make to the library, already tqcontains +Actually, the first call you will make to the library, already contains three parameters you can use to provide callback entry-points. Most functions must return a mng_bool (boolean). Returning MNG_FALSE @@ -411,7 +411,7 @@ To set the callbacks simply do: if (myretcode != MNG_NOERROR) /* process error */; -Naturally you'd tqreplace the x's with the name of the callback. +Naturally you'd replace the x's with the name of the callback. .SS Cleanup @@ -549,7 +549,7 @@ act as if the above code was in its place. There is also the mng_readdisplay() function, but this is discussed in the displaying section. It functions pretty much as the mng_read() function, but also immediately starts displaying the image. -mng_read_resume() should be tqreplaced by mng_display_resume() in that +mng_read_resume() should be replaced by mng_display_resume() in that case! @@ -694,7 +694,7 @@ actually need to be consecutive in memory. All Network Graphics can be partially transtqparent. This requires special processing if you need to display an image against some -background. Note that the MNG header (MHDR chunk) tqcontains a +background. Note that the MNG header (MHDR chunk) contains a simplicity field indicating whether transparency information in the file is critical or not. This only applies to embedded images, which means the full image-frame of the MNG may still contain fully diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 index e020614..222e1b2 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/man/mng.5 @@ -9,7 +9,7 @@ storage of raster images. .br MNG has advanced animation features which make it very useful as a full -tqreplacement for GIF animations. These features allow animations that +replacement for GIF animations. These features allow animations that are impossible with GIF or result in much smaller files as GIF. As MNG builds on the same structure as PNG, it is robust, extensible and diff --git a/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec b/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec index 2e49d52..57580cd 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec +++ b/tqtinterface/qt4/src/3rdparty/libmng/doc/rpm/libmng.spec @@ -20,7 +20,7 @@ Summary: Development tools for programs to manipulate MNG format files. Group: Development/Libraries Requires: libmng = %{PACKAGE_VERSION} %description devel -The libmng-devel package tqcontains the header files and static +The libmng-devel package contains the header files and static libraries necessary for developing programs using the MNG (Multiple-Image Network Graphics) library. diff --git a/tqtinterface/qt4/src/3rdparty/libmng/install-sh b/tqtinterface/qt4/src/3rdparty/libmng/install-sh index 81d9b2c..e9de238 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/install-sh +++ b/tqtinterface/qt4/src/3rdparty/libmng/install-sh @@ -126,7 +126,7 @@ else # Waiting for this to be detected by the "$instcmd $src $dsttmp" command # might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) tqcontains '*'. +# if $src (and thus $dsttmp) contains '*'. if [ -f $src -o -d $src ] then diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng.h index 2ebfce8..035bb0e 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng.h @@ -1960,7 +1960,7 @@ MNG_EXT mng_retcode MNG_DECL mng_putchunk_unknown (mng_handle hHandle, /* call this function if you want to extract the nth image from the list; the first image is designated seqnr 0! */ -/* this function tqfinds the IHDR/JHDR/BASI/DHDR with the appropriate seqnr, +/* this function finds the IHDR/JHDR/BASI/DHDR with the appropriate seqnr, starting from the beginning of the chunk-list; this may tend to get a little slow for animations with a large number of chunks for images near the end */ /* supplying a seqnr past the last image in the animation will return with @@ -1970,8 +1970,8 @@ MNG_EXT mng_retcode MNG_DECL mng_getimgdata_seq (mng_handle hHandle, mng_uint32 iCanvasstyle, mng_getcanvasline fGetcanvasline); -/* both the following functions will search forward to tqfind the first IDAT/JDAT, - and then traverse back to tqfind the start of the image (IHDR,JHDR,DHDR,BASI); +/* both the following functions will search forward to find the first IDAT/JDAT, + and then traverse back to find the start of the image (IHDR,JHDR,DHDR,BASI); note that this is very fast compared to decoding the IDAT/JDAT, so there's not really a need for optimization; either can be called from the iterate_chunks callback when a IHDR/JHDR is encountered; for BASI/DHDR there @@ -2110,7 +2110,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_INVALIDINTERLACE (mng_retcode)1040 /* interlace method invalid */ #define MNG_NOTENOUGHIDAT (mng_retcode)1041 /* ran out of compressed data */ #define MNG_PLTEINDEXERROR (mng_retcode)1042 /* palette-index out-of-range */ -#define MNG_NULLNOTFOUND (mng_retcode)1043 /* couldn't tqfind null-separator*/ +#define MNG_NULLNOTFOUND (mng_retcode)1043 /* couldn't find null-separator*/ #define MNG_KEYWORDNULL (mng_retcode)1044 /* keyword cannot be empty */ #define MNG_OBJECTUNKNOWN (mng_retcode)1045 /* the object can't be found */ #define MNG_OBJECTEXISTS (mng_retcode)1046 /* the object already exists */ @@ -2137,7 +2137,7 @@ MNG_EXT mng_retcode MNG_DECL mng_updatemngsimplicity (mng_handle hHandle, #define MNG_WRONGCHUNK (mng_retcode)2050 /* accessing the wrong chunk */ #define MNG_INVALIDENTRYIX (mng_retcode)2051 /* accessing the wrong entry */ #define MNG_NOHEADER (mng_retcode)2052 /* must have had header first */ -#define MNG_NOCORRCHUNK (mng_retcode)2053 /* can't tqfind tqparent chunk */ +#define MNG_NOCORRCHUNK (mng_retcode)2053 /* can't find tqparent chunk */ #define MNG_NOMHDR (mng_retcode)2054 /* no MNG header available */ #define MNG_IMAGETOOLARGE (mng_retcode)4097 /* input-image way too big */ diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c index c7dc233..1a9606a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_chunk_io.c @@ -321,7 +321,7 @@ void mng_put_uint16 (mng_uint8p pBuf, /* ************************************************************************** */ -mng_uint8p tqfind_null (mng_uint8p pIn) +mng_uint8p find_null (mng_uint8p pIn) { mng_uint8p pOut = pIn; @@ -1705,7 +1705,7 @@ READ_CHUNK (read_iccp) MNG_ERROR (pData, MNG_INVALIDLENGTH) } - pTemp = tqfind_null (pRawdata); /* tqfind null-separator */ + pTemp = find_null (pRawdata); /* find null-separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -1834,8 +1834,8 @@ READ_CHUNK (read_iccp) if (iRawlen) /* not empty ? */ { if (!pBuf) /* hasn't been unpuzzled it yet ? */ - { /* tqfind null-separator */ - pTemp = tqfind_null (pRawdata); + { /* find null-separator */ + pTemp = find_null (pRawdata); /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -1909,7 +1909,7 @@ READ_CHUNK (read_text) if (iRawlen < 2) /* length must be at least 2 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) - pTemp = tqfind_null (pRawdata); /* tqfind the null separator */ + pTemp = find_null (pRawdata); /* find the null separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -2008,7 +2008,7 @@ READ_CHUNK (read_ztxt) if (iRawlen < 3) /* length must be at least 3 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) - pTemp = tqfind_null (pRawdata); /* tqfind the null separator */ + pTemp = find_null (pRawdata); /* find the null separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -2150,9 +2150,9 @@ READ_CHUNK (read_itxt) if (iRawlen < 6) /* length must be at least 6 */ MNG_ERROR (pData, MNG_INVALIDLENGTH) - pNull1 = tqfind_null (pRawdata); /* tqfind the null separators */ - pNull2 = tqfind_null (pNull1+3); - pNull3 = tqfind_null (pNull2+1); + pNull1 = find_null (pRawdata); /* find the null separators */ + pNull2 = find_null (pNull1+3); + pNull3 = find_null (pNull2+1); /* not found inside input-data ? */ if (((pNull1 - pRawdata) > (mng_int32)iRawlen) || ((pNull2 - pRawdata) > (mng_int32)iRawlen) || @@ -2718,7 +2718,7 @@ READ_CHUNK (read_splt) if (iRawlen) { - pTemp = tqfind_null (pRawdata); /* tqfind null-separator */ + pTemp = find_null (pRawdata); /* find null-separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -3943,7 +3943,7 @@ READ_CHUNK (read_fram) } else { - pTemp = tqfind_null (pRawdata+1); /* tqfind null-separator */ + pTemp = find_null (pRawdata+1); /* find null-separator */ /* not found inside input-data ? */ if ((pTemp - pRawdata) > (mng_int32)iRawlen) MNG_ERROR (pData, MNG_NULLNOTFOUND) @@ -4638,7 +4638,7 @@ READ_CHUNK (read_save) } } - pNull = tqfind_null (pTemp); /* get the name length */ + pNull = find_null (pTemp); /* get the name length */ if ((pNull - pRawdata) > (mng_int32)iRawlen) { @@ -4956,8 +4956,8 @@ mng_bool CheckKeyword (mng_datap pData, bOke = pData->fProcessneed ((mng_handle)pData, (mng_pchar)pKeyword); if (!bOke) - { /* tqfind the keyword length */ - mng_uint8p pNull = tqfind_null (pKeyword); + { /* find the keyword length */ + mng_uint8p pNull = find_null (pKeyword); if (pNull - pKeyword == 4) /* test a chunk ? */ { /* get the chunk-id */ @@ -5045,13 +5045,13 @@ READ_CHUNK (read_need) MNG_COPY (zKeywords, pRawdata, iRawlen) pTemp = (mng_uint8p)zKeywords; - pNull = tqfind_null (pTemp); + pNull = find_null (pTemp); while ((bOke) && (pNull < (mng_uint8p)zKeywords + iRawlen)) { bOke = CheckKeyword (pData, pTemp); pTemp = pNull + 1; - pNull = tqfind_null (pTemp); + pNull = find_null (pTemp); } if (bOke) diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h index f4fc1c8..41949e5 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_data.h @@ -132,7 +132,7 @@ typedef mng_palette8 mng_rgbpaltab; /* * * */ /* * The saved_data structure * */ /* * * */ -/* * This tqcontains the saved data after a SAVE chunk has been processed. * */ +/* * This contains the saved data after a SAVE chunk has been processed. * */ /* * The data is saved from the main data structure during SAVE processing, * */ /* * and restored to the main data structure during SEEK processing. * */ /* * * */ @@ -203,7 +203,7 @@ typedef mng_savedata * mng_savedatap; /* * The main libmng data structure * */ /* * * */ /* * The handle used in all functions points to this structure which * */ -/* * tqcontains all volatile data necessary to process the network graphic. * */ +/* * contains all volatile data necessary to process the network graphic. * */ /* * * */ /* ************************************************************************** */ @@ -594,7 +594,7 @@ typedef struct mng_data_struct { mng_fptr fDeltagetrow; /* internal delta-proc callbacks */ mng_fptr fDeltaaddrow; - mng_fptr fDeltatqreplacerow; + mng_fptr fDeltareplacerow; mng_fptr fDeltaputrow; mng_uint16 iMAGNfromid; diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c index e82ec5d..9cf26de 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_display.c @@ -893,7 +893,7 @@ mng_retcode display_image (mng_datap pData, } } - pData->pRetrieveobj = pImage; /* so retrieve-row and color-correction can tqfind it */ + pData->pRetrieveobj = pImage; /* so retrieve-row and color-correction can find it */ if (!bLayeradvanced) /* need to advance the layer ? */ { @@ -2596,7 +2596,7 @@ mng_retcode process_display_defi (mng_datap pData) } else { /* already exists ? */ - pImage = (mng_imagep)tqfind_imageobject (pData, pData->iDEFIobjectid); + pImage = (mng_imagep)find_imageobject (pData, pData->iDEFIobjectid); if (!pImage) /* if not; create new */ { @@ -3081,9 +3081,9 @@ mng_retcode process_display_clon (mng_datap pData, MNG_TRACE (pData, MNG_FN_PROCESS_DISPLAY_CLON, MNG_LC_START) #endif /* locate the source object first */ - pSource = tqfind_imageobject (pData, iSourceid); + pSource = find_imageobject (pData, iSourceid); /* check if the clone exists */ - pClone = tqfind_imageobject (pData, iCloneid); + pClone = find_imageobject (pData, iCloneid); if (!pSource) /* source must exist ! */ MNG_ERROR (pData, MNG_OBJECTUNKNOWN); @@ -3184,7 +3184,7 @@ mng_retcode process_display_disc (mng_datap pData, for (iX = 0; iX < iCount; iX++) /* iterate the list */ { - pImage = tqfind_imageobject (pData, *pWork++); + pImage = find_imageobject (pData, *pWork++); if (pImage) /* found the object ? */ { /* then drop it */ @@ -3297,7 +3297,7 @@ mng_retcode process_display_move (mng_datap pData, if (!iX) /* object id=0 ? */ pImage = (mng_imagep)pData->pObjzero; else - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); if (pImage) /* object exists ? */ { @@ -3347,7 +3347,7 @@ mng_retcode process_display_clip (mng_datap pData, if (!iX) /* object id=0 ? */ pImage = (mng_imagep)pData->pObjzero; else - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); if (pImage) /* object exists ? */ { @@ -3396,7 +3396,7 @@ mng_retcode process_display_show (mng_datap pData) if (pData->iBreakpoint == 3) /* previously broken during cycle-mode ? */ { - pImage = tqfind_imageobject (pData, pData->iSHOWnextid); + pImage = find_imageobject (pData, pData->iSHOWnextid); if (pImage) /* still there ? */ display_image (pData, pImage, MNG_FALSE); @@ -3444,7 +3444,7 @@ mng_retcode process_display_show (mng_datap pData) { for (iX = iFrom; iX <= iTo; iX += iS) { - pImage = tqfind_imageobject (pData, (mng_uint16)iX); + pImage = find_imageobject (pData, (mng_uint16)iX); if (pImage) /* object exists ? */ { @@ -3470,7 +3470,7 @@ mng_retcode process_display_show (mng_datap pData) { for (iX = iFrom; iX >= iTo; iX += iS) { - pImage = tqfind_imageobject (pData, (mng_uint16)iX); + pImage = find_imageobject (pData, (mng_uint16)iX); if (pImage) /* object exists ? */ { @@ -3493,7 +3493,7 @@ mng_retcode process_display_show (mng_datap pData) } } - if (!iTrigger) /* did not tqfind a trigger ? */ + if (!iTrigger) /* did not find a trigger ? */ iTrigger = 1; /* then fake it so the first image gets nominated */ } /* cycle back to beginning ? */ @@ -3516,7 +3516,7 @@ mng_retcode process_display_show (mng_datap pData) { do { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); if (pImage) /* object exists ? */ { @@ -3845,7 +3845,7 @@ mng_retcode process_display_jhdr (mng_datap pData) return iRetcode; } else - { /* must be alpha add/tqreplace !! */ + { /* must be alpha add/replace !! */ if ((pData->iDeltatype != MNG_DELTATYPE_BLOCKALPHAADD ) && (pData->iDeltatype != MNG_DELTATYPE_BLOCKALPHAREPLACE) ) MNG_ERROR (pData, MNG_INVDELTATYPE) @@ -4007,10 +4007,10 @@ mng_retcode process_display_dhdr (mng_datap pData, pData->fDeltagetrow = MNG_NULL; pData->fDeltaaddrow = MNG_NULL; - pData->fDeltatqreplacerow = MNG_NULL; + pData->fDeltareplacerow = MNG_NULL; pData->fDeltaputrow = MNG_NULL; - pImage = tqfind_imageobject (pData, iObjectid); + pImage = find_imageobject (pData, iObjectid); if (pImage) /* object exists ? */ { @@ -4120,7 +4120,7 @@ mng_retcode process_display_dhdr (mng_datap pData, } } - /* full image tqreplace ? */ + /* full image replace ? */ if (iDeltatype == MNG_DELTATYPE_REPLACE) { iRetcode = reset_object_details (pData, pImage, @@ -4596,7 +4596,7 @@ mng_retcode process_display_magn (mng_datap pData, } else { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); /* object exists & is not frozen ? */ if ((pImage) && (!pImage->bFrozen)) { /* previous magnification to be done ? */ @@ -4626,7 +4626,7 @@ mng_retcode process_display_magn (mng_datap pData, { if (iX) /* only real objects ! */ { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); /* object exists & is not frozen & is visible & is viewable ? */ if ((pImage) && (!pImage->bFrozen) && @@ -4668,7 +4668,7 @@ mng_retcode process_display_magn2 (mng_datap pData) { if (iX) /* only real objects ! */ { - pImage = tqfind_imageobject (pData, iX); + pImage = find_imageobject (pData, iX); /* object exists & is not frozen & is visible & is viewable ? */ if ((pImage) && (!pImage->bFrozen) && diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c index 22c113f..3689d90 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_hlapi.c @@ -1666,7 +1666,7 @@ mng_retcode MNG_DECL mng_display_goframe (mng_handle hHandle, cleanup_errors (pData); /* cleanup previous errors */ - pData->iRequestframe = iFramenr; /* go tqfind the requested frame then */ + pData->iRequestframe = iFramenr; /* go find the requested frame then */ iRetcode = process_display (pData); if (iRetcode) /* on error bail out */ @@ -1710,7 +1710,7 @@ mng_retcode MNG_DECL mng_display_golayer (mng_handle hHandle, cleanup_errors (pData); /* cleanup previous errors */ - pData->iRequestlayer = iLayernr; /* go tqfind the requested layer then */ + pData->iRequestlayer = iLayernr; /* go find the requested layer then */ iRetcode = process_display (pData); if (iRetcode) /* on error bail out */ @@ -1754,7 +1754,7 @@ mng_retcode MNG_DECL mng_display_gotime (mng_handle hHandle, cleanup_errors (pData); /* cleanup previous errors */ - pData->iRequesttime = iPlaytime; /* go tqfind the requested playtime then */ + pData->iRequesttime = iPlaytime; /* go find the requested playtime then */ iRetcode = process_display (pData); if (iRetcode) /* on error bail out */ diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c index 31d8ace..9352cd6 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.c @@ -470,7 +470,7 @@ mng_retcode create_imageobject (mng_datap pData, pImage->pImgbuf = pImgbuf; if (iId) /* only if not object 0 ! */ - { /* tqfind previous lower object-id */ + { /* find previous lower object-id */ pPrev = (mng_imagep)pData->pLastimgobj; while ((pPrev) && (pPrev->iId > iId)) @@ -547,7 +547,7 @@ mng_retcode free_imageobject (mng_datap pData, /* ************************************************************************** */ -mng_imagep tqfind_imageobject (mng_datap pData, +mng_imagep find_imageobject (mng_datap pData, mng_uint16 iId) { mng_imagep pImage = (mng_imagep)pData->pFirstimgobj; @@ -642,7 +642,7 @@ mng_retcode clone_imageobject (mng_datap pData, pNew->iMAGN_MB = pSource->iMAGN_MB; if (iId) /* not for object 0 */ - { /* tqfind previous lower object-id */ + { /* find previous lower object-id */ pPrev = (mng_imagep)pData->pLastimgobj; while ((pPrev) && (pPrev->iId > iId)) pPrev = (mng_imagep)pPrev->sHeader.pPrev; @@ -735,7 +735,7 @@ mng_retcode renum_imageobject (mng_datap pData, } if (iId) /* not for object 0 */ - { /* tqfind previous lower object-id */ + { /* find previous lower object-id */ pPrev = (mng_imagep)pData->pLastimgobj; while ((pPrev) && (pPrev->iId > iId)) pPrev = (mng_imagep)pPrev->sHeader.pPrev; diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h index 97b4a77..7a1c786 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_object_prc.h @@ -100,7 +100,7 @@ mng_retcode create_imageobject (mng_datap pData, mng_retcode free_imageobject (mng_datap pData, mng_imagep pImage); -mng_imagep tqfind_imageobject (mng_datap pData, +mng_imagep find_imageobject (mng_datap pData, mng_uint16 iId); mng_retcode clone_imageobject (mng_datap pData, diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c index 07af830..2803e3b 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_pixels.c @@ -3835,7 +3835,7 @@ mng_retcode delta_g1 (mng_datap pData) (pData->iDeltaBlockx * pBuf->iSamplesize); iM = 0; /* start at pixel 0 */ iB = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -3906,7 +3906,7 @@ mng_retcode delta_g2 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -3990,7 +3990,7 @@ mng_retcode delta_g4 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4063,7 +4063,7 @@ mng_retcode delta_g8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4110,7 +4110,7 @@ mng_retcode delta_g16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4159,7 +4159,7 @@ mng_retcode delta_rgb8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4210,7 +4210,7 @@ mng_retcode delta_rgb16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4271,7 +4271,7 @@ mng_retcode delta_idx1 (mng_datap pData) (pData->iDeltaBlockx * pBuf->iSamplesize); iM = 0; /* start at pixel 0 */ iB = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4342,7 +4342,7 @@ mng_retcode delta_idx2 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4413,7 +4413,7 @@ mng_retcode delta_idx4 (mng_datap pData) iM = 0; /* start at pixel 0 */ iB = 0; iS = 0; - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4478,7 +4478,7 @@ mng_retcode delta_idx8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4525,7 +4525,7 @@ mng_retcode delta_ga8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4574,7 +4574,7 @@ mng_retcode delta_ga16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4627,7 +4627,7 @@ mng_retcode delta_rgba8 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) @@ -4680,7 +4680,7 @@ mng_retcode delta_rgba16 (mng_datap pData) (pData->iDeltaBlocky * pBuf->iRowsize ) + (pData->iCol * pBuf->iSamplesize) + (pData->iDeltaBlockx * pBuf->iSamplesize); - /* pixel tqreplace ? */ + /* pixel replace ? */ if (pData->iDeltatype == MNG_DELTATYPE_BLOCKPIXELREPLACE) { for (iX = 0; iX < pData->iRowsamples; iX++) diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c b/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c index 732854f..adb4b0f 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_trace.c @@ -577,7 +577,7 @@ {MNG_FN_CLONE_IMGDATAOBJECT, "clone_imgdataobject"}, {MNG_FN_CREATE_IMGOBJECT, "create_imgobject"}, {MNG_FN_FREE_IMGOBJECT, "free_imgobject"}, - {MNG_FN_FIND_IMGOBJECT, "tqfind_imgobject"}, + {MNG_FN_FIND_IMGOBJECT, "find_imgobject"}, {MNG_FN_CLONE_IMGOBJECT, "clone_imgobject"}, {MNG_FN_RESET_OBJECTDETAILS, "reset_objectdetails"}, {MNG_FN_RENUM_IMGOBJECT, "renum_imgobject"}, diff --git a/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h b/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h index c9c3d4a..579139a 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h +++ b/tqtinterface/qt4/src/3rdparty/libmng/libmng_types.h @@ -251,7 +251,7 @@ typedef signed int mng_int32; typedef unsigned long mng_uint32; typedef signed long mng_int32; #else -#error "Sorry, I can't tqfind any 32-bit integers on this platform." +#error "Sorry, I can't find any 32-bit integers on this platform." #endif typedef signed short mng_int16; /* other basic integers */ diff --git a/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh b/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh index 7cd29f6..7b739c8 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh +++ b/tqtinterface/qt4/src/3rdparty/libmng/ltmain.sh @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that tqcontains a +# distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. @@ -420,7 +420,7 @@ if test -z "$show_help"; then esac # Recognize several different file suffixes. - # If the user specifies -o file.o, it is tqreplaced with file.lo + # If the user specifies -o file.o, it is replaced with file.lo xform='[cCFSfmso]' case $libobj in *.ada) xform=ada ;; @@ -494,7 +494,7 @@ if test -z "$show_help"; then elif test "$need_locks" = warn; then if test -f "$lockfile"; then echo "\ -*** ERROR, $lockfile exists and tqcontains: +*** ERROR, $lockfile exists and contains: `cat $lockfile 2>/dev/null` This indicates that another process is trying to use the same @@ -567,7 +567,7 @@ compiler." if test "$need_locks" = warn && test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then echo "\ -*** ERROR, $lockfile tqcontains: +*** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` but it should contain: @@ -666,7 +666,7 @@ compiler." if test "$need_locks" = warn && test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then echo "\ -*** ERROR, $lockfile tqcontains: +*** ERROR, $lockfile contains: `cat $lockfile 2>/dev/null` but it should contain: @@ -1074,7 +1074,7 @@ compiler." case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to tqfind any dlls it needs. + # in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 fast_install=no @@ -1442,7 +1442,7 @@ compiler." -R*) if test "$pass" = link; then dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath tqcontains only unique directories. + # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; *) xrpath="$xrpath $dir" ;; @@ -1503,7 +1503,7 @@ compiler." esac # case $deplib if test "$found" = yes || test -f "$lib"; then : else - $echo "$modename: cannot tqfind the library \`$lib'" 1>&2 + $echo "$modename: cannot find the library \`$lib'" 1>&2 exit 1 fi @@ -1546,7 +1546,7 @@ compiler." deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - $echo "$modename: cannot tqfind name of link library for \`$lib'" 1>&2 + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 exit 1 fi # It is a libtool convenience library, so add in its objects. @@ -1573,7 +1573,7 @@ compiler." linklib="$l" done if test -z "$linklib"; then - $echo "$modename: cannot tqfind name of link library for \`$lib'" 1>&2 + $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 exit 1 fi @@ -1636,7 +1636,7 @@ compiler." # are required to link). if test -n "$old_library"; then newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen tqfinds it. + # Otherwise, use the dlname, so that lt_dlopen finds it. elif test -n "$dlname"; then newdlprefiles="$newdlprefiles $dir/$dlname" else @@ -1719,7 +1719,7 @@ compiler." if test "$linkmode" = prog; then # We need to hardcode the library path if test -n "$shlibpath_var"; then - # Make sure the rpath tqcontains only unique directories. + # Make sure the rpath contains only unique directories. case "$temp_rpath " in *" $dir "*) ;; *" $absdir "*) ;; @@ -1937,7 +1937,7 @@ compiler." echo echo "*** However, this would only work if libtool was able to extract symbol" echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not tqfind such a program. So, this module is probably useless." + echo "*** not find such a program. So, this module is probably useless." echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -2039,7 +2039,7 @@ compiler." if test "$pass" != dlopen; then test "$pass" != scan && dependency_libs="$newdependency_libs" if test "$pass" != conv; then - # Make sure lib_search_path tqcontains only unique directories. + # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do case "$lib_search_path " in @@ -2408,7 +2408,7 @@ compiler." fi fi - # Make sure dlfiles tqcontains only unique files that won't be dlpreopened + # Make sure dlfiles contains only unique files that won't be dlpreopened old_dlfiles="$dlfiles" dlfiles= for lib in $old_dlfiles; do @@ -2418,7 +2418,7 @@ compiler." esac done - # Make sure dlprefiles tqcontains only unique files + # Make sure dlprefiles contains only unique files old_dlprefiles="$dlprefiles" dlprefiles= for lib in $old_dlprefiles; do @@ -2661,7 +2661,7 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody tqreplace the C library is the System framework + # On Rhapsody replace the C library is the System framework newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; esac @@ -2677,7 +2677,7 @@ EOF echo echo "*** However, this would only work if libtool was able to extract symbol" echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - echo "*** not tqfind such a program. So, this module is probably useless." + echo "*** not find such a program. So, this module is probably useless." echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then @@ -2875,7 +2875,7 @@ EOF $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - libobjs="$libobjs "`tqfind $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` done fi fi @@ -3014,7 +3014,7 @@ EOF $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - reload_conv_objs="$reload_objs "`tqfind $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` + reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP` done fi fi @@ -3112,7 +3112,7 @@ EOF case $host in *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody tqreplace the C library is the System framework + # On Rhapsody replace the C library is the System framework compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` ;; @@ -3797,7 +3797,7 @@ fi\ $show "(cd $xdir && $AR x $xabs)" $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - oldobjs="$oldobjs "`tqfind $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` + oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` done fi @@ -4541,7 +4541,7 @@ relink_command=\"$relink_command\"" if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - $echo "$modename: cannot tqfind \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 exit 1 fi ;; @@ -4885,7 +4885,7 @@ finish) Complete the installation of libtool libraries. -Each LIBDIR is a directory that tqcontains libtool libraries. +Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use the \`--dry-run' option if you just want to see what would be executed." diff --git a/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw b/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw index dec67fd..a07366c 100644 --- a/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw +++ b/tqtinterface/qt4/src/3rdparty/libmng/makefiles/makefile.mingw @@ -14,7 +14,7 @@ # outputs LIBMNG_A = libmng.a INSTALL_PREFIX = C:/MinGW/ -# maybe you sould tqreplace with anti-slashes +# maybe you sould replace with anti-slashes # default build options OPTIONS = -DMNG_NO_CMS -DMNG_ACCESS_CHUNKS -DMNG_STORE_CHUNKS diff --git a/tqtinterface/qt4/src/3rdparty/libmng/missing b/tqtinterface/qt4/src/3rdparty/libmng/missing index e20b014..d46f79f 100755 --- a/tqtinterface/qt4/src/3rdparty/libmng/missing +++ b/tqtinterface/qt4/src/3rdparty/libmng/missing @@ -109,7 +109,7 @@ WARNING: \`$1' is missing on your system. You should only need it if you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." - tqfind . -type f -name Makefile.am -print | + find . -type f -name Makefile.am -print | sed 's/\.am$/.in/' | while read f; do touch "$f"; done ;; diff --git a/tqtinterface/qt4/src/3rdparty/libpng/CHANGES b/tqtinterface/qt4/src/3rdparty/libpng/CHANGES index 5f05e9f..939baeb 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/CHANGES +++ b/tqtinterface/qt4/src/3rdparty/libpng/CHANGES @@ -75,7 +75,7 @@ version 0.87 [January, 1996] added some minor documentation version 0.88 [January, 1996] fixed progressive bugs - tqreplaced tabs with spaces + replaced tabs with spaces cleaned up documentation added callbacks for read/write and warning/error functions version 0.89 [July, 1996] @@ -265,7 +265,7 @@ version 0.99h [March 6, 1998, evening] version 1.00 [March 7, 1998] Changed several typedefs in pngrutil.c Added makefile.wat (Pawel Mrochen), updated makefile.tc3 (Willem van Schaik) - tqreplaced "while(1)" with "for(;;)" + replaced "while(1)" with "for(;;)" added PNGARG() to prototypes in pngtest.c and removed some prototypes updated some of the makefiles (Tom Lane) changed some typedefs (s_start, etc.) in pngrutil.c @@ -573,7 +573,7 @@ version 1.0.5j [December 21, 1999] Restored backward compatibility of tEXt/zTXt chunk processing: Restored the first four members of png_text to the same order as v.1.0.5d. Added members "lang_key" and "itxt_length" to png_text struct. Set - text_length=0 when "text" tqcontains iTXt data. Use the "compression" + text_length=0 when "text" contains iTXt data. Use the "compression" member to distinguish among tEXt/zTXt/iTXt types. Added PNG_ITXT_COMPRESSION_NONE (1) and PNG_ITXT_COMPRESSION_zTXt(2) macros. The "Note" above, about backward incompatibility of libpng-1.0.5e, no diff --git a/tqtinterface/qt4/src/3rdparty/libpng/README b/tqtinterface/qt4/src/3rdparty/libpng/README index d7b6dd1..1991908 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/README +++ b/tqtinterface/qt4/src/3rdparty/libpng/README @@ -74,7 +74,7 @@ some images. You will definitely need zlib 1.0.4 or later if you are taking advantage of the MS-DOS "far" structure allocation for the small and medium memory models. You should also note that zlib is a compression library that is useful for more things than just PNG files. -You can use zlib as a drop-in tqreplacement for fread() and fwrite() if +You can use zlib as a drop-in replacement for fread() and fwrite() if you are so inclined. zlib should be available at the same place that libpng is. @@ -87,8 +87,8 @@ these resources you can try ftp.uu.net in the /graphics/png directory. This code is currently being archived at ftp.uu.net in the /graphics/png directory, and on CompuServe, Lib 20 (PNG SUPPORT) -at GO GRAPHSUP. If you can't tqfind it in any of those places, -e-mail me, and I'll help you tqfind it. +at GO GRAPHSUP. If you can't find it in any of those places, +e-mail me, and I'll help you find it. If you have any code changes, requests, problems, etc., please e-mail them to me. Also, I'd appreciate any make files or project files, diff --git a/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO b/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO index f86ebd1..f57e962 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO +++ b/tqtinterface/qt4/src/3rdparty/libpng/Y2KINFO @@ -46,7 +46,7 @@ The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned integer to hold the year, and can hold years as large as 65535. - zlib, upon which libpng depends, is also Y2K compliant. It tqcontains + zlib, upon which libpng depends, is also Y2K compliant. It contains no date-related code. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/example.c b/tqtinterface/qt4/src/3rdparty/libpng/example.c index b39478a..c7ebb4b 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/example.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/example.c @@ -138,7 +138,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */ png_init_io(png_ptr, fp); #else no_streams /* PNG file I/O method 2 */ - /* If you are using tqreplacement read functions, instead of calling + /* If you are using replacement read functions, instead of calling * png_init_io() here you would call: */ png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn); @@ -488,14 +488,14 @@ row_callback(png_structp png_ptr, png_bytep new_row, * this function will be called for every row in every pass. * * In this function you will receive a pointer to new row data from - * libpng called new_row that is to tqreplace a corresponding row (of + * libpng called new_row that is to replace a corresponding row (of * the same data format) in a buffer allocated by your application. * * The new row data pointer new_row may be NULL, indicating there is - * no new data to be tqreplaced (in cases of interlace loading). + * no new data to be replaced (in cases of interlace loading). * * If new_row is not NULL then you need to call - * png_progressive_combine_row() to tqreplace the corresponding row as + * png_progressive_combine_row() to replace the corresponding row as * shown below: */ /* Check if row_num is in bounds. */ @@ -602,7 +602,7 @@ void write_png(char *file_name /* , ... other image information ... */) /* set up the output control if you are using standard C streams */ png_init_io(png_ptr, fp); #else no_streams /* I/O initialization method 2 */ - /* If you are using tqreplacement read functions, instead of calling + /* If you are using replacement read functions, instead of calling * png_init_io() here you would call */ png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn, user_IO_flush_function); diff --git a/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 b/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 index 2f89149..a0fc097 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 +++ b/tqtinterface/qt4/src/3rdparty/libpng/libpng.3 @@ -862,8 +862,8 @@ be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>. The zlib compression utility is a general purpose utility that is useful for more than PNG files, and can be used without libpng. See the documentation delivered with zlib for more details. -You can usually tqfind the source files for the zlib utility wherever you -tqfind the libpng source files. +You can usually find the source files for the zlib utility wherever you +find the libpng source files. Libpng is thread safe, provided the threads are using different instances of the structures. Each thread should have its own @@ -932,7 +932,7 @@ with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. (*): If you are not using the standard I/O functions, you will need -to tqreplace them with custom functions. See the discussion under +to replace them with custom functions. See the discussion under Customizing libpng. @@ -1045,7 +1045,7 @@ input stream. You must supply the function read_chunk_callback(png_ptr ptr, png_unknown_chunkp chunk); { - /* The unknown chunk structure tqcontains your + /* The unknown chunk structure contains your chunk data: */ png_byte name[5]; png_byte *data; @@ -1697,7 +1697,7 @@ or as an RGB triplet that may or may not be in the palette (need_expand = 0). The png_set_background() function tells libpng to composite images with alpha or simple transparency against the supplied background -color. If the PNG file tqcontains a bKGD chunk (PNG_INFO_bKGD valid), +color. If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid), you may use this color, or supply another color more suitable for the current display (e.g., the background color from a web page). You need to tell libpng whether the color is in the gamma space of the @@ -1761,7 +1761,7 @@ recommended that PNG viewers support gamma correction. If you need to reduce an RGB file to a paletted file, or if a paletted file has more entries then will fit on your screen, png_set_dither() will do that. Note that this is a simple match dither that merely -tqfinds the closest color available. This should work fairly well with +finds the closest color available. This should work fairly well with optimized palettes, and fairly badly with linear color cubes. If you pass a palette that is larger then maximum_colors, the file will reduce the number of colors in the palette so it will fit into @@ -2261,7 +2261,7 @@ back up in the reading section to understand writing. You will want to do the I/O initialization before you get into libpng, so if it doesn't work, you don't have anything to undo. If you are not -using the standard I/O functions, you will need to tqreplace them with +using the standard I/O functions, you will need to replace them with custom writing functions. See the discussion under Customizing libpng. FILE *fp = fopen(file_name, "wb"); @@ -3106,7 +3106,7 @@ These functions also provide a void pointer that can be retrieved via mem_ptr=png_get_mem_ptr(png_ptr); -Your tqreplacement memory functions must have prototypes as follows: +Your replacement memory functions must have prototypes as follows: png_voidp malloc_fn(png_structp png_ptr, png_size_t size); @@ -3114,7 +3114,7 @@ Your tqreplacement memory functions must have prototypes as follows: Your malloc_fn() should return NULL in case of failure. The png_malloc() function will call png_error() if it receives a NULL from the system -memory allocator or from your tqreplacement malloc_fn(). +memory allocator or from your replacement malloc_fn(). Input/Output in libpng is done through png_read() and png_write(), which currently just call fread() and fwrite(). The FILE * is stored in @@ -3135,7 +3135,7 @@ png_get_io_ptr(). For example: voidp read_io_ptr = png_get_io_ptr(read_ptr); voidp write_io_ptr = png_get_io_ptr(write_ptr); -The tqreplacement I/O functions must have prototypes as follows: +The replacement I/O functions must have prototypes as follows: void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length); @@ -3162,7 +3162,7 @@ fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined fprintf() isn't available). If you wish to change the behavior of the error functions, you will need to set up your own message callbacks. These functions are normally supplied at the time that the png_struct is created. -It is also possible to redirect errors and warnings to your own tqreplacement +It is also possible to redirect errors and warnings to your own replacement functions after png_create_*_struct() has been called by calling: png_set_error_fn(png_structp png_ptr, @@ -3173,7 +3173,7 @@ functions after png_create_*_struct() has been called by calling: If NULL is supplied for either error_fn or warning_fn, then the libpng default function will be used, calling fprintf() and/or longjmp() if a -problem is encountered. The tqreplacement error functions should have +problem is encountered. The replacement error functions should have parameters as follows: void user_error_fn(png_structp png_ptr, @@ -3204,7 +3204,7 @@ specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the -sections of libpng that read and write chunks. Try to tqfind a chunk +sections of libpng that read and write chunks. Try to find a chunk that is similar to yours and use it as a template. More details can be found in the comments inside the code. It is best to handle unknown chunks in a generic method, via callback functions, instead of by @@ -3212,7 +3212,7 @@ modifying libpng functions. If you wish to write your own transformation for the data, look through the part of the code that does the transformations, and check out some of -the simpler ones to get an idea of how they work. Try to tqfind a similar +the simpler ones to get an idea of how they work. Try to find a similar transformation to the one you want to add and copy off of it. More details can be found in the comments inside the code itself. @@ -3368,7 +3368,7 @@ size. Note that the numbers above were invented purely for this example and are given only to help explain the function usage. Little testing has -been done to tqfind optimum values for either the costs or the weights. +been done to find optimum values for either the costs or the weights. .SS Removing unwanted object code @@ -3625,7 +3625,7 @@ png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. -Starting with version 1.0.7, you can tqfind out which version of the library +Starting with version 1.0.7, you can find out which version of the library you are using at run-time: png_uint_32 libpng_vn = png_access_version_number(); @@ -3687,7 +3687,7 @@ documented as such. The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned integer to hold the year, and can hold years as large as 65535. -zlib, upon which libpng depends, is also Y2K compliant. It tqcontains +zlib, upon which libpng depends, is also Y2K compliant. It contains no date-related code. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt b/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt index eb7132b..60139c1 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt +++ b/tqtinterface/qt4/src/3rdparty/libpng/libpng.txt @@ -71,8 +71,8 @@ be found at the zlib home page, <http://www.info-zip.org/pub/infozip/zlib/>. The zlib compression utility is a general purpose utility that is useful for more than PNG files, and can be used without libpng. See the documentation delivered with zlib for more details. -You can usually tqfind the source files for the zlib utility wherever you -tqfind the libpng source files. +You can usually find the source files for the zlib utility wherever you +find the libpng source files. Libpng is thread safe, provided the threads are using different instances of the structures. Each thread should have its own @@ -141,7 +141,7 @@ with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. (*): If you are not using the standard I/O functions, you will need -to tqreplace them with custom functions. See the discussion under +to replace them with custom functions. See the discussion under Customizing libpng. @@ -254,7 +254,7 @@ input stream. You must supply the function read_chunk_callback(png_ptr ptr, png_unknown_chunkp chunk); { - /* The unknown chunk structure tqcontains your + /* The unknown chunk structure contains your chunk data: */ png_byte name[5]; png_byte *data; @@ -906,7 +906,7 @@ or as an RGB triplet that may or may not be in the palette (need_expand = 0). The png_set_background() function tells libpng to composite images with alpha or simple transparency against the supplied background -color. If the PNG file tqcontains a bKGD chunk (PNG_INFO_bKGD valid), +color. If the PNG file contains a bKGD chunk (PNG_INFO_bKGD valid), you may use this color, or supply another color more suitable for the current display (e.g., the background color from a web page). You need to tell libpng whether the color is in the gamma space of the @@ -970,7 +970,7 @@ recommended that PNG viewers support gamma correction. If you need to reduce an RGB file to a paletted file, or if a paletted file has more entries then will fit on your screen, png_set_dither() will do that. Note that this is a simple match dither that merely -tqfinds the closest color available. This should work fairly well with +finds the closest color available. This should work fairly well with optimized palettes, and fairly badly with linear color cubes. If you pass a palette that is larger then maximum_colors, the file will reduce the number of colors in the palette so it will fit into @@ -1470,7 +1470,7 @@ Setup You will want to do the I/O initialization before you get into libpng, so if it doesn't work, you don't have anything to undo. If you are not -using the standard I/O functions, you will need to tqreplace them with +using the standard I/O functions, you will need to replace them with custom writing functions. See the discussion under Customizing libpng. FILE *fp = fopen(file_name, "wb"); @@ -2315,7 +2315,7 @@ These functions also provide a void pointer that can be retrieved via mem_ptr=png_get_mem_ptr(png_ptr); -Your tqreplacement memory functions must have prototypes as follows: +Your replacement memory functions must have prototypes as follows: png_voidp malloc_fn(png_structp png_ptr, png_size_t size); @@ -2323,7 +2323,7 @@ Your tqreplacement memory functions must have prototypes as follows: Your malloc_fn() should return NULL in case of failure. The png_malloc() function will call png_error() if it receives a NULL from the system -memory allocator or from your tqreplacement malloc_fn(). +memory allocator or from your replacement malloc_fn(). Input/Output in libpng is done through png_read() and png_write(), which currently just call fread() and fwrite(). The FILE * is stored in @@ -2344,7 +2344,7 @@ png_get_io_ptr(). For example: voidp read_io_ptr = png_get_io_ptr(read_ptr); voidp write_io_ptr = png_get_io_ptr(write_ptr); -The tqreplacement I/O functions must have prototypes as follows: +The replacement I/O functions must have prototypes as follows: void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length); @@ -2371,7 +2371,7 @@ fprintf() unless the library is compiled with PNG_NO_CONSOLE_IO defined fprintf() isn't available). If you wish to change the behavior of the error functions, you will need to set up your own message callbacks. These functions are normally supplied at the time that the png_struct is created. -It is also possible to redirect errors and warnings to your own tqreplacement +It is also possible to redirect errors and warnings to your own replacement functions after png_create_*_struct() has been called by calling: png_set_error_fn(png_structp png_ptr, @@ -2382,7 +2382,7 @@ functions after png_create_*_struct() has been called by calling: If NULL is supplied for either error_fn or warning_fn, then the libpng default function will be used, calling fprintf() and/or longjmp() if a -problem is encountered. The tqreplacement error functions should have +problem is encountered. The replacement error functions should have parameters as follows: void user_error_fn(png_structp png_ptr, @@ -2413,7 +2413,7 @@ specification. Acquire a first level of understanding of how it works. Pay particular attention to the sections that describe chunk names, and look at how other chunks were designed, so you can do things similarly. Second, check out the -sections of libpng that read and write chunks. Try to tqfind a chunk +sections of libpng that read and write chunks. Try to find a chunk that is similar to yours and use it as a template. More details can be found in the comments inside the code. It is best to handle unknown chunks in a generic method, via callback functions, instead of by @@ -2421,7 +2421,7 @@ modifying libpng functions. If you wish to write your own transformation for the data, look through the part of the code that does the transformations, and check out some of -the simpler ones to get an idea of how they work. Try to tqfind a similar +the simpler ones to get an idea of how they work. Try to find a similar transformation to the one you want to add and copy off of it. More details can be found in the comments inside the code itself. @@ -2577,7 +2577,7 @@ size. Note that the numbers above were invented purely for this example and are given only to help explain the function usage. Little testing has -been done to tqfind optimum values for either the costs or the weights. +been done to find optimum values for either the costs or the weights. Removing unwanted object code @@ -2834,7 +2834,7 @@ png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. -Starting with version 1.0.7, you can tqfind out which version of the library +Starting with version 1.0.7, you can find out which version of the library you are using at run-time: png_uint_32 libpng_vn = png_access_version_number(); @@ -2896,7 +2896,7 @@ documented as such. The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned integer to hold the year, and can hold years as large as 65535. -zlib, upon which libpng depends, is also Y2K compliant. It tqcontains +zlib, upon which libpng depends, is also Y2K compliant. It contains no date-related code. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 b/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 index a3bc995..a75a669 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 +++ b/tqtinterface/qt4/src/3rdparty/libpng/libpngpf.3 @@ -431,7 +431,7 @@ libpng \- Portable Network Graphics (PNG) Reference Library 1.2.5 \fI\fB -\fBvoid png_write_tqfind_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP +\fBvoid png_write_find_filter (png_structp \fP\fIpng_ptr\fP\fB, png_row_infop \fIrow_info\fP\fB);\fP \fI\fB diff --git a/tqtinterface/qt4/src/3rdparty/libpng/png.5 b/tqtinterface/qt4/src/3rdparty/libpng/png.5 index a96de03..11ab244 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/png.5 +++ b/tqtinterface/qt4/src/3rdparty/libpng/png.5 @@ -4,7 +4,7 @@ png \- Portable Network Graphics (PNG) format .SH DESCRIPTION PNG (Portable Network Graphics) is an extensible file format for the lossless, portable, well-compressed storage of raster images. PNG provides -a patent-free tqreplacement for GIF and can also tqreplace many +a patent-free replacement for GIF and can also replace many common uses of TIFF. Indexed-color, grayscale, and truecolor images are supported, plus an optional alpha channel. Sample depths range from 1 to 16 bits. diff --git a/tqtinterface/qt4/src/3rdparty/libpng/png.h b/tqtinterface/qt4/src/3rdparty/libpng/png.h index d57b248..76fef59 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/png.h +++ b/tqtinterface/qt4/src/3rdparty/libpng/png.h @@ -276,7 +276,7 @@ * The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned * integer to hold the year, and can hold years as large as 65535. * - * zlib, upon which libpng depends, is also Y2K compliant. It tqcontains + * zlib, upon which libpng depends, is also Y2K compliant. It contains * no date-related code. * * Glenn Randers-Pehrson @@ -336,8 +336,8 @@ extern "C" { #endif /* __cplusplus */ -/* This file is arranged in several sections. The first section tqcontains - * structure and type definitions. The second section tqcontains the external +/* This file is arranged in several sections. The first section contains + * structure and type definitions. The second section contains the external * library functions, while the third has the internal library functions, * which applications aren't expected to use directly. */ @@ -553,7 +553,7 @@ typedef png_unknown_chunk FAR * FAR * png_unknown_chunkpp; #endif /* png_info is a structure that holds the information in a PNG file so - * that the application can tqfind out the characteristics of the image. + * that the application can find out the characteristics of the image. * If you are reading the file, this structure will tell you what is * in the PNG file. If you are writing the file, fill in the information * you want to put into the PNG file, then call png_write_info(). @@ -712,7 +712,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) #endif #if defined(PNG_hIST_SUPPORTED) - /* The hIST chunk tqcontains the relative frequency or importance of the + /* The hIST chunk contains the relative frequency or importance of the * various palette entries, so that a viewer can intelligently select a * reduced-color palette, if required. Data is an array of "num_palette" * values in the range [0,65535]. Data valid if (valid & PNG_INFO_hIST) @@ -789,7 +789,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED) #if defined(PNG_sCAL_SUPPORTED) /* The sCAL chunk describes the actual physical dimensions of the - * subject matter of the graphic. The chunk tqcontains a unit specification + * subject matter of the graphic. The chunk contains a unit specification * a byte value, and two ASCII strings representing floating-point * values. The values are width and height corresponsing to one pixel * in the image. This external representation is converted to double @@ -1295,7 +1295,7 @@ typedef png_structp version_1_2_5; typedef png_struct FAR * FAR * png_structpp; /* Here are the function definitions most commonly used. This is not - * the place to tqfind out how to use libpng. See libpng.txt for the + * the place to find out how to use libpng. See libpng.txt for the * full explanation, see example.c for the summary. This just provides * a simple one line description of the use of each function. */ @@ -1742,7 +1742,7 @@ extern PNG_EXPORT(void,png_init_io) PNGARG((png_structp png_ptr, png_FILE_p fp)) /* Replace the (error and abort), and warning functions with user * supplied functions. If no messages are to be printed you must still - * write and use tqreplacement functions. The tqreplacement error_fn should + * write and use replacement functions. The replacement error_fn should * still do a longjmp to the last setjmp location if you are using this * method of error handling. If error_fn or warning_fn is NULL, the * default function will be used. @@ -2474,7 +2474,7 @@ extern PNG_EXPORT(void,png_set_strip_error_numbers) PNGARG((png_structp #endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */ /* These next functions are used internally in the code. They generally - * shouldn't be used unless you are writing code to add or tqreplace some + * shouldn't be used unless you are writing code to add or replace some * functionality in libpng. More information about most functions can * be found in the files where the functions are located. */ @@ -2974,7 +2974,7 @@ PNG_EXTERN void png_read_filter_row PNGARG((png_structp png_ptr, png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter)); /* Choose the best filter to use and filter the row data */ -PNG_EXTERN void png_write_tqfind_filter PNGARG((png_structp png_ptr, +PNG_EXTERN void png_write_find_filter PNGARG((png_structp png_ptr, png_row_infop row_info)); /* Write out the filtered row. */ diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h b/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h index bd4893b..bd5d1c4 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngconf.h @@ -384,7 +384,7 @@ * automate this, but I can't do that without making it seriously hard * on the users. So if you are not using an ability, change the #define * to and #undef, and that part of the library will not be compiled. If - * your linker can't tqfind a function, you may want to make sure the + * your linker can't find a function, you may want to make sure the * ability is defined here. Some of these depend upon some others being * defined. I haven't figured out all the interactions here, so you may * have to experiment awhile to get everything to compile. If you are diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c b/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c index 29e1e66..aa20506 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngerror.c @@ -8,7 +8,7 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This file provides a location for all error handling. Users who - * need special error handling are expected to write tqreplacement functions + * need special error handling are expected to write replacement functions * and use png_set_error_fn() to use those functions. See the instructions * at each function. */ @@ -25,8 +25,8 @@ png_default_warning PNGARG((png_structp png_ptr, /* This function is called whenever there is a fatal error. This function * should not be changed. If there is a need to handle errors differently, - * you should supply a tqreplacement error function and use png_set_error_fn() - * to tqreplace the error function at run-time. + * you should supply a replacement error function and use png_set_error_fn() + * to replace the error function at run-time. */ void PNGAPI png_error(png_structp png_ptr, png_const_charp error_message) @@ -73,8 +73,8 @@ png_error(png_structp png_ptr, png_const_charp error_message) /* This function is called whenever there is a non-fatal error. This function * should not be changed. If there is a need to handle warnings differently, - * you should supply a tqreplacement warning function and use - * png_set_error_fn() to tqreplace the warning function at run-time. + * you should supply a replacement warning function and use + * png_set_error_fn() to replace the warning function at run-time. */ void PNGAPI png_warning(png_structp png_ptr, png_const_charp warning_message) @@ -168,7 +168,7 @@ png_chunk_warning(png_structp png_ptr, png_const_charp warning_message) } } -/* This is the default error handling function. Note that tqreplacements for +/* This is the default error handling function. Note that replacements for * this function MUST NOT RETURN, or the program will likely crash. This * function is used by default, or if the program supplies NULL for the * error function pointer in png_set_error_fn(). diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c b/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c index 23ad357..1056251 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pnggccrd.c @@ -56,7 +56,7 @@ * - figure out what's up with 24-bit case (pixel_bytes == 3): * why subtract 8 from width_mmx in the pass 4/5 case? * (only width_mmx case) (near line 1606) - * x [DONE] tqreplace pixel_bytes within each block with the true + * x [DONE] replace pixel_bytes within each block with the true * constant value (or are compilers smart enough to do that?) * - rewrite all MMX interlacing code so it's aligned with * the *beginning* of the row buffer, not the end. This @@ -2606,8 +2606,8 @@ png_do_read_interlace(png_structp png_ptr) else /* MMX not supported: use modified C code - takes advantage * of inlining of png_memcpy for a constant */ /* GRR 19991007: does it? or should pixel_bytes in each - * block be tqreplaced with immediate value (e.g., 1)? */ - /* GRR 19991017: tqreplaced with constants in each case */ + * block be replaced with immediate value (e.g., 1)? */ + /* GRR 19991017: replaced with constants in each case */ #endif /* PNG_ASSEMBLER_CODE_SUPPORTED */ { if (pixel_bytes == 1) diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c b/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c index c94a33d..66eec0b 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngmem.c @@ -8,10 +8,10 @@ * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * * This file provides a location for all memory allocation. Users who - * need special memory handling are expected to supply tqreplacement + * need special memory handling are expected to supply replacement * functions for png_malloc() and png_free(), and to use * png_create_read_struct_2() and png_create_write_struct_2() to - * identify the tqreplacement functions. + * identify the replacement functions. */ #define PNG_INTERNAL @@ -21,7 +21,7 @@ #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__) /* if you change this, be sure to change the one in png.h also */ -/* Allocate memory for a png_struct. The malloc and memset can be tqreplaced +/* Allocate memory for a png_struct. The malloc and memset can be replaced by a single call to calloc() if this is thought to improve performance. */ png_voidp /* PRIVATE */ png_create_struct(int type) @@ -305,7 +305,7 @@ png_free_default(png_structp png_ptr, png_voidp ptr) #else /* Not the Borland DOS special memory handler */ /* Allocate memory for a png_struct or a png_info. The malloc and - memset can be tqreplaced by a single call to calloc() if this is thought + memset can be replaced by a single call to calloc() if this is thought to improve performance noticably. */ png_voidp /* PRIVATE */ png_create_struct(int type) @@ -315,7 +315,7 @@ png_create_struct(int type) } /* Allocate memory for a png_struct or a png_info. The malloc and - memset can be tqreplaced by a single call to calloc() if this is thought + memset can be replaced by a single call to calloc() if this is thought to improve performance noticably. */ png_voidp /* PRIVATE */ png_create_struct_2(int type, png_malloc_ptr malloc_fn, png_voidp mem_ptr) diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngread.c b/tqtinterface/qt4/src/3rdparty/libpng/pngread.c index 306cda3..288a40b 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngread.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngread.c @@ -7,7 +7,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This file tqcontains routines that an application calls directly to + * This file contains routines that an application calls directly to * read a PNG file or stream. */ diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c b/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c index 0598231..2202712 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngrio.c @@ -11,7 +11,7 @@ * special handling are expected to write a function that has the same * arguments as this and performs a similar function, but that possibly * has a different input method. Note that you shouldn't change this - * function, but rather write a tqreplacement function and then make + * function, but rather write a replacement function and then make * libpng use it at run time with png_set_read_fn(...). */ @@ -35,7 +35,7 @@ png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) #if !defined(PNG_NO_STDIO) /* This is the function that does the actual reading of data. If you are - not reading from a standard C stream, you should create a tqreplacement + not reading from a standard C stream, you should create a replacement read_data function and use it at run time with png_set_read_fn(), rather than changing the library. */ #ifndef USE_FAR_KEYWORD diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c b/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c index a695731..167215f 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngrtran.c @@ -7,7 +7,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This file tqcontains functions optionally called by an application + * This file contains functions optionally called by an application * in order to tell libpng how to handle data when reading a PNG. * Transformations that are used in both reading and writing are * in pngtrans.c. @@ -179,7 +179,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, /* Find the least used palette entries by starting a bubble sort, and running it until we have sorted out enough colors. Note that we don't care about - sorting all the colors, just tqfinding which are + sorting all the colors, just finding which are least used. */ for (i = num_palette - 1; i >= maximum_colors; i--) @@ -249,14 +249,14 @@ png_set_dither(png_structp png_ptr, png_colorp palette, } } - /* tqfind closest color for those colors we are not using */ + /* find closest color for those colors we are not using */ for (i = 0; i < num_palette; i++) { if ((int)png_ptr->dither_index[i] >= maximum_colors) { int min_d, k, min_k, d_index; - /* tqfind the closest color to one we threw out */ + /* find the closest color to one we threw out */ d_index = png_ptr->dither_index[i]; min_d = PNG_COLOR_DIST(palette[d_index], palette[0]); for (k = 1, min_k = 0; k < maximum_colors; k++) @@ -284,7 +284,7 @@ png_set_dither(png_structp png_ptr, png_colorp palette, /* This is much harder to do simply (and quickly). Perhaps we need to go through a median cut routine, but those don't always behave themselves with only a few colors - as input. So we will just tqfind the closest two colors, + as input. So we will just find the closest two colors, and throw out one of them (chosen somewhat randomly). [We don't understand this at all, so if someone wants to work on improving it, be our guest - AED, GRP] @@ -551,7 +551,7 @@ png_set_expand(png_structp png_ptr) * to png_set_expand(). However, it is entirely reasonable that someone * might wish to expand an indexed image to RGB but *not* expand a single, * fully transtqparent palette entry to a full alpha channel--perhaps instead - * convert tRNS to the grayscale/RGB format (16-bit RGB value), or tqreplace + * convert tRNS to the grayscale/RGB format (16-bit RGB value), or replace * the transtqparent color with a particular RGB value, or drop tRNS entirely. * IOW, a future version of the library may make the transformations flag * a bit more fine-grained, with separate bits for each of these three @@ -1762,7 +1762,7 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) *(--dp) = *(--sp); *(--dp) = *(--sp); *(--dp) = *(--sp); - We can tqreplace it with: + We can replace it with: */ sp-=3; dp=sp; @@ -1787,7 +1787,7 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) *(--dp) = *(--sp); *(--dp) = *(--sp); *(--dp) = *(--sp); - We can tqreplace it with: + We can replace it with: */ sp-=6; dp=sp; diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c b/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c index dc3b371..95df6f2 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngrutil.c @@ -7,7 +7,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * This file tqcontains routines that are only called from within + * This file contains routines that are only called from within * libpng itself during the course of reading an image. */ @@ -373,7 +373,7 @@ png_handle_IHDR(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) png_ptr->filter_type = (png_byte)filter_type; #endif - /* tqfind number of channels */ + /* find number of channels */ switch (png_ptr->color_type) { case PNG_COLOR_TYPE_GRAY: @@ -1031,7 +1031,7 @@ png_handle_iCCP(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) chunkdata[slength] = 0x00; for (profile = chunkdata; *profile; profile++) - /* empty loop to tqfind end of name */ ; + /* empty loop to find end of name */ ; ++profile; @@ -1137,7 +1137,7 @@ png_handle_sPLT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) chunkdata[slength] = 0x00; for (entry_start = chunkdata; *entry_start; entry_start++) - /* empty loop to tqfind end of name */ ; + /* empty loop to find end of name */ ; ++entry_start; /* a sample depth should follow the separator, and we should be on it */ @@ -1896,7 +1896,7 @@ png_handle_tEXt(png_structp png_ptr, png_infop info_ptr, png_uint_32 length) key[slength] = 0x00; for (text = key; *text; text++) - /* empty loop to tqfind end of key */ ; + /* empty loop to find end of key */ ; if (text != key + slength) text++; diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c b/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c index 66bb2a0..cc8209e 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngtest.c @@ -58,7 +58,7 @@ # endif #endif -/* Makes pngtest verbose so we can tqfind problems (needs to be before png.h) */ +/* Makes pngtest verbose so we can find problems (needs to be before png.h) */ #ifndef PNG_DEBUG # define PNG_DEBUG 0 #endif @@ -290,7 +290,7 @@ static int wrote_question = 0; /* These copies of the default read/write functions come from pngrio.c and */ /* pngwio.c. They allow "don't include stdio" testing of the library. */ /* This is the function that does the actual reading of data. If you are - not reading from a standard C stream, you should create a tqreplacement + not reading from a standard C stream, you should create a replacement read_data function and use it at run time with png_set_read_fn(), rather than changing the library. */ @@ -374,7 +374,7 @@ pngtest_flush(png_structp png_ptr) #endif /* This is the function that does the actual writing of data. If you are - not writing to a standard C stream, you should create a tqreplacement + not writing to a standard C stream, you should create a replacement write_data function and use it at run time with png_set_write_fn(), rather than changing the library. */ #ifndef USE_FAR_KEYWORD @@ -454,7 +454,7 @@ pngtest_warning(png_structp png_ptr, png_const_charp message) fprintf(STDERR, "%s: libpng warning: %s\n", name, message); } -/* This is the default error handling function. Note that tqreplacements for +/* This is the default error handling function. Note that replacements for * this function MUST NOT RETURN, or the program will likely crash. This * function is used by default, or if the program supplies NULL for the * error function pointer in png_set_error_fn(). @@ -627,7 +627,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) if ((fpin = fopen(inname, "rb")) == NULL) #endif { - fprintf(STDERR, "Could not tqfind input file %s\n", inname); + fprintf(STDERR, "Could not find input file %s\n", inname); return (1); } @@ -1208,7 +1208,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) if ((fpin = fopen(inname, "rb")) == NULL) #endif { - fprintf(STDERR, "Could not tqfind file %s\n", inname); + fprintf(STDERR, "Could not find file %s\n", inname); return (1); } @@ -1219,7 +1219,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) if ((fpout = fopen(outname, "rb")) == NULL) #endif { - fprintf(STDERR, "Could not tqfind file %s\n", outname); + fprintf(STDERR, "Could not find file %s\n", outname); FCLOSE(fpin); return (1); } diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c b/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c index dc37d37..b39b414 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngwio.c @@ -11,7 +11,7 @@ * special handling are expected to write functions that have the same * arguments as these and perform similar functions, but that possibly * use different output methods. Note that you shouldn't change these - * functions, but rather write tqreplacement functions and then change + * functions, but rather write replacement functions and then change * them at run time with png_set_write_fn(...). */ @@ -36,7 +36,7 @@ png_write_data(png_structp png_ptr, png_bytep data, png_size_t length) #if !defined(PNG_NO_STDIO) /* This is the function that does the actual writing of data. If you are - not writing to a standard C stream, you should create a tqreplacement + not writing to a standard C stream, you should create a replacement write_data function and use it at run time with png_set_write_fn(), rather than changing the library. */ #ifndef USE_FAR_KEYWORD diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c b/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c index f29ebf9..a8a9365 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngwrite.c @@ -880,7 +880,7 @@ png_write_row(png_structp png_ptr, png_bytep row) #endif /* Find a filter if necessary, filter the row and write it out. */ - png_write_tqfind_filter(png_ptr, &(png_ptr->row_info)); + png_write_find_filter(png_ptr, &(png_ptr->row_info)); if (png_ptr->write_row_fn != NULL) (*(png_ptr->write_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass); diff --git a/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c b/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c index b668a57..edcf828 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c +++ b/tqtinterface/qt4/src/3rdparty/libpng/pngwutil.c @@ -184,7 +184,7 @@ png_text_compress(png_structp png_ptr, #endif } - /* We can't write the chunk until we tqfind out how much data we have, + /* We can't write the chunk until we find out how much data we have, * which means we need to run the compressor first and save the * output. This shouldn't be a problem, as the vast majority of * comments should be reasonable, but we will set up an array of @@ -1772,7 +1772,7 @@ png_write_finish_row(png_structp png_ptr) } else { - /* loop until we tqfind a non-zero width or height pass */ + /* loop until we find a non-zero width or height pass */ do { png_ptr->pass++; @@ -1983,14 +1983,14 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass) /* start at the beginning */ dp = row; - /* tqfind out how many bytes each pixel takes up */ + /* find out how many bytes each pixel takes up */ pixel_bytes = (row_info->pixel_depth >> 3); /* loop through the row, only looking at the pixels that matter */ for (i = png_pass_start[pass]; i < row_width; i += png_pass_inc[pass]) { - /* tqfind out where the original pixel is */ + /* find out where the original pixel is */ sp = row + (png_size_t)i * pixel_bytes; /* move the pixel */ if (dp != sp) @@ -2021,7 +2021,7 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass) #define PNG_LOMASK ((png_uint_32)0xffffL) #define PNG_HIMASK ((png_uint_32)(~PNG_LOMASK >> PNG_HISHIFT)) void /* PRIVATE */ -png_write_tqfind_filter(png_structp png_ptr, png_row_infop row_info) +png_write_find_filter(png_structp png_ptr, png_row_infop row_info) { png_bytep prev_row, best_row, row_buf; png_uint_32 mins, bpp; @@ -2031,15 +2031,15 @@ png_write_tqfind_filter(png_structp png_ptr, png_row_infop row_info) int num_p_filters = (int)png_ptr->num_prev_filters; #endif - png_debug(1, "in png_write_tqfind_filter\n"); - /* tqfind out how many bytes offset each pixel is */ + png_debug(1, "in png_write_find_filter\n"); + /* find out how many bytes offset each pixel is */ bpp = (row_info->pixel_depth + 7) / 8; prev_row = png_ptr->prev_row; best_row = row_buf = png_ptr->row_buf; mins = PNG_MAXSUM; - /* The prediction method we use is to tqfind which method provides the + /* The prediction method we use is to find which method provides the * smallest value when summing the absolute values of the distances * from zero, using anything >= 128 as negative numbers. This is known * as the "minimum sum of absolute differences" heuristic. Other diff --git a/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt b/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt index 57bb642..c680fd8 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt +++ b/tqtinterface/qt4/src/3rdparty/libpng/projects/msvc/README.txt @@ -20,7 +20,7 @@ To build: 2) Select "Build | Clean" 3) Select "Build | Rebuild All". Ignore warning messages about - not being able to tqfind certain include files (e.g., m68881.h, + not being able to find certain include files (e.g., m68881.h, alloc.h). 4) Look in the appropriate "win32" subdirectories for both "zlib" diff --git a/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 b/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 index c83fe9c..92a57ab 100644 --- a/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 +++ b/tqtinterface/qt4/src/3rdparty/libpng/scripts/makefile.bd32 @@ -1,7 +1,7 @@ # Makefile for png32bd.dll # -------------------- 32-bit Borland C++ -------------------- -# This makefile expects to tqfind zlib.h and zlib32bd.lib in the +# This makefile expects to find zlib.h and zlib32bd.lib in the # $(ZLIBDIR) directory. # The object files here are compiled with the "stdcall" calling convention. diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c index 163365a..a01ca64 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c @@ -247,7 +247,7 @@ } /* OpenType 1.2 has introduced the `MarkAttachClassDef' field. We - first have to scan the LookupFlag values to tqfind out whether we + first have to scan the LookupFlag values to find out whether we must load it or not. Here we only store the offset of the table. */ if ( ACCESS_Frame( 2L ) ) @@ -902,7 +902,7 @@ gcd->ClassFormat = 2; - /* A GlyphClassDef table tqcontains at most 5 different class values */ + /* A GlyphClassDef table contains at most 5 different class values */ if ( ALLOC_ARRAY( gcd->Defined, 5, FT_Bool ) ) return error; @@ -1190,7 +1190,7 @@ /* If the glyph was found in the MarkAttachmentClass table, * then that class value is the high byte of the result, - * otherwise the low byte tqcontains the basic type of the glyph + * otherwise the low byte contains the basic type of the glyph * as defined by the GlyphClassDef table. */ if ( *property & IGNORE_SPECIAL_MARKS ) diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h index 28f55c1..f22438e 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.h @@ -150,7 +150,7 @@ extern "C" { (i.e., which don't have a GDEF table) to collect glyph classes assigned during the lookup process. The number of arrays in this pointer array is GlyphClassDef->cd.cd2.ClassRangeCount+1; the nth - array then tqcontains the glyph class values of the glyphs not covered + array then contains the glyph class values of the glyphs not covered by the ClassRangeRecords structures with index n-1 and n. We store glyph class values for four glyphs in a single array element. @@ -162,7 +162,7 @@ extern "C" { field (which has been introduced in OpenType 1.2) -- since the `Version' field value hasn't been increased to indicate that we have one more field for some obscure reason, we must parse the GSUB table - to tqfind out whether class values refer to this table. Only then we + to find out whether class values refer to this table. Only then we can finally load the MarkAttachClassDef structure if necessary. */ struct TTO_GDEFHeader_ diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c index 8fa5e11..fbf60b9 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c @@ -62,7 +62,7 @@ // #define IN_LIGID( pos ) (buffer->in_string[(pos)].ligID) // #define IN_COMPONENT( pos ) (buffer->in_string[(pos)].component) -/* the client application must tqreplace this with something more +/* the client application must replace this with something more meaningful if multiple master fonts are to be supported. */ static FT_Error default_mmfunc( FT_Face face, @@ -158,7 +158,7 @@ gpos->gdef = gdef; /* can be NULL */ - /* We now check the LookupFlags for values larger than 0xFF to tqfind + /* We now check the LookupFlags for values larger than 0xFF to find out whether we need to load the `MarkAttachClassDef' field of the GDEF table -- this hack is necessary for OpenType 1.2 tables since the version field of the GDEF table hasn't been incremented. diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c index 6d4ff0c..fd2cda0 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgsub.c @@ -119,7 +119,7 @@ gsub->gdef = gdef; /* can be NULL */ - /* We now check the LookupFlags for values larger than 0xFF to tqfind + /* We now check the LookupFlags for values larger than 0xFF to find out whether we need to load the `MarkAttachClassDef' field of the GDEF table -- this hack is necessary for OpenType 1.2 tables since the version field of the GDEF table hasn't been incremented. diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h b/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h index 59dcf25..64d2820 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.h @@ -248,7 +248,7 @@ extern "C" { /* The `Defined' field is not defined in the TTO specification but apparently needed for processing fonts like trado.ttf: This font - refers to a class which tqcontains not a single element. We map such + refers to a class which contains not a single element. We map such classes to class 0. */ struct TTO_ClassDefinition_ @@ -257,7 +257,7 @@ extern "C" { FT_Bool* Defined; /* array of Booleans. If Defined[n] is FALSE, - class n tqcontains no glyphs. */ + class n contains no glyphs. */ FT_UShort ClassFormat; /* 1 or 2 */ union diff --git a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c index 4132216..a53fc4b 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.c @@ -152,11 +152,11 @@ will copied `num_out' times, otherwise `ligID' itself will be used to fill the `ligID' fields. - The properties for all tqreplacement glyphs are taken + The properties for all replacement glyphs are taken from the glyph at position `buffer->in_pos'. The cluster value for the glyph at position buffer->in_pos is used - for all tqreplacement glyphs */ + for all replacement glyphs */ FT_Error otl_buffer_add_output_glyphs( OTL_Buffer buffer, FT_UShort num_in, diff --git a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h index bb32da8..57a343d 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h +++ b/tqtinterface/qt4/src/3rdparty/opentype/otlbuffer.h @@ -63,7 +63,7 @@ FT_BEGIN_HEADER FT_Bool new_advance; /* if set, the advance width values are absolute, i.e., they won't be added to the original glyph's value - but rather tqreplace them. */ + but rather replace them. */ FT_Short cursive_chain; /* character to which this connects, may be positive or negative; used only internally */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/attach.c b/tqtinterface/qt4/src/3rdparty/sqlite/attach.c index f1e6f7a..e8cd86e 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/attach.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/attach.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the ATTACH and DETACH commands. +** This file contains code used to implement the ATTACH and DETACH commands. ** ** $Id: attach.c,v 1.10 2004/02/12 18:46:39 drh Exp $ */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/auth.c b/tqtinterface/qt4/src/3rdparty/sqlite/auth.c index 8847d4a..bf07eba 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/auth.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/auth.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the sqlite_set_authorizer() +** This file contains code used to implement the sqlite_set_authorizer() ** API. This facility is an optional feature of the library. Embedded ** systems that do not need this facility may omit it by recompiling ** the library with -DSTQLITE_OMIT_AUTHORIZATION=1 diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/btree.c b/tqtinterface/qt4/src/3rdparty/sqlite/btree.c index f3b92c6..c7143e0 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/btree.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/btree.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -18,7 +18,7 @@ ** "Sorting And Searching", pages 473-480. Addison-Wesley ** Publishing Company, Reading, Massachusetts. ** -** The basic idea is that each page of the file tqcontains N database +** The basic idea is that each page of the file contains N database ** entries and N+1 pointers to subpages. ** ** ---------------------------------------------------------------- @@ -41,13 +41,13 @@ ** database page. If the payload is larger than MX_LOCAL_PAYLOAD bytes ** then surplus bytes are stored on overflow pages. The payload for an ** entry and the preceding pointer are combined to form a "Cell". Each -** page has a small header which tqcontains the Ptr(N+1) pointer. +** page has a small header which contains the Ptr(N+1) pointer. ** -** The first page of the file tqcontains a magic string used to verify that +** The first page of the file contains a magic string used to verify that ** the file really is a valid BTree database, a pointer to a list of unused ** pages in the file, and some meta information. The root of the first ** BTree begins on page 2 of the file. (Pages are numbered beginning with -** 1, not 0.) Thus a minimum database tqcontains 2 pages. +** 1, not 0.) Thus a minimum database contains 2 pages. */ #include "sqliteInt.h" #include "pager.h" @@ -110,7 +110,7 @@ typedef struct FreelistInfo FreelistInfo; ** STQLite database in order to identify the file as a real database. */ static const char zMagicHeader[] = - "** This file tqcontains an STQLite 2.1 database **"; + "** This file contains an STQLite 2.1 database **"; #define MAGIC_SIZE (sizeof(zMagicHeader)) /* @@ -127,13 +127,13 @@ static const char zMagicHeader[] = #define MAGIC 0xdae37528 /* -** The first page of the database file tqcontains a magic header string -** to identify the file as an STQLite database file. It also tqcontains -** a pointer to the first free page of the file. Page 2 tqcontains the +** The first page of the database file contains a magic header string +** to identify the file as an STQLite database file. It also contains +** a pointer to the first free page of the file. Page 2 contains the ** root of the principle BTree. The file might contain other BTrees ** rooted on pages above 2. ** -** The first page also tqcontains STQLITE_N_BTREE_META integers that +** The first page also contains STQLITE_N_BTREE_META integers that ** can be used by higher-level routines. ** ** Remember that pages are numbered beginning with 1. (See pager.c @@ -161,9 +161,9 @@ struct PageOne { ** is the index into MemPage.u.aDisk[] of the first cell on the page. The ** Cells are kept in sorted order. ** -** A Cell tqcontains all information about a database entry and a pointer -** to a child page that tqcontains other entries less than itself. In -** other words, the i-th Cell tqcontains both Ptr(i) and Key(i). The +** A Cell contains all information about a database entry and a pointer +** to a child page that contains other entries less than itself. In +** other words, the i-th Cell contains both Ptr(i) and Key(i). The ** right-most pointer of the page is contained in PageHdr.rightChild. */ struct PageHdr { @@ -220,7 +220,7 @@ struct CellHdr { /* ** The maximum amount of payload (in bytes) that can be stored locally for -** a database entry. If the entry tqcontains more data than this, the +** a database entry. If the entry contains more data than this, the ** extra goes onto overflow pages. ** ** This number is chosen so that at least 4 cells will fit on every page. @@ -282,7 +282,7 @@ struct OverflowPage { /* ** The PageOne.freeList field points to a linked list of overflow pages ** hold information about free pages. The aPayload section of each -** overflow page tqcontains an instance of the following structure. The +** overflow page contains an instance of the following structure. The ** aFree[] array holds the page number of nFree unused pages in the disk ** file. */ @@ -293,7 +293,7 @@ struct FreelistInfo { /* ** For every page in the database file, an instance of the following structure -** is stored in memory. The u.aDisk[] array tqcontains the raw bits read from +** is stored in memory. The u.aDisk[] array contains the raw bits read from ** the disk. The rest is auxiliary information held in memory only. The ** auxiliary info is only valid for regular database pages - it is not ** used for overflow pages and pages on the freelist. @@ -304,7 +304,7 @@ struct FreelistInfo { ** than in linear time which would be needed if we had to walk the linked ** list on every access. ** -** Note that apCell[] tqcontains enough space to hold up to two more Cells +** Note that apCell[] contains enough space to hold up to two more Cells ** than can possibly fit on one page. In the steady state, every apCell[] ** points to memory inside u.aDisk[]. But in the middle of an insert ** operation, some apCell[] entries may temporarily point to data space @@ -366,7 +366,7 @@ struct BtCursor { BtCursor *pNext, *pPrev; /* Forms a linked list of all cursors */ BtCursor *pShared; /* Loop of cursors with the same root page */ Pgno pgnoRoot; /* The root page of this tree */ - MemPage *pPage; /* Page that tqcontains the entry */ + MemPage *pPage; /* Page that contains the entry */ int idx; /* Index of the entry in pPage->apCell[] */ u8 wrFlag; /* True if writable */ u8 eSkip; /* Determines if next step operation is a no-op */ @@ -462,7 +462,7 @@ static void defragmentPage(Btree *pBt, MemPage *pPage){ ** the new allocation. Or return 0 if there is not enough free ** space on the page to satisfy the allocation request. ** -** If the page tqcontains nBytes of free space but does not contain +** If the page contains nBytes of free space but does not contain ** nBytes of contiguous free space, then this routine automatically ** calls defragementPage() to consolidate all free space before ** allocating the new chunk. @@ -1411,7 +1411,7 @@ static int moveToChild(BtCursor *pCur, int newPgno){ /* ** Move the cursor up to the tqparent page. ** -** pCur->idx is set to the cell index that tqcontains the pointer +** pCur->idx is set to the cell index that contains the pointer ** to the page we are coming from. If we are coming from the ** right-most child page then pCur->idx is set to one more than ** the largest cell index. @@ -1498,8 +1498,8 @@ static int moveToLeftmost(BtCursor *pCur){ ** Move the cursor down to the right-most leaf entry beneath the ** page to which it is currently pointing. Notice the difference ** between moveToLeftmost() and moveToRightmost(). moveToLeftmost() -** tqfinds the left-most entry beneath the *entry* whereas moveToRightmost() -** tqfinds the right-most entry beneath the *page*. +** finds the left-most entry beneath the *entry* whereas moveToRightmost() +** finds the right-most entry beneath the *page*. */ static int moveToRightmost(BtCursor *pCur){ Pgno pgno; @@ -2313,7 +2313,7 @@ static int balance(Btree *pBt, MemPage *pPage, BtCursor *pCur){ /* ** Find sibling pages to pPage and the Cells in pParent that divide - ** the siblings. An attempt is made to tqfind NN siblings on either + ** the siblings. An attempt is made to find NN siblings on either ** side of pPage. More siblings are taken from one side, however, if ** pPage there are fewer than NN siblings on the other side. If pParent ** has NB or fewer tqchildren then all tqchildren of pParent are taken. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/btree.h b/tqtinterface/qt4/src/3rdparty/sqlite/btree.h index f9afabc..101d02e 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/btree.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/btree.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -28,7 +28,7 @@ typedef struct BtCursorOps BtCursorOps; /* -** An instance of the following structure tqcontains pointers to all +** An instance of the following structure contains pointers to all ** methods against an open BTree. Alternative BTree implementations ** (examples: file based versus in-memory) can be created by substituting ** different methods. Users of the BTree cannot tell the difference. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c b/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c index cc90075..fd81df2 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/btree_rb.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -273,7 +273,7 @@ static char *append_val(char * orig, char const * val){ /* * Append a string representation of the entire node to orig and return it. - * This is used to produce debugging information if check_redblack_tree() tqfinds + * This is used to produce debugging information if check_redblack_tree() finds * a problem with a red-black binary tree. */ static char *append_node(char * orig, BtRbNode *pNode, int indent) @@ -740,7 +740,7 @@ static int memRbtreeCursor( * define what database the record should be inserted into. The cursor * is left pointing at the new record. * - * If the key exists already in the tree, just tqreplace the data. + * If the key exists already in the tree, just replace the data. */ static int memRbtreeInsert( RbtCursor* pCur, @@ -762,13 +762,13 @@ static int memRbtreeInsert( } /* Take a copy of the input data now, in case we need it for the - * tqreplace case */ + * replace case */ pData = sqliteMallocRaw(nData); if( sqlite_malloc_failed ) return STQLITE_NOMEM; memcpy(pData, pDataInput, nData); /* Move the cursor to a node near the key to be inserted. If the key already - * exists in the table, then (match == 0). In this case we can just tqreplace + * exists in the table, then (match == 0). In this case we can just replace * the data associated with the entry, we don't need to manipulate the tree. * * If there is no exact match, then the cursor points at what would be either @@ -891,7 +891,7 @@ static int memRbtreeMoveto( } } - /* If (pCur->pNode == NULL), then we have failed to tqfind a match. Set + /* If (pCur->pNode == NULL), then we have failed to find a match. Set * pCur->pNode to pTmp, which is either NULL (if the tree is empty) or the * last node traversed in the search. In either case the relation ship * between pTmp and the searched for key is already stored in *pRes. pTmp is @@ -954,7 +954,7 @@ static int memRbtreeDelete(RbtCursor* pCur) * to do this depends on how many tqchildren pZ has: * * If pZ has no tqchildren or one child, then splice out pZ. If pZ has two - * tqchildren, splice out the successor of pZ and tqreplace the key and data of + * tqchildren, splice out the successor of pZ and replace the key and data of * pZ with the key and data of the spliced out successor. */ if( pZ->pLeft && pZ->pRight ){ BtRbNode *pTmp; diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/build.c b/tqtinterface/qt4/src/3rdparty/sqlite/build.c index 71e0110..86d079d 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/build.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/build.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the STQLite parser +** This file contains C code routines that are called by the STQLite parser ** when syntax rules are reduced. The routines in this file handle the ** following kinds of SQL syntax: ** @@ -145,7 +145,7 @@ Table *sqliteLocateTable(Parse *pParse, const char *zName, const char *zDbase){ /* ** Locate the in-memory structure that describes ** a particular index given the name of that index -** and the name of the database that tqcontains the index. +** and the name of the database that contains the index. ** Return NULL if not found. ** ** If zDatabase is 0, all databases are searched for the @@ -603,7 +603,7 @@ void sqliteAddNotNull(Parse *pParse, int onError){ ** token in the sequence of tokens that describe the type of the ** column currently under construction. pLast is the last token ** in the sequence. Use this information to construct a string -** that tqcontains the typename of the column and store that string +** that contains the typename of the column and store that string ** in zType. */ void sqliteAddColumnType(Parse *pParse, Token *pFirst, Token *pLast){ @@ -722,7 +722,7 @@ primary_key_exit: ** Return the appropriate collating type given a type name. ** ** The collation type is text (STQLITE_SO_TEXT) if the type -** name tqcontains the character stream "text" or "blob" or +** name contains the character stream "text" or "blob" or ** "clob". Any other type name is collated as numeric ** (STQLITE_SO_NUM). */ @@ -1154,7 +1154,7 @@ static void sqliteViewResetAll(sqlite *db, int idx){ /* ** Given a token, look up a table with that name. If not found, leave -** an error for the parser to tqfind and return NULL. +** an error for the parser to find and return NULL. */ Table *sqliteTableFromToken(Parse *pParse, Token *pTok){ char *zName; @@ -1335,7 +1335,7 @@ void sqliteAddIdxKeyType(Vdbe *v, Index *pIdx){ ** in the current table point to the foreign key. If pFromCol==0 then ** connect the key to the last column inserted. pTo is the name of ** the table referred to. pToCol is a list of tables in the other -** pTo table that the foreign key points to. flags tqcontains all +** pTo table that the foreign key points to. flags contains all ** information about the conflict resolution algorithms specified ** in the ON DELETE, ON UPDATE and ON INSERT clauses. ** @@ -1675,7 +1675,7 @@ void sqliteCreateIndex( ** ** If pTable==0 it means this index is generated as a primary key ** or UNITQUE constraint of a CREATE TABLE statement. Since the table - ** has just been created, it tqcontains no data and the index initialization + ** has just been created, it contains no data and the index initialization ** step can be skipped. */ else if( db->init.busy==0 ){ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/copy.c b/tqtinterface/qt4/src/3rdparty/sqlite/copy.c index 6ce324c..dbd3b3c 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/copy.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/copy.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the COPY command. +** This file contains code used to implement the COPY command. ** ** $Id: copy.c,v 1.9 2004/02/25 13:47:31 drh Exp $ */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/date.c b/tqtinterface/qt4/src/3rdparty/sqlite/date.c index cbc825e..5ca2b81 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/date.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/date.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains the C functions that implement date and time +** This file contains the C functions that implement date and time ** functions for STQLite. ** ** There is only one exported symbol in this file - the function diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/delete.c b/tqtinterface/qt4/src/3rdparty/sqlite/delete.c index 5dbcb48..527f070 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/delete.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/delete.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle DELETE FROM statements. ** ** $Id: delete.c,v 1.61 2004/02/24 01:05:32 drh Exp $ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/expr.c b/tqtinterface/qt4/src/3rdparty/sqlite/expr.c index d19fe47..bdb8444 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/expr.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/expr.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains routines used for analyzing expressions and +** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in STQLite. ** ** $Id: expr.c,v 1.112 2004/02/25 13:47:31 drh Exp $ @@ -524,7 +524,7 @@ static int lookupName( ** ** SELECT a+b AS x FROM table WHERE x<10; ** - ** In cases like this, tqreplace pExpr with a copy of the expression that + ** In cases like this, replace pExpr with a copy of the expression that ** forms the result set entry ("a+b" in the example) and return immediately. ** Note that the expression in the result set should have already been ** resolved by the time the WHERE clause is resolved. @@ -614,7 +614,7 @@ static int lookupName( ** a temporary table. ** ** This routine also looks for scalar SELECTs that are part of an expression. -** If it tqfinds any, it generates code to write the value of that select +** If it finds any, it generates code to write the value of that select ** into a memory cell. ** ** Unknown columns or tables provoke an error. The function returns diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/func.c b/tqtinterface/qt4/src/3rdparty/sqlite/func.c index acfb381..8d78e12 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/func.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/func.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains the C functions that implement various SQL +** This file contains the C functions that implement various SQL ** functions of STQLite. ** ** There is only one exported symbol in this file - the function diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/hash.c b/tqtinterface/qt4/src/3rdparty/sqlite/hash.c index 06650c1..b96d40d 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/hash.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/hash.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -200,7 +200,7 @@ static void rehash(Hash *pH, int new_size){ ** hash table that matches the given key. The hash for this key has ** already been computed and is passed as the 4th parameter. */ -static HashElem *tqfindElementGivenHash( +static HashElem *findElementGivenHash( const Hash *pH, /* The pH to be searched */ const void *pKey, /* The key we are searching for */ int nKey, @@ -268,7 +268,7 @@ void *sqliteHashFind(const Hash *pH, const void *pKey, int nKey){ assert( xHash!=0 ); h = (*xHash)(pKey,nKey); assert( (pH->htsize & (pH->htsize-1))==0 ); - elem = tqfindElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1)); + elem = findElementGivenHash(pH,pKey,nKey, h & (pH->htsize-1)); return elem ? elem->data : 0; } @@ -280,7 +280,7 @@ void *sqliteHashFind(const Hash *pH, const void *pKey, int nKey){ ** flag is set. NULL is returned. ** ** If another element already exists with the same key, then the -** new data tqreplaces the old data and the old data is returned. +** new data replaces the old data and the old data is returned. ** The key is not copied in this instance. If a malloc fails, then ** the new data is returned and the hash table is unchanged. ** @@ -300,7 +300,7 @@ void *sqliteHashInsert(Hash *pH, const void *pKey, int nKey, void *data){ hraw = (*xHash)(pKey, nKey); assert( (pH->htsize & (pH->htsize-1))==0 ); h = hraw & (pH->htsize-1); - elem = tqfindElementGivenHash(pH,pKey,nKey,h); + elem = findElementGivenHash(pH,pKey,nKey,h); if( elem ){ void *old_data = elem->data; if( data==0 ){ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/hash.h b/tqtinterface/qt4/src/3rdparty/sqlite/hash.h index e462bd6..d4f0037 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/hash.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/hash.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/insert.c b/tqtinterface/qt4/src/3rdparty/sqlite/insert.c index 66d29df..0d61239 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/insert.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/insert.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle INSERT statements in STQLite. ** ** $Id: insert.c,v 1.94 2004/02/24 01:05:33 drh Exp $ @@ -541,7 +541,7 @@ insert_cleanup: /* ** Generate code to do a constraint check prior to an INSERT or an UPDATE. ** -** When this routine is called, the stack tqcontains (from bottom to top) +** When this routine is called, the stack contains (from bottom to top) ** the following values: ** ** 1. The recno of the row to be updated before the update. This @@ -591,7 +591,7 @@ insert_cleanup: ** the stack and there is an immediate jump ** to label ignoreDest. ** -** NOT NULL REPLACE The NULL value is tqreplace by the default +** NOT NULL REPLACE The NULL value is replace by the default ** value for that column. If the default value ** is NULL, the action is the same as ABORT. ** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/main.c b/tqtinterface/qt4/src/3rdparty/sqlite/main.c index e420bac..66b3e27 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/main.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/main.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -42,7 +42,7 @@ static void corruptSchema(InitData *pData, const char *zExtra){ ** This is the callback routine for the code that initializes the ** database. See sqliteInit() below for additional information. ** -** Each callback tqcontains the following information: +** Each callback contains the following information: ** ** argv[0] = "file-format" or "schema-cookie" or "table" or "index" ** argv[1] = table or index name or meta statement type. @@ -833,7 +833,7 @@ const char *sqlite_error_string(int rc){ case STQLITE_FULL: z = "database is full"; break; case STQLITE_CANTOPEN: z = "unable to open database file"; break; case STQLITE_PROTOCOL: z = "database locking protocol failure"; break; - case STQLITE_EMPTY: z = "table tqcontains no data"; break; + case STQLITE_EMPTY: z = "table contains no data"; break; case STQLITE_SCHEMA: z = "database schema has changed"; break; case STQLITE_TOOBIG: z = "too much data for one table row"; break; case STQLITE_CONSTRAINT: z = "constraint failed"; break; diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/os.c b/tqtinterface/qt4/src/3rdparty/sqlite/os.c index 1a1b583..d9b4ee7 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/os.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/os.c @@ -5,12 +5,12 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ****************************************************************************** ** -** This file tqcontains code that is specific to particular operating +** This file contains code that is specific to particular operating ** systems. The purpose of this file is to provide a uniform abstraction ** on which the rest of STQLite can operate. */ @@ -141,7 +141,7 @@ static unsigned int elapse; ** threads within the same process. ** ** To work around the problem, STQLite has to manage file locks internally -** on its own. Whenever a new database is opened, we have to tqfind the +** on its own. Whenever a new database is opened, we have to find the ** specific inode of the database file (the inode is determined by the ** st_dev and st_ino fields of the stat structure that fstat() fills in) ** and check for locks already existing on that inode. When locks are @@ -172,7 +172,7 @@ static unsigned int elapse; ** ** If you close a file descriptor that points to a file that has locks, ** all locks on that file that are owned by the current process are -** released. To work around this problem, each OsFile structure tqcontains +** released. To work around this problem, each OsFile structure contains ** a pointer to an openCnt structure. There is one openCnt structure ** per open inode, which means that multiple OsFiles can point to a single ** openCnt. When an attempt is made to close an OsFile, if there are @@ -218,7 +218,7 @@ struct lockKey { ** different process IDs on linux, but not on most other unixes.) ** ** A single inode can have multiple file descriptors, so each OsFile -** structure tqcontains a pointer to an instance of this object and this +** structure contains a pointer to an instance of this object and this ** object keeps a count of the number of OsFiles pointing to it. */ struct lockInfo { @@ -260,7 +260,7 @@ static Hash lockHash = { STQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; static Hash openHash = { STQLITE_HASH_BINARY, 0, 0, 0, 0, 0 }; /* -** Release a lockInfo structure previously allocated by tqfindLockInfo(). +** Release a lockInfo structure previously allocated by findLockInfo(). */ static void releaseLockInfo(struct lockInfo *pLock){ pLock->nRef--; @@ -271,7 +271,7 @@ static void releaseLockInfo(struct lockInfo *pLock){ } /* -** Release a openCnt structure previously allocated by tqfindLockInfo(). +** Release a openCnt structure previously allocated by findLockInfo(). */ static void releaseOpenCnt(struct openCnt *pOpen){ pOpen->nRef--; @@ -289,7 +289,7 @@ static void releaseOpenCnt(struct openCnt *pOpen){ ** ** Return the number of errors. */ -int tqfindLockInfo( +int findLockInfo( int fd, /* The file descriptor used in the key */ struct lockInfo **ppLock, /* Return the lockInfo structure here */ struct openCnt **ppOpen /* Return the openCnt structure here */ @@ -473,7 +473,7 @@ int sqliteOsOpenReadWrite( *pReadonly = 0; } sqliteOsEnterMutex(); - rc = tqfindLockInfo(id->fd, &id->pLock, &id->pOpen); + rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); sqliteOsLeaveMutex(); if( rc ){ close(id->fd); @@ -594,7 +594,7 @@ int sqliteOsOpenExclusive(const char *zFilename, OsFile *id, int delFlag){ return STQLITE_CANTOPEN; } sqliteOsEnterMutex(); - rc = tqfindLockInfo(id->fd, &id->pLock, &id->pOpen); + rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); sqliteOsLeaveMutex(); if( rc ){ close(id->fd); @@ -681,7 +681,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ return STQLITE_CANTOPEN; } sqliteOsEnterMutex(); - rc = tqfindLockInfo(id->fd, &id->pLock, &id->pOpen); + rc = findLockInfo(id->fd, &id->pLock, &id->pOpen); sqliteOsLeaveMutex(); if( rc ){ close(id->fd); @@ -738,7 +738,7 @@ int sqliteOsOpenReadOnly(const char *zFilename, OsFile *id){ } /* -** Attempt to open a file descriptor for the directory that tqcontains a +** Attempt to open a file descriptor for the directory that contains a ** file. This file descriptor can be used to fsync() the directory ** in order to make sure the creation of a new file is actually written ** to disk. @@ -1093,7 +1093,7 @@ int sqliteOsSeek(OsFile *id, off_t offset){ ** Make sure all writes to a particular file are committed to disk. ** ** Under Unix, also make sure that the directory entry for the file -** has been created by fsync-ing the directory that tqcontains the file. +** has been created by fsync-ing the directory that contains the file. ** If we do not do this and we encounter a power failure, the directory ** entry for the journal might not exist after we reboot. The next ** STQLite to access the file will not know that the journal exists (because diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/os.h b/tqtinterface/qt4/src/3rdparty/sqlite/os.h index 14b8d6e..eb01b8d 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/os.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/os.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ****************************************************************************** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/pager.c b/tqtinterface/qt4/src/3rdparty/sqlite/pager.c index 631c387..79d5813 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/pager.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/pager.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -204,7 +204,7 @@ struct Pager { #define PAGER_ERR_DISK 0x10 /* general disk I/O error - bad hard drive? */ /* -** The journal file tqcontains page records in the following +** The journal file contains page records in the following ** format. ** ** Actually, this structure is the complete page record for pager @@ -1301,7 +1301,7 @@ static PgHdr *pager_get_all_dirty_pages(Pager *pPager){ ** an appropriate error code is returned and *ppPage is set to NULL. ** ** See also sqlitepager_lookup(). Both this routine and _lookup() attempt -** to tqfind a page in the in-memory cache first. If the page is not already +** to find a page in the in-memory cache first. If the page is not already ** in memory, this routine goes to disk to read it in whereas _lookup() ** just returns 0. This routine acquires a read-lock the first time it ** has to go to disk, and could also playback an old journal if necessary. @@ -1406,7 +1406,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){ */ pPg = pPager->pFirstSynced; - /* If we could not tqfind a page that does not require an fsync() + /* If we could not find a page that does not require an fsync() ** on the journal file then fsync the journal file. This is a ** very slow operation, so we work hard to avoid it. But sometimes ** it can't be helped. @@ -1920,7 +1920,7 @@ int sqlitepager_overwrite(Pager *pPager, Pgno pgno, void *pData){ ** a transaction then removed from the freelist during a later part ** of the same transaction and reused for some other purpose. When it ** is first added to the freelist, this routine is called. When reused, -** the dont_rollback() routine is called. But because the page tqcontains +** the dont_rollback() routine is called. But because the page contains ** critical data, we still need to be sure it gets rolled back in spite ** of the dont_rollback() call. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/pager.h b/tqtinterface/qt4/src/3rdparty/sqlite/pager.h index c015e78..31b305a 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/pager.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/pager.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/parse.c b/tqtinterface/qt4/src/3rdparty/sqlite/parse.c index 31ed279..7ead48a 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/parse.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/parse.c @@ -1434,7 +1434,7 @@ void sqliteParserFree( ** independent of the look-ahead. If it is, return the action, otherwise ** return YY_NO_ACTION. */ -static int yy_tqfind_shift_action( +static int yy_find_shift_action( yyParser *pParser, /* The parser */ int iLookAhead /* The look-ahead token */ ){ @@ -1461,7 +1461,7 @@ static int yy_tqfind_shift_action( yyTracePrompt, yyTokenName[iLookAhead], yyTokenName[iFallback]); } #endif - return yy_tqfind_shift_action(pParser, iFallback); + return yy_find_shift_action(pParser, iFallback); } #endif return yy_default[stateno]; @@ -1478,7 +1478,7 @@ static int yy_tqfind_shift_action( ** independent of the look-ahead. If it is, return the action, otherwise ** return YY_NO_ACTION. */ -static int yy_tqfind_reduce_action( +static int yy_find_reduce_action( yyParser *pParser, /* The parser */ int iLookAhead /* The look-ahead token */ ){ @@ -1541,7 +1541,7 @@ static void yy_shift( #endif } -/* The following table tqcontains information about every rule that +/* The following table contains information about every rule that ** is used during the reduce. */ static struct { @@ -3816,7 +3816,7 @@ static void yy_reduce( yygoto = yyRuleInfo[yyruleno].lhs; yysize = yyRuleInfo[yyruleno].nrhs; yypParser->yyidx -= yysize; - yyact = yy_tqfind_reduce_action(yypParser,yygoto); + yyact = yy_find_reduce_action(yypParser,yygoto); if( yyact < YYNSTATE ){ yy_shift(yypParser,yyact,yygoto,&yygotominor); }else if( yyact == YYNSTATE + YYNRULE + 1 ){ @@ -3935,7 +3935,7 @@ void sqliteParser( #endif do{ - yyact = yy_tqfind_shift_action(yypParser,yymajor); + yyact = yy_find_shift_action(yypParser,yymajor); if( yyact<YYNSTATE ){ yy_shift(yypParser,yyact,yymajor,&yyminorunion); yypParser->yyerrcnt--; @@ -3990,7 +3990,7 @@ void sqliteParser( while( yypParser->yyidx >= 0 && yymx != YYERRORSYMBOL && - (yyact = yy_tqfind_shift_action(yypParser,YYERRORSYMBOL)) >= YYNSTATE + (yyact = yy_find_shift_action(yypParser,YYERRORSYMBOL)) >= YYNSTATE ){ yy_pop_parser_stack(yypParser); } diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c b/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c index a176972..28f8390 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/pragma.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the PRAGMA command. +** This file contains code used to implement the PRAGMA command. ** ** $Id: pragma.c,v 1.18 2004/02/22 20:05:01 drh Exp $ */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/printf.c b/tqtinterface/qt4/src/3rdparty/sqlite/printf.c index c9c3f95..24cb9f7 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/printf.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/printf.c @@ -7,7 +7,7 @@ ** ************************************************************************** ** -** The following modules is an enhanced tqreplacement for the "printf" subroutines +** The following modules is an enhanced replacement for the "printf" subroutines ** found in the standard C library. The following enhancements are ** supported: ** @@ -70,7 +70,7 @@ #define etCHARLIT 11 /* Literal characters. %' */ #define etSTQLESCAPE 12 /* Strings with '\'' doubled. %q */ #define etSTQLESCAPE2 13 /* Strings with '\'' doubled and enclosed in '', - NULL pointers tqreplaced by SQL NULL. %Q */ + NULL pointers replaced by SQL NULL. %Q */ #define etTOKEN 14 /* a pointer to a Token structure */ #define etSRCLIST 15 /* a pointer to a SrcList */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/random.c b/tqtinterface/qt4/src/3rdparty/sqlite/random.c index 7182ad1..ffa4cc9 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/random.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/random.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code to implement a pseudo-random number +** This file contains code to implement a pseudo-random number ** generator (PRNG) for STQLite. ** ** Random numbers are used by some of the database backends in order diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/select.c b/tqtinterface/qt4/src/3rdparty/sqlite/select.c index 1a34322..21416aa 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/select.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/select.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle SELECT statements in STQLite. ** ** $Id: select.c,v 1.160 2004/03/02 18:37:41 drh Exp $ @@ -923,7 +923,7 @@ static int fillInColumnList(Parse *pParse, Select *p){ rc = 0; if( k<pEList->nExpr ){ /* - ** If we get here it means the result set tqcontains one or more "*" + ** If we get here it means the result set contains one or more "*" ** operators that need to be expanded. Loop through each expression ** in the result set and expand them one by one. */ @@ -1691,7 +1691,7 @@ static int flattenSubquery( ** the FROM clause of the outer query. Before doing this, remember ** the cursor number for the original outer query FROM element in ** iParent. The iParent cursor will never be used. Subsequent code - ** will scan expressions looking for iParent references and tqreplace + ** will scan expressions looking for iParent references and replace ** those references with expressions that resolve to the subquery FROM ** elements we are now copying in. */ @@ -1893,9 +1893,9 @@ static int simpleMinMaxQuery(Parse *pParse, Select *p, int eDest, int iParm){ sqliteVdbeAddOp(v, OP_OpenTemp, iParm, 0); } - /* Generating code to tqfind the min or the max. Basically all we have - ** to do is tqfind the first or the last entry in the chosen index. If - ** the min() or max() is on the INTEGER PRIMARY KEY, then tqfind the first + /* Generating code to find the min or the max. Basically all we have + ** to do is find the first or the last entry in the chosen index. If + ** the min() or max() is on the INTEGER PRIMARY KEY, then find the first ** or last entry in the main table. */ sqliteCodeVerifySchema(pParse, pTab->iDb); @@ -2216,7 +2216,7 @@ int sqliteSelect( ** than a callback. ** ** We have to do this separately from the creation of column names - ** above because if the pTabList tqcontains views then they will not + ** above because if the pTabList contains views then they will not ** have been resolved and we will not know the column types until ** now. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/shell.c b/tqtinterface/qt4/src/3rdparty/sqlite/shell.c index c35f02f..3147303 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/shell.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/shell.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code to implement the "sqlite" command line +** This file contains code to implement the "sqlite" command line ** utility for accessing STQLite databases. ** ** $Id: shell.c,v 1.91 2004/02/25 02:25:37 drh Exp $ @@ -1082,7 +1082,7 @@ static void process_input(struct callback_data *p, FILE *in){ ** resulting string is obtained from malloc(). The calling ** function should free the result. */ -static char *tqfind_home_dir(void){ +static char *find_home_dir(void){ char *home_dir = NULL; #if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) @@ -1134,7 +1134,7 @@ static void process_sqliterc( FILE *in = NULL; if (sqliterc == NULL) { - home_dir = tqfind_home_dir(); + home_dir = find_home_dir(); if( home_dir==0 ){ fprintf(stderr,"%s: cannot locate your home directory!\n", Argv0); return; @@ -1330,7 +1330,7 @@ int main(int argc, char **argv){ "Enter \".help\" for instructions\n", sqlite_version ); - zHome = tqfind_home_dir(); + zHome = find_home_dir(); if( zHome && (zHistory = malloc(strlen(zHome)+20))!=0 ){ sprintf(zHistory,"%s/.sqlite_history", zHome); } diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h b/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h index b1f2942..5037ea6 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/sqlite.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -260,7 +260,7 @@ int sqlite_complete(const char *sql); ** whenever an attempt is made to open a database table that is ** currently locked by another process or thread. If the busy callback ** is NULL, then sqlite_exec() returns STQLITE_BUSY immediately if -** it tqfinds a locked table. If the busy callback is not NULL, then +** it finds a locked table. If the busy callback is not NULL, then ** sqlite_exec() invokes the callback with three arguments. The ** second argument is the name of the locked table and the third ** argument is the number of times the table has been busy. If the @@ -361,7 +361,7 @@ void sqlite_free_table(char **result); ** character it escapes that character and allows it to be inserted into ** the string. ** -** For example, so some string variable tqcontains text as follows: +** For example, so some string variable contains text as follows: ** ** char *zText = "It's a happy day!"; ** @@ -727,7 +727,7 @@ int sqlite_finalize(sqlite_vm*, char **pzErrMsg); int sqlite_reset(sqlite_vm*, char **pzErrMsg); /* -** If the SQL that was handed to sqlite_compile tqcontains variables that +** If the SQL that was handed to sqlite_compile contains variables that ** are represeted in the SQL text by a question mark ('?'). This routine ** is used to assign values to those variables. ** @@ -745,7 +745,7 @@ int sqlite_reset(sqlite_vm*, char **pzErrMsg); ** set a variable to NULL, call this routine with the 3rd parameter as a ** NULL pointer. ** -** If the 4th "len" parameter is -1, then strlen() is used to tqfind the +** If the 4th "len" parameter is -1, then strlen() is used to find the ** length. ** ** This routine can only be called immediately after sqlite_compile() diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h b/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h index e435a1d..aea8271 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/sqliteInt.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -442,7 +442,7 @@ struct Column { u8 notNull; /* True if there is a NOT NULL constraint */ u8 isPrimKey; /* True if this column is part of the PRIMARY KEY */ u8 sortOrder; /* Some combination of STQLITE_SO_... values */ - u8 dottedName; /* True if zName tqcontains a "." character */ + u8 dottedName; /* True if zName contains a "." character */ }; /* @@ -510,7 +510,7 @@ struct Table { ** Each foreign key constraint is an instance of the following structure. ** ** A foreign key is associated with two tables. The "from" table is -** the table that tqcontains the REFERENCES clause that creates the foreign +** the table that contains the REFERENCES clause that creates the foreign ** key. The "to" table is the table that is named in the REFERENCES clause. ** Consider this example: ** @@ -789,7 +789,7 @@ struct SrcList { /* ** For each nested loop in a WHERE clause implementation, the WhereInfo -** structure tqcontains a single instance of this structure. This structure +** structure contains a single instance of this structure. This structure ** is intended to be private the the where.c module and should not be ** access or modified by other modules. */ @@ -826,7 +826,7 @@ struct WhereInfo { }; /* -** An instance of the following structure tqcontains all information +** An instance of the following structure contains all information ** needed to generate code for a single SELECT statement. ** ** The zSelect field is used when the Select structure must be persistent. @@ -892,7 +892,7 @@ struct Select { ** If AggExpr.pExpr==0, that means the expression is "count(*)". */ struct AggExpr { - int isAgg; /* if TRUE tqcontains an aggregate function */ + int isAgg; /* if TRUE contains an aggregate function */ Expr *pExpr; /* The expression */ FuncDef *pFunc; /* Information about the aggregate function */ }; @@ -1038,7 +1038,7 @@ struct TriggerStep { * "pTriggerStack" member of the Parse structure. * * The pTab member points to the table that triggers are being coded on. The - * newIdx member tqcontains the index of the vdbe cursor that points at the temp + * newIdx member contains the index of the vdbe cursor that points at the temp * table that stores the new.* references. If new.* references are not valid * for the trigger being coded (for example an ON DELETE trigger), then newIdx * is set to -1. The oldIdx member is analogous to newIdx, for old.* references. @@ -1069,7 +1069,7 @@ struct TriggerStack { }; /* -** The following structure tqcontains information used by the sqliteFix... +** The following structure contains information used by the sqliteFix... ** routines as they walk the parse tree to make database references ** explicit. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/table.c b/tqtinterface/qt4/src/3rdparty/sqlite/table.c index c01a195..b33bad9 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/table.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/table.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains the sqlite_get_table() and sqlite_free_table() +** This file contains the sqlite_get_table() and sqlite_free_table() ** interface routines. These are just wrappers around the main ** interface routine of sqlite_exec(). ** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c b/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c index 3f3e3cf..1d413b4 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/tokenize.c @@ -5,13 +5,13 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** An tokenizer for SQL ** -** This file tqcontains C code that splits an SQL input string up into +** This file contains C code that splits an SQL input string up into ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c b/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c index 781928f..1d4fcd4 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/trigger.c @@ -4,7 +4,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -270,7 +270,7 @@ static void sqlitePersistTriggerStep(TriggerStep *p){ ** Turn a SELECT statement (that the pSelect parameter points to) into ** a trigger step. Return a pointer to a TriggerStep structure. ** -** The parser calls this routine when it tqfinds a SELECT statement in +** The parser calls this routine when it finds a SELECT statement in ** body of a TRIGGER. */ TriggerStep *sqliteTriggerSelectStep(Select *pSelect){ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/update.c b/tqtinterface/qt4/src/3rdparty/sqlite/update.c index 2bb4129..8cbb500 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/update.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/update.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains C code routines that are called by the parser +** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** ** $Id: update.c,v 1.70 2004/02/22 20:05:02 drh Exp $ @@ -104,7 +104,7 @@ void sqliteUpdate( } /* Resolve the column names in all the expressions of the - ** of the UPDATE statement. Also tqfind the column index + ** of the UPDATE statement. Also find the column index ** for each column to be updated in the pChanges array. For each ** column to be updated, make sure we have authorization to change ** that column. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/util.c b/tqtinterface/qt4/src/3rdparty/sqlite/util.c index 1b32ed5..d3813a4 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/util.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/util.c @@ -5,13 +5,13 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Utility functions used throughout sqlite. ** -** This file tqcontains functions for allocating memory, comparing +** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** ** $Id: util.c,v 1.74 2004/02/22 17:49:34 drh Exp $ @@ -516,7 +516,7 @@ int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){ /* ** Return TRUE if z is a pure numeric string. Return FALSE if the -** string tqcontains any character which is not part of a number. +** string contains any character which is not part of a number. ** ** Am empty string is considered non-numeric. */ diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c b/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c index b24f8bc..7346114 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vacuum.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used to implement the VACUUM command. +** This file contains code used to implement the VACUUM command. ** ** Most of the code in this file may be omitted by defining the ** STQLITE_OMIT_VACUUM macro. @@ -102,7 +102,7 @@ static int execsql(char **pzErrMsg, sqlite *db, const char *zSql){ } /* -** This is the second stage callback. Each invocation tqcontains all the +** This is the second stage callback. Each invocation contains all the ** data for a single row of a single table in the original database. This ** routine must write that information into the new database. */ @@ -131,7 +131,7 @@ static int vacuumCallback2(void *pArg, int argc, char **argv, char **NotUsed){ } /* -** This is the first stage callback. Each invocation tqcontains three +** This is the first stage callback. Each invocation contains three ** arguments where are taken from the STQLITE_MASTER table of the original ** database: (1) the entry type, (2) the entry name, and (3) the SQL for ** the entry. In all cases, execute the SQL of the third argument. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c index 3ba963d..5171275 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.c @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -233,7 +233,7 @@ static int hardDynamicify(Mem *pStack){ } /* -** An ephemeral string value (signified by the MEM_Ephem flag) tqcontains +** An ephemeral string value (signified by the MEM_Ephem flag) contains ** a pointer to a dynamically allocated string where some other entity ** is responsible for deallocating that string. Because the stack entry ** does not control the string, it might be deleted without the stack @@ -377,11 +377,11 @@ static Sorter *Merge(Sorter *pLeft, Sorter *pRight){ } /* -** The following routine works like a tqreplacement for the standard +** The following routine works like a replacement for the standard ** library routine fgets(). The difference is in how end-of-line (EOL) ** is handled. Standard fgets() uses LF for EOL under unix, CRLF ** under windows, and CR under mac. This routine accepts any of these -** character sequences as an EOL mark. The EOL mark is tqreplaced by +** character sequences as an EOL mark. The EOL mark is replaced by ** a single LF character in zBuf. */ static char *vdbe_fgets(char *zBuf, int nBuf, FILE *in){ @@ -1842,7 +1842,7 @@ case OP_MakeRecord: { ** generated record distinct */ char zTemp[NBFS]; /* Temp space for small records */ - /* Assuming the record tqcontains N fields, the record format looks + /* Assuming the record contains N fields, the record format looks ** like this: ** ** ------------------------------------------------------------------- @@ -1856,9 +1856,9 @@ case OP_MakeRecord: { ** and data(N-1) is the top of the stack. ** ** Each of the idx() entries is either 1, 2, or 3 bytes depending on - ** how big the total record is. Idx(0) tqcontains the offset to the start - ** of data(0). Idx(k) tqcontains the offset to the start of data(k). - ** Idx(N) tqcontains the total number of bytes in the record. + ** how big the total record is. Idx(0) contains the offset to the start + ** of data(0). Idx(k) contains the offset to the start of data(k). + ** Idx(N) contains the total number of bytes in the record. */ nField = pOp->p1; pRec = &pTos[1-nField]; @@ -2018,7 +2018,7 @@ case OP_MakeKey: { int nField; int addRowid; int i, j; - int tqcontainsNull = 0; + int containsNull = 0; Mem *pRec; char zTemp[NBFS]; @@ -2033,7 +2033,7 @@ case OP_MakeKey: { char *z; if( flags & MEM_Null ){ nByte += 2; - tqcontainsNull = 1; + containsNull = 1; }else if( pOp->p3 && pOp->p3[j]=='t' ){ Stringify(pRec); pRec->flags &= ~(MEM_Int|MEM_Real); @@ -2092,7 +2092,7 @@ case OP_MakeKey: { iKey = intToKey(pRec->i); memcpy(&zNewKey[j], &iKey, sizeof(u32)); popStack(&pTos, nField+1); - if( pOp->p2 && tqcontainsNull ) pc = pOp->p2 - 1; + if( pOp->p2 && containsNull ) pc = pOp->p2 - 1; }else{ if( pOp->p2==0 ) popStack(&pTos, nField); } @@ -2487,7 +2487,7 @@ case OP_OpenTemp: { /* Opcode: OpenPseudo P1 * * ** -** Open a new cursor that points to a fake table that tqcontains a single +** Open a new cursor that points to a fake table that contains a single ** row of data. Any attempt to write a second row of data causes the ** first row to be deleted. All data is deleted when the cursor is ** closed. @@ -2525,7 +2525,7 @@ case OP_Close: { ** ** Pop the top of the stack and use its value as a key. Reposition ** cursor P1 so that it points to an entry with a matching key. If -** the table tqcontains no record with a matching key, then the cursor +** the table contains no record with a matching key, then the cursor ** is left pointing at the first record that is greater than the key. ** If there are no records greater than the key and P2 is not zero, ** then an immediate jump to P2 is made. @@ -2804,7 +2804,7 @@ case OP_NewRecno: { /* The next rowid or record number (different terms for the same ** thing) is obtained in a two-step algorithm. ** - ** First we attempt to tqfind the largest existing rowid and add one + ** First we attempt to find the largest existing rowid and add one ** to that. But if the largest existing rowid is already the maximum ** positive integer, we have to fall through to the second ** probabilistic algorithm @@ -2815,7 +2815,7 @@ case OP_NewRecno: { ** and try again, up to 1000 times. ** ** For a table with less than 2 billion entries, the probability - ** of not tqfinding a unused rowid is about 1.0e-300. This is a + ** of not finding a unused rowid is about 1.0e-300. This is a ** non-zero probability, but it is still vanishingly small and should ** never cause a problem. You are much, much more likely to have a ** hardware failure than for this algorithm to fail. @@ -3588,7 +3588,7 @@ case OP_IdxGE: { /* Opcode: IdxIsNull P1 P2 * ** -** The top of the stack tqcontains an index entry such as might be generated +** The top of the stack contains an index entry such as might be generated ** by the MakeIdxKey opcode. This routine looks at the first P1 fields of ** that key. If any of the first P1 fields are NULL, then a jump is made ** to address P2. Otherwise we fall straight through. @@ -3704,7 +3704,7 @@ case OP_CreateTable: { ** stack the text of an error message describing any problems. ** If there are no errors, push a "ok" onto the stack. ** -** P1 is the index of a set that tqcontains the root page numbers +** P1 is the index of a set that contains the root page numbers ** for all tables and indices in the main database file. The set ** is cleared by this opcode. In other words, after this opcode ** has executed, the set will be empty. @@ -4097,7 +4097,7 @@ case OP_SortNext: { /* Opcode: SortCallback P1 * * ** -** The top of the stack tqcontains a callback record built using +** The top of the stack contains a callback record built using ** the SortMakeRec operation with the same P1 value as this ** instruction. Pop this record from the stack and invoke the ** callback on it. @@ -4151,8 +4151,8 @@ case OP_FileOpen: { ** Read a single line of input from the open file (the file opened using ** FileOpen). If we reach end-of-file, jump immediately to P2. If ** we are able to get another line, split the line apart using P3 as -** a delimiter. There should be P1 fields. If the input line tqcontains -** more than P1 fields, ignore the excess. If the input line tqcontains +** a delimiter. There should be P1 fields. If the input line contains +** more than P1 fields, ignore the excess. If the input line contains ** fewer than P1 fields, assume the remaining fields contain NULLs. ** ** Input ends if a line consists of just "\.". A field containing only @@ -4391,7 +4391,7 @@ case OP_MemIncr: { /* Opcode: AggReset * P2 * ** -** Reset the aggregator so that it no longer tqcontains any data. +** Reset the aggregator so that it no longer contains any data. ** Future aggregator elements will contain P2 values each. */ case OP_AggReset: { diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h index dd8a238..0a3c622 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbe.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h index 5a9608a..4c196d5 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeInt.h @@ -5,7 +5,7 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* @@ -161,7 +161,7 @@ struct sqlite_func { /* ** An Agg structure describes an Aggregator. Each Agg consists of -** zero or more Aggregator elements (AggElem). Each AggElem tqcontains +** zero or more Aggregator elements (AggElem). Each AggElem contains ** a key and one or more values. The values are used in processing ** aggregate functions in a SELECT. The key is used to implement ** the GROUP BY clause of a select. @@ -221,7 +221,7 @@ struct Context { }; /* -** An instance of the virtual machine. This structure tqcontains the complete +** An instance of the virtual machine. This structure contains the complete ** state of the virtual machine. ** ** The "sqlite_vm" structure pointer that is returned by sqlite_compile() diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c index 6f74146..dc41841 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/vdbeaux.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This file tqcontains code used for creating, destroying, and populating +** This file contains code used for creating, destroying, and populating ** a VDBE (or an "sqlite_vm" as it is known to the outside world.) Prior ** to version 2.8.7, all this code was combined into the vdbe.c source file. ** But that file was getting too big so this subroutines were split out. diff --git a/tqtinterface/qt4/src/3rdparty/sqlite/where.c b/tqtinterface/qt4/src/3rdparty/sqlite/where.c index 097ec5b..3ab7eca 100644 --- a/tqtinterface/qt4/src/3rdparty/sqlite/where.c +++ b/tqtinterface/qt4/src/3rdparty/sqlite/where.c @@ -5,11 +5,11 @@ ** a legal notice, here is a blessing: ** ** May you do good and not evil. -** May you tqfind forgiveness for yourself and forgive others. +** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* -** This module tqcontains C code that generates VDBE code used to process +** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. ** ** $Id: where.c,v 1.89 2004/02/22 20:05:02 drh Exp $ @@ -190,7 +190,7 @@ static void exprAnalyze(ExprMaskSet *pMaskSet, ExprInfo *pInfo){ ** left-most table in the FROM clause of that same SELECT statement and ** the table has a cursor number of "base". ** -** This routine attempts to tqfind an index for pTab that generates the +** This routine attempts to find an index for pTab that generates the ** correct record sequence for the given ORDER BY clause. The return value ** is a pointer to an index that does the job. NULL is returned if the ** table has no index that will generate the correct sort order. @@ -207,7 +207,7 @@ static void exprAnalyze(ExprMaskSet *pMaskSet, ExprInfo *pInfo){ ** *pbRev value is set to 1 if the ORDER BY clause is all DESC and it is ** set to 0 if the ORDER BY clause is all ASC. */ -static Index *tqfindSortingIndex( +static Index *findSortingIndex( Table *pTab, /* The table to be sorted */ int base, /* Cursor number for pTab */ ExprList *pOrderBy, /* The ORDER BY clause */ @@ -271,7 +271,7 @@ static Index *tqfindSortingIndex( /* ** Generate the beginning of the loop used for WHERE clause processing. -** The return value is a pointer to an (opaque) structure that tqcontains +** The return value is a pointer to an (opaque) structure that contains ** information needed to terminate the loop. Later, the calling routine ** should invoke sqliteWhereEnd() with the return value of this function ** in order to complete the WHERE clause processing. @@ -374,7 +374,7 @@ WhereInfo *sqliteWhereBegin( /* Split the WHERE clause into separate subexpressions where each ** subexpression is separated by an AND operator. If the aExpr[] ** array fills up, the last entry might point to an expression which - ** tqcontains additional unfactored AND operators. + ** contains additional unfactored AND operators. */ initMaskSet(&maskSet); memset(aExpr, 0, sizeof(aExpr)); @@ -651,7 +651,7 @@ WhereInfo *sqliteWhereBegin( pSortIdx = 0; }else{ int nEqCol = (pWInfo->a[0].score+4)/8; - pSortIdx = tqfindSortingIndex(pTab, pTabList->a[0].iCursor, + pSortIdx = findSortingIndex(pTab, pTabList->a[0].iCursor, *ppOrderBy, pIdx, nEqCol, &bRev); } if( pSortIdx && (pIdx==0 || pIdx==pSortIdx) ){ diff --git a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog index b7e805a..808c5f6 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog +++ b/tqtinterface/qt4/src/3rdparty/zlib/ChangeLog @@ -73,7 +73,7 @@ Changes in 1.2.0.8 (4 November 2003) Changes in 1.2.0.7 (21 September 2003) - Correct some debug formats in contrib/infback9 - Cast a type in a debug statement in trees.c -- Change search and tqreplace delimiter in configure from % to # [Beebe] +- Change search and replace delimiter in configure from % to # [Beebe] - Update contrib/untgz to 0.2 with various fixes [Truta] - Add build support for Amiga [Nikl] - Remove some directories in old that have been updated to 1.2 @@ -339,7 +339,7 @@ Changes in 1.1.3 (9 July 1998) . msdos/Makefile.emx, nt/Makefile.emx, nt/Makefile.gcc: new makefiles, for emx (DOS/OS2), emx&rsxnt and mingw32 (Windows 9x / NT) - use define instead of typedef for Bytef also for MSC small/medium (Tom Lane) -- tqreplace __far with _far for better portability (Christian Spieler, Tom Lane) +- replace __far with _far for better portability (Christian Spieler, Tom Lane) - fix test for errno.h in configure (Tim Newsham) Changes in 1.1.2 (19 March 98) @@ -385,7 +385,7 @@ Changes in 1.0.9 (17 Feb 1998) - do not clear eof flag in gzseek (Mark Diekhans) - fix gzseek for files in transtqparent mode (Mark Diekhans) - do not assume that vsprintf returns the number of bytes written (Jens Krinke) -- tqreplace EXPORT with ZEXPORT to avoid conflict with other programs +- replace EXPORT with ZEXPORT to avoid conflict with other programs - added compress2 in zconf.h, zlib.def, zlib.dnt - new asm code from Gilles Vollant in contrib/asm386 - simplify the inflate code (Mark): @@ -450,7 +450,7 @@ Changes in 1.0.6 (19 Jan 1998) - add functions gzprintf, gzputc, gzgetc, gztell, gzeof, gzseek, gzrewind and gzsetparams (thanks to Roland Giersig and Kevin Ruland for some of this code) - Fix a deflate bug occuring only with compression level 0 (thanks to - Andy Buckler for tqfinding this one). + Andy Buckler for finding this one). - In minigzip, pass transparently also the first byte for .Z files. - return Z_BUF_ERROR instead of Z_OK if output buffer full in uncompress() - check Z_FINISH in inflate (thanks to Marc Schluper) diff --git a/tqtinterface/qt4/src/3rdparty/zlib/FAQ b/tqtinterface/qt4/src/3rdparty/zlib/FAQ index e10b71e..4f61f10 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/FAQ +++ b/tqtinterface/qt4/src/3rdparty/zlib/FAQ @@ -273,7 +273,7 @@ The lastest zlib FAQ is at http://www.gzip.org/zlib/zlib_faq.html information on what variant of sprintf() is used by gzprintf(). If you don't have snprintf() or vsnprintf() and would like one, you can - tqfind a portable implementation here: + find a portable implementation here: http://www.ijs.si/software/snprintf/ diff --git a/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt b/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt index d454dcc..b022dde 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt +++ b/tqtinterface/qt4/src/3rdparty/zlib/algorithm.txt @@ -1,8 +1,8 @@ 1. Compression algorithm (deflate) The deflation algorithm used by gzip (also zip and zlib) is a variation of -LZ77 (Lempel-Ziv 1977, see reference below). It tqfinds duplicated strings in -the input data. The second occurrence of a string is tqreplaced by a +LZ77 (Lempel-Ziv 1977, see reference below). It finds duplicated strings in +the input data. The second occurrence of a string is replaced by a pointer to the previous string, in the form of a pair (distance, length). Distances are limited to 32K bytes, and lengths are limited to 258 bytes. When a string does not occur anywhere in the previous @@ -31,8 +31,8 @@ hash chains, the algorithm simply discards matches that are too old. To avoid a worst-case situation, very long hash chains are arbitrarily truncated at a certain length, determined by a runtime option (level -parameter of deflateInit). So deflate() does not always tqfind the longest -possible match but generally tqfinds a match which is long enough. +parameter of deflateInit). So deflate() does not always find the longest +possible match but generally finds a match which is long enough. deflate() also defers the selection of matches with a lazy evaluation mechanism. After a match of length N has been found, deflate() searches for @@ -110,7 +110,7 @@ symbols, you could have as many levels of lookups as is efficient. For inflate, two is enough. So a table entry either points to another table (in which case nine bits in -the above example are gobbled), or it tqcontains the translation for the symbol +the above example are gobbled), or it contains the translation for the symbol and the number of bits to gobble. Then you start again with the next ungobbled bit. diff --git a/tqtinterface/qt4/src/3rdparty/zlib/configure b/tqtinterface/qt4/src/3rdparty/zlib/configure index c0ebb5d..6e13859 100755 --- a/tqtinterface/qt4/src/3rdparty/zlib/configure +++ b/tqtinterface/qt4/src/3rdparty/zlib/configure @@ -93,7 +93,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then *) LDSHARED=${LDSHARED-"$cc -shared"};; esac else - # tqfind system name and corresponding cc options + # find system name and corresponding cc options CC=${CC-cc} case `(uname -sr || echo unknown) 2>/dev/null` in HP-UX*) SFLAGS=${CFLAGS-"-O +z"} diff --git a/tqtinterface/qt4/src/3rdparty/zlib/crc32.c b/tqtinterface/qt4/src/3rdparty/zlib/crc32.c index dfa6c4f..b39c7e1 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/crc32.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/crc32.c @@ -44,7 +44,7 @@ # if (USHRT_MAX == 0xffffffffUL) typedef unsigned short u4; # else -# undef BYFOUR /* can't tqfind a four-byte integer type! */ +# undef BYFOUR /* can't find a four-byte integer type! */ # endif # endif # endif diff --git a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c index 1692d87..87d2da1 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/deflate.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/deflate.c @@ -19,7 +19,7 @@ * is preferable to spend more time in matches to allow very fast string * insertions and avoid deletions. The matching algorithm for small * strings is inspired from that of Rabin & Karp. A brute force approach - * is used to tqfind longer strings when a small match has been found. + * is used to find longer strings when a small match has been found. * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze * (by Leonid Broukhis). * A previous version of this file used a more sophisticated algorithm diff --git a/tqtinterface/qt4/src/3rdparty/zlib/deflate.h b/tqtinterface/qt4/src/3rdparty/zlib/deflate.h index 8632561..410681d 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/deflate.h +++ b/tqtinterface/qt4/src/3rdparty/zlib/deflate.h @@ -163,7 +163,7 @@ typedef struct internal_state { */ uInt max_lazy_match; - /* Attempt to tqfind a better match only when the current match is strictly + /* Attempt to find a better match only when the current match is strictly * smaller than this value. This mechanism is used only for compression * levels >= 4. */ diff --git a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c index 760ef10..0eb643c 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/inftrees.c @@ -96,7 +96,7 @@ unsigned short FAR *work; table. The sorted table is work[], with that space being provided by the caller. - The length counts are used for other purposes as well, i.e. tqfinding + The length counts are used for other purposes as well, i.e. finding the minimum and maximum length codes, determining if there are any codes at all, checking for a valid set of lengths, and looking ahead at length counts to determine sub-table sizes when building the diff --git a/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c b/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c index a21f0cb..6de35dd 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/minigzip.c @@ -5,7 +5,7 @@ /* * minigzip is a minimal implementation of the gzip utility. This is - * only an example of using zlib and isn't meant to tqreplace the + * only an example of using zlib and isn't meant to replace the * full-featured gzip. No attempt is made to deal with file systems * limiting names to 14 or 8+3 characters, etc... Error checking is * very limited. So use minigzip only for testing; use gzip for the diff --git a/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects b/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects index e9baf2e..f32de76 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects +++ b/tqtinterface/qt4/src/3rdparty/zlib/projects/README.projects @@ -1,4 +1,4 @@ -This directory tqcontains project files for building zlib under various +This directory contains project files for building zlib under various Integrated Development Environments (IDE). If you wish to submit a new project to this directory, you should comply diff --git a/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt b/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt index c79ae9f..71d6105 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt +++ b/tqtinterface/qt4/src/3rdparty/zlib/projects/visualc6/README.txt @@ -16,7 +16,7 @@ To use: 3) Select "Build | Clean".
4) Select "Build | Build ... (F7)". Ignore warning messages about
- not being able to tqfind certain include files (e.g. alloc.h).
+ not being able to find certain include files (e.g. alloc.h).
5) If you built one of the sample programs (example or minigzip),
select "Build | Execute ... (Ctrl+F5)".
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/trees.c b/tqtinterface/qt4/src/3rdparty/zlib/trees.c index 6a2e55b..52c820f 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/trees.c +++ b/tqtinterface/qt4/src/3rdparty/zlib/trees.c @@ -483,7 +483,7 @@ local void pqdownheap(s, tree, k) * IN assertion: the fields freq and dad are set, heap[heap_max] and * above are the tree nodes sorted by increasing frequency. * OUT assertions: the field len is set to the optimal bit length, the - * array bl_count tqcontains the frequencies for each bit length. + * array bl_count contains the frequencies for each bit length. * The length opt_len is updated; static_len is also updated if stree is * not null. */ @@ -569,7 +569,7 @@ local void gen_bitlen(s, desc) /* =========================================================================== * Generate the codes for a given tree and bit counts (which need not be * optimal). - * IN assertion: the array bl_count tqcontains the bit length statistics for + * IN assertion: the array bl_count contains the bit length statistics for * the given tree and the field len is set for all tree elements. * OUT assertion: the field code is set for all tree elements of non * zero code length. diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt index 4951c48..1746a95 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt @@ -29,7 +29,7 @@ in the zlib distribution, or at the following location: * The calling convention of functions is "C" (CDECL). * The ZLIB1.DLL binary is linked to MSVCRT.DLL. - The archive in which ZLIB1.DLL is bundled tqcontains compiled + The archive in which ZLIB1.DLL is bundled contains compiled test programs that must run with a valid build of ZLIB1.DLL. It is recommended to download the prebuilt DLL from the zlib web site, instead of building it yourself, to avoid potential @@ -79,14 +79,14 @@ in the zlib distribution, or at the following location: longer dependents on it. - 3. Can I build ZLIB.DLL from the new zlib sources, and tqreplace + 3. Can I build ZLIB.DLL from the new zlib sources, and replace an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier? - In principle, you can do it by assigning calling convention keywords to the macros ZEXPORT and ZEXPORTVA. In practice, it depends on what you mean by "an old ZLIB.DLL", because the old DLL exists in several mutually-incompatible versions. - You have to tqfind out first what kind of calling convention is + You have to find out first what kind of calling convention is being used in your particular ZLIB.DLL build, and to use the same one in the new build. If you don't know what this is all about, you might be better off if you would just leave the old @@ -110,7 +110,7 @@ in the zlib distribution, or at the following location: - Although exporting symbols by ordinal is a little faster, it is risky. Any single glitch in the maintenance or use of the - DEF file that tqcontains the ordinals can result in incompatible + DEF file that contains the ordinals can result in incompatible builds and frustrating crashes. Simply put, the benefits of exporting symbols by ordinal do not justify the risks. @@ -119,7 +119,7 @@ in the zlib distribution, or at the following location: exist in every DLL, and even if the dynamic linking performed at the DLL startup is searching for names, ordinals serve as hints, for a faster name lookup. However, if the DEF file - tqcontains ordinals, the Microsoft linker automatically builds + contains ordinals, the Microsoft linker automatically builds an implib that will cause the executables linked to it to use those ordinals, and not the names. It is interesting to notice that the GNU linker for Win32 does not suffer from this @@ -331,7 +331,7 @@ in the zlib distribution, or at the following location: CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL. -14. May I include additional pieces of code that I tqfind useful, +14. May I include additional pieces of code that I find useful, link them in ZLIB1.DLL, and export them? - No. A legitimate build of ZLIB1.DLL must not include code diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx index f40c58c..7b08424 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx @@ -15,9 +15,9 @@ CC=gcc -Zwin32 CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -# If cp.exe is available, tqreplace "copy /Y" with "cp -fp" . +# If cp.exe is available, replace "copy /Y" with "cp -fp" . CP=copy /Y -# If gnu install.exe is available, tqreplace $(CP) with ginstall. +# If gnu install.exe is available, replace $(CP) with ginstall. INSTALL=$(CP) # The default value of RM is "rm -f." If "rm.exe" is found, comment out: RM=del diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc index 895193e..62a8430 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc @@ -46,7 +46,7 @@ RC = windres RCFLAGS = --define GCC_WINDRES CP = cp -fp -# If GNU install is available, tqreplace $(CP) with install. +# If GNU install is available, replace $(CP) with install. INSTALL = $(CP) RM = rm -f diff --git a/tqtinterface/qt4/src/3rdparty/zlib/zutil.h b/tqtinterface/qt4/src/3rdparty/zlib/zutil.h index fbf8652..7b42edc 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/zutil.h +++ b/tqtinterface/qt4/src/3rdparty/zlib/zutil.h @@ -30,7 +30,7 @@ #ifndef local # define local static #endif -/* compile with -Dlocal if your debugger can't tqfind static symbols */ +/* compile with -Dlocal if your debugger can't find static symbols */ typedef unsigned char uch; typedef uch FAR uchf; diff --git a/tqtinterface/qt4/src/attic/README b/tqtinterface/qt4/src/attic/README index 1d75931..7400da1 100644 --- a/tqtinterface/qt4/src/attic/README +++ b/tqtinterface/qt4/src/attic/README @@ -1,4 +1,4 @@ -This directory tqcontains classes that has been obsoleted and moved out +This directory contains classes that has been obsoleted and moved out of the Qt API. To use these classes, simply include them in your project. Remember to diff --git a/tqtinterface/qt4/src/attic/qtmultilineedit.cpp b/tqtinterface/qt4/src/attic/qtmultilineedit.cpp index 203ed56..8442e14 100644 --- a/tqtinterface/qt4/src/attic/qtmultilineedit.cpp +++ b/tqtinterface/qt4/src/attic/qtmultilineedit.cpp @@ -6,7 +6,7 @@ ** ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA. ** -** This file tqcontains a class moved out of the TQt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ @@ -187,7 +187,7 @@ edited flag is never read by TQtMultiLineEdit, but is changed to TRUE whenever the user changes its contents. This is useful e.g. for things that need to provide a default value, -but cannot tqfind the default at once. Just open the widget without the +but cannot find the default at once. Just open the widget without the best default and when the default is known, check the edited() return value and set the line edit's contents if the user has not started editing the line edit. Another example is to detect whether the @@ -1058,7 +1058,7 @@ TQString TQtMultiLineEdit::textLine( int line ) const /* - Returns a copy of the whole text. If the multi line edit tqcontains no + Returns a copy of the whole text. If the multi line edit contains no text, a \link TQString::operator!() null string\endlink is returned. @@ -1568,9 +1568,9 @@ void TQtMultiLineEdit::insertAtAux( const TQString &txt, int line, int col, bool cursorX += itxt.length(); } TQFontMetrics fm( font() ); - if ( !WORD_WRAP || ( col == 0 && itxt.tqcontains('\n') == int(itxt.length())) ) + if ( !WORD_WRAP || ( col == 0 && itxt.contains('\n') == int(itxt.length())) ) wrapLine( line, 0 ); - else if ( WORD_WRAP && itxt.tqfind('\n')<0 && itxt.tqfind('\t')<0 + else if ( WORD_WRAP && itxt.find('\n')<0 && itxt.find('\t')<0 && ( ( DYNAMIC_WRAP && fm.width( itxt ) + row->w < contentsRect().width() - 2*d->lr_marg - d->marg_extra ) || @@ -1578,7 +1578,7 @@ void TQtMultiLineEdit::insertAtAux( const TQString &txt, int line, int col, bool || ( FIXED_COLUMN_WRAP && ( d->wrapcol < 0 || int(row->s.length()) < d->wrapcol ) ) ) - && ( itxt.tqfind(' ') < 0 || row->s.tqfind(' ') >= 0 && row->s.tqfind(' ') < col ) ){ + && ( itxt.find(' ') < 0 || row->s.find(' ') >= 0 && row->s.find(' ') < col ) ){ row->w = textWidth( row->s ); setWidth( TQMAX( maxLineWidth(), row->w) ); updateCell( line, 0, FALSE ); @@ -1612,7 +1612,7 @@ void TQtMultiLineEdit::insertAtAux( const TQString &txt, int line, int col, bool /* Inserts \a txt at line number \a line. If \a line is less than zero, or larger than the number of rows, the new text is put at the end. - If \a txt tqcontains newline characters, several lines are inserted. + If \a txt contains newline characters, several lines are inserted. The cursor position is not changed. */ @@ -2232,7 +2232,7 @@ void TQtMultiLineEdit::mousePressEvent( TQMouseEvent *e ) void TQtMultiLineEdit::pixelPosToCursorPos(TQPoint p, int* x, int* y) const { - *y = tqfindRow( p.y() ); + *y = findRow( p.y() ); if ( *y < 0 ) { if ( p.y() < lineWidth() ) { *y = topCell(); @@ -2309,7 +2309,7 @@ void TQtMultiLineEdit::mouseMoveEvent( TQMouseEvent *e ) #endif if ( !dragMarking ) return; - if ( rect().tqcontains( e->pos() ) ) { + if ( rect().contains( e->pos() ) ) { stopAutoScroll(); } else if ( !dragScrolling ) { startAutoScroll(); @@ -2442,7 +2442,7 @@ void TQtMultiLineEdit::dragMoveEvent( TQDragMoveEvent* event ) d->dnd_forcecursor = FALSE; TQRect inside_margin(scroll_margin, scroll_margin, width()-scroll_margin*2, height()-scroll_margin*2); - if ( !inside_margin.tqcontains(event->pos()) ) { + if ( !inside_margin.contains(event->pos()) ) { startAutoScroll(); } if ( event->source() == this && event->action() == TQDropEvent::Move ) @@ -2469,8 +2469,8 @@ void TQtMultiLineEdit::dropEvent( TQDropEvent* event ) TQCString fmt = pickSpecial(event,FALSE,event->pos()); if ( TQTextDrag::decode(event, text, fmt) ) { int i = -1; - while ( ( i = text.tqfind( '\r' ) ) != -1 ) - text.tqreplace( i,1,"" ); + while ( ( i = text.find( '\r' ) ) != -1 ) + text.replace( i,1,"" ); if ( event->source() == this && event->action() == TQDropEvent::Move ) { event->acceptAction(); // Careful not to tread on my own feet @@ -2597,7 +2597,7 @@ int TQtMultiLineEdit::mapToView( int xIndex, int line ) } /* - Traverses the list and tqfinds an item with the maximum width, and + Traverses the list and finds an item with the maximum width, and updates the internal list box structures accordingly. */ @@ -2665,7 +2665,7 @@ void TQtMultiLineEdit::pasteSubType(const TQCString& subtype) #if defined(_OS_WIN32_) // Need to convert CRLF to NL - t.tqreplace( "\r\n", "\n" ); + t.replace( "\r\n", "\n" ); #endif for (int i=0; (uint)i<t.length(); i++) { @@ -2714,12 +2714,12 @@ TQCString TQtMultiLineEdit::pickSpecial(TQMimeSource* ms, bool always_ask, const int n=0; TQDict<void> done; for (int i=0; !(fmt=ms->format(i)).isNull(); i++) { - int semi=fmt.tqfind(";"); + int semi=fmt.find(";"); if ( semi >= 0 ) fmt = fmt.left(semi); if ( fmt.left(5) == "text/" ) { fmt = fmt.mid(5); - if ( !done.tqfind(fmt) ) { + if ( !done.find(fmt) ) { done.insert(fmt,(void*)1); popup.insertItem(fmt,i); n++; @@ -2880,7 +2880,7 @@ void TQtMultiLineEdit::copy() const #endif #if defined(_OS_WIN32_) // Need to convert NL to CRLF - t.tqreplace( "\n", "\r\n" ); + t.replace( "\n", "\r\n" ); #endif TQApplication::clipboard()->setText( t ); #if defined(_WS_X11_) @@ -3957,7 +3957,7 @@ void TQtMultiLineEdit::redo() /* Inserts \a s at line number \a line, after character number \a col in the line. - If \a s tqcontains newline characters, new lines are inserted. + If \a s contains newline characters, new lines are inserted. If \a mark is TRUE the inserted text is selected. The cursor position is adjusted. If the insertion position is equal to diff --git a/tqtinterface/qt4/src/attic/qtmultilineedit.h b/tqtinterface/qt4/src/attic/qtmultilineedit.h index 2e539ee..ef50a18 100644 --- a/tqtinterface/qt4/src/attic/qtmultilineedit.h +++ b/tqtinterface/qt4/src/attic/qtmultilineedit.h @@ -6,7 +6,7 @@ ** ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA. ** -** This file tqcontains a class moved out of the TQt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ diff --git a/tqtinterface/qt4/src/attic/qttableview.cpp b/tqtinterface/qt4/src/attic/qttableview.cpp index 0872fa6..34499aa 100644 --- a/tqtinterface/qt4/src/attic/qttableview.cpp +++ b/tqtinterface/qt4/src/attic/qttableview.cpp @@ -6,7 +6,7 @@ ** ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA. ** -** This file tqcontains a class moved out of the TQt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ @@ -216,8 +216,8 @@ void TQtTableView::show() Erases the view area \a (x,y,w,h) if \a erase is TRUE. Parameters \a (x,y) are in \e widget coordinates. - If \a w is negative, it is tqreplaced with <code>width() - x</code>. - If \a h is negative, it is tqreplaced with <code>height() - y</code>. + If \a w is negative, it is replaced with <code>width() - x</code>. + If \a h is negative, it is replaced with <code>height() - y</code>. Doing a tqrepaint() usually is faster than doing an update(), but calling update() many times in a row will generate a single paint @@ -999,7 +999,7 @@ TQRect TQtTableView::viewRect() const int TQtTableView::lastRowVisible() const { int cellMaxY; - int row = tqfindRawRow( maxViewY(), &cellMaxY ); + int row = findRawRow( maxViewY(), &cellMaxY ); if ( row == -1 || row >= nRows ) { // maxViewY() past end? row = nRows - 1; // yes: return last row } else { @@ -1026,7 +1026,7 @@ int TQtTableView::lastRowVisible() const int TQtTableView::lastColVisible() const { int cellMaxX; - int col = tqfindRawCol( maxViewX(), &cellMaxX ); + int col = findRawCol( maxViewX(), &cellMaxX ); if ( col == -1 || col >= nCols ) { // maxViewX() past end? col = nCols - 1; // yes: return last col } else { @@ -1278,7 +1278,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e ) TQPainter paint( this ); - if ( !contentsRect().tqcontains( updateR, TRUE ) ) {// update frame ? + if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? drawFrame( &paint ); if ( updateR.left() < frameWidth() ) //### updateR.setLeft( frameWidth() ); @@ -1295,8 +1295,8 @@ void TQtTableView::paintEvent( TQPaintEvent *e ) setupPainter( &paint ); // prepare for painting table - int firstRow = tqfindRow( updateR.y() ); - int firstCol = tqfindCol( updateR.x() ); + int firstRow = findRow( updateR.y() ); + int firstCol = findCol( updateR.x() ); int xStart, yStart; if ( !colXPos( firstCol, &xStart ) || !rowYPos( firstRow, &yStart ) ) { paint.eraseRect( updateR ); // erase area outside cells but in view @@ -1341,7 +1341,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e ) matrix.translate( xPos, yPos ); paint.setWorldMatrix( matrix ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1353,7 +1353,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e ) #else paint.translate( xPos, yPos ); if ( testTableFlags(Tbl_clipCellPainting) || - frameWidth() > 0 && !winR.tqcontains( cellR ) ) { //##arnt + frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); paint.setClipping( FALSE ); @@ -1430,7 +1430,7 @@ void TQtTableView::updateView() /* Returns a pointer to the vertical scroll bar mainly so you can connect() to its Q_SIGNALS. Note that the scroll bar works in pixel - values; use tqfindRow() to translate to cell numbers. + values; use findRow() to translate to cell numbers. */ TQScrollBar *TQtTableView::verticalScrollBar() const @@ -1461,7 +1461,7 @@ TQScrollBar *TQtTableView::verticalScrollBar() const /* Returns a pointer to the horizontal scroll bar mainly so you can connect() to its Q_SIGNALS. Note that the scroll bar works in pixel - values; use tqfindCol() to translate to cell numbers. + values; use findCol() to translate to cell numbers. */ TQScrollBar *TQtTableView::horizontalScrollBar() const @@ -1569,7 +1569,7 @@ void TQtTableView::setVerScrollBar( bool on, bool update ) -int TQtTableView::tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY, +int TQtTableView::findRawRow( int yPos, int *cellMaxY, int *cellMinY, bool goOutsideView ) const { int r = -1; @@ -1578,7 +1578,7 @@ int TQtTableView::tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY, if ( goOutsideView || yPos >= minViewY() && yPos <= maxViewY() ) { if ( yPos < minViewY() ) { #if defined(TQT_CHECK_RANGE) - qWarning( "TQtTableView::tqfindRawRow: (%s) internal error: " + qWarning( "TQtTableView::findRawRow: (%s) internal error: " "yPos < minViewY() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), yPos, yOffs ); @@ -1616,7 +1616,7 @@ int TQtTableView::tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY, } -int TQtTableView::tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX , +int TQtTableView::findRawCol( int xPos, int *cellMaxX, int *cellMinX , bool goOutsideView ) const { int c = -1; @@ -1625,7 +1625,7 @@ int TQtTableView::tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX , if ( goOutsideView || xPos >= minViewX() && xPos <= maxViewX() ) { if ( xPos < minViewX() ) { #if defined(TQT_CHECK_RANGE) - qWarning( "TQtTableView::tqfindRawCol: (%s) internal error: " + qWarning( "TQtTableView::findRawCol: (%s) internal error: " "xPos < minViewX() && goOutsideView " "not supported. (%d,%d)", name( "unnamed" ), xPos, xOffs ); @@ -1667,13 +1667,13 @@ int TQtTableView::tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX , \e widget coordinates. Returns -1 if \a yPos is outside the valid range. - \sa tqfindCol(), rowYPos() + \sa findCol(), rowYPos() */ -int TQtTableView::tqfindRow( int yPos ) const +int TQtTableView::findRow( int yPos ) const { int cellMaxY; - int row = tqfindRawRow( yPos, &cellMaxY ); + int row = findRawRow( yPos, &cellMaxY ); if ( testTableFlags(Tbl_cutCellsV) && cellMaxY > maxViewY() ) row = - 1; // cell cut by bottom margin if ( row >= nRows ) @@ -1687,13 +1687,13 @@ int TQtTableView::tqfindRow( int yPos ) const in \e widget coordinates. Returns -1 if \a xPos is outside the valid range. - \sa tqfindRow(), colXPos() + \sa findRow(), colXPos() */ -int TQtTableView::tqfindCol( int xPos ) const +int TQtTableView::findCol( int xPos ) const { int cellMaxX; - int col = tqfindRawCol( xPos, &cellMaxX ); + int col = findRawCol( xPos, &cellMaxX ); if ( testTableFlags(Tbl_cutCellsH) && cellMaxX > maxViewX() ) col = - 1; // cell cut by right margin if ( col >= nCols ) @@ -1709,7 +1709,7 @@ int TQtTableView::tqfindCol( int xPos ) const coordinates) if the row is visible. Returns FALSE and does not modify \a *yPos if \a row is invisible or invalid. - \sa colXPos(), tqfindRow() + \sa colXPos(), findRow() */ bool TQtTableView::rowYPos( int row, int *yPos ) const @@ -1749,7 +1749,7 @@ bool TQtTableView::rowYPos( int row, int *yPos ) const coordinates) if the column is visible. Returns FALSE and does not modify \a *xPos if \a col is invisible or invalid. - \sa rowYPos(), tqfindCol() + \sa rowYPos(), findCol() */ bool TQtTableView::colXPos( int col, int *xPos ) const @@ -1785,7 +1785,7 @@ bool TQtTableView::colXPos( int col, int *xPos ) const Moves the visible area of the table right by \a xPixels and down by \a yPixels pixels. Both may be negative. - \warning You might tqfind that TQScrollView offers a higher-level of + \warning You might find that TQScrollView offers a higher-level of functionality than using TQtTableView and this function. This function is \e not the same as TQWidget::scroll(); in particular, diff --git a/tqtinterface/qt4/src/attic/qttableview.h b/tqtinterface/qt4/src/attic/qttableview.h index 5ba8a17..b8e7c56 100644 --- a/tqtinterface/qt4/src/attic/qttableview.h +++ b/tqtinterface/qt4/src/attic/qttableview.h @@ -6,7 +6,7 @@ ** ** Copyright (C) 2010 Timothy Pearson and (C) 1992-2008 Trolltech ASA. ** -** This file tqcontains a class moved out of the TQt GUI Toolkit API. It +** This file contains a class moved out of the TQt GUI Toolkit API. It ** may be used, distributed and modified without limitation. ** **********************************************************************/ @@ -104,8 +104,8 @@ protected: void paintEvent( TQPaintEvent * ); void resizeEvent( TQResizeEvent * ); - int tqfindRow( int yPos ) const; - int tqfindCol( int xPos ) const; + int findRow( int yPos ) const; + int findCol( int xPos ) const; bool rowYPos( int row, int *yPos ) const; bool colXPos( int col, int *xPos ) const; @@ -132,9 +132,9 @@ private: virtual void setHorScrollBar( bool on, bool update = TRUE ); virtual void setVerScrollBar( bool on, bool update = TRUE ); void updateView(); - int tqfindRawRow( int yPos, int *cellMaxY, int *cellMinY = 0, + int findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0, bool goOutsideView = FALSE ) const; - int tqfindRawCol( int xPos, int *cellMaxX, int *cellMinX = 0, + int findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0, bool goOutsideView = FALSE ) const; int maxColsVisible() const; diff --git a/tqtinterface/qt4/src/canvas/tqcanvas.cpp b/tqtinterface/qt4/src/canvas/tqcanvas.cpp index 22ee9f4..a827602 100644 --- a/tqtinterface/qt4/src/canvas/tqcanvas.cpp +++ b/tqtinterface/qt4/src/canvas/tqcanvas.cpp @@ -150,7 +150,7 @@ void TQCanvasClusterizer::add(const TQRect& rect) int cursor; for (cursor=0; cursor<count; cursor++) { - if (cluster[cursor].tqcontains(rect)) { + if (cluster[cursor].contains(rect)) { // Wholly contained already. return; } @@ -449,7 +449,7 @@ static int scm(int a, int b) \module canvas The TQCanvas class manages its 2D graphic area and all the canvas - items the area tqcontains. The canvas has no visual appearance of + items the area contains. The canvas has no visual appearance of its own. Instead, it is displayed on screen using a TQCanvasView. Multiple TQCanvasView widgets may be associated with a canvas to provide multiple views of the same canvas. @@ -493,7 +493,7 @@ static int scm(int a, int b) is perfectly possible. At such a size a widget might be very inefficient, and some window systems might not support it at all, whereas TQCanvas scales well. Even with a billion pixels and a million - items, tqfinding a particular canvas item, detecting collisions, etc., + items, finding a particular canvas item, detecting collisions, etc., is still fast (though the memory consumption may be prohibitive at such extremes). @@ -1046,7 +1046,7 @@ void TQCanvas::advance() if ( i ) i->advance(0); } - // we expect the dict tqcontains the exact same items as in the + // we expect the dict contains the exact same items as in the // first pass. it.toFirst(); while ( it.current() ) { @@ -1081,7 +1081,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, TQRect all(0,0,width(),height()); - if ( !all.tqcontains(ivr) ) { + if ( !all.contains(ivr) ) { // Need to clip with edge of canvas. #ifndef TQT_NO_TRANSFORMATIONS @@ -1126,7 +1126,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, p->drawPixmap(vr.x(), vr.y(), offscr, 0, 0, vr.width(), vr.height()); } else { TQRect r = vr; r.moveBy(tl.x(),tl.y()); // move to untransformed co-ords - if ( !all.tqcontains(ivr) ) { + if ( !all.contains(ivr) ) { TQRegion inside = p->clipRegion() & r; //TQRegion outside = p->clipRegion() - r; //p->setClipRegion(outside); @@ -1893,7 +1893,7 @@ class TQCanvasItemExtra { \e after the next advance(1) call. The rtti() function is used for identifying subclasses of TQCanvasItem. - The canvas() function returns a pointer to the canvas which tqcontains the + The canvas() function returns a pointer to the canvas which contains the canvas item. TQCanvasItem provides the show() and isVisible() functions like those in @@ -2722,8 +2722,8 @@ TQCanvasItemList TQCanvas::collisions(const TQPointArray& chunklist, for (TQCanvasItemList::ConstIterator it=l->begin(); it!=l->end(); ++it) { TQCanvasItem *g=*it; if ( g != item ) { - if ( !seen.tqfind(g) ) { - seen.tqreplace(g,(void*)1); + if ( !seen.find(g) ) { + seen.replace(g,(void*)1); if ( !exact || item->collidesWith(g) ) result.append(g); } @@ -3056,7 +3056,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray(TQValueList<TQPixmap> list, TQPointArra } /*! - Destroys the pixmap array and all the pixmaps it tqcontains. + Destroys the pixmap array and all the pixmaps it contains. */ TQCanvasPixmapArray::~TQCanvasPixmapArray() { @@ -3107,13 +3107,13 @@ bool TQCanvasPixmapArray::readPixmaps( const TQString& filenamepattern, If count() is 1 \a filename must specify a real filename to read the tqmask from. If count() is greater than 1, the \a filename must - contain a "%1" that will get tqreplaced by the number of the tqmask to + contain a "%1" that will get replaced by the number of the tqmask to be loaded, just like TQCanvasPixmapArray::readPixmaps(). All collision masks must be 1-bit images or this function call will fail. - If the file isn't readable, tqcontains the wrong number of images, + If the file isn't readable, contains the wrong number of images, or there is some other error, this function will return FALSE, and the array will be flagged as invalid; otherwise this function returns TRUE. @@ -3510,7 +3510,7 @@ void TQCanvasSprite::draw(TQPainter& painter) Example: - The following code tqfinds the part of the canvas that is visible in + The following code finds the part of the canvas that is visible in this view, i.e. the bounding rectangle of the view in canvas coordinates. \code diff --git a/tqtinterface/qt4/src/codecs/tqbig5codec.cpp b/tqtinterface/qt4/src/codecs/tqbig5codec.cpp index bdab025..be0d14c 100644 --- a/tqtinterface/qt4/src/codecs/tqbig5codec.cpp +++ b/tqtinterface/qt4/src/codecs/tqbig5codec.cpp @@ -112,7 +112,7 @@ int qt_UnicodeToBig5hkscs(uint wc, uchar *r); #define IsSecondByteRange2(c) (InRange((c), 0xA1, 0xFE)) #define IsSecondByte(c) (IsSecondByteRange1(c) || IsSecondByteRange2(c)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) struct B5Map { ushort x; @@ -569,7 +569,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -581,11 +581,11 @@ public: result += TQValidChar(u); else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; @@ -655,19 +655,19 @@ TQString TQBig5Codec::toUnicode(const char* chars, int len) const if ( qt_Big5ToUnicode( (const uchar*)(chars + i - 1), &u ) == 2 ) result += TQValidChar(u); else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Bad String - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -855,7 +855,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -867,11 +867,11 @@ public: result += TQValidChar(u); else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; @@ -938,19 +938,19 @@ TQString TQBig5hkscsCodec::toUnicode(const char* chars, int len) const if ( qt_Big5hkscsToUnicode( (const uchar*)(chars + i - 1), &u ) == 2 ) result += TQValidChar(u); else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Bad String - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; diff --git a/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp b/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp index 416ad78..f758586 100644 --- a/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqeucjpcodec.cpp @@ -125,7 +125,7 @@ static const uchar Ss3 = 0x8f; // Single Shift 3 #define IsKana(c) (((c) >= 0xa1) && ((c) <= 0xdf)) #define IsEucChar(c) (((c) >= 0xa1) && ((c) <= 0xfe)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /*! Constructs a TQEucJpCodec. @@ -230,7 +230,7 @@ TQString TQEucJpCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } } else if ( ch == Ss3 ) { @@ -245,17 +245,17 @@ TQString TQEucJpCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else if ( IsEucChar(ch) ) { // JIS X 0208 @@ -266,14 +266,14 @@ TQString TQEucJpCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -424,7 +424,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -434,7 +434,7 @@ public: uint u = conv->jisx0201ToUnicode(ch); result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else if ( buf[0] == Ss3 ) { @@ -444,7 +444,7 @@ public: nbuf = 2; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } } else { @@ -454,7 +454,7 @@ public: result += TQValidChar(u); } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } @@ -465,7 +465,7 @@ public: uint u = conv->jisx0212ToUnicode(buf[1] & 0x7f, ch & 0x7f); result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } diff --git a/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp b/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp index 67ac98e..7ae89eb 100644 --- a/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqeuckrcodec.cpp @@ -101,7 +101,7 @@ unsigned int qt_Ksc5601ToUnicode(unsigned int code); unsigned int qt_UnicodeToKsc5601(unsigned int tqunicode); #define IsEucChar(c) (((c) >= 0xa1) && ((c) <= 0xfe)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /*! \reimp @@ -174,14 +174,14 @@ TQString TQEucKrCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -304,7 +304,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -314,7 +314,7 @@ public: result += TQValidChar(u); } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; diff --git a/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp b/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp index 4abf8f4..257b631 100644 --- a/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp +++ b/tqtinterface/qt4/src/codecs/tqgb18030codec.cpp @@ -133,7 +133,7 @@ #define Is3rdByte(c) (InRange((c), 0x81, 0xFE)) #define Is4thByte(c) (InRange((c), 0x30, 0x39)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /* User-defined areas: UDA 1: 0xAAA1 - 0xAFFE (564/0) UDA 2: 0xF8A1 - 0xFEFE (658/0) @@ -257,12 +257,12 @@ TQString TQGb18030Codec::toUnicode(const char* chars, int len) const } i += clen; } else if (i < len) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } else { // Invalid or undefined - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } @@ -365,7 +365,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -377,7 +377,7 @@ public: if (clen == 2) { result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else if ( Is2ndByteIn4Bytes(ch) ) { @@ -385,7 +385,7 @@ public: nbuf = 2; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -395,7 +395,7 @@ public: buf[2] = ch; nbuf = 3; } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -417,10 +417,10 @@ public: result += TQChar(low); } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; @@ -540,7 +540,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -552,12 +552,12 @@ public: if (clen == 2) { result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -627,15 +627,15 @@ TQString TQGbkCodec::toUnicode(const char* chars, int len) const result += TQValidChar(u); i += 2; } else if (clen == 4) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i += 4; } else if (i < len) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } else { // Invalid or undefined - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } @@ -739,7 +739,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -751,12 +751,12 @@ public: if (clen == 2) { result += TQValidChar(u); } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; } else { // Error - result += TQChar::tqreplacement; + result += TQChar::replacement; nbuf = 0; } break; @@ -828,15 +828,15 @@ TQString TQGb2312Codec::toUnicode(const char* chars, int len) const if ( clen == 2 && IsByteInGb2312(ch) && IsByteInGb2312((uchar)(chars[i+1])) ) result += TQValidChar(u); else - result += TQChar::tqreplacement; + result += TQChar::replacement; i += clen; } else if (i < len) { - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } else { // Invalid or undefined - result += TQChar::tqreplacement; + result += TQChar::replacement; i++; } } @@ -9204,22 +9204,22 @@ static uint qt_Gb18030ToUnicode(const uchar *gbstr, int& len) { } else { /* undefined or reserved area */ len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } } else { len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } } else { len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } } else { len = 1; - uni = TQChar::tqreplacement.tqunicode(); + uni = TQChar::replacement.tqunicode(); } return uni; } diff --git a/tqtinterface/qt4/src/codecs/tqisciicodec.cpp b/tqtinterface/qt4/src/codecs/tqisciicodec.cpp index e6063b4..b9f414b 100644 --- a/tqtinterface/qt4/src/codecs/tqisciicodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqisciicodec.cpp @@ -1,7 +1,7 @@ #include "tqisciicodec_p.h" #ifndef TQT_NO_CODECS -#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::replacement) /*! \class TQIsciiCodec diff --git a/tqtinterface/qt4/src/codecs/tqjiscodec.cpp b/tqtinterface/qt4/src/codecs/tqjiscodec.cpp index ebebca2..c8cccbb 100644 --- a/tqtinterface/qt4/src/codecs/tqjiscodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqjiscodec.cpp @@ -148,7 +148,7 @@ static const uchar Overline = 0x7e; #define IsKana(c) (((c) >= 0xa1) && ((c) <= 0xdf)) #define IsJisChar(c) (((c) >= 0x21) && ((c) <= 0x7e)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) enum Iso2022State{ Ascii, MinState = Ascii, JISX0201_Latin, JISX0201_Kana, @@ -362,7 +362,7 @@ TQString TQJisCodec::toUnicode(const char* chars, int len) const } break; default: - result += TQChar::tqreplacement; + result += TQChar::replacement; break; } } @@ -668,7 +668,7 @@ public: buf[nbuf++] = ch; break; default: - result += TQChar::tqreplacement; + result += TQChar::replacement; break; } break; @@ -684,7 +684,7 @@ public: result += TQValidChar(u); break; default: - result += TQChar::tqreplacement; + result += TQChar::replacement; break; } nbuf = 0; diff --git a/tqtinterface/qt4/src/codecs/tqjpunicode.cpp b/tqtinterface/qt4/src/codecs/tqjpunicode.cpp index d0ced80..9d0e875 100644 --- a/tqtinterface/qt4/src/codecs/tqjpunicode.cpp +++ b/tqtinterface/qt4/src/codecs/tqjpunicode.cpp @@ -769,7 +769,7 @@ TQJpUnicodeConv *TQJpUnicodeConv::newConverter(int rule) if ( rule == Default && (e=getenv("UNICODEMAP_JP")) != 0 ) { TQCString env( e ); for (int i = 0; i < (int)env.length(); ) { - int j = env.tqfind(',', i); + int j = env.find(',', i); TQCString s; if (j < 0) { s = env.mid(i).stripWhiteSpace(); diff --git a/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp b/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp index 56bf40d..a5640aa 100644 --- a/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqrtlcodec.cpp @@ -291,9 +291,9 @@ static TQString reverseLine(const TQString &str, unsigned int from, unsigned int * "SHALOM my friend" or "my friend SHALOM", depending on the basic direction * one assumes for the text. * - * So this function uses some heuristics to tqfind the right answer... + * So this function uses some heuristics to find the right answer... */ -static TQChar::Direction tqfindBasicDirection(TQString str) +static TQChar::Direction findBasicDirection(TQString str) { unsigned int pos; unsigned int len = str.length(); @@ -421,7 +421,7 @@ const char* TQHebrewCodec::mimeName() const static TQString visualOrder(TQString logical, TQChar::Direction basicDir) { - logical.tqreplace(TQChar('\n'), TQChar(0x2028)); + logical.replace(TQChar('\n'), TQChar(0x2028)); #ifdef USE_QT4 // [FIXME] @@ -471,8 +471,8 @@ static TQString visualOrder(TQString logical, TQChar::Direction basicDir) } visual += sub; } - // tqreplace Unicode newline back with \n to compare. - visual.tqreplace(TQChar(0x2028), TQChar('\n')); + // replace Unicode newline back with \n to compare. + visual.replace(TQChar(0x2028), TQChar('\n')); if (l != levels) { delete [] levels; delete [] visualOrder; @@ -542,7 +542,7 @@ TQString TQHebrewCodec::toUnicode(const char* chars, int len ) const // do transformation from visual byte ordering to logical byte // ordering if( basicDir == TQChar::DirON ) - basicDir = tqfindBasicDirection(r); + basicDir = findBasicDirection(r); return visualOrder(r, basicDir); } diff --git a/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp b/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp index 000898d..5b907d6 100644 --- a/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqsjiscodec.cpp @@ -102,7 +102,7 @@ static const uchar Esc = 0x1b; #define IsSjisChar2(c) (((c) >= 0x40) && ((c) != 0x7f) && ((c) <= 0xfc)) #define IsUserDefinedChar1(c) (((c) >= 0xf0) && ((c) <= 0xfc)) -#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((ushort)(u)) : TQChar::replacement) /*! Creates a Shift-JIS codec. Note that this is done automatically by @@ -207,20 +207,20 @@ TQString TQSjisCodec::toUnicode(const char* chars, int len) const } else if ((u = conv->cp932ToUnicode(ch, c2))) { result += TQValidChar(u); } else if ( IsUserDefinedChar1(ch) ) { - result += TQChar::tqreplacement; + result += TQChar::replacement; } else { u = conv->sjisToUnicode(ch, c2); result += TQValidChar(u); } } else { i--; - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } else { - result += TQChar::tqreplacement; + result += TQChar::replacement; } } return result; @@ -343,7 +343,7 @@ public: nbuf = 1; } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } break; case 1: @@ -354,14 +354,14 @@ public: } else if ((u = conv->cp932ToUnicode(buf[0], ch))) { result += TQValidChar(u); } else if ( IsUserDefinedChar1(buf[0]) ) { - result += TQChar::tqreplacement; + result += TQChar::replacement; } else { u = conv->sjisToUnicode(buf[0], ch); result += TQValidChar(u); } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } nbuf = 0; break; diff --git a/tqtinterface/qt4/src/codecs/tqtextcodec.cpp b/tqtinterface/qt4/src/codecs/tqtextcodec.cpp index 7458db6..8784e4d 100644 --- a/tqtinterface/qt4/src/codecs/tqtextcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqtextcodec.cpp @@ -320,7 +320,7 @@ TQString TQTextStatelessDecoder::toUnicode(const char* chars, int len) recently created TQTextCodec objects take precedence over earlier ones. - You may tqfind it more convenient to make your codec class available + You may find it more convenient to make your codec class available as a plugin; see the \link plugins-howto.html plugin documentation\endlink for more details. @@ -872,7 +872,7 @@ TQTextCodec* TQTextCodec::codecForName( const char* name, int accuracy ) often use most of the available character sequences, and so only by linguistic analysis could a true match be made. - \a chars tqcontains the string to check, and \a len tqcontains the + \a chars contains the string to check, and \a len contains the number of characters in the string to use. \sa heuristicContentMatch() @@ -944,7 +944,7 @@ const char* TQTextCodec::mimeName() const the first \a len bytes of \a chars and returns a value indicating how likely it is that the string is a prefix of text encoded in the encoding of the subclass. A negative return value indicates - that the text is detectably not in the encoding (e.g. it tqcontains + that the text is detectably not in the encoding (e.g. it contains characters undefined in the encoding). A return value of 0 indicates that the text should be decoded with this codec rather than as ASCII, but there is no particular evidence. The value @@ -1064,7 +1064,7 @@ TQCString TQTextCodec::fromUnicode(const TQString& uc) const /*! \overload - \a a tqcontains the source characters; \a len tqcontains the number of + \a a contains the source characters; \a len contains the number of characters in \a a to use. */ TQString TQTextCodec::toUnicode(const TQByteArray& a, int len) const @@ -1077,7 +1077,7 @@ TQString TQTextCodec::toUnicode(const TQByteArray& a, int len) const /*! \overload - \a a tqcontains the source characters. + \a a contains the source characters. */ TQString TQTextCodec::toUnicode(const TQByteArray& a) const { @@ -1088,7 +1088,7 @@ TQString TQTextCodec::toUnicode(const TQByteArray& a) const /*! \overload - \a a tqcontains the source characters; \a len tqcontains the number of + \a a contains the source characters; \a len contains the number of characters in \a a to use. */ TQString TQTextCodec::toUnicode(const TQCString& a, int len) const @@ -1101,7 +1101,7 @@ TQString TQTextCodec::toUnicode(const TQCString& a, int len) const /*! \overload - \a a tqcontains the source characters. + \a a contains the source characters. */ TQString TQTextCodec::toUnicode(const TQCString& a) const { @@ -1112,7 +1112,7 @@ TQString TQTextCodec::toUnicode(const TQCString& a) const /*! \overload - \a chars tqcontains the source characters. + \a chars contains the source characters. */ TQString TQTextCodec::toUnicode(const char* chars) const { @@ -1149,7 +1149,7 @@ bool TQTextCodec::canEncode( TQChar ch ) const /*! \overload - \a s tqcontains the string being tested for encode-ability. + \a s contains the string being tested for encode-ability. */ bool TQTextCodec::canEncode( const TQString& s ) const { @@ -2657,7 +2657,7 @@ TQString TQLatin15Codec::toUnicode(const char* chars, int len) const } static inline unsigned char -latin15CharFromUnicode( unsigned short uc, bool tqreplacement = TRUE ) +latin15CharFromUnicode( unsigned short uc, bool replacement = TRUE ) { uchar c; if ( uc < 0x0100 ) { @@ -2671,7 +2671,7 @@ latin15CharFromUnicode( unsigned short uc, bool tqreplacement = TRUE ) case 0xbc: case 0xbd: case 0xbe: - c = tqreplacement ? '?' : 0; + c = replacement ? '?' : 0; break; default: c = (unsigned char) uc; @@ -2707,10 +2707,10 @@ latin15CharFromUnicode( unsigned short uc, bool tqreplacement = TRUE ) c = 0xbe; break; default: - c = tqreplacement ? '?' : 0; + c = replacement ? '?' : 0; } } else { - c = tqreplacement ? '?' : 0; + c = replacement ? '?' : 0; } } return c; @@ -2818,20 +2818,20 @@ static void setupLocaleMapper() } // Now try these in order: - // 1. CODESET from ctype if it tqcontains a .CODESET part (e.g. en_US.ISO8859-15) - // 2. CODESET from lang if it tqcontains a .CODESET part + // 1. CODESET from ctype if it contains a .CODESET part (e.g. en_US.ISO8859-15) + // 2. CODESET from lang if it contains a .CODESET part // 3. ctype (maybe the locale is named "ISO-8859-1" or something) // 4. locale (ditto) // 5. check for "@euro" // 6. guess locale from ctype unless ctype is "C" // 7. guess locale from lang - // 1. CODESET from ctype if it tqcontains a .CODESET part (e.g. en_US.ISO8859-15) + // 1. CODESET from ctype if it contains a .CODESET part (e.g. en_US.ISO8859-15) char * codeset = ctype ? strchr( ctype, '.' ) : 0; if ( codeset && *codeset == '.' ) localeMapper = checkForCodec( codeset + 1 ); - // 2. CODESET from lang if it tqcontains a .CODESET part + // 2. CODESET from lang if it contains a .CODESET part codeset = lang ? strchr( lang, '.' ) : 0; if ( !localeMapper && codeset && *codeset == '.' ) localeMapper = checkForCodec( codeset + 1 ); diff --git a/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp b/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp index e35758b..b9b3dc8 100644 --- a/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqtsciicodec.cpp @@ -100,7 +100,7 @@ static unsigned char qt_UnicodeToTSCII(ushort u1, ushort u2, ushort u3); static unsigned int qt_TSCIIToUnicode(unsigned int code, uint *s); #define IsTSCIIChar(c) (((c) >= 0x80) && ((c) <= 0xfd)) -#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::tqreplacement) +#define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::replacement) /*! \reimp */ int TQTsciiCodec::mibEnum() const @@ -162,7 +162,7 @@ TQString TQTsciiCodec::toUnicode(const char* chars, int len) const } } else { // Invalid - result += TQChar::tqreplacement; + result += TQChar::replacement; } } diff --git a/tqtinterface/qt4/src/codecs/tqutfcodec.cpp b/tqtinterface/qt4/src/codecs/tqutfcodec.cpp index 3a80d31..c0f4fac 100644 --- a/tqtinterface/qt4/src/codecs/tqutfcodec.cpp +++ b/tqtinterface/qt4/src/codecs/tqutfcodec.cpp @@ -188,7 +188,7 @@ public: *qch++ = TQChar(low); headerDone = TRUE; } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) { - *qch++ = TQChar::tqreplacement; + *qch++ = TQChar::replacement; } else { if (headerDone || TQChar(uc) != TQChar::byteOrderMark) *qch++ = uc; @@ -198,7 +198,7 @@ public: } else { // error i = error; - *qch++ = TQChar::tqreplacement; + *qch++ = TQChar::replacement; need = 0; } } else { @@ -222,7 +222,7 @@ public: min_uc = 0x10000; } else { // error - *qch++ = TQChar::tqreplacement; + *qch++ = TQChar::replacement; } } } diff --git a/tqtinterface/qt4/src/dialogs/tqdialog.cpp b/tqtinterface/qt4/src/dialogs/tqdialog.cpp index 58093f1..31341ca 100644 --- a/tqtinterface/qt4/src/dialogs/tqdialog.cpp +++ b/tqtinterface/qt4/src/dialogs/tqdialog.cpp @@ -114,7 +114,7 @@ A <b>modeless</b> dialog is a dialog that operates independently of other windows in the same application. Find and - tqreplace dialogs in word-processors are often modeless to allow the + replace dialogs in word-processors are often modeless to allow the user to interact with both the application's main window and with the dialog. diff --git a/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp b/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp index 8a86b71..86c50dc 100644 --- a/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp +++ b/tqtinterface/qt4/src/dialogs/tqerrormessage.cpp @@ -242,7 +242,7 @@ bool TQErrorMessage::nextPending() while ( !pending->isEmpty() ) { TQString p = *pending->begin(); pending->remove( pending->begin() ); - if ( !p.isEmpty() && !doNotShow->tqfind( p ) ) { + if ( !p.isEmpty() && !doNotShow->find( p ) ) { errors->setText( p ); return TRUE; } @@ -260,7 +260,7 @@ bool TQErrorMessage::nextPending() void TQErrorMessage::message( const TQString & m ) { - if ( doNotShow->tqfind( m ) ) + if ( doNotShow->find( m ) ) return; pending->append( m ); if ( !isVisible() && nextPending() ) diff --git a/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp b/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp index 928c7a6..424ac7e 100644 --- a/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp +++ b/tqtinterface/qt4/src/dialogs/tqfiledialog.cpp @@ -1089,7 +1089,7 @@ public: return TQString::null; for ( int i = 0; i < len ;++i ) { uchar inCh = (uchar)cName[ i ]; - if ( inCh >= 128 || sChars.tqcontains(inCh) ) + if ( inCh >= 128 || sChars.contains(inCh) ) { newStr += TQChar( '%' ); ushort c = inCh / 16; @@ -1311,7 +1311,7 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e ) TQListBoxItem *item = dragItem; dragItem = 0; if ( item ) { - if ( !tqitemRect( item ).tqcontains( e->pos() ) ) + if ( !tqitemRect( item ).contains( e->pos() ) ) return; TQUriDrag* drag = new TQUriDrag( viewport() ); TQStringList files; @@ -1439,7 +1439,7 @@ void TQFileListBox::viewportDropEvent( TQDropEvent *e ) TQString name = (currDropItem ? TQFileDialogPrivate::encodeFileName(currDropItem->text()) : TQString(".")); TQUrlInfo info(filedialog->d->url, name); for ( i = 0; i < lst.count(); ++i ) { - int slash = lst[i].tqfindRev('/'); + int slash = lst[i].findRev('/'); TQString filename = lst[i].right(lst[i].length() - slash - 1); exists = exists || TQFileDialogPrivate::fileExists( dest, filename); } @@ -1454,7 +1454,7 @@ void TQFileListBox::viewportDropEvent( TQDropEvent *e ) bool TQFileListBox::acceptDrop( const TQPoint &pnt, TQWidget *source ) { TQListBoxItem *item = itemAt( pnt ); - if ( !item || (item && !tqitemRect( item ).tqcontains( pnt )) ) { + if ( !item || (item && !tqitemRect( item ).contains( pnt )) ) { if ( source == viewport() && startDragDir == filedialog->dirPath() ) return FALSE; return TRUE; @@ -1462,7 +1462,7 @@ bool TQFileListBox::acceptDrop( const TQPoint &pnt, TQWidget *source ) TQUrlInfo fi( filedialog->d->url, item->text() ); - if ( fi.isDir() && tqitemRect( item ).tqcontains( pnt ) ) + if ( fi.isDir() && tqitemRect( item ).contains( pnt ) ) return TRUE; return FALSE; } @@ -1476,7 +1476,7 @@ void TQFileListBox::setCurrentDropItem( const TQPoint &pnt ) item = itemAt( pnt ); if ( item && !TQUrlInfo( filedialog->d->url, item->text() ).isDir() ) item = 0; - if ( item && !tqitemRect( item ).tqcontains( pnt ) ) + if ( item && !tqitemRect( item ).contains( pnt ) ) item = 0; currDropItem = item; @@ -1858,7 +1858,7 @@ void TQFileDialogTQFileListView::viewportDropEvent( TQDropEvent *e ) TQString name = (currDropItem ? TQFileDialogPrivate::encodeFileName(currDropItem->text(0)) : TQString(".")); TQUrlInfo info(filedialog->d->url, name); for (uint i = 0; i < l.count(); ++i) { - int slash = l[i].tqfindRev('/'); + int slash = l[i].findRev('/'); TQString filename = l[i].right(l[i].length() - slash - 1); exists = exists || TQFileDialogPrivate::fileExists(dest, filename); } @@ -1873,7 +1873,7 @@ void TQFileDialogTQFileListView::viewportDropEvent( TQDropEvent *e ) bool TQFileDialogTQFileListView::acceptDrop( const TQPoint &pnt, TQWidget *source ) { TQListViewItem *item = itemAt( pnt ); - if ( !item || (item && !tqitemRect( item ).tqcontains( pnt )) ) { + if ( !item || (item && !tqitemRect( item ).contains( pnt )) ) { if ( source == viewport() && startDragDir == filedialog->dirPath() ) return FALSE; return TRUE; @@ -1881,7 +1881,7 @@ bool TQFileDialogTQFileListView::acceptDrop( const TQPoint &pnt, TQWidget *sourc TQUrlInfo fi( filedialog->d->url, item->text( 0 ) ); - if ( fi.isDir() && tqitemRect( item ).tqcontains( pnt ) ) + if ( fi.isDir() && tqitemRect( item ).contains( pnt ) ) return TRUE; return FALSE; } @@ -1896,7 +1896,7 @@ void TQFileDialogTQFileListView::setCurrentDropItem( const TQPoint &pnt ) if ( item && !TQUrlInfo( filedialog->d->url, item->text( 0 ) ).isDir() ) item = 0; - if ( item && !tqitemRect( item ).tqcontains( pnt ) ) + if ( item && !tqitemRect( item ).contains( pnt ) ) item = 0; currDropItem = item; @@ -1994,7 +1994,7 @@ void TQFileDialogTQFileListView::contentsMoved( int, int ) TQFileDialogPrivate::File::~File() { - if ( d->pendingItems.tqfindRef( this ) ) + if ( d->pendingItems.findRef( this ) ) d->pendingItems.removeRef( this ); } @@ -2152,12 +2152,12 @@ static TQStringList makeFiltersList( const TQString &filter ) if ( filter.isEmpty() ) return TQStringList(); - int i = filter.tqfind( ";;", 0 ); + int i = filter.find( ";;", 0 ); TQString sep( ";;" ); if ( i == -1 ) { - if ( filter.tqfind( "\n", 0 ) != -1 ) { + if ( filter.find( "\n", 0 ) != -1 ) { sep = "\n"; - i = filter.tqfind( sep, 0 ); + i = filter.find( sep, 0 ); } } @@ -2435,10 +2435,10 @@ TQFileDialog::TQFileDialog( const TQString& dirName, const TQString & filter, if ( !filter.isEmpty() ) { setFilters( filter ); if ( !dirName.isEmpty() ) { - int dotpos = dirName.tqfind( TQChar('.'), 0, FALSE ); + int dotpos = dirName.find( TQChar('.'), 0, FALSE ); if ( dotpos != -1 ) { for ( int b=0 ; b<d->types->count() ; b++ ) { - if ( d->types->text(b).tqcontains( dirName.right( dirName.length() - dotpos ) ) ) { + if ( d->types->text(b).contains( dirName.right( dirName.length() - dotpos ) ) ) { d->types->setCurrentItem( b ); setFilter( d->types->text( b ) ); return; @@ -2580,7 +2580,7 @@ void TQFileDialog::init() } if ( !!TQDir::homeDirPath() ) { - if ( !d->paths->listBox()->tqfindItem( TQDir::homeDirPath() ) ) + if ( !d->paths->listBox()->findItem( TQDir::homeDirPath() ) ) d->paths->insertItem( *openFolderIcon, TQDir::homeDirPath() ); } @@ -2883,7 +2883,7 @@ void TQFileDialog::changeMode( int id ) if ( !d->infoPreview && !d->contentsPreview ) return; - TQButton *btn = (TQButton*)d->modeButtons->tqfind( id ); + TQButton *btn = (TQButton*)d->modeButtons->find( id ); if ( !btn ) return; @@ -2935,7 +2935,7 @@ TQFileDialog::~TQFileDialog() \brief the name of the selected file - If a file was selected selectedFile tqcontains the file's name including + If a file was selected selectedFile contains the file's name including its absolute path; otherwise selectedFile is empty. \sa TQString::isEmpty(), selectedFiles, selectedFilter @@ -2995,7 +2995,7 @@ void TQFileDialog::setSelectedFilter( int n ) /*! Sets the current filter selected in the file dialog to the first - one that tqcontains the text \a tqmask. + one that contains the text \a tqmask. */ void TQFileDialog::setSelectedFilter( const TQString& tqmask ) @@ -3003,7 +3003,7 @@ void TQFileDialog::setSelectedFilter( const TQString& tqmask ) int n; for ( n = 0; n < d->types->count(); n++ ) { - if ( d->types->text( n ).tqcontains( tqmask, FALSE ) ) { + if ( d->types->text( n ).contains( tqmask, FALSE ) ) { d->types->setCurrentItem( n ); TQString f = tqmask; TQRegExp r( TQString::tqfromLatin1(qt_file_dialog_filter_reg_exp) ); @@ -3022,7 +3022,7 @@ void TQFileDialog::setSelectedFilter( const TQString& tqmask ) \brief the list of selected files - If one or more files are selected, selectedFiles tqcontains their + If one or more files are selected, selectedFiles contains their names including their absolute paths. If no files are selected or the mode isn't ExistingFiles selectedFiles is an empty list. @@ -3050,12 +3050,12 @@ TQStringList TQFileDialog::selectedFiles() const if ( mode() == ExistingFiles ) { TQStringList selectedLst; TQString selectedFiles = nameEdit->text(); - if (selectedFiles.tqfindRev('\"') == -1) { + if (selectedFiles.findRev('\"') == -1) { //probably because Enter was pressed on the nameEdit, so we have one file //not in "" but raw selectedLst.append(selectedFiles); } else { - selectedFiles.truncate( selectedFiles.tqfindRev( '\"' ) ); + selectedFiles.truncate( selectedFiles.findRev( '\"' ) ); selectedLst = selectedLst.split( TQString("\" "), selectedFiles ); } for ( TQStringList::Iterator it = selectedLst.begin(); it != selectedLst.end(); ++it ) { @@ -3144,7 +3144,7 @@ TQString TQFileDialog::dirPath() const Sets the filter used in the file dialog to \a newFilter. - If \a newFilter tqcontains a pair of parentheses containing one or more + If \a newFilter contains a pair of parentheses containing one or more of <em><b>anything*something</b></em> separated by spaces or by semi-colons then only the text contained in the parentheses is used as the filter. This means that these calls are all equivalent: @@ -3673,7 +3673,7 @@ void TQFileDialog::okClicked() } #endif - if ( fn.tqcontains("*") ) { + if ( fn.contains("*") ) { addFilter( fn ); nameEdit->blockSignals( TRUE ); nameEdit->setText( TQString::tqfromLatin1("") ); @@ -3737,7 +3737,7 @@ void TQFileDialog::okClicked() // If selection is valid, return it, else try // using selection as a directory to change to. - if ( !d->currentFileName.isNull() && !d->currentFileName.tqcontains( "*" ) ) { + if ( !d->currentFileName.isNull() && !d->currentFileName.contains( "*" ) ) { emit fileSelected( selectedFile() ); accept(); } else { @@ -3761,8 +3761,8 @@ void TQFileDialog::okClicked() trySetSelection( TRUE, d->url, TRUE ); d->checkForFilter = FALSE; } else { - if ( !nameEdit->text().tqcontains( "/" ) && - !nameEdit->text().tqcontains( "\\" ) + if ( !nameEdit->text().contains( "/" ) && + !nameEdit->text().contains( "\\" ) #if defined(TQ_OS_WIN32) && nameEdit->text()[ 1 ] != ':' #endif @@ -3823,9 +3823,9 @@ bool TQFileDialog::trySetSelection( bool isDir, const TQUrlOperator &u, bool upd { if ( !isDir && !u.path().isEmpty() && u.path().right( 1 ) == "/" ) isDir = TRUE; - if ( u.fileName().tqcontains( "*") && d->checkForFilter ) { + if ( u.fileName().contains( "*") && d->checkForFilter ) { TQString fn( u.fileName() ); - if ( fn.tqcontains( "*" ) ) { + if ( fn.contains( "*" ) ) { addFilter( fn ); d->currentFileName = TQString::null; d->url.setFileName( TQString::null ); @@ -4411,11 +4411,11 @@ void TQFileDialog::newFolderClicked() TQStringList lst; TQListViewItemIterator it( files ); for ( ; it.current(); ++it ) - if ( it.current()->text( 0 ).tqcontains( tr( "New Folder" ) ) ) + if ( it.current()->text( 0 ).contains( tr( "New Folder" ) ) ) lst.append( it.current()->text( 0 ) ); if ( !lst.count() == 0 ) - while ( lst.tqcontains( foldername ) ) + while ( lst.contains( foldername ) ) foldername = tr( "New Folder %1" ).arg( ++i ); d->url.mkdir( foldername ); @@ -5220,7 +5220,7 @@ const TQPixmap * TQWindowsIconProvider::pixmap( const TQFileInfo &fi ) if ( fi.isDir() ) { return &defaultFolder; } else if ( ext != ".EXE" ) { - it = cache.tqfind( key ); + it = cache.find( key ); if ( it != cache.end() ) return &( *it ); @@ -5266,7 +5266,7 @@ const TQPixmap * TQWindowsIconProvider::pixmap( const TQFileInfo &fi ) if (lst.count() >= 2) { // don't just assume that lst has two entries TQString filepath = lst[ 0 ].stripWhiteSpace(); if ( !filepath.isEmpty() ) { - if ( filepath.tqfind("%1") != -1 ) { + if ( filepath.find("%1") != -1 ) { filepath = filepath.arg( fi.filePath() ); if ( ext == ".DLL" ) { pix = defaultFile; @@ -5739,7 +5739,7 @@ static bool isRoot( const TQUrl &u ) { #if defined(TQ_OS_MAC9) TQString p = TQDir::convertSeparators(u.path()); - if(p.tqcontains(':') == 1) + if(p.contains(':') == 1) return TRUE; #elif defined(TQ_OS_UNIX) if ( u.path() == "/" ) @@ -5750,7 +5750,7 @@ static bool isRoot( const TQUrl &u ) p.right( 2 ) == ":/" ) return TRUE; if ( p[ 0 ] == '/' && p[ 1 ] == '/' ) { - int slashes = p.tqcontains( '/' ); + int slashes = p.contains( '/' ); if ( slashes <= 3 ) return TRUE; if ( slashes == 4 && p[ (int)p.length() - 1 ] == '/' ) @@ -6043,7 +6043,7 @@ void TQFileDialog::itemChanged( TQNetworkOperation *op ) TQUrlInfo *i = 0; TQListViewItemIterator it1( files ); bool ok1 = FALSE, ok2 = FALSE; - // first check whether the new file tqreplaces an existing file. + // first check whether the new file replaces an existing file. for ( i = d->sortedList.first(); it1.current(); ++it1, i = d->sortedList.next() ) { if ( ( (TQFileDialogPrivate::File*)it1.current() )->info.name() == op->arg( 1 ) ) { delete ( (TQFileDialogPrivate::File*)it1.current() )->i; diff --git a/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp b/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp index fbccfa8..5a10f04 100644 --- a/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp +++ b/tqtinterface/qt4/src/dialogs/tqfontdialog.cpp @@ -523,7 +523,7 @@ void TQFontDialog::updateFamilies() d->fdb.tqfamilies(TQFont::UnknownScript); TQStringList::ConstIterator it = l.begin(), end = l.end(); for (; it != end; ++it) { - if (! familyNames.tqcontains(*it)) + if (! familyNames.contains(*it)) familyNames << *it; } } @@ -625,12 +625,12 @@ void TQFontDialog::updateStyles() } } if (!found && first) { - if (cstyle.tqcontains("Italic")) { - cstyle.tqreplace("Italic", "Oblique"); + if (cstyle.contains("Italic")) { + cstyle.replace("Italic", "Oblique"); first = FALSE; goto redo; - } else if (cstyle.tqcontains("Oblique")) { - cstyle.tqreplace("Oblique", "Italic"); + } else if (cstyle.contains("Oblique")) { + cstyle.replace("Oblique", "Italic"); first = FALSE; goto redo; } diff --git a/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp b/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp index 79f6bfc..878a618 100644 --- a/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp +++ b/tqtinterface/qt4/src/dialogs/tqmessagebox.cpp @@ -1167,12 +1167,12 @@ static char * qtlogo_xpm[] = { Examples: - If a program is unable to tqfind a supporting file, but can do perfectly + If a program is unable to find a supporting file, but can do perfectly well without it: \code TQMessageBox::information( this, "Application name", - "Unable to tqfind the user preferences file.\n" + "Unable to find the user preferences file.\n" "The factory default will be used instead." ); \endcode @@ -1224,7 +1224,7 @@ static char * qtlogo_xpm[] = { recommend using the application name as the window's caption. Below are more examples of how to use the static member functions. - After these examples you will tqfind an overview of the non-static + After these examples you will find an overview of the non-static member functions. Exiting a program is part of its normal operation. If there is @@ -1233,7 +1233,7 @@ static char * qtlogo_xpm[] = { \code switch( TQMessageBox::information( this, "Application name here", - "The document tqcontains unsaved changes\n" + "The document contains unsaved changes\n" "Do you want to save the changes before exiting?", "&Save", "&Discard", "Cancel", 0, // Enter == button 0 diff --git a/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp b/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp index eb4a794..d4f2472 100644 --- a/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp +++ b/tqtinterface/qt4/src/dialogs/tqprintdialog.cpp @@ -170,7 +170,7 @@ public: : TQListViewItem( printers, name, host, comment ), ali( aliases ) { } bool samePrinter( const TQString& name ) { - return text( 0 ) == name || ali.tqfind( name ) != ali.end(); + return text( 0 ) == name || ali.find( name ) != ali.end(); } TQStringList ali; @@ -199,13 +199,13 @@ static void parsePrinterDesc( TQString printerDesc, TQListView * printers ) return; printerDesc = printerDesc.simplifyWhiteSpace(); - int i = printerDesc.tqfind( ':' ); + int i = printerDesc.find( ':' ); TQString printerName, printerComment, printerHost; TQStringList aliases; if ( i >= 0 ) { // have ':' want '|' - int j = printerDesc.tqfind( '|' ); + int j = printerDesc.find( '|' ); if ( j > 0 && j < i ) { printerName = printerDesc.left( j ); aliases = TQStringList::split( '|', @@ -217,11 +217,11 @@ static void parsePrinterDesc( TQString printerDesc, TQListView * printers ) printerName = printerDesc.left( i ); } // look for lprng pseudo all printers entry - i = printerDesc.tqfind( TQRegExp(TQString::tqfromLatin1(": *all *=")) ); + i = printerDesc.find( TQRegExp(TQString::tqfromLatin1(": *all *=")) ); if ( i >= 0 ) printerName = ""; // look for signs of this being a remote printer - i = printerDesc.tqfind( TQRegExp(TQString::tqfromLatin1(": *rm *=")) ); + i = printerDesc.find( TQRegExp(TQString::tqfromLatin1(": *rm *=")) ); if ( i >= 0 ) { // point k at the end of remote host name while ( printerDesc[i] != '=' ) @@ -382,17 +382,17 @@ static char * parsePrintersConf( TQListView * printers, bool *found = 0 ) } else { printerDesc += TQString::fromLocal8Bit(line); printerDesc = printerDesc.simplifyWhiteSpace(); - int i = printerDesc.tqfind( ':' ); + int i = printerDesc.find( ':' ); TQString printerName, printerHost, printerComment; TQStringList aliases; if ( i >= 0 ) { // have : want | - int j = printerDesc.tqfind( '|', 0 ); + int j = printerDesc.find( '|', 0 ); if ( j >= i ) j = -1; printerName = printerDesc.mid( 0, j < 0 ? i : j ); if ( printerName == TQString::tqfromLatin1("_default") ) { - i = printerDesc.tqfind( + i = printerDesc.find( TQRegExp( TQString::tqfromLatin1(": *use *=") ) ); while ( printerDesc[i] != '=' ) i++; @@ -421,7 +421,7 @@ static char * parsePrintersConf( TQListView * printers, bool *found = 0 ) .arg( aliases.join(", ") ); } // look for signs of this being a remote printer - i = printerDesc.tqfind( + i = printerDesc.find( TQRegExp( TQString::tqfromLatin1(": *bsdaddr *=") ) ); if ( i >= 0 ) { // point k at the end of remote host name @@ -635,7 +635,7 @@ static void parseEtcLpMember( TQListView * printers ) ++it; // I haven't found any real documentation, so I'm guessing that // since lpstat uses /etc/lp/member rather than one of the - // other directories, it's the one to use. I did not tqfind a + // other directories, it's the one to use. I did not find a // decent way to locate aliases and remote printers. if ( printer->isFile() ) perhapsAddPrinter( printers, printer->fileName(), @@ -698,11 +698,11 @@ static void parseSpoolInterface( TQListView * printers ) configFile.close(); printerType = printerType.stripWhiteSpace(); - if ( printerType.tqfind("postscript", 0, FALSE) < 0 ) + if ( printerType.find("postscript", 0, FALSE) < 0 ) continue; int ii = 0; - while ( (ii = namePrinter.tqfind('"', ii)) >= 0 ) + while ( (ii = namePrinter.find('"', ii)) >= 0 ) namePrinter.remove( ii, 1 ); if ( hostName.isEmpty() || hostPrinter.isEmpty() ) { @@ -751,7 +751,7 @@ static void parseQconfig( TQListView * printers ) bool indented = line[0].isSpace(); line = line.simplifyWhiteSpace(); - int i = line.tqfind('='); + int i = line.find('='); if ( indented && i != -1 ) { // line in stanza TQString variable = TQT_TQSTRING(line.left( i )).simplifyWhiteSpace(); TQString value=TQT_TQSTRING(line.mid( i+1, line.length() )).simplifyWhiteSpace(); @@ -764,7 +764,7 @@ static void parseQconfig( TQListView * printers ) } else if ( line[0] == '*' ) { // comment // nothing to do } else if ( ts.atEnd() || // end of file, or beginning of new stanza - ( !indented && line.tqfind( newStanza ) != -1 ) ) { + ( !indented && line.find( newStanza ) != -1 ) ) { if ( up && stanzaName.length() > 0 && stanzaName.length() < 21 ) { if ( remoteHost.length() ) // remote printer perhapsAddPrinter( printers, stanzaName, remoteHost, @@ -1087,7 +1087,7 @@ TQGroupBox * TQPrintDialog::setupDestination() } } - // all printers hopefully known. try to tqfind a good default + // all printers hopefully known. try to find a good default TQString dollarPrinter; { const char * t = getenv( "PRINTER" ); diff --git a/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp b/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp index dc670a9..66b9a64 100644 --- a/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp +++ b/tqtinterface/qt4/src/dialogs/tqtabdialog.cpp @@ -402,7 +402,7 @@ void TQTabDialog::showTab( int i ) the label is shown on-screen and may vary according to language and other factors. - If the tab's \a label tqcontains an ampersand, the letter following + If the tab's \a label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro&wse" then Alt+W becomes an accelerator which will move the focus to this tab. @@ -458,7 +458,7 @@ void TQTabDialog::addTab( TQWidget * child, TQTab* tab ) the label is shown on-screen and may vary according to language and other factors. - If the tab's \a label tqcontains an ampersand, the letter following + If the tab's \a label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro&wse" then Alt+W becomes an accelerator which will move the focus to this tab. diff --git a/tqtinterface/qt4/src/dialogs/tqwizard.cpp b/tqtinterface/qt4/src/dialogs/tqwizard.cpp index c14b2cb..93c3173 100644 --- a/tqtinterface/qt4/src/dialogs/tqwizard.cpp +++ b/tqtinterface/qt4/src/dialogs/tqwizard.cpp @@ -67,7 +67,7 @@ A wizard is a special type of input dialog that consists of a sequence of dialog pages. A wizard's purpose is to walk the user through a process step by step. Wizards are useful for complex or - infrequently occurring tasks that people may tqfind difficult to + infrequently occurring tasks that people may find difficult to learn or do. TQWizard provides page titles and displays Next, Back, Finish, @@ -318,7 +318,7 @@ void TQWizard::insertPage( TQWidget * page, const TQString & title, int index ) \fn void TQWizard::selected(const TQString&) This signal is emitted when the current page changes. The - parameter tqcontains the title of the selected page. + parameter contains the title of the selected page. */ @@ -377,7 +377,7 @@ int TQWizard::indexOf( TQWidget* page ) const TQWizardPrivate::Page * p = d->page( page ); if ( !p ) return -1; - return d->pages.tqfind( p ); + return d->pages.find( p ); } /*! diff --git a/tqtinterface/qt4/src/embedded/qt_embedded.pri b/tqtinterface/qt4/src/embedded/qt_embedded.pri index 5bdbdef..88646d7 100644 --- a/tqtinterface/qt4/src/embedded/qt_embedded.pri +++ b/tqtinterface/qt4/src/embedded/qt_embedded.pri @@ -33,31 +33,31 @@ embedded { } else:DEFINES += TQT_NO_QWS_LINUXFB - tqcontains( gfx-drivers, qvfb ) { + contains( gfx-drivers, qvfb ) { HEADERS += $$EMBEDDED_H/tqgfxvfb_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxvfb_qws.cpp } else:DEFINES += TQT_NO_QWS_VFB - tqcontains( gfx-drivers, vnc ) { + contains( gfx-drivers, vnc ) { HEADERS += $$EMBEDDED_H/tqgfxvnc_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxvnc_qws.cpp } else:DEFINES += TQT_NO_QWS_VNC - !tqcontains( DEFINES, TQT_NO_QWS_LINUXFB):tqcontains( gfx-drivers, vga16 ) { + !contains( DEFINES, TQT_NO_QWS_LINUXFB):contains( gfx-drivers, vga16 ) { HEADERS += $$EMBEDDED_H/tqgfxvga16_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxvga16_qws.cpp } else:DEFINES += TQT_NO_QWS_VGA16 - tqcontains( gfx-drivers, transformed ) { + contains( gfx-drivers, transformed ) { HEADERS += $$EMBEDDED_H/tqgfxtransformed_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxtransformed_qws.cpp } else:DEFINES += TQT_NO_QWS_TRANSFORMED - tqcontains( gfx-drivers, snap ) { + contains( gfx-drivers, snap ) { exists( $(SCITECH)/include/snap/graphics.h) { HEADERS += $$EMBEDDED_H/tqgfxsnap_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxsnap_qws.cpp @@ -73,34 +73,34 @@ embedded { } else:DEFINES += TQT_NO_QWS_SNAP - tqcontains( gfx-drivers, mach64 ) { + contains( gfx-drivers, mach64 ) { HEADERS += $$EMBEDDED_H/tqgfxmach64_qws.h \ $$EMBEDDED_H/tqgfxmach64defs_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxmach64_qws.cpp } else:DEFINES += TQT_NO_QWS_MACH64 - tqcontains( gfx-drivers, voodoo ) { + contains( gfx-drivers, voodoo ) { HEADERS += $$EMBEDDED_H/tqgfxvoodoo_qws.h \ $$EMBEDDED_H/tqgfxvoodoodefs_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxvoodoo_qws.cpp } else:DEFINES += TQT_NO_QWS_VOODOO3 - tqcontains( gfx-drivers, matrox ) { + contains( gfx-drivers, matrox ) { HEADERS += $$EMBEDDED_H/tqgfxmatrox_qws.h \ $$EMBEDDED_H/tqgfxmatroxdefs_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxmatrox_qws.cpp } else:DEFINES += TQT_NO_QWS_MATROX - tqcontains( gfx-drivers, shadowfb ) { + contains( gfx-drivers, shadowfb ) { HEADERS += $$EMBEDDED_H/tqgfxshadow_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxshadow_qws.cpp } else:DEFINES += TQT_NO_QWS_SHADOWFB - tqcontains( gfx-drivers, repeater ) { + contains( gfx-drivers, repeater ) { HEADERS += $$EMBEDDED_H/tqgfxrepeater_qws.h SOURCES += $$EMBEDDED_CPP/tqgfxrepeater_qws.cpp } @@ -110,46 +110,46 @@ embedded { # Keyboard drivers # - tqcontains( kbd-drivers, sl5000 ) { + contains( kbd-drivers, sl5000 ) { HEADERS +=$$EMBEDDED_H/tqkbdsl5000_qws.h SOURCES +=$$EMBEDDED_CPP/tqkbdsl5000_qws.cpp - !tqcontains( kbd-drivers, tty ) { + !contains( kbd-drivers, tty ) { kbd-drivers += tty } } else:DEFINES += TQT_NO_QWS_KBD_SL5000 - tqcontains( kbd-drivers, tty ) { + contains( kbd-drivers, tty ) { HEADERS +=$$EMBEDDED_H/tqkbdtty_qws.h SOURCES +=$$EMBEDDED_CPP/tqkbdtty_qws.cpp - !tqcontains( kbd-drivers, pc101 ) { + !contains( kbd-drivers, pc101 ) { kbd-drivers += pc101 } } else:DEFINES += TQT_NO_QWS_KBD_TTY - tqcontains( kbd-drivers, usb ) { + contains( kbd-drivers, usb ) { HEADERS +=$$EMBEDDED_H/tqkbdusb_qws.h SOURCES +=$$EMBEDDED_CPP/tqkbdusb_qws.cpp - !tqcontains( kbd-drivers, pc101 ) { + !contains( kbd-drivers, pc101 ) { kbd-drivers += pc101 } } else:DEFINES += TQT_NO_QWS_KBD_USB - tqcontains( kbd-drivers, pc101 ) { + contains( kbd-drivers, pc101 ) { HEADERS +=$$EMBEDDED_H/tqkbdpc101_qws.h SOURCES +=$$EMBEDDED_CPP/tqkbdpc101_qws.cpp } else:DEFINES += TQT_NO_QWS_KBD_PC101 - tqcontains( kbd-drivers, yopy ) { + contains( kbd-drivers, yopy ) { HEADERS +=$$EMBEDDED_H/tqkbdyopy_qws.h SOURCES +=$$EMBEDDED_CPP/tqkbdyopy_qws.cpp } else:DEFINES += TQT_NO_QWS_KBD_YOPY - tqcontains( kbd-drivers, vr41xx ) { + contains( kbd-drivers, vr41xx ) { HEADERS +=$$EMBEDDED_H/tqkbdvr41xx_qws.h SOURCES +=$$EMBEDDED_CPP/tqkbdvr41xx_qws.cpp } @@ -159,31 +159,31 @@ embedded { # Mouse drivers # - tqcontains( mouse-drivers, pc ) { + contains( mouse-drivers, pc ) { HEADERS +=$$EMBEDDED_H/tqmousepc_qws.h SOURCES +=$$EMBEDDED_CPP/tqmousepc_qws.cpp } else:DEFINES += TQT_NO_QWS_MOUSE_PC - tqcontains( mouse-drivers, bus ) { + contains( mouse-drivers, bus ) { HEADERS +=$$EMBEDDED_H/tqmousebus_qws.h SOURCES +=$$EMBEDDED_CPP/tqmousebus_qws.cpp } else:DEFINES += TQT_NO_QWS_MOUSE_BUS - tqcontains( mouse-drivers, linuxtp ) { + contains( mouse-drivers, linuxtp ) { HEADERS +=$$EMBEDDED_H/tqmouselinuxtp_qws.h SOURCES +=$$EMBEDDED_CPP/tqmouselinuxtp_qws.cpp } else:DEFINES += TQT_NO_QWS_MOUSE_LINUXTP - tqcontains( mouse-drivers, vr41xx ) { + contains( mouse-drivers, vr41xx ) { HEADERS +=$$EMBEDDED_H/tqmousevr41xx_qws.h SOURCES +=$$EMBEDDED_CPP/tqmousevr41xx_qws.cpp } else:DEFINES += TQT_NO_QWS_MOUSE_VR41 - tqcontains( mouse-drivers, yopy ) { + contains( mouse-drivers, yopy ) { HEADERS +=$$EMBEDDED_H/tqmouseyopy_qws.h SOURCES +=$$EMBEDDED_CPP/tqmouseyopy_qws.cpp } diff --git a/tqtinterface/qt4/src/iconview/tqiconview.cpp b/tqtinterface/qt4/src/iconview/tqiconview.cpp index c1705c7..d1e1e14 100644 --- a/tqtinterface/qt4/src/iconview/tqiconview.cpp +++ b/tqtinterface/qt4/src/iconview/tqiconview.cpp @@ -287,8 +287,8 @@ public: public: - /* tqfinds the containers that intersect with \a searchRect in the direction \a dir relative to \a relativeTo */ - TQPtrList<ItemContainer>* tqfindContainers( + /* finds the containers that intersect with \a searchRect in the direction \a dir relative to \a relativeTo */ + TQPtrList<ItemContainer>* findContainers( TQIconView:: Direction dir, const TQPoint &relativeTo, const TQRect &searchRect ) const; @@ -296,7 +296,7 @@ public: }; -TQPtrList<TQIconViewPrivate::ItemContainer>* TQIconViewPrivate::tqfindContainers( +TQPtrList<TQIconViewPrivate::ItemContainer>* TQIconViewPrivate::findContainers( TQIconView:: Direction dir, const TQPoint &relativeTo, const TQRect &searchRect ) const @@ -398,7 +398,7 @@ void TQIconViewToolTip::maybeTip( const TQPoint &pos ) if ( !parentWidget() || !view || view->wordWrapIconText() || !view->showToolTips() ) return; - TQIconViewItem *item = view->tqfindItem( view->viewportToContents( pos ) ); + TQIconViewItem *item = view->findItem( view->viewportToContents( pos ) ); if ( !item || item->tmpText == item->itemText ) return; @@ -808,7 +808,7 @@ void TQIconDragData::setTextRect( const TQRect &r ) \ingroup advanced \module iconview - A TQIconViewItem tqcontains an icon, a string and optionally a sort + A TQIconViewItem contains an icon, a string and optionally a sort key, and can display itself in a TQIconView. The class is designed to be very similar to TQListView and TQListBox in use, both via instantiation and subclassing. @@ -854,7 +854,7 @@ void TQIconDragData::setTextRect( const TQRect &r ) Items may be repositioned with move() and moveBy(). An item's tqgeometry is available from rect(), x(), y(), width(), height(), size(), pos(), textRect() and pixmapRect(). You can also test - against the position of a point with tqcontains() and intersects(). + against the position of a point with contains() and intersects(). To remove an item from an icon view, just delete the item. The TQIconViewItem destructor removes it cleanly from its icon view. @@ -1424,7 +1424,7 @@ TQIconViewItem *TQIconViewItem::prevItem() const Returns a pointer to the next item, or 0 if this is the last item in the icon view. - To tqfind the first item use TQIconView::firstItem(). + To find the first item use TQIconView::firstItem(). Example: \code @@ -1734,11 +1734,11 @@ TQRect TQIconViewItem::pixmapRect( bool relative ) const } /*! - Returns TRUE if the item tqcontains the point \a pnt (in contents + Returns TRUE if the item contains the point \a pnt (in contents coordinates); otherwise returns FALSE. */ -bool TQIconViewItem::tqcontains( const TQPoint& pnt ) const +bool TQIconViewItem::contains( const TQPoint& pnt ) const { TQRect textArea = textRect( FALSE ); TQRect pixmapArea = pixmapRect( FALSE ); @@ -1746,7 +1746,7 @@ bool TQIconViewItem::tqcontains( const TQPoint& pnt ) const textArea.setTop( pixmapArea.bottom() ); else textArea.setLeft( pixmapArea.right() ); - return textArea.tqcontains( pnt ) || pixmapArea.tqcontains( pnt ); + return textArea.contains( pnt ) || pixmapArea.contains( pnt ); } /*! @@ -2147,7 +2147,7 @@ void TQIconViewItem::paintFocus( TQPainter *p, const TQColorGroup & ) This function is called when something is dropped on the item. \a e provides all the information about the drop. If the drag object - of the drop was a TQIconDrag, \a lst tqcontains the list of the + of the drop was a TQIconDrag, \a lst contains the list of the dropped items. You can get the data by calling TQIconDragItem::data() on each item. If the \a lst is empty, i.e. the drag was not a TQIconDrag, you must decode the data in \a e and @@ -2309,7 +2309,7 @@ void TQIconViewItem::checkRect() selected. Items can be renamed in-place. TQIconView also supports \link #draganddrop drag and drop\endlink. - Each item tqcontains a label string, a pixmap or picture (the icon + Each item contains a label string, a pixmap or picture (the icon itself) and optionally a sort key. The sort key is used for sorting the items and defaults to the label string. The label string can be displayed below or to the right of the icon (see \l @@ -2388,8 +2388,8 @@ void TQIconViewItem::checkRect() do_something( item ); \endcode TQIconView also provides currentItem(). You can search for an item - using tqfindItem() (searching by position or for label text) and - with tqfindFirstVisibleItem() and tqfindLastVisibleItem(). The number + using findItem() (searching by position or for label text) and + with findFirstVisibleItem() and findLastVisibleItem(). The number of items is returned by count(). An item can be removed from an icon view using takeItem(); to delete an item use \c delete. All the items can be deleted with clear(). @@ -2471,7 +2471,7 @@ void TQIconViewItem::checkRect() connect to the dropped() signal and reimplement TQIconViewItem::acceptDrop() and TQIconViewItem::dropped(). If you've used a TQIconDrag (or a subclass of it) the second argument to the - dropped signal tqcontains a TQValueList of TQIconDragItems -- you can + dropped signal contains a TQValueList of TQIconDragItems -- you can access their data by calling TQIconDragItem::data() on each one. For an example implementation of complex drag-and-drop look at the @@ -2560,7 +2560,7 @@ void TQIconViewItem::checkRect() (but not on any icon) which the icon view itself can't handle. \a e provides all the information about the drop. If the drag - object of the drop was a TQIconDrag, \a lst tqcontains the list of + object of the drop was a TQIconDrag, \a lst contains the list of the dropped items. You can get the data using TQIconDragItem::data() on each item. If the \a lst is empty, i.e. the drag was not a TQIconDrag, you have to decode the data in \a e @@ -3351,7 +3351,7 @@ void TQIconView::doAutoScroll() alreadyIntersected = TRUE; TQIconViewItem *item = c->items.first(); for ( ; item; item = c->items.next() ) { - if ( d->selectedItems.tqfind( item ) ) + if ( d->selectedItems.find( item ) ) continue; if ( !item->intersects( nr ) ) { if ( item->isSelected() ) { @@ -3453,14 +3453,14 @@ void TQIconView::doAutoScroll() emit selectionChanged( d->currentItem ); } - if ( !TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).tqcontains( vp ) && + if ( !TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) && !d->scrollTimer ) { d->scrollTimer = new TQTimer( this ); connect( d->scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); d->scrollTimer->start( 100, FALSE ); - } else if ( TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).tqcontains( vp ) && + } else if ( TQRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) && d->scrollTimer ) { disconnect( d->scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); @@ -3739,22 +3739,22 @@ TQIconView::SelectionMode TQIconView::selectionMode() const } /*! - Returns a pointer to the item that tqcontains point \a pos, which is - given in contents coordinates, or 0 if no item tqcontains point \a + Returns a pointer to the item that contains point \a pos, which is + given in contents coordinates, or 0 if no item contains point \a pos. */ -TQIconViewItem *TQIconView::tqfindItem( const TQPoint &pos ) const +TQIconViewItem *TQIconView::findItem( const TQPoint &pos ) const { if ( !d->firstItem ) return 0; TQIconViewPrivate::ItemContainer *c = d->lastContainer; for ( ; c; c = c->p ) { - if ( c->rect.tqcontains( pos ) ) { + if ( c->rect.contains( pos ) ) { TQIconViewItem *item = c->items.last(); for ( ; item; item = c->items.prev() ) - if ( item->tqcontains( pos ) ) + if ( item->contains( pos ) ) return item; } } @@ -3771,7 +3771,7 @@ TQIconViewItem *TQIconView::tqfindItem( const TQPoint &pos ) const {TQt::StringComparisonMode}.) */ -TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFlags compare ) const +TQIconViewItem *TQIconView::findItem( const TQString &text, TQt::ComparisonFlags compare ) const { if ( !d->firstItem ) return 0; @@ -3792,7 +3792,7 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla TQIconViewItem *beginsWithItem = 0; TQIconViewItem *endsWithItem = 0; - TQIconViewItem *tqcontainsItem = 0; + TQIconViewItem *containsItem = 0; if ( item ) { for ( ; item; item = item->next ) { @@ -3804,11 +3804,11 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; } if ( d->currentItem && d->firstItem ) { @@ -3822,11 +3822,11 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; } } } @@ -3836,8 +3836,8 @@ TQIconViewItem *TQIconView::tqfindItem( const TQString &text, TQt::ComparisonFla return beginsWithItem; else if ( endsWithItem ) return endsWithItem; - else if ( tqcontainsItem ) - return tqcontainsItem; + else if ( containsItem ) + return containsItem; return 0; } @@ -3993,15 +3993,15 @@ void TQIconView::ensureItemVisible( TQIconViewItem *item ) returns a pointer to that item. \a r is given in content coordinates. Returns 0 if no item overlaps \a r. - If you want to tqfind all items that touch \a r, you will need to + If you want to find all items that touch \a r, you will need to use this function and nextItem() in a loop ending at - tqfindLastVisibleItem() and test TQIconViewItem::rect() for each of + findLastVisibleItem() and test TQIconViewItem::rect() for each of these items. - \sa tqfindLastVisibleItem() TQIconViewItem::rect() + \sa findLastVisibleItem() TQIconViewItem::rect() */ -TQIconViewItem* TQIconView::tqfindFirstVisibleItem( const TQRect &r ) const +TQIconViewItem* TQIconView::findFirstVisibleItem( const TQRect &r ) const { TQIconViewPrivate::ItemContainer *c = d->firstContainer; TQIconViewItem *i = 0; @@ -4039,10 +4039,10 @@ TQIconViewItem* TQIconView::tqfindFirstVisibleItem( const TQRect &r ) const returns a pointer to that item. \a r is given in content coordinates. Returns 0 if no item overlaps \a r. - \sa tqfindFirstVisibleItem() + \sa findFirstVisibleItem() */ -TQIconViewItem* TQIconView::tqfindLastVisibleItem( const TQRect &r ) const +TQIconViewItem* TQIconView::findLastVisibleItem( const TQRect &r ) const { TQIconViewPrivate::ItemContainer *c = d->firstContainer; TQIconViewItem *i = 0; @@ -4486,7 +4486,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) } d->dragStartPos = e->pos(); - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); d->pressedItem = item; if ( item ) @@ -4509,7 +4509,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e ) if ( e->button() == Qt::LeftButton && !( e->state() & ShiftButton ) && !( e->state() & ControlButton ) && item && item->isSelected() && - item->textRect( FALSE ).tqcontains( e->pos() ) ) { + item->textRect( FALSE ).contains( e->pos() ) ) { if ( !item->renameEnabled() ) { d->mousePressed = TRUE; @@ -4641,7 +4641,7 @@ void TQIconView::contentsContextMenuEvent( TQContextMenuEvent *e ) emit contextMenuRequested( item, viewport()->mapToGlobal( contentsToViewport( r.center() ) ) ); } else { d->mousePressed = FALSE; - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); emit contextMenuRequested( item, e->globalPos() ); } } @@ -4652,7 +4652,7 @@ void TQIconView::contentsContextMenuEvent( TQContextMenuEvent *e ) void TQIconView::contentsMouseReleaseEvent( TQMouseEvent *e ) { - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); d->selectedItems.clear(); bool emitClicked = TRUE; @@ -4714,7 +4714,7 @@ void TQIconView::contentsMouseReleaseEvent( TQMouseEvent *e ) void TQIconView::contentsMouseMoveEvent( TQMouseEvent *e ) { - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); if ( d->highlightedItem != item ) { if ( item ) emit onItem( item ); @@ -4755,7 +4755,7 @@ void TQIconView::contentsMouseMoveEvent( TQMouseEvent *e ) void TQIconView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) { - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); if ( item ) { selectAll( FALSE ); item->setSelected( TRUE, TRUE ); @@ -4800,16 +4800,16 @@ void TQIconView::contentsDragMoveEvent( TQDragMoveEvent *e ) TQIconViewItem *old = d->tmpCurrentItem; d->tmpCurrentItem = 0; - TQIconViewItem *item = tqfindItem( e->pos() ); + TQIconViewItem *item = findItem( e->pos() ); if ( item ) { if ( old && - old->rect().tqcontains(d->oldDragPos) && - !old->rect().tqcontains(e->pos()) ) { + old->rect().contains(d->oldDragPos) && + !old->rect().contains(e->pos()) ) { old->dragLeft(); repaintItem( old ); } - if ( !item->rect().tqcontains(d->oldDragPos) ) + if ( !item->rect().contains(d->oldDragPos) ) item->dragEntered(); if (item->acceptDrop(e) || (item->isSelected() && e->source() == viewport())) { d->oldDragAcceptAction = TRUE; @@ -4872,7 +4872,7 @@ void TQIconView::contentsDropEvent( TQDropEvent *e ) if ( d->tmpCurrentItem ) repaintItem( d->tmpCurrentItem ); - TQIconViewItem *i = tqfindItem( e->pos() ); + TQIconViewItem *i = findItem( e->pos() ); if ((!i || i->isSelected()) && e->source() == viewport() && d->currentItem && !d->cleared) { if ( !d->rearrangeEnabled ) @@ -5024,13 +5024,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) } else { if ( d->arrangement == LeftToRight ) { // we use pixmap so the items textlength are ignored - // tqfind topmost, leftmost item + // find topmost, leftmost item if ( i->pixmapRect( FALSE ).y() < item->pixmapRect( FALSE ).y() || ( i->pixmapRect( FALSE ).y() == item->pixmapRect( FALSE ).y() && i->pixmapRect( FALSE ).x() < item->pixmapRect( FALSE ).x() ) ) item = i; } else { - // tqfind leftmost, topmost item + // find leftmost, topmost item if ( i->pixmapRect( FALSE ).x() < item->pixmapRect( FALSE ).x() || ( i->pixmapRect( FALSE ).x() == item->pixmapRect( FALSE ).x() && i->pixmapRect( FALSE ).y() < item->pixmapRect( FALSE ).y() ) ) @@ -5067,13 +5067,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) item = i; } else { if ( d->arrangement == LeftToRight ) { - // tqfind bottommost, rightmost item + // find bottommost, rightmost item if ( i->pixmapRect( FALSE ).bottom() > item->pixmapRect( FALSE ).bottom() || ( i->pixmapRect( FALSE ).bottom() == item->pixmapRect( FALSE ).bottom() && i->pixmapRect( FALSE ).right() > item->pixmapRect( FALSE ).right() ) ) item = i; } else { - // tqfind rightmost, bottommost item + // find rightmost, bottommost item if ( i->pixmapRect( FALSE ).right() > item->pixmapRect( FALSE ).right() || ( i->pixmapRect( FALSE ).right() == item->pixmapRect( FALSE ).right() && i->pixmapRect( FALSE ).bottom() > item->pixmapRect( FALSE ).bottom() ) ) @@ -5100,12 +5100,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) Direction dir = DirRight; TQRect r( 0, d->currentItem->y(), contentsWidth(), d->currentItem->height() ); - item = tqfindItem( dir, d->currentItem->rect().center(), r ); + item = findItem( dir, d->currentItem->rect().center(), r ); // search the row below from the right while ( !item && r.y() < contentsHeight() ) { r.moveBy(0, d->currentItem->height() ); - item = tqfindItem( dir, TQPoint( 0, r.center().y() ), r ); + item = findItem( dir, TQPoint( 0, r.center().y() ), r ); } if ( item ) { @@ -5122,12 +5122,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) Direction dir = DirLeft; TQRect r( 0, d->currentItem->y(), contentsWidth(), d->currentItem->height() ); - item = tqfindItem( dir, d->currentItem->rect().center(), r ); + item = findItem( dir, d->currentItem->rect().center(), r ); // search the row above from the left while ( !item && r.y() >= 0 ) { r.moveBy(0, - d->currentItem->height() ); - item = tqfindItem( dir, TQPoint( contentsWidth(), r.center().y() ), r ); + item = findItem( dir, TQPoint( contentsWidth(), r.center().y() ), r ); } if ( item ) { @@ -5155,12 +5155,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) Direction dir = DirDown; TQRect r( d->currentItem->x(), 0, d->currentItem->width(), contentsHeight() ); - item = tqfindItem( dir, d->currentItem->rect().center(), r ); + item = findItem( dir, d->currentItem->rect().center(), r ); - // tqfinding the closest item below and to the right + // finding the closest item below and to the right while ( !item && r.x() < contentsWidth() ) { r.moveBy( r.width() , 0 ); - item = tqfindItem( dir, TQPoint( r.center().x(), 0 ), r ); + item = findItem( dir, TQPoint( r.center().x(), 0 ), r ); } @@ -5176,12 +5176,12 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) Direction dir = DirUp; TQRect r( d->currentItem->x(), 0, d->currentItem->width(), contentsHeight() ); - item = tqfindItem( dir, d->currentItem->rect().center(), r ); + item = findItem( dir, d->currentItem->rect().center(), r ); - // tqfinding the closest item above and to the left + // finding the closest item above and to the left while ( !item && r.x() >= 0 ) { r.moveBy(- r.width(), 0 ); - item = tqfindItem( dir, TQPoint(r.center().x(), contentsHeight() ), r ); + item = findItem( dir, TQPoint(r.center().x(), contentsHeight() ), r ); } TQIconViewItem *i = d->currentItem; @@ -5198,13 +5198,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) else r = TQRect( d->currentItem->x() + visibleWidth(), 0, visibleWidth(), contentsHeight() ); TQIconViewItem *item = d->currentItem; - TQIconViewItem *ni = tqfindFirstVisibleItem( r ); + TQIconViewItem *ni = findFirstVisibleItem( r ); if ( !ni ) { if ( d->arrangement == LeftToRight ) r = TQRect( 0, d->currentItem->y() + d->currentItem->height(), contentsWidth(), contentsHeight() ); else r = TQRect( d->currentItem->x() + d->currentItem->width(), 0, contentsWidth(), contentsHeight() ); - ni = tqfindLastVisibleItem( r ); + ni = findLastVisibleItem( r ); } if ( ni ) { setCurrentItem( ni ); @@ -5220,13 +5220,13 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) else r = TQRect( d->currentItem->x() - visibleWidth(), 0, visibleWidth(), contentsHeight() ); TQIconViewItem *item = d->currentItem; - TQIconViewItem *ni = tqfindFirstVisibleItem( r ); + TQIconViewItem *ni = findFirstVisibleItem( r ); if ( !ni ) { if ( d->arrangement == LeftToRight ) r = TQRect( 0, 0, contentsWidth(), d->currentItem->y() ); else r = TQRect( 0, 0, d->currentItem->x(), contentsHeight() ); - ni = tqfindFirstVisibleItem( r ); + ni = findFirstVisibleItem( r ); } if ( ni ) { setCurrentItem( ni ); @@ -5244,18 +5244,18 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) i = i->next; if ( !i ) i = d->firstItem; - i = tqfindItemByName( i ); + i = findItemByName( i ); } else { d->inputTimer->stop(); d->currInputString += e->text(); - i = tqfindItemByName( i ); + i = findItemByName( i ); if ( !i ) { d->currInputString = e->text(); if (d->currentItem && d->currentItem->next) i = d->currentItem->next; else i = d->firstItem; - i = tqfindItemByName(i); + i = findItemByName(i); } } if ( i ) { @@ -5308,7 +5308,7 @@ void TQIconView::keyPressEvent( TQKeyEvent *e ) The function choses the closest item with its center in the searchRect. */ -TQIconViewItem* TQIconView::tqfindItem( Direction dir, +TQIconViewItem* TQIconView::findItem( Direction dir, const TQPoint &relativeTo, const TQRect &searchRect ) const { @@ -5318,14 +5318,14 @@ TQIconViewItem* TQIconView::tqfindItem( Direction dir, // gets list of containers with potential items TQPtrList<TQIconViewPrivate::ItemContainer>* cList = - d->tqfindContainers( dir, relativeTo, searchRect); + d->findContainers( dir, relativeTo, searchRect); cList->first(); while ( cList->current() && !centerMatch ) { TQPtrList<TQIconViewItem> &list = (cList->current())->items; for ( item = list.first(); item; item = list.next() ) { if ( neighbourItem( dir, relativeTo, item ) && - searchRect.tqcontains( item->rect().center() ) && + searchRect.contains( item->rect().center() ) && item != currentItem() ) { int ml = (relativeTo - item->rect().center()).manhattanLength(); if ( centerMatch ) { @@ -5622,7 +5622,7 @@ void TQIconView::emitRenamed( TQIconViewItem *item ) /*! If a drag enters the icon view the tqshapes of the objects which the - drag tqcontains are drawn, usnig \a pos as origin. + drag contains are drawn, usnig \a pos as origin. */ void TQIconView::drawDragShapes( const TQPoint &pos ) @@ -5767,7 +5767,7 @@ TQSize TQIconView::tqminimumSizeHint() const with \a text. */ -TQIconViewItem* TQIconView::tqfindItemByName( TQIconViewItem *start ) +TQIconViewItem* TQIconView::findItemByName( TQIconViewItem *start ) { if ( !start ) return 0; @@ -6001,7 +6001,7 @@ int TQIconView::calcGridNum( int w, int x ) const /*! \internal - Returns the first item of the row which tqcontains \a item. + Returns the first item of the row which contains \a item. */ TQIconViewItem *TQIconView::rowBegin( TQIconViewItem * ) const @@ -6162,10 +6162,10 @@ void TQIconView::updateItemContainer( TQIconViewItem *item ) } const TQRect irect = item->rect(); - bool tqcontains = FALSE; + bool contains = FALSE; for (;;) { if ( c->rect.intersects( irect ) ) { - tqcontains = c->rect.tqcontains( irect ); + contains = c->rect.contains( irect ); break; } @@ -6187,7 +6187,7 @@ void TQIconView::updateItemContainer( TQIconViewItem *item ) c->items.append( item ); item->d->container1 = c; - if ( !tqcontains ) { + if ( !contains ) { c = c->n; if ( !c ) { appendItemContainer(); @@ -6209,7 +6209,7 @@ void TQIconView::updateItemContainer( TQIconViewItem *item ) void TQIconView::appendItemContainer() { TQSize s; - // #### We have to tqfind out which value is best here + // #### We have to find out which value is best here if ( d->arrangement == LeftToRight ) s = TQSize( INT_MAX - 1, RECT_EXTENSION ); else @@ -6251,7 +6251,7 @@ void TQIconView::rebuildContainers() c = d->lastContainer; while ( item ) { if (item->isVisible()) { - if ( c->rect.tqcontains( item->rect() ) ) { + if ( c->rect.contains( item->rect() ) ) { item->d->container1 = c; item->d->container2 = 0; c->items.append( item ); @@ -6350,7 +6350,7 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift, } - // tqfinding the rectangles + // finding the rectangles TQRect topRect, bottomRect, midRect; if ( !spanning ) { midRect = from->rect().unite( to->rect() ); @@ -6378,7 +6378,7 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift, } } - // tqfinding contained items and selecting them + // finding contained items and selecting them TQIconViewItem *item = 0; bool changed = FALSE; bool midValid = midRect.isValid(); @@ -6388,11 +6388,11 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift, for ( item = d->firstItem; item; item = item->next ) { bool contained = FALSE; TQPoint itemCenter = item->rect().center(); - if ( midValid && midRect.tqcontains( itemCenter ) ) + if ( midValid && midRect.contains( itemCenter ) ) contained = TRUE; - if ( !contained && topValid && topRect.tqcontains( itemCenter ) ) + if ( !contained && topValid && topRect.contains( itemCenter ) ) contained = TRUE; - if ( !contained && bottomValid && bottomRect.tqcontains( itemCenter ) ) + if ( !contained && bottomValid && bottomRect.contains( itemCenter ) ) contained = TRUE; if ( contained ) { @@ -6442,7 +6442,7 @@ void TQIconView::handleItemChange( TQIconViewItem *old, bool shift, TQBitmap TQIconView::tqmask( TQPixmap *pix ) const { TQPixmap m; - if ( d->maskCache.tqfind( TQT_TQSTRING(TQString::number( pix->serialNumber() )), m ) ) + if ( d->maskCache.find( TQT_TQSTRING(TQString::number( pix->serialNumber() )), m ) ) return TQBitmap(m); m = pix->createHeuristicMask(); d->maskCache.insert( TQString::number( pix->serialNumber() ), m ); diff --git a/tqtinterface/qt4/src/iconview/tqiconview.h b/tqtinterface/qt4/src/iconview/tqiconview.h index 3bbb6f8..2ef7472 100644 --- a/tqtinterface/qt4/src/iconview/tqiconview.h +++ b/tqtinterface/qt4/src/iconview/tqiconview.h @@ -189,7 +189,7 @@ public: TQPoint pos() const; TQRect textRect( bool relative = TRUE ) const; TQRect pixmapRect( bool relative = TRUE ) const; - bool tqcontains( const TQPoint& pnt ) const; + bool contains( const TQPoint& pnt ) const; bool intersects( const TQRect& r ) const; virtual bool acceptDrop( const TQMimeSource *mime ) const; @@ -340,8 +340,8 @@ public: virtual void setSelectionMode( SelectionMode m ); SelectionMode selectionMode() const; - TQIconViewItem *tqfindItem( const TQPoint &pos ) const; - TQIconViewItem *tqfindItem( const TQString &text, TQt::ComparisonFlags compare = TQt::BeginsWith ) const; + TQIconViewItem *findItem( const TQPoint &pos ) const; + TQIconViewItem *findItem( const TQString &text, TQt::ComparisonFlags compare = TQt::BeginsWith ) const; virtual void selectAll( bool select ); virtual void clearSelection(); virtual void invertSelection(); @@ -350,8 +350,8 @@ public: void repaintSelectedItems(); void ensureItemVisible( TQIconViewItem *item ); - TQIconViewItem* tqfindFirstVisibleItem( const TQRect &r ) const; - TQIconViewItem* tqfindLastVisibleItem( const TQRect &r ) const; + TQIconViewItem* findFirstVisibleItem( const TQRect &r ) const; + TQIconViewItem* findLastVisibleItem( const TQRect &r ) const; virtual void clear(); @@ -483,7 +483,7 @@ private: virtual void initDragEnter( TQDropEvent *e ); #endif void drawContents( TQPainter* ); - TQIconViewItem* tqfindItemByName( TQIconViewItem *start ); + TQIconViewItem* findItemByName( TQIconViewItem *start ); void handleItemChange( TQIconViewItem *old, bool shift, bool control, bool homeend = FALSE); @@ -498,7 +498,7 @@ private: DirLeft, DirRight }; - TQIconViewItem* tqfindItem( Direction dir, + TQIconViewItem* findItem( Direction dir, const TQPoint &relativeTo, const TQRect &searchRect ) const; bool neighbourItem( Direction dir, diff --git a/tqtinterface/qt4/src/kernel/qpsprinter.ps b/tqtinterface/qt4/src/kernel/qpsprinter.ps index b38868f..9ea2dc0 100644 --- a/tqtinterface/qt4/src/kernel/qpsprinter.ps +++ b/tqtinterface/qt4/src/kernel/qpsprinter.ps @@ -634,10 +634,10 @@ %% Font handling % the next three commands are for defining fonts. The first one -% tries to tqfind the most suitable printer font out of a fontlist. +% tries to find the most suitable printer font out of a fontlist. % if encoding is false the default one will be used. /MF { % newname encoding fontlist - % this function tries to tqfind a suitable postscript font. + % this function tries to find a suitable postscript font. % We try quite hard not to get courier for a % proportional font. The following takes an array of fonts. % The algorithm will take the first font that @@ -650,7 +650,7 @@ true exch true exch % push a dummy on the stack, { % so the loop over the array will leave a font in any case when exiting. exch pop exch pop % (dummy | oldfont) (dummy | fontdict) fontarray - dup 0 get dup tqfindfont % get the fontname from the array and load it + dup 0 get dup findfont % get the fontname from the array and load it dup /FontName get % see if the font exists 3 -1 roll eq { % see if fontname and the one provided are equal exit @@ -671,7 +671,7 @@ 1 index /FID ne % don't copy FID, as it's not allowed in PS Level 1 {def}{pop pop}ifelse } forall - /Encoding fencoding def % tqreplace encoding + /Encoding fencoding def % replace encoding currentdict end } ifelse @@ -680,7 +680,7 @@ % an embedded font. This is used for the base fonts of the composite font used later on. /MFEmb { % newname encoding fontname - tqfindfont dup length dict + findfont dup length dict begin { 1 index /FID ne @@ -696,7 +696,7 @@ % % newname pointsize fontmame DF - /DF { - tqfindfont + findfont % get the fontsize on top of the stack and define font matrix /fs 3 -1 roll d [ fs 0 0 fs -1 mul 0 0 ] makefont diff --git a/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp b/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp index 4c15ee2..6954cb3 100644 --- a/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp +++ b/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp @@ -201,7 +201,7 @@ static int menuBarHeightForWidth( TQMenuBar *menubar, int w ) \fn virtual bool TQLayoutItem::isEmpty() const Implemented in subclasses to return whether this item is empty, - i.e. whether it tqcontains any widgets. + i.e. whether it contains any widgets. */ /*! @@ -696,7 +696,7 @@ TQSize TQWidgetItem::tqsizeHint() const } /*! - Returns TRUE because a spacer item never tqcontains widgets. + Returns TRUE because a spacer item never contains widgets. */ bool TQSpacerItem::isEmpty() const { @@ -1413,9 +1413,9 @@ bool TQLayout::activate() prefer when being laid out. Only \link #interesting one of the constructors\endlink is of interest in most applications. - TQSizePolicy tqcontains two independent SizeType objects; one describes + TQSizePolicy contains two independent SizeType objects; one describes the widgets's horizontal size policy, and the other describes its - vertical size policy. It also tqcontains a flag to indicate whether the + vertical size policy. It also contains a flag to indicate whether the height and width of its preferred size are related. The horizontal and vertical \l{SizeType}s are set in the usual constructor diff --git a/tqtinterface/qt4/src/kernel/tqaccel.cpp b/tqtinterface/qt4/src/kernel/tqaccel.cpp index fd47345..96a3470 100644 --- a/tqtinterface/qt4/src/kernel/tqaccel.cpp +++ b/tqtinterface/qt4/src/kernel/tqaccel.cpp @@ -82,7 +82,7 @@ using namespace Qt; Example: \snippet doc/src/snippets/code/src_qt3support_other_q3accel.cpp 0 - A TQAccel tqcontains a list of accelerator items that can be + A TQAccel contains a list of accelerator items that can be manipulated using insertItem(), removeItem(), clear(), key() and findKey(). @@ -915,7 +915,7 @@ QString TQAccel::keyToString(QKeySequence k) if \a s is not recognized. This function is typically used with \link TQT_BASE_OBJECT_NAME::tr() tr - \endlink(), so that accelerator keys can be tqreplaced in + \endlink(), so that accelerator keys can be replaced in translations: \snippet doc/src/snippets/code/src_qt3support_other_q3accel.cpp 5 @@ -1065,9 +1065,9 @@ QT_END_NAMESPACE fileMenu->insertItem( "Undo", tqparent, TQT_SLOT(undo()), CTRL+Key_Z ); \endcode - A TQAccel tqcontains a list of accelerator items that can be + A TQAccel contains a list of accelerator items that can be manipulated using insertItem(), removeItem(), clear(), key() and - tqfindKey(). + findKey(). Each accelerator item consists of an identifier and a \l TQKeySequence. A single key sequence consists of a keyboard code @@ -1536,7 +1536,7 @@ TQAccelPrivate::~TQAccelPrivate() TQAccelManager::self()->unregisterAccel( this ); } -static TQAccelItem *tqfind_id( TQAccelList &list, int id ) +static TQAccelItem *find_id( TQAccelList &list, int id ) { register TQAccelItem *item = list.first(); while ( item && item->id != id ) @@ -1544,7 +1544,7 @@ static TQAccelItem *tqfind_id( TQAccelList &list, int id ) return item; } -static TQAccelItem *tqfind_key( TQAccelList &list, const TQKeySequence &key ) +static TQAccelItem *find_key( TQAccelList &list, const TQKeySequence &key ) { register TQAccelItem *item = list.first(); while ( item && !( item->key == key ) ) @@ -1676,7 +1676,7 @@ uint TQAccel::count() const static int get_seq_id() { - static int seq_no = -2; // -1 is used as return value in tqfindKey() + static int seq_no = -2; // -1 is used as return value in findKey() return seq_no--; } @@ -1713,7 +1713,7 @@ int TQAccel::insertItem( const TQKeySequence& key, int id ) void TQAccel::removeItem( int id ) { - if ( tqfind_id( d->aitems, id) ) + if ( find_id( d->aitems, id) ) d->aitems.remove(); } @@ -1735,7 +1735,7 @@ void TQAccel::clear() TQKeySequence TQAccel::key( int id ) { - TQAccelItem *item = tqfind_id( d->aitems, id); + TQAccelItem *item = find_id( d->aitems, id); return item ? item->key : TQKeySequence( 0 ); } @@ -1745,9 +1745,9 @@ TQKeySequence TQAccel::key( int id ) \a key, or -1 if the item cannot be found. */ -int TQAccel::tqfindKey( const TQKeySequence& key ) const +int TQAccel::findKey( const TQKeySequence& key ) const { - TQAccelItem *item = tqfind_key( d->aitems, key ); + TQAccelItem *item = find_key( d->aitems, key ); return item ? item->id : -1; } @@ -1761,7 +1761,7 @@ int TQAccel::tqfindKey( const TQKeySequence& key ) const bool TQAccel::isItemEnabled( int id ) const { - TQAccelItem *item = tqfind_id( d->aitems, id); + TQAccelItem *item = find_id( d->aitems, id); return item ? item->enabled : FALSE; } @@ -1777,7 +1777,7 @@ bool TQAccel::isItemEnabled( int id ) const void TQAccel::setItemEnabled( int id, bool enable ) { - TQAccelItem *item = tqfind_id( d->aitems, id); + TQAccelItem *item = find_id( d->aitems, id); if ( item ) item->enabled = enable; } @@ -1805,7 +1805,7 @@ void TQAccel::setItemEnabled( int id, bool enable ) bool TQAccel::connectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, const char *member ) { - TQAccelItem *item = tqfind_id( d->aitems, id); + TQAccelItem *item = find_id( d->aitems, id); if ( item ) { if ( !item->signal ) { item->signal = new TQSignal; @@ -1826,7 +1826,7 @@ bool TQAccel::connectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, const c bool TQAccel::disconnectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, const char *member ) { - TQAccelItem *item = tqfind_id( d->aitems, id); + TQAccelItem *item = find_id( d->aitems, id); if ( item && item->signal ) return item->signal->disconnect( receiver, member ); return FALSE; @@ -1877,7 +1877,7 @@ TQKeySequence TQAccel::shortcutKey( const TQString &str ) int p = 0; while ( p >= 0 ) { - p = str.tqfind( '&', p ) + 1; + p = str.find( '&', p ) + 1; if ( p <= 0 || p >= (int)str.length() ) return 0; if ( str[p] != '&' ) { @@ -1919,7 +1919,7 @@ TQString TQAccel::keyToString( TQKeySequence k ) if \a s is not recognized. This function is typically used with \link TQObject::tr() tr - \endlink(), so that accelerator keys can be tqreplaced in + \endlink(), so that accelerator keys can be replaced in translations: \code @@ -1960,7 +1960,7 @@ TQKeySequence TQAccel::stringToKey( const TQString & s ) void TQAccel::setWhatsThis( int id, const TQString& text ) { - TQAccelItem *item = tqfind_id( d->aitems, id); + TQAccelItem *item = find_id( d->aitems, id); if ( item ) item->whatsthis = text; } @@ -1974,7 +1974,7 @@ void TQAccel::setWhatsThis( int id, const TQString& text ) TQString TQAccel::whatsThis( int id ) const { - TQAccelItem *item = tqfind_id( d->aitems, id); + TQAccelItem *item = find_id( d->aitems, id); return item? item->whatsthis : TQString::null; } @@ -2083,7 +2083,7 @@ documentation for details. The \link http://www.amazon.com/exec/obidos/ASIN/0735605661/trolltech/t Microsoft book \endlink has ISBN 0735605661. The corresponding Open Group -book is very hard to tqfind, rather expensive and we cannot recommend +book is very hard to find, rather expensive and we cannot recommend it. However, if you really want it, OGPubs@opengroup.org might be able to help. Ask them for ISBN 1859121047. diff --git a/tqtinterface/qt4/src/kernel/tqaccel.h b/tqtinterface/qt4/src/kernel/tqaccel.h index d60a3b8..1726aca 100644 --- a/tqtinterface/qt4/src/kernel/tqaccel.h +++ b/tqtinterface/qt4/src/kernel/tqaccel.h @@ -188,7 +188,7 @@ public: void clear(); TQKeySequence key( int id ); - int tqfindKey( const TQKeySequence& key ) const; + int findKey( const TQKeySequence& key ) const; bool isItemEnabled( int id ) const; void setItemEnabled( int id, bool enable ); diff --git a/tqtinterface/qt4/src/kernel/tqaccessible.cpp b/tqtinterface/qt4/src/kernel/tqaccessible.cpp index ba19cf7..8d7e588 100644 --- a/tqtinterface/qt4/src/kernel/tqaccessible.cpp +++ b/tqtinterface/qt4/src/kernel/tqaccessible.cpp @@ -360,9 +360,9 @@ void AccessibleCache::removeObject(TQObject *object) no accessibility implementation for \a object exists. The function uses the \link TQObject::className() classname - \endlink of \a object to tqfind a suitable implementation. If no + \endlink of \a object to find a suitable implementation. If no implementation for the object's class is available the function - tries to tqfind an implementation for the object's tqparent class. + tries to find an implementation for the object's tqparent class. This function is called to answer an accessibility client's request for object information. You should never need to call this @@ -375,7 +375,7 @@ TQRESULT TQAccessible::queryAccessibleInterface( TQObject *object, TQAccessibleI return TQE_INVALIDARG; if ( qAccessibleInterface ) { - *iface = qAccessibleInterface->tqfind( object ); + *iface = qAccessibleInterface->find( object ); if ( *iface ) { (*iface)->addRef(); return TQS_OK; @@ -477,7 +477,7 @@ bool TQAccessible::isActive() /*! \fn int TQAccessibleInterface::controlAt( int x, int y ) const - Returns the ID of the child that tqcontains the screen coordinates + Returns the ID of the child that contains the screen coordinates (\a x, \a y). This function returns 0 if the point is positioned on the object itself. If the tested point is outside the boundaries of the object this function returns -1. @@ -518,7 +518,7 @@ bool TQAccessible::isActive() control, or the string property of the object itself if \a control is 0. - The \e Name is a string used by clients to identify, tqfind or + The \e Name is a string used by clients to identify, find or announce an accessible object for the user. All objects must have a name that is unique within their container. diff --git a/tqtinterface/qt4/src/kernel/tqapplication.cpp b/tqtinterface/qt4/src/kernel/tqapplication.cpp index 74d2f08..0e3b55c 100644 --- a/tqtinterface/qt4/src/kernel/tqapplication.cpp +++ b/tqtinterface/qt4/src/kernel/tqapplication.cpp @@ -725,7 +725,7 @@ void TQApplication::commitData( TQSessionManager& sm ) } else { w = list->next(); } - while ( w && done.tqcontainsRef( w ) ) + while ( w && done.containsRef( w ) ) w = list->next(); } delete list; @@ -954,14 +954,14 @@ TQPalette TQApplication::tqpalette( const TQWidget* w ) { } #ifndef TQT_NO_CURSOR -//void TQApplication::setOverrideCursor( const QCursor &cur, bool tqreplace=FALSE ) { -// TQ_UNUSED(tqreplace); +//void TQApplication::setOverrideCursor( const QCursor &cur, bool replace=FALSE ) { +// TQ_UNUSED(replace); // QApplication::setOverrideCursor( cur ); // } -void TQApplication::setOverrideCursor( const QCursor &cur, bool tqreplace ) { - TQ_UNUSED(tqreplace); - printf("[FIXME] TQApplication::setOverrideCursor( const QCursor &cur, bool tqreplace=FALSE ) unimplemented\n\r"); +void TQApplication::setOverrideCursor( const QCursor &cur, bool replace ) { + TQ_UNUSED(replace); + printf("[FIXME] TQApplication::setOverrideCursor( const QCursor &cur, bool replace=FALSE ) unimplemented\n\r"); } #endif @@ -1033,7 +1033,7 @@ void TQApplication::aboutTQt() \ingroup application \mainclass - It tqcontains the main event loop, where all events from the window + It contains the main event loop, where all events from the window system and other sources are processed and dispatched. It also handles the application's initialization and finalization, and provides session management. It also handles most system-wide and @@ -1095,7 +1095,7 @@ void TQApplication::aboutTQt() \endlist The <a href="simple-application.html">Application walk-through - example</a> tqcontains a typical complete main() that does the usual + example</a> contains a typical complete main() that does the usual things with TQApplication. Since the TQApplication object does so much initialization, it @@ -1554,7 +1554,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) TQCString s; if ( arg == "-qdevel" || arg == "-qdebug") { // obsolete argument - } else if ( arg.tqfind( "-style=", 0, FALSE ) != -1 ) { + } else if ( arg.find( "-style=", 0, FALSE ) != -1 ) { s = arg.right( arg.length() - 7 ); } else if ( qstrcmp(arg,"-style") == 0 && i < argc-1 ) { s = argv[++i]; @@ -1564,7 +1564,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) TQCString s = argv[++i]; if ( !s.isEmpty() ) { session_id = TQString::tqfromLatin1( s ); - int p = session_id.tqfind( '_' ); + int p = session_id.find( '_' ); if ( p >= 0 ) { if ( !session_key ) session_key = new TQString; @@ -1613,7 +1613,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv ) Note that \a argc and \a argv might be changed. TQt removes command line arguments that it recognizes. The modified \a argc and \a argv can also be accessed later with \c tqApp->argc() and \c tqApp->argv(). - The documentation for argv() tqcontains a detailed description of how + The documentation for argv() contains a detailed description of how to process command line arguments. TQt debugging options (not available if TQt was compiled with the @@ -2132,7 +2132,7 @@ TQApplication::~TQApplication() \endcode If you run \c{showargs -display unix:0 -font 9x15bold hello world} - under X11, the list box tqcontains the three strings "showargs", + under X11, the list box contains the three strings "showargs", "hello" and "world". TQt provides a global pointer, \c tqApp, that points to the @@ -2519,7 +2519,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 ) linkTarget = fileInfo.readLink(); break; } - } while ( (slashPos = part.tqfindRev('/')) != -1 ); + } while ( (slashPos = part.findRev('/')) != -1 ); if ( foundLink ) { TQString path2; @@ -2529,7 +2529,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 ) path2 += "/" + path.right( path.length() - slashPos - 1 ); } else { TQString relPath; - relPath = part.left( part.tqfindRev('/') + 1 ) + linkTarget; + relPath = part.left( part.findRev('/') + 1 ) + linkTarget; if ( slashPos < (int) path.length() ) { if ( !linkTarget.endsWith( "/" ) ) relPath += "/"; @@ -2546,7 +2546,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 ) #endif // TQ_WS_WIN /*! - Returns the directory that tqcontains the application executable. + Returns the directory that contains the application executable. For example, if you have installed TQt in the \c{C:\Trolltech\TQt} directory, and you run the \c{demo} example, this function will @@ -2556,7 +2556,7 @@ static TQString resolveSymlinks( const TQString& path, int depth = 0 ) executable, which may be inside of an application bundle (if the application is bundled). - \warning On Unix, this function assumes that argv[0] tqcontains the file + \warning On Unix, this function assumes that argv[0] contains the file name of the executable (which it normally does). It also assumes that the current directory hasn't been changed by the application. @@ -2574,7 +2574,7 @@ TQString TQApplication::applicationDirPath() directory, and you run the \c{demo} example, this function will return "C:/Trolltech/TQt/examples/demo/demo.exe". - \warning On Unix, this function assumes that argv[0] tqcontains the file + \warning On Unix, this function assumes that argv[0] contains the file name of the executable (which it normally does). It also assumes that the current directory hasn't been changed by the application. @@ -2607,9 +2607,9 @@ TQString TQApplication::applicationFilePath() file path. */ absPath = argv0; - } else if ( argv0.tqfind('/') != -1 ) { + } else if ( argv0.find('/') != -1 ) { /* - If argv0 tqcontains one or more slashes, it is a file path + If argv0 contains one or more slashes, it is a file path relative to the current directory. */ absPath = TQDir::current().absFilePath( argv0 ); @@ -2675,7 +2675,7 @@ TQStringList TQApplication::libraryPaths() TQString installPathPlugins = TQString::fromLocal8Bit(qInstallPathPlugins()); if ( TQFile::exists(installPathPlugins) ) { #ifdef TQ_WS_WIN - installPathPlugins.tqreplace('\\', '/'); + installPathPlugins.replace('\\', '/'); #endif app_libpaths->append(installPathPlugins); } @@ -2686,11 +2686,11 @@ TQStringList TQApplication::libraryPaths() #ifdef TQ_WS_WIN else { app_location = TQString(tqAppFileName()); - app_location.tqreplace('\\', '/'); + app_location.replace('\\', '/'); } #endif if (!app_location.isEmpty()) { - app_location.truncate( app_location.tqfindRev( '/' ) ); + app_location.truncate( app_location.findRev( '/' ) ); if ( app_location != qInstallPathPlugins() && TQFile::exists( app_location ) ) app_libpaths->append( app_location ); } @@ -2731,7 +2731,7 @@ void TQApplication::addLibraryPath( const TQString &path ) // make sure that library paths is initialized libraryPaths(); - if ( !app_libpaths->tqcontains( path ) ) + if ( !app_libpaths->contains( path ) ) app_libpaths->prepend( path ); } @@ -2749,7 +2749,7 @@ void TQApplication::removeLibraryPath( const TQString &path ) // make sure that library paths is initialized libraryPaths(); - if ( app_libpaths->tqcontains( path ) ) + if ( app_libpaths->contains( path ) ) app_libpaths->remove( path ); } #endif //TQT_NO_COMPONENT @@ -2782,7 +2782,7 @@ TQPalette TQApplication::palette(const TQWidget* w) } if ( w && app_palettes ) { - TQPalette* wp = app_palettes->tqfind( w->className() ); + TQPalette* wp = app_palettes->find( w->className() ); if ( wp ) return *wp; TQAsciiDictIterator<TQPalette> it( *app_palettes ); @@ -2841,7 +2841,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets, TQ_CHECK_PTR( app_palettes ); app_palettes->setAutoDelete( TRUE ); } - oldpal = app_palettes->tqfind( className ); + oldpal = app_palettes->find( className ); app_palettes->insert( className, new TQPalette( pal ) ); } if ( informWidgets && is_app_running && !is_app_closing ) { @@ -2870,7 +2870,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets, TQFont TQApplication::font( const TQWidget *w ) { if ( w && app_fonts ) { - TQFont* wf = app_fonts->tqfind( w->className() ); + TQFont* wf = app_fonts->find( w->className() ); if ( wf ) return *wf; TQAsciiDictIterator<TQFont> it( *app_fonts ); @@ -4005,7 +4005,7 @@ TQString TQApplication::translate( const char * context, const char * sourceText TQString result; for ( it = translators->begin(); it != translators->end(); ++it ) { mf = *it; - result = mf->tqfindMessage( context, sourceText, comment ).translation(); + result = mf->findMessage( context, sourceText, comment ).translation(); if ( !result.isNull() ) return result; } @@ -4920,7 +4920,7 @@ void TQApplication::commitData( TQSessionManager& sm ) } else { w = list->next(); } - while ( w && done.tqcontainsRef( w ) ) + while ( w && done.containsRef( w ) ) w = list->next(); } delete list; @@ -5009,7 +5009,7 @@ void TQApplication::setStartDragDistance( int l ) For example, if the mouse position of the click is stored in \c startPos and the current position (e.g. in the mouse move event) is - \c currPos, you can tqfind out if a drag should be started with code + \c currPos, you can find out if a drag should be started with code like this: \code if ( ( startPos - currPos ).manhattanLength() > diff --git a/tqtinterface/qt4/src/kernel/tqapplication.h b/tqtinterface/qt4/src/kernel/tqapplication.h index e5e2ea9..1c16117 100644 --- a/tqtinterface/qt4/src/kernel/tqapplication.h +++ b/tqtinterface/qt4/src/kernel/tqapplication.h @@ -142,8 +142,8 @@ public: static void sendPostedEvents(); #ifndef TQT_NO_CURSOR -// static void setOverrideCursor( const QCursor &cur, bool tqreplace=FALSE ); - static void setOverrideCursor( const QCursor &cur, bool tqreplace=FALSE ); +// static void setOverrideCursor( const QCursor &cur, bool replace=FALSE ); + static void setOverrideCursor( const QCursor &cur, bool replace=FALSE ); #endif static void setReverseLayout(bool b); @@ -298,7 +298,7 @@ public: static void setColorSpec( int ); #ifndef TQT_NO_CURSOR static TQCursor *overrideCursor(); - static void setOverrideCursor( const TQCursor &, bool tqreplace=FALSE ); + static void setOverrideCursor( const TQCursor &, bool replace=FALSE ); static void restoreOverrideCursor(); #endif static bool hasGlobalMouseTracking(); @@ -518,8 +518,8 @@ private: void process_cmdline( int* argcptr, char ** argv ); bool internalNotify( TQObject *, TQEvent * ); #if defined(TQ_WS_TQWS) - static TQWidget *tqfindChildWidget( const TQWidget *p, const TQPoint &pos ); - static TQWidget *tqfindWidget( const TQObjectList&, const TQPoint &, bool rec ); + static TQWidget *findChildWidget( const TQWidget *p, const TQPoint &pos ); + static TQWidget *findWidget( const TQObjectList&, const TQPoint &, bool rec ); #endif #if defined(TQ_WS_MAC) diff --git a/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp b/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp index aaa9faf..64a2704 100644 --- a/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp @@ -513,12 +513,12 @@ void qt_deferred_map_take( TQWidget* w ) deferred_map_list->remove( w ); } } -bool qt_deferred_map_tqcontains( TQWidget* w ) +bool qt_deferred_map_contains( TQWidget* w ) { if (!deferred_map_list) return FALSE; else - return deferred_map_list->tqcontains( w ); + return deferred_map_list->contains( w ); } /***************************************************************************** @@ -902,7 +902,7 @@ void qt_get_net_virtual_roots() TQApplication::colorSpec() is TQApplication::ManyColor. */ -static Visual *tqfind_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols ) +static Visual *find_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols ) { XVisualInfo *vi, rvi; int best=0, n, i; @@ -1028,7 +1028,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, int resl = res.length(); while (l < resl) { - r = res.tqfind( '\n', l ); + r = res.find( '\n', l ); if ( r < 0 ) r = resl; while ( isspace((uchar) res[l]) ) @@ -1041,20 +1041,20 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, // OPTIMIZED, since we only want "*[fbgs].." TQCString item = res.mid( l, r - l ).simplifyWhiteSpace(); - int i = item.tqfind( ":" ); + int i = item.find( ":" ); key = item.left( i ).stripWhiteSpace().mid(1).lower(); value = item.right( item.length() - i - 1 ).stripWhiteSpace(); mine = TRUE; } else if ( res[l] == appName[0] || (appClass && res[l] == appClass[0]) ) { if (res.mid(l,apnl) == apn && (res[l+apnl] == '.' || res[l+apnl] == '*')) { TQCString item = res.mid( l, r - l ).simplifyWhiteSpace(); - int i = item.tqfind( ":" ); + int i = item.find( ":" ); key = item.left( i ).stripWhiteSpace().mid(apnl+1).lower(); value = item.right( item.length() - i - 1 ).stripWhiteSpace(); mine = TRUE; } else if (res.mid(l,apcl) == apc && (res[l+apcl] == '.' || res[l+apcl] == '*')) { TQCString item = res.mid( l, r - l ).simplifyWhiteSpace(); - int i = item.tqfind( ":" ); + int i = item.find( ":" ); key = item.left( i ).stripWhiteSpace().mid(apcl+1).lower(); value = item.right( item.length() - i - 1 ).stripWhiteSpace(); mine = TRUE; @@ -1063,7 +1063,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, if ( mine ) { if ( !font && key == "systemfont") - sysFont = value.left( value.tqfindRev(':') ).copy(); + sysFont = value.left( value.findRev(':') ).copy(); if ( !font && key == "font") resFont = value.copy(); else if ( !fg && key == "foreground" ) @@ -1175,13 +1175,13 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, if ( !resEF.isEmpty() ) { TQStringList effects = TQStringList::split(" ",resEF); - TQApplication::setEffectEnabled( Qt::UI_General, effects.tqcontains("general") ); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, effects.tqcontains("animatemenu") ); - TQApplication::setEffectEnabled( Qt::UI_FadeMenu, effects.tqcontains("fademenu") ); - TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, effects.tqcontains("animatecombo") ); - TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, effects.tqcontains("animatetooltip") ); - TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, effects.tqcontains("fadetooltip") ); - TQApplication::setEffectEnabled( Qt::UI_AnimateToolBox, effects.tqcontains("animatetoolbox") ); + TQApplication::setEffectEnabled( Qt::UI_General, effects.contains("general") ); + TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, effects.contains("animatemenu") ); + TQApplication::setEffectEnabled( Qt::UI_FadeMenu, effects.contains("fademenu") ); + TQApplication::setEffectEnabled( Qt::UI_AnimateCombo, effects.contains("animatecombo") ); + TQApplication::setEffectEnabled( Qt::UI_AnimateTooltip, effects.contains("animatetooltip") ); + TQApplication::setEffectEnabled( Qt::UI_FadeTooltip, effects.contains("fadetooltip") ); + TQApplication::setEffectEnabled( Qt::UI_AnimateToolBox, effects.contains("animatetoolbox") ); } } @@ -1551,7 +1551,7 @@ void qt_init_internal( int *argcptr, char **argv, int screen; TQString serverVendor( ServerVendor( QX11Info::display()) ); - if (serverVendor.tqcontains("XFree86") && VendorRelease(QX11Info::display()) < 40300000) + if (serverVendor.contains("XFree86") && VendorRelease(QX11Info::display()) < 40300000) qt_hebrew_keyboard_hack = TRUE; for ( screen = 0; screen < appScreenCount; ++screen ) { @@ -1590,10 +1590,10 @@ void qt_init_internal( int *argcptr, char **argv, if ( qt_visual_option == TrueColor || TQApplication::colorSpec() == TQApplication::ManyColor ) { - // tqfind custom visual + // find custom visual int d, c; - vis = tqfind_truecolor_visual( QX11Info::display(), screen, &d, &c ); + vis = find_truecolor_visual( QX11Info::display(), screen, &d, &c ); TQPaintDevice::x_appdepth_arr[ screen ] = d; TQPaintDevice::x_appcells_arr[ screen ] = c; @@ -1638,7 +1638,7 @@ void qt_init_internal( int *argcptr, char **argv, TQPaintDevice::x_appcolormap_arr[ screen ] = 0; - if ( ! serverVendor.tqcontains( "Hewlett-Packard" ) ) { + if ( ! serverVendor.contains( "Hewlett-Packard" ) ) { // on HPUX 10.20 local displays, the RGB_DEFAULT_MAP colormap // doesn't give us correct colors. Why this happens, I have // no clue, so we disable this for HPUX @@ -1831,7 +1831,7 @@ void qt_init_internal( int *argcptr, char **argv, // #endif // TQT_NO_XFTFREETYPE // look at the modifier mapping, and get the correct masks for alt/meta - // tqfind the alt/meta masks + // find the alt/meta masks XModifierKeymap *map = XGetModifierMapping(QX11Info::display()); if (map) { int i, maskIndex = 0, mapIndex = 0; @@ -2729,7 +2729,7 @@ void qt_enter_modal( TQWidget *widget ) TQApplication::sendEvent(widget->parentWidget(), &e); } - qt_dispatchEnterLeave( 0, TQWidget::tqfind((WId)curWin) ); + qt_dispatchEnterLeave( 0, TQWidget::find((WId)curWin) ); qt_modal_stack->insert( 0, widget ); app_do_modal = TRUE; curWin = 0; @@ -2745,7 +2745,7 @@ void qt_leave_modal( TQWidget *widget ) qt_modal_stack = 0; TQPoint p( TQCursor::pos() ); TQWidget* w = TQApplication::widgetAt( p.x(), p.y(), TRUE ); - qt_dispatchEnterLeave( w, TQWidget::tqfind( curWin ) ); // send synthetic enter event + qt_dispatchEnterLeave( w, TQWidget::find( curWin ) ); // send synthetic enter event curWin = w? w->winId() : 0; } } @@ -3094,12 +3094,12 @@ void qt_deferred_map_take( TQWidget* w ) deferred_map_list->remove( w ); } } -bool qt_deferred_map_tqcontains( TQWidget* w ) +bool qt_deferred_map_contains( TQWidget* w ) { if (!deferred_map_list) return FALSE; else - return deferred_map_list->tqcontains( w ); + return deferred_map_list->contains( w ); } @@ -3644,13 +3644,13 @@ bool TQApplication::x11_apply_settings() TQStringList effects = settings.readListEntry("/qt/GUIEffects"); - TQApplication::setEffectEnabled( TQt::UI_General, effects.tqcontains("general") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.tqcontains("animatemenu") ); - TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.tqcontains("fademenu") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.tqcontains("animatecombo") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.tqcontains("animatetooltip") ); - TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.tqcontains("fadetooltip") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.tqcontains("animatetoolbox") ); + TQApplication::setEffectEnabled( TQt::UI_General, effects.contains("general") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.contains("animatemenu") ); + TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.contains("fademenu") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.contains("animatecombo") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.contains("animatetooltip") ); + TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.contains("fadetooltip") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.contains("animatetoolbox") ); TQStringList fontsubs = settings.entryList("/qt/Font Substitutions"); @@ -3809,7 +3809,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, int resl = res.length(); while (l < resl) { - r = res.tqfind( '\n', l ); + r = res.find( '\n', l ); if ( r < 0 ) r = resl; while ( isspace((uchar) res[l]) ) @@ -3822,20 +3822,20 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, // OPTIMIZED, since we only want "*[fbgs].." TQCString item = res.mid( l, r - l ).simplifyWhiteSpace(); - int i = item.tqfind( ":" ); + int i = item.find( ":" ); key = item.left( i ).stripWhiteSpace().mid(1).lower(); value = item.right( item.length() - i - 1 ).stripWhiteSpace(); mine = TRUE; } else if ( res[l] == appName[0] || (appClass && res[l] == appClass[0]) ) { if (res.mid(l,apnl) == apn && (res[l+apnl] == '.' || res[l+apnl] == '*')) { TQCString item = res.mid( l, r - l ).simplifyWhiteSpace(); - int i = item.tqfind( ":" ); + int i = item.find( ":" ); key = item.left( i ).stripWhiteSpace().mid(apnl+1).lower(); value = item.right( item.length() - i - 1 ).stripWhiteSpace(); mine = TRUE; } else if (res.mid(l,apcl) == apc && (res[l+apcl] == '.' || res[l+apcl] == '*')) { TQCString item = res.mid( l, r - l ).simplifyWhiteSpace(); - int i = item.tqfind( ":" ); + int i = item.find( ":" ); key = item.left( i ).stripWhiteSpace().mid(apcl+1).lower(); value = item.right( item.length() - i - 1 ).stripWhiteSpace(); mine = TRUE; @@ -3844,7 +3844,7 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, if ( mine ) { if ( !font && key == "systemfont") - sysFont = value.left( value.tqfindRev(':') ).copy(); + sysFont = value.left( value.findRev(':') ).copy(); if ( !font && key == "font") resFont = value.copy(); else if ( !fg && key == "foreground" ) @@ -3955,13 +3955,13 @@ static void qt_set_x11_resources( const char* font = 0, const char* fg = 0, if ( !resEF.isEmpty() ) { TQStringList effects = TQStringList::split(" ",resEF); - TQApplication::setEffectEnabled( TQt::UI_General, effects.tqcontains("general") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.tqcontains("animatemenu") ); - TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.tqcontains("fademenu") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.tqcontains("animatecombo") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.tqcontains("animatetooltip") ); - TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.tqcontains("fadetooltip") ); - TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.tqcontains("animatetoolbox") ); + TQApplication::setEffectEnabled( TQt::UI_General, effects.contains("general") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, effects.contains("animatemenu") ); + TQApplication::setEffectEnabled( TQt::UI_FadeMenu, effects.contains("fademenu") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateCombo, effects.contains("animatecombo") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateTooltip, effects.contains("animatetooltip") ); + TQApplication::setEffectEnabled( TQt::UI_FadeTooltip, effects.contains("fadetooltip") ); + TQApplication::setEffectEnabled( TQt::UI_AnimateToolBox, effects.contains("animatetoolbox") ); } } @@ -4160,7 +4160,7 @@ static void qt_check_focus_model() TQApplication::colorSpec() is TQApplication::ManyColor. */ -static Visual *tqfind_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols ) +static Visual *find_truecolor_visual( Display *dpy, int scr, int *depth, int *ncols ) { XVisualInfo *vi, rvi; int best=0, n, i; @@ -4405,7 +4405,7 @@ void qt_init_internal( int *argcptr, char **argv, int screen; TQString serverVendor( ServerVendor( appDpy) ); - if (serverVendor.tqcontains("XFree86") && VendorRelease(appDpy) < 40300000) + if (serverVendor.contains("XFree86") && VendorRelease(appDpy) < 40300000) qt_hebrew_keyboard_hack = TRUE; for ( screen = 0; screen < appScreenCount; ++screen ) { @@ -4444,10 +4444,10 @@ void qt_init_internal( int *argcptr, char **argv, if ( qt_visual_option == TrueColor || TQApplication::colorSpec() == TQApplication::ManyColor ) { - // tqfind custom visual + // find custom visual int d, c; - vis = tqfind_truecolor_visual( appDpy, screen, &d, &c ); + vis = find_truecolor_visual( appDpy, screen, &d, &c ); TQPaintDevice::x_appdepth_arr[ screen ] = d; TQPaintDevice::x_appcells_arr[ screen ] = c; @@ -4492,7 +4492,7 @@ void qt_init_internal( int *argcptr, char **argv, TQPaintDevice::x_appcolormap_arr[ screen ] = 0; - if ( ! serverVendor.tqcontains( "Hewlett-Packard" ) ) { + if ( ! serverVendor.contains( "Hewlett-Packard" ) ) { // on HPUX 10.20 local displays, the RGB_DEFAULT_MAP colormap // doesn't give us correct colors. Why this happens, I have // no clue, so we disable this for HPUX @@ -4665,7 +4665,7 @@ void qt_init_internal( int *argcptr, char **argv, #endif // TQT_NO_XFTFREETYPE // look at the modifier mapping, and get the correct masks for alt/meta - // tqfind the alt/meta masks + // find the alt/meta masks XModifierKeymap *map = XGetModifierMapping(appDpy); if (map) { int i, maskIndex = 0, mapIndex = 0; @@ -5382,8 +5382,8 @@ static TQCursorList *cursorStack = 0; corresponding restoreOverrideCursor(), otherwise the stack will never be emptied. - If \a tqreplace is TRUE, the new cursor will tqreplace the last - override cursor (the stack keeps its depth). If \a tqreplace is + If \a replace is TRUE, the new cursor will replace the last + override cursor (the stack keeps its depth). If \a replace is FALSE, the new stack is pushed onto the top of the stack. Example: @@ -5396,7 +5396,7 @@ static TQCursorList *cursorStack = 0; \sa overrideCursor(), restoreOverrideCursor(), TQWidget::setCursor() */ -void TQApplication::setOverrideCursor( const TQCursor &cursor, bool tqreplace ) +void TQApplication::setOverrideCursor( const TQCursor &cursor, bool replace ) { if ( !cursorStack ) { cursorStack = new TQCursorList; @@ -5405,7 +5405,7 @@ void TQApplication::setOverrideCursor( const TQCursor &cursor, bool tqreplace ) } app_cursor = new TQCursor( cursor ); TQ_CHECK_PTR( app_cursor ); - if ( tqreplace ) + if ( replace ) cursorStack->removeLast(); cursorStack->append( app_cursor ); @@ -5522,10 +5522,10 @@ void TQApplication::setGlobalMouseTracking( bool enable ) /***************************************************************************** - Routines to tqfind a TQt widget from a screen position + Routines to find a TQt widget from a screen position *****************************************************************************/ -Window qt_x11_tqfindClientWindow( Window win, Atom property, bool leaf ) +Window qt_x11_findClientWindow( Window win, Atom property, bool leaf ) { Atom type = None; int format, i; @@ -5546,7 +5546,7 @@ Window qt_x11_tqfindClientWindow( Window win, Atom property, bool leaf ) return 0; } for ( i=ntqchildren-1; !target && i >= 0; i-- ) - target = qt_x11_tqfindClientWindow( tqchildren[i], property, leaf ); + target = qt_x11_findClientWindow( tqchildren[i], property, leaf ); if ( tqchildren ) XFree( (char *)tqchildren ); return target; @@ -5581,14 +5581,14 @@ TQWidget *TQApplication::widgetAt( int x, int y, bool child ) if ( !target || target == TQPaintDevice::x11AppRootWindow(screen) ) return 0; TQWidget *w, *c; - w = TQWidget::tqfind( (WId)target ); + w = TQWidget::find( (WId)target ); if ( !w ) { qt_ignore_badwindow(); - target = qt_x11_tqfindClientWindow( target, qt_wm_state, TRUE ); + target = qt_x11_findClientWindow( target, qt_wm_state, TRUE ); if (qt_badwindow() ) return 0; - w = TQWidget::tqfind( (WId)target ); + w = TQWidget::find( (WId)target ); #if 0 if ( !w ) { // Perhaps the widgets at (x,y) is inside a foreign application? @@ -5734,7 +5734,7 @@ void qPRCleanup( TQWidget *widget ) static TQETWidget *qPRFindWidget( Window oldwin ) { - return wPRmapper ? (TQETWidget*)wPRmapper->tqfind((long)oldwin) : 0; + return wPRmapper ? (TQETWidget*)wPRmapper->find((long)oldwin) : 0; } /*! @@ -5854,7 +5854,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) break; } - TQETWidget *widget = (TQETWidget*)TQWidget::tqfind( (WId)event->xany.window ); + TQETWidget *widget = (TQETWidget*)TQWidget::find( (WId)event->xany.window ); if ( wPRmapper ) { // just did a widget reparent? if ( widget == 0 ) { // not in std widget mapper @@ -6165,7 +6165,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) if ( qt_focus_model == FocusModel_PointerRoot ) // PointerRoot mode setActiveWindow( widget ); } - qt_dispatchEnterLeave( widget, TQWidget::tqfind( curWin ) ); + qt_dispatchEnterLeave( widget, TQWidget::find( curWin ) ); curWin = widget->winId(); widget->translateMouseEvent( event ); //we don't get MotionNotify, emulate it } @@ -6185,7 +6185,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) XEvent ev; while ( XCheckMaskEvent( widget->x11Display(), EnterWindowMask | LeaveWindowMask , &ev ) && !qt_x11EventFilter( &ev )) { - TQWidget* event_widget = TQWidget::tqfind( ev.xcrossing.window ); + TQWidget* event_widget = TQWidget::find( ev.xcrossing.window ); if( event_widget && event_widget->x11Event( &ev ) ) break; if ( ev.type == LeaveNotify && ev.xcrossing.mode == NotifyNormal ){ @@ -6254,7 +6254,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) if ( event->xreparent.tqparent == TQPaintDevice::x11AppRootWindow() ) { if ( widget->isTopLevel() ) { widget->topData()->parentWinId = event->xreparent.tqparent; - if ( qt_deferred_map_tqcontains( widget ) ) { + if ( qt_deferred_map_contains( widget ) ) { qt_deferred_map_take( widget ); XMapWindow( appDpy, widget->winId() ); } @@ -6269,7 +6269,7 @@ int TQApplication::x11ProcessEvent( XEvent* event ) if ( qt_focus_model != FocusModel_Unknown ) { // toplevel reparented... - TQWidget *newtqparent = TQWidget::tqfind( event->xreparent.tqparent ); + TQWidget *newtqparent = TQWidget::find( event->xreparent.tqparent ); if ( ! newtqparent || newtqparent->isDesktop() ) { // we dont' know about the new tqparent (or we've been // reparented to root), perhaps a window manager @@ -6380,7 +6380,7 @@ void qt_enter_modal( TQWidget *widget ) TQApplication::sendEvent(widget->parentWidget(), &e); } - qt_dispatchEnterLeave( 0, TQWidget::tqfind((WId)curWin) ); + qt_dispatchEnterLeave( 0, TQWidget::find((WId)curWin) ); qt_modal_stack->insert( 0, widget ); app_do_modal = TRUE; curWin = 0; @@ -6396,7 +6396,7 @@ void qt_leave_modal( TQWidget *widget ) qt_modal_stack = 0; TQPoint p( TQCursor::pos() ); TQWidget* w = TQApplication::widgetAt( p.x(), p.y(), TRUE ); - qt_dispatchEnterLeave( w, TQWidget::tqfind( curWin ) ); // send synthetic enter event + qt_dispatchEnterLeave( w, TQWidget::find( curWin ) ); // send synthetic enter event curWin = w? w->winId() : 0; } } @@ -6518,7 +6518,7 @@ void TQApplication::closePopup( TQWidget *popup ) popupWidgets = 0; if ( !qt_nograb() && popupGrabOk ) { // grabbing not disabled if ( mouseButtonState != 0 - || popup->tqgeometry(). tqcontains(TQPoint(mouseGlobalXPos, mouseGlobalYPos) ) ) + || popup->tqgeometry(). contains(TQPoint(mouseGlobalXPos, mouseGlobalYPos) ) ) { // mouse release event or inside XAllowEvents( popup->x11Display(), AsyncPointer, CurrentTime ); @@ -6794,7 +6794,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) if ( tqApp->inPopupMode() ) { // in popup mode TQWidget *popup = tqApp->activePopupWidget(); if ( popup != this ) { - if ( testWFlags(WType_Popup) && rect().tqcontains(pos) ) + if ( testWFlags(WType_Popup) && rect().contains(pos) ) popup = this; else // send to last popup pos = popup->mapFromGlobal( globalPos ); @@ -6866,7 +6866,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event ) XAllowEvents( dpy, SyncPointer, CurrentTime ); } else { if ( type != TQEvent::MouseButtonRelease && state != 0 && - TQWidget::tqfind((WId)mouseActWindow) ) { + TQWidget::find((WId)mouseActWindow) ) { manualGrab = TRUE; // need to manually grab XGrabPointer( dpy, mouseActWindow, False, (uint)(ButtonPressMask | ButtonReleaseMask | @@ -7214,7 +7214,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event) topData()->parentWinId = 0; // map the window if we were waiting for a transition to // withdrawn - if ( qt_deferred_map_tqcontains( this ) ) { + if ( qt_deferred_map_contains( this ) ) { qt_deferred_map_take( this ); XMapWindow( appDpy, winId() ); } @@ -7243,7 +7243,7 @@ bool TQETWidget::translatePropertyEvent(const XEvent *event) topData()->parentWinId = 0; // map the window if we were waiting for a // transition to withdrawn - if ( qt_deferred_map_tqcontains( this ) ) { + if ( qt_deferred_map_contains( this ) ) { qt_deferred_map_take( this ); XMapWindow( appDpy, winId() ); } @@ -7765,7 +7765,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, qt_ximComposingKeycode = 0; } if ( key ) - keyDict->tqreplace( keycode, (void*)key ); + keyDict->replace( keycode, (void*)key ); // all keysyms smaller than that are actally keys that can be mapped // to tqunicode chars if ( count == 0 && key < 0xff00 ) { @@ -7820,15 +7820,15 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count, ascii = chars[0]; // +256 so we can store all eight-bit codes, including ascii 0, // and independent of whether char is signed or not. - textDict->tqreplace( keycode, (void*)(long)(256+ascii) ); + textDict->replace( keycode, (void*)(long)(256+ascii) ); } tlw = 0; } else { - key = (int)(long)keyDict->tqfind( keycode ); + key = (int)(long)keyDict->find( keycode ); if ( key ) if( !willRepeat && statefulTranslation ) // Take out key of dictionary only if this call. keyDict->take( keycode ); - long s = (long)textDict->tqfind( keycode ); + long s = (long)textDict->find( keycode ); if ( s ) { if( statefulTranslation ) textDict->take( keycode ); diff --git a/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp b/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp index 508002f..8c6ba74 100644 --- a/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp +++ b/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp @@ -452,7 +452,7 @@ TQImageFormatType* TQImageDecoder::format( const char* name ) } /*! - Call this function to tqfind the name of the format of the given + Call this function to find the name of the format of the given header. The returned string is statically allocated. The function will look at the first \a length characters in the \a buffer. @@ -506,7 +506,7 @@ TQStrList TQImageDecoder::inputFormats() f; f = TQImageDecoderPrivate::factories->next()) { - if ( !result.tqcontains( f->formatName() ) ) { + if ( !result.contains( f->formatName() ) ) { result.inSort( f->formatName() ); } } diff --git a/tqtinterface/qt4/src/kernel/tqclipboard.cpp b/tqtinterface/qt4/src/kernel/tqclipboard.cpp index 9c7a318..4c2b341 100644 --- a/tqtinterface/qt4/src/kernel/tqclipboard.cpp +++ b/tqtinterface/qt4/src/kernel/tqclipboard.cpp @@ -257,7 +257,7 @@ void TQClipboard::setData(QMimeSource *source, Mode mode) // Copy text from the clipboard (paste) TQString text = cb->text(TQClipboard::Clipboard); if ( !text.isNull() ) - qDebug( "The clipboard tqcontains: " + text ); + qDebug( "The clipboard contains: " + text ); // Copy text into the clipboard cb->setText( "This text can be pasted by other programs", @@ -507,7 +507,7 @@ void TQClipboard::setText( const TQString &text ) /*! Returns the clipboard image, or returns a null image if the - clipboard does not contain an image or if it tqcontains an image in + clipboard does not contain an image or if it contains an image in an unsupported image format. The \a mode argument is used to control which part of the system diff --git a/tqtinterface/qt4/src/kernel/tqclipboard_x11.cpp b/tqtinterface/qt4/src/kernel/tqclipboard_x11.cpp index 9fd90e4..b1f76c0 100644 --- a/tqtinterface/qt4/src/kernel/tqclipboard_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqclipboard_x11.cpp @@ -668,7 +668,7 @@ static int incr_timer_id = 0; static int qt_xclb_transation_event_handler(XEvent *event) { - TransactionMap::Iterator it = transactions->tqfind(event->xany.window); + TransactionMap::Iterator it = transactions->find(event->xany.window); if (it != transactions->end()) { if ((*it)->x11Event(event) != 0) return 1; diff --git a/tqtinterface/qt4/src/kernel/tqcolor.cpp b/tqtinterface/qt4/src/kernel/tqcolor.cpp index f245773..f6fcce6 100644 --- a/tqtinterface/qt4/src/kernel/tqcolor.cpp +++ b/tqtinterface/qt4/src/kernel/tqcolor.cpp @@ -761,7 +761,7 @@ void TQColor::hsv( int *h, int *s, int *v ) const max = b; whatmax = 2; } - uint min = r; // tqfind minimum value + uint min = r; // find minimum value if ( (uint)g < min ) min = g; if ( (uint)b < min ) min = b; int delta = max-min; diff --git a/tqtinterface/qt4/src/kernel/tqcolor_x11.cpp b/tqtinterface/qt4/src/kernel/tqcolor_x11.cpp index 909ecbb..ed3a764 100644 --- a/tqtinterface/qt4/src/kernel/tqcolor_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqcolor_x11.cpp @@ -306,7 +306,7 @@ int TQColor::numBitPlanes() Finds the nearest color. */ -static int tqfind_nearest_color( int r, int g, int b, int* mindist_out, +static int find_nearest_color( int r, int g, int b, int* mindist_out, TQColorScreenData *sd ) { int mincol = -1; @@ -356,7 +356,7 @@ uint TQColor::alloc( int screen ) d.d32.pix = pix; return pix; } - TQColorData *c = sd->colorDict->tqfind( (long)(d.argb) ); + TQColorData *c = sd->colorDict->find( (long)(d.argb) ); if ( c ) { // found color in dictionary pix = c->pix; if ( screen == TQPaintDevice::x11AppScreen() ) { @@ -382,7 +382,7 @@ uint TQColor::alloc( int screen ) do { // This loop is run until we manage to either allocate or - // tqfind an approximate color, it stops after a few iterations. + // find an approximate color, it stops after a few iterations. try_again = FALSE; @@ -408,7 +408,7 @@ uint TQColor::alloc( int screen ) sd->g_cells ); } int mindist; - i = tqfind_nearest_color( r, g, b, &mindist, sd ); + i = find_nearest_color( r, g, b, &mindist, sd ); if ( mindist != 0 && !try_alloc ) { // Not an exact match with an existing color @@ -550,7 +550,7 @@ uint TQColor::alloc() /***************************************************************************** The color dictionary speeds up color allocation significantly for X11. When there are no more colors, TQColor::alloc() will set the colors_avail - flag to FALSE and try to tqfind the nearest color. + flag to FALSE and try to find the nearest color. NOTE: From deep within the event loop, the colors_avail flag is reset to TRUE (calls the function qt_reset_color_avail()), because some other application might free its colors, thereby making them available for @@ -627,7 +627,7 @@ void qt_reset_color_avail() Finds the nearest color. */ -static int tqfind_nearest_color( int r, int g, int b, int* mindist_out, +static int find_nearest_color( int r, int g, int b, int* mindist_out, TQColorScreenData *sd ) { int mincol = -1; @@ -910,7 +910,7 @@ uint TQColor::alloc( int screen ) d.d32.pix = pix; return pix; } - TQColorData *c = sd->colorDict->tqfind( (long)(d.argb) ); + TQColorData *c = sd->colorDict->find( (long)(d.argb) ); if ( c ) { // found color in dictionary pix = c->pix; if ( screen == TQPaintDevice::x11AppScreen() ) { @@ -936,7 +936,7 @@ uint TQColor::alloc( int screen ) do { // This loop is run until we manage to either allocate or - // tqfind an approximate color, it stops after a few iterations. + // find an approximate color, it stops after a few iterations. try_again = FALSE; @@ -962,7 +962,7 @@ uint TQColor::alloc( int screen ) sd->g_cells ); } int mindist; - i = tqfind_nearest_color( r, g, b, &mindist, sd ); + i = find_nearest_color( r, g, b, &mindist, sd ); if ( mindist != 0 && !try_alloc ) { // Not an exact match with an existing color diff --git a/tqtinterface/qt4/src/kernel/tqcursor.h b/tqtinterface/qt4/src/kernel/tqcursor.h index 9aa6437..1c1d4c1 100644 --- a/tqtinterface/qt4/src/kernel/tqcursor.h +++ b/tqtinterface/qt4/src/kernel/tqcursor.h @@ -148,7 +148,7 @@ private: int hotX, int hotY ); void update() const; TQCursorData *data; - TQCursor *tqfind_cur(int); + TQCursor *find_cur(int); #if defined(TQ_WS_MAC) friend void qt_mac_set_cursor(const TQCursor *c, const Point *p); #endif diff --git a/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp b/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp index 36f2504..aac3336 100644 --- a/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp @@ -302,7 +302,7 @@ TQT_STATIC_CONST_IMPL TQCursor & TQt::whatsThisCursor = cursorTable[15]; TQT_STATIC_CONST_IMPL TQCursor & TQt::busyCursor = cursorTable[16]; -TQCursor *TQCursor::tqfind_cur( int tqshape ) // tqfind predefined cursor +TQCursor *TQCursor::find_cur( int tqshape ) // find predefined cursor { return (uint)tqshape <= LastCursor ? &cursorTable[tqshape] : 0; } @@ -379,7 +379,7 @@ TQCursor::TQCursor( int tqshape ) { if ( !initialized ) initialize(); - TQCursor *c = tqfind_cur( tqshape ); + TQCursor *c = find_cur( tqshape ); if ( !c ) // not found c = &cursorTable[arrowCursorIdx]; // then use arrowCursor c->data->ref(); @@ -504,7 +504,7 @@ void TQCursor::setShape( int tqshape ) { if ( !initialized ) initialize(); - TQCursor *c = tqfind_cur( tqshape ); // tqfind one of the global ones + TQCursor *c = find_cur( tqshape ); // find one of the global ones if ( !c ) // not found c = &cursorTable[arrowCursorIdx]; // then use arrowCursor c->data->ref(); diff --git a/tqtinterface/qt4/src/kernel/tqdesktopwidget_x11.cpp b/tqtinterface/qt4/src/kernel/tqdesktopwidget_x11.cpp index 84da179..8235e81 100644 --- a/tqtinterface/qt4/src/kernel/tqdesktopwidget_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqdesktopwidget_x11.cpp @@ -345,7 +345,7 @@ int TQDesktopWidget::screenNumber( TQWidget *widget ) const int TQDesktopWidget::screenNumber( const TQPoint &point ) const { for ( int i = 0; i < d->screenCount; ++i ) { - if ( d->rects[i].tqcontains( point ) ) + if ( d->rects[i].contains( point ) ) return i; } return -1; diff --git a/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp b/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp index 56d00d4..471df70 100644 --- a/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp @@ -81,7 +81,7 @@ extern void qt_leave_modal( TQWidget *widget ); } #endif -extern Window qt_x11_tqfindClientWindow( Window, Atom, bool ); +extern Window qt_x11_findClientWindow( Window, Atom, bool ); extern Atom qt_wm_state; // this stuff is copied from qclb_x11.cpp @@ -404,7 +404,7 @@ const char* qt_xdnd_atom_to_str( Atom a ) qt_xdnd_drag_types->setAutoDelete( TRUE ); } TQCString* result; - if ( !(result=qt_xdnd_drag_types->tqfind( a )) ) { + if ( !(result=qt_xdnd_drag_types->find( a )) ) { const char* mimeType = XGetAtomName( TQPaintDevice::x11AppDisplay(), a ); if ( !mimeType ) return 0; // only happens on protocol error @@ -425,7 +425,7 @@ Atom* qt_xdnd_str_to_atom( const char *mimeType ) } Atom * result; - if ( (result = qt_xdnd_atom_numbers->tqfind( mimeType )) ) + if ( (result = qt_xdnd_atom_numbers->find( mimeType )) ) return result; result = new Atom; @@ -489,7 +489,7 @@ void qt_xdnd_cleanup() } -static TQWidget * tqfind_child( TQWidget * tlw, TQPoint & p ) +static TQWidget * find_child( TQWidget * tlw, TQPoint & p ) { TQWidget * w = tlw; @@ -608,7 +608,7 @@ void qt_handle_xdnd_position( TQWidget *w, const XEvent * xe, bool passive ) const unsigned long *l = (const unsigned long *)xe->xclient.data.l; TQPoint p( (l[2] & 0xffff0000) >> 16, l[2] & 0x0000ffff ); - TQWidget * c = tqfind_child( w, p ); // changes p to to c-local coordinates + TQWidget * c = find_child( w, p ); // changes p to to c-local coordinates if (!passive && checkEmbedded(c, xe)) return; @@ -728,7 +728,7 @@ void qt_handle_xdnd_position( TQWidget *w, const XEvent * xe, bool passive ) // reset qt_xdnd_target_current_time = CurrentTime; - TQWidget * source = TQWidget::tqfind( qt_xdnd_dragsource_xid ); + TQWidget * source = TQWidget::find( qt_xdnd_dragsource_xid ); if ( source && source->isDesktop() && !source->acceptDrops() ) source = 0; @@ -811,7 +811,7 @@ void qt_xdnd_send_leave() leave.data.l[3] = 0; // w, h leave.data.l[4] = 0; // just null - TQWidget * w = TQWidget::tqfind( qt_xdnd_current_proxy_target ); + TQWidget * w = TQWidget::find( qt_xdnd_current_proxy_target ); if ( w && w->isDesktop() && !w->acceptDrops() ) w = 0; @@ -1164,7 +1164,7 @@ void TQDragManager::cancel( bool deleteSource ) } static -Window tqfindRealWindow( const TQPoint & pos, Window w, int md ) +Window findRealWindow( const TQPoint & pos, Window w, int md ) { if ( qt_xdnd_deco && w == qt_xdnd_deco->winId() ) return 0; @@ -1198,14 +1198,14 @@ Window tqfindRealWindow( const TQPoint & pos, Window w, int md ) if ( XQueryTree( TQPaintDevice::x11AppDisplay(), w, &r, &p, &c, &nc ) ) { r=0; for (uint i=nc; !r && i--; ) { - r = tqfindRealWindow( pos-TQPoint(attr.x,attr.y), + r = findRealWindow( pos-TQPoint(attr.x,attr.y), c[i], md-1 ); } XFree(c); if ( r ) return r; - // We didn't tqfind a client window! Just use the + // We didn't find a client window! Just use the // innermost window. } @@ -1282,7 +1282,7 @@ void TQDragManager::move( const TQPoint & globalPos ) if (type) break; - // tqfind child at the coordinates + // find child at the coordinates if (!XTranslateCoordinates( TQPaintDevice::x11AppDisplay(), src, src, lx, ly, &lx2, &ly2, &target)) { target = 0; @@ -1290,13 +1290,13 @@ void TQDragManager::move( const TQPoint & globalPos ) } } if ( qt_xdnd_deco && (!target || target == qt_xdnd_deco->winId()) ) { - target = tqfindRealWindow(globalPos,rootwin,6); + target = findRealWindow(globalPos,rootwin,6); } } TQWidget* w; if ( target ) { - w = TQWidget::tqfind( (WId)target ); + w = TQWidget::find( (WId)target ); if ( w && w->isDesktop() && !w->acceptDrops() ) w = 0; } else { @@ -1442,7 +1442,7 @@ void TQDragManager::drop() drop.data.l[3] = 0; drop.data.l[4] = 0; - TQWidget * w = TQWidget::tqfind( qt_xdnd_current_proxy_target ); + TQWidget * w = TQWidget::find( qt_xdnd_current_proxy_target ); if ( w && w->isDesktop() && !w->acceptDrops() ) w = 0; @@ -1567,7 +1567,7 @@ static TQByteArray qt_xdnd_obtain_data( const char *format ) TQWidget* w; if ( qt_xdnd_dragsource_xid && qt_xdnd_source_object && - (w=TQWidget::tqfind( qt_xdnd_dragsource_xid )) + (w=TQWidget::find( qt_xdnd_dragsource_xid )) && (!w->isDesktop() || w->acceptDrops()) ) { TQDragObject * o = qt_xdnd_source_object; @@ -1583,8 +1583,8 @@ static TQByteArray qt_xdnd_obtain_data( const char *format ) if ( !qt_xdnd_target_data ) qt_xdnd_target_data = new TQIntDict<TQByteArray>( 17 ); - if ( qt_xdnd_target_data->tqfind( (int)*a ) ) { - result = *(qt_xdnd_target_data->tqfind( (int)*a )); + if ( qt_xdnd_target_data->find( (int)*a ) ) { + result = *(qt_xdnd_target_data->find( (int)*a )); } else { if ( XGetSelectionOwner( TQPaintDevice::x11AppDisplay(), qt_xdnd_selection ) == None ) diff --git a/tqtinterface/qt4/src/kernel/tqdragobject.cpp b/tqtinterface/qt4/src/kernel/tqdragobject.cpp index 5a4d2fe..579eab8 100644 --- a/tqtinterface/qt4/src/kernel/tqdragobject.cpp +++ b/tqtinterface/qt4/src/kernel/tqdragobject.cpp @@ -2034,7 +2034,7 @@ TQPixmap *TQDragObject::cursor( DragMode m ) const copy of the dragged data (but see target()); otherwise returns FALSE. - If the drag tqcontains \e references to information (e.g. file names + If the drag contains \e references to information (e.g. file names in a TQUriDrag are references) then the return value should always be ignored, as the target is expected to manipulate the referred-to content directly. On X11 the return value should @@ -2174,7 +2174,7 @@ static void stripws(TQCString& s) { int f; - while ( (f=s.tqfind(' ')) >= 0 ) + while ( (f=s.find(' ')) >= 0 ) s.remove(f,1); } @@ -2324,13 +2324,13 @@ const char * TQTextDrag::format(int i) const return d->fmt[i]; } -TQTextCodec* qt_tqfindcharset(const TQCString& mimetype) +TQTextCodec* qt_findcharset(const TQCString& mimetype) { - int i=mimetype.tqfind("charset="); + int i=mimetype.find("charset="); if ( i >= 0 ) { TQCString cs = mimetype.mid(i+8); stripws(cs); - i = cs.tqfind(';'); + i = cs.find(';'); if ( i >= 0 ) cs = cs.left(i); // win98 often has charset=utf16, and we need to get the correct codec for @@ -2361,13 +2361,13 @@ static TQTextCodec *codecForHTML(const TQCString &ba) mib = 106; // utf-8 } else { pos = 0; - while ((pos = ba.tqfind("<meta http-equiv=", pos, FALSE)) != -1) { - int end = ba.tqfind('>', pos+1); + while ((pos = ba.find("<meta http-equiv=", pos, FALSE)) != -1) { + int end = ba.find('>', pos+1); if (end == -1) break; - pos = ba.tqfind("charset=", pos, FALSE) + (int)strlen("charset="); + pos = ba.find("charset=", pos, FALSE) + (int)strlen("charset="); if (pos != -1 && pos < end) { - int pos2 = ba.tqfind('\"', pos+1); + int pos2 = ba.find('\"', pos+1); TQCString cs = ba.mid(pos, pos2-pos); c = TQTextCodec::codecForName(cs); if (c) @@ -2383,7 +2383,7 @@ static TQTextCodec *codecForHTML(const TQCString &ba) } static -TQTextCodec* tqfindcodec(const TQMimeSource* e) +TQTextCodec* findcodec(const TQMimeSource* e) { TQTextCodec* r = 0; const char* f; @@ -2393,7 +2393,7 @@ TQTextCodec* tqfindcodec(const TQMimeSource* e) if (html) r = codecForHTML(TQCString(e->tqencodedData(f))); if (!r) - r = qt_tqfindcharset(TQCString(f).lower()); + r = qt_findcharset(TQCString(f).lower()); if (r) return r; } @@ -2411,15 +2411,15 @@ TQByteArray TQTextDrag::tqencodedData(const char* mime) const if ( 0==qstrnicmp(mime,"text/",5) ) { TQCString m(mime); m = m.lower(); - TQTextCodec *codec = qt_tqfindcharset(m); + TQTextCodec *codec = qt_findcharset(m); if ( !codec ) return r; TQString text( d->txt ); #if defined(TQ_WS_WIN) - int index = text.tqfind( TQString::tqfromLatin1("\r\n"), 0 ); + int index = text.find( TQString::tqfromLatin1("\r\n"), 0 ); while ( index != -1 ) { - text.tqreplace( index, 2, TQChar('\n') ); - index = text.tqfind( "\r\n", index ); + text.replace( index, 2, TQChar('\n') ); + index = text.find( "\r\n", index ); } #endif r = codec->fromUnicode(text); @@ -2448,7 +2448,7 @@ bool TQTextDrag::canDecode( const TQMimeSource* e ) const char* f; for (int i=0; (f=e->format(i)); i++) { if ( 0==qstrnicmp(f,"text/",5) ) { - return tqfindcodec(e) != 0; + return findcodec(e) != 0; } } return 0; @@ -2490,7 +2490,7 @@ bool TQTextDrag::decode( const TQMimeSource* e, TQString& str, TQCString& subtyp if ( 0==qstrnicmp(mime,"text/",5) ) { TQCString m(mime); m = m.lower(); - int semi = m.tqfind(';'); + int semi = m.find(';'); if ( semi < 0 ) semi = m.length(); TQCString foundst = m.mid(5,semi-5); @@ -2503,7 +2503,7 @@ bool TQTextDrag::decode( const TQMimeSource* e, TQString& str, TQCString& subtyp codec = codecForHTML(TQCString(bytes.data(), bytes.size())); } if (!codec) - codec = qt_tqfindcharset(m); + codec = qt_findcharset(m); if ( codec ) { TQByteArray payload; @@ -2847,7 +2847,7 @@ void TQStoredDrag::setEncodedData( const TQByteArray & tqencodedData ) } /*! - Returns the stored data. \a m tqcontains the data's format. + Returns the stored data. \a m contains the data's format. \sa setEncodedData() */ @@ -3095,7 +3095,7 @@ TQCString TQUriDrag::localFileToUri(const TQString& filename) // Slosh -> Slash int slosh; - while ( (slosh=r.tqfind('\\')) >= 0 ) { + while ( (slosh=r.find('\\')) >= 0 ) { r[slosh] = '/'; } @@ -3165,7 +3165,7 @@ TQString TQUriDrag::uriToLocalFile(const char* uri) return file; if (0==qstrnicmp(uri,"file:/",6)) // It is a local file uri uri += 6; - else if (TQString(uri).tqfind(":/") != -1) // It is a different scheme uri + else if (TQString(uri).find(":/") != -1) // It is a different scheme uri return file; bool local = uri[0] != '/' || ( uri[0] != '\0' && uri[1] == '/' ); diff --git a/tqtinterface/qt4/src/kernel/tqdrawutil.cpp b/tqtinterface/qt4/src/kernel/tqdrawutil.cpp index 6ce07d5..07e2bb4 100644 --- a/tqtinterface/qt4/src/kernel/tqdrawutil.cpp +++ b/tqtinterface/qt4/src/kernel/tqdrawutil.cpp @@ -633,7 +633,7 @@ void qDrawItem( TQPainter *p, TQt::GUIStyle gs, } else { // color pixmap, no tqmask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::tqfind(k); + TQPixmap *tqmask = TQPixmapCache::find(k); bool del=FALSE; if ( !tqmask ) { tqmask = new TQPixmap( pm.createHeuristicMask() ); diff --git a/tqtinterface/qt4/src/kernel/tqevent.cpp b/tqtinterface/qt4/src/kernel/tqevent.cpp index 59a6ca7..6b9f90b 100644 --- a/tqtinterface/qt4/src/kernel/tqevent.cpp +++ b/tqtinterface/qt4/src/kernel/tqevent.cpp @@ -100,7 +100,7 @@ TQt::ButtonState TQContextMenuEvent::state() const { TQt-defined events types, the value should be at least as large as the value of the "User" entry in the TQEvent::Type enum. - TQCustomEvent tqcontains a generic void* data member that may be used + TQCustomEvent contains a generic void* data member that may be used for transferring event-specific data to the receiver. Note that since events are normally delivered asynchronously, the data pointer, if used, must remain valid until the event has been @@ -207,7 +207,7 @@ TQCustomEvent::TQCustomEvent( int type ) TQWidget::mouseMoveEvent(). TQObject::installEventFilter() allows an object to intercept events destined for another object. - The basic TQEvent tqcontains only an event type parameter. + The basic TQEvent contains only an event type parameter. Subclasses of TQEvent contain additional parameters that describe the particular event. @@ -350,7 +350,7 @@ TQCustomEvent::TQCustomEvent( int type ) /*! \class TQTimerEvent tqevent.h - \brief The TQTimerEvent class tqcontains parameters that describe a + \brief The TQTimerEvent class contains parameters that describe a timer event. \ingroup events @@ -387,7 +387,7 @@ TQCustomEvent::TQCustomEvent( int type ) \class TQMouseEvent tqevent.h \ingroup events - \brief The TQMouseEvent class tqcontains parameters that describe a mouse event. + \brief The TQMouseEvent class contains parameters that describe a mouse event. Mouse events occur when a mouse button is pressed or released inside a widget or when the mouse cursor is moved. @@ -400,7 +400,7 @@ TQCustomEvent::TQCustomEvent( int type ) inside a widget; the widget will continue to receive mouse events until the last mouse button is released. - A mouse event tqcontains a special accept flag that indicates + A mouse event contains a special accept flag that indicates whether the receiver wants the event. You should call TQMouseEvent::ignore() if the mouse event is not handled by your widget. A mouse event is propagated up the tqparent widget chain @@ -620,7 +620,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const /*! \class TQWheelEvent tqevent.h - \brief The TQWheelEvent class tqcontains parameters that describe a wheel event. + \brief The TQWheelEvent class contains parameters that describe a wheel event. \ingroup events @@ -629,7 +629,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const distance is provided by delta(). The functions pos() and globalPos() return the mouse pointer location at the time of the event. - A wheel event tqcontains a special accept flag that indicates + A wheel event contains a special accept flag that indicates whether the receiver wants the event. You should call TQWheelEvent::accept() if you handle the wheel event; otherwise it will be sent to the tqparent widget. @@ -656,7 +656,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const The globalPos() is initialized to TQCursor::pos(), i.e. \a pos, which is usually (but not always) right. Use the other constructor if you need to specify the global position explicitly. \a delta - tqcontains the rotation distance, \a state holds the keyboard + contains the rotation distance, \a state holds the keyboard modifier flags at the time of the event and \a orient holds the wheel's orientation. @@ -674,7 +674,7 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio \fn TQWheelEvent::TQWheelEvent( const TQPoint &pos, const TQPoint& globalPos, int delta, int state, Orientation orient = Vertical ) Constructs a wheel event object. The position when the event - occurred is given in \a pos and \a globalPos. \a delta tqcontains + occurred is given in \a pos and \a globalPos. \a delta contains the rotation distance, \a state holds the keyboard modifier flags at the time of the event and \a orient holds the wheel's orientation. @@ -820,14 +820,14 @@ TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientatio /*! \class TQKeyEvent tqevent.h - \brief The TQKeyEvent class tqcontains describes a key event. + \brief The TQKeyEvent class contains describes a key event. \ingroup events Key events occur when a key is pressed or released when a widget has keyboard input focus. - A key event tqcontains a special accept flag that indicates whether the + A key event contains a special accept flag that indicates whether the receiver wants the key event. You should call TQKeyEvent::ignore() if the key press or release event is not handled by your widget. A key event is propagated up the tqparent widget chain until a widget accepts it with @@ -1292,7 +1292,7 @@ TQt::ButtonState TQKeyEvent::stateAfter() const /*! \class TQFocusEvent tqevent.h - \brief The TQFocusEvent class tqcontains event parameters for widget focus + \brief The TQFocusEvent class contains event parameters for widget focus events. \ingroup events @@ -1396,7 +1396,7 @@ void TQFocusEvent::resetReason() /*! \class TQPaintEvent tqevent.h - \brief The TQPaintEvent class tqcontains event parameters for paint events. + \brief The TQPaintEvent class contains event parameters for paint events. \ingroup events @@ -1404,7 +1404,7 @@ void TQFocusEvent::resetReason() for instance when part of a widget is exposed because a covering widget is moved. - The event tqcontains a region() that needs to be updated, and a + The event contains a region() that needs to be updated, and a rect() that is the bounding rectangle of that region. Both are provided because many widgets can't make much use of region(), and rect() can be much faster than region().boundingRect(). Painting @@ -1468,7 +1468,7 @@ void TQFocusEvent::resetReason() /*! \class TQMoveEvent tqevent.h - \brief The TQMoveEvent class tqcontains event parameters for move events. + \brief The TQMoveEvent class contains event parameters for move events. \ingroup events @@ -1503,7 +1503,7 @@ void TQFocusEvent::resetReason() /*! \class TQResizeEvent tqevent.h - \brief The TQResizeEvent class tqcontains event parameters for resize events. + \brief The TQResizeEvent class contains event parameters for resize events. \ingroup events @@ -1537,7 +1537,7 @@ void TQFocusEvent::resetReason() /*! \class TQCloseEvent tqevent.h - \brief The TQCloseEvent class tqcontains parameters that describe a close event. + \brief The TQCloseEvent class contains parameters that describe a close event. \ingroup events @@ -1694,7 +1694,7 @@ void TQFocusEvent::resetReason() /*! \class TQContextMenuEvent tqevent.h - \brief The TQContextMenuEvent class tqcontains parameters that describe a context menu event. + \brief The TQContextMenuEvent class contains parameters that describe a context menu event. \ingroup events @@ -1963,7 +1963,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s commonly used visual cue is to use a dotted underline. After the user has selected the final string, an IMEndEvent will - be sent to the widget. The event tqcontains the final string the + be sent to the widget. The event contains the final string the user selected, and could be empty if they canceled the composition. This string should be accepted as the final text the user entered, and the intermediate composition string should be @@ -1980,7 +1980,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s Constructs a new TQIMEvent with the accept flag set to FALSE. \a type can be one of TQEvent::IMStartEvent, TQEvent::IMComposeEvent - or TQEvent::IMEndEvent. \a text tqcontains the current compostion + or TQEvent::IMEndEvent. \a text contains the current compostion string and \a cursorPosition the current position of the cursor inside \a text. */ @@ -1989,7 +1989,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s \fn const TQString &TQIMEvent::text() const Returns the composition text. This is a null string for an - IMStartEvent, and tqcontains the final accepted string (which may be + IMStartEvent, and contains the final accepted string (which may be empty) in the IMEndEvent. */ @@ -2045,7 +2045,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s /*! \class TQTabletEvent tqevent.h - \brief The TQTabletEvent class tqcontains parameters that describe a Tablet + \brief The TQTabletEvent class contains parameters that describe a Tablet event. \ingroup events @@ -2060,7 +2060,7 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s you to get the pressure(), the xTilt() and yTilt(), as well as the type of tqdevice being used with tqdevice() (see \l{TabletDevice}). - A tablet event tqcontains a special accept flag that indicates + A tablet event contains a special accept flag that indicates whether the receiver wants the event. You should call TQTabletEvent::accept() if you handle the tablet event; otherwise it will be sent to the tqparent widget. @@ -2096,9 +2096,9 @@ TQContextMenuEvent::TQContextMenuEvent( Reason reason, const TQPoint &pos, int s int pressure, int xTilt, int yTilt, const TQPair<int,int> &uId ) Construct a tablet event of type \a t. The position of when the event occurred is given - int \a pos and \a globalPos. \a tqdevice tqcontains the \link TabletDevice tqdevice type\endlink, - \a pressure tqcontains the pressure exerted on the \a tqdevice, \a xTilt and \a yTilt contain - \a tqdevice's degree of tilt from the X and Y axis respectively. The \a uId tqcontains an + int \a pos and \a globalPos. \a tqdevice contains the \link TabletDevice tqdevice type\endlink, + \a pressure contains the pressure exerted on the \a tqdevice, \a xTilt and \a yTilt contain + \a tqdevice's degree of tilt from the X and Y axis respectively. The \a uId contains an event id. On Irix, \a globalPos will contain the high-resolution coordinates received from the @@ -2128,10 +2128,10 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP Constructs a tablet event object. The position when the event occurred is is given in \a pos and \a globalPos. \a tqdevice - tqcontains the \link TabletDevice tqdevice type\endlink, \a pressure - tqcontains the pressure exerted on the \a tqdevice, \a xTilt and \a + contains the \link TabletDevice tqdevice type\endlink, \a pressure + contains the pressure exerted on the \a tqdevice, \a xTilt and \a yTilt contain the \a tqdevice's degrees of tilt from the X and Y - axis respectively. The \a uId tqcontains an event id. + axis respectively. The \a uId contains an event id. On Irix, \a globalPos will contain the high-resolution coordinates received from the tablet tqdevice driver, instead of from the @@ -2279,8 +2279,8 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP Returns a unique ID for the current tqdevice. It is possible to generate a unique ID for any Wacom© tqdevice. This makes it possible to differentiate between multiple tqdevices being used at - the same time on the tablet. The \c first member tqcontains a value - for the type, the \c second member tqcontains a physical ID obtained + the same time on the tablet. The \c first member contains a value + for the type, the \c second member contains a physical ID obtained from the tqdevice. Each combination of these values is unique. Note: for different platforms, the \c first value is different due to different driver implementations. @@ -2288,7 +2288,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP /*! \class TQChildEvent tqevent.h - \brief The TQChildEvent class tqcontains event parameters for child object + \brief The TQChildEvent class contains event parameters for child object events. \ingroup events @@ -2358,7 +2358,7 @@ TQTabletEvent::TQTabletEvent( Type t, const TQPoint &pos, const TQPoint &globalP TQt-defined events types, the value should be at least as large as the value of the "User" entry in the TQEvent::Type enum. - TQCustomEvent tqcontains a generic void* data member that may be used + TQCustomEvent contains a generic void* data member that may be used for transferring event-specific data to the receiver. Note that since events are normally delivered asynchronously, the data pointer, if used, must remain valid until the event has been diff --git a/tqtinterface/qt4/src/kernel/tqevent.h b/tqtinterface/qt4/src/kernel/tqevent.h index 224759f..143c766 100644 --- a/tqtinterface/qt4/src/kernel/tqevent.h +++ b/tqtinterface/qt4/src/kernel/tqevent.h @@ -271,7 +271,7 @@ inline int TQIMEvent::selectionLength() const // This class is rather closed at the moment. If you need to create your // own DND event objects, write to qt-bugs@trolltech.com and we'll try to -// tqfind a way to extend it so it covers your needs. +// find a way to extend it so it covers your needs. class TQ_EXPORT TQDropEvent : public TQEvent, public TQMimeSource { @@ -835,7 +835,7 @@ inline int TQIMEvent::selectionLength() const // This class is rather closed at the moment. If you need to create your // own DND event objects, write to qt-bugs@trolltech.com and we'll try to -// tqfind a way to extend it so it covers your needs. +// find a way to extend it so it covers your needs. class TQ_EXPORT TQDropEvent : public TQEvent, public TQMimeSource { diff --git a/tqtinterface/qt4/src/kernel/tqeventloop_unix.cpp b/tqtinterface/qt4/src/kernel/tqeventloop_unix.cpp index a865978..53ca943 100644 --- a/tqtinterface/qt4/src/kernel/tqeventloop_unix.cpp +++ b/tqtinterface/qt4/src/kernel/tqeventloop_unix.cpp @@ -151,7 +151,7 @@ static inline timeval operator-( const timeval &t1, const timeval &t2 ) // The timerBitVec array is used for keeping track of timer identifiers. // -static int allocTimerId() // tqfind avail timer identifier +static int allocTimerId() // find avail timer identifier { int i = timerBitVec->size()-1; while ( i >= 0 && (*timerBitVec)[i] ) @@ -312,7 +312,7 @@ bool qKillTimer( int id ) id > (int)timerBitVec->size() || !timerBitVec->testBit( id-1 ) ) return FALSE; // not init'd or invalid timer t = timerList->first(); - while ( t && t->id != id ) // tqfind timer info in list + while ( t && t->id != id ) // find timer info in list t = timerList->next(); if ( t ) { // id found timerBitVec->clearBit( id-1 ); // set timer inactive @@ -440,7 +440,7 @@ void TQEventLoop::unregisterSocketNotifier( TQSocketNotifier *notifier ) d->sn_pending_list.removeRef( sn ); // remove from activation list list->remove(); // remove notifier found above - if ( d->sn_highest == sockfd ) { // tqfind highest fd + if ( d->sn_highest == sockfd ) { // find highest fd d->sn_highest = -1; for ( int i=0; i<3; i++ ) { if ( d->sn_vec[i].list && ! d->sn_vec[i].list->isEmpty() ) @@ -557,7 +557,7 @@ int TQEventLoop::activateTimers() n_act++; TQTimerEvent e( t->id ); TQApplication::sendEvent( t->obj, &e ); // send event - if ( timerList->tqfindRef( begin ) == -1 ) + if ( timerList->findRef( begin ) == -1 ) begin = 0; } return n_act; diff --git a/tqtinterface/qt4/src/kernel/tqeventloop_x11.cpp b/tqtinterface/qt4/src/kernel/tqeventloop_x11.cpp index 2c60d10..61b6117 100644 --- a/tqtinterface/qt4/src/kernel/tqeventloop_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqeventloop_x11.cpp @@ -85,7 +85,7 @@ void qt_install_preselect_handler( VFPTR handler ) void qt_remove_preselect_handler( VFPTR handler ) { if ( qt_preselect_handler ) { - TQVFuncList::Iterator it = qt_preselect_handler->tqfind( handler ); + TQVFuncList::Iterator it = qt_preselect_handler->find( handler ); if ( it != qt_preselect_handler->end() ) qt_preselect_handler->remove( it ); } @@ -99,7 +99,7 @@ void qt_install_postselect_handler( VFPTR handler ) void qt_remove_postselect_handler( VFPTR handler ) { if ( qt_postselect_handler ) { - TQVFuncList::Iterator it = qt_postselect_handler->tqfind( handler ); + TQVFuncList::Iterator it = qt_postselect_handler->find( handler ); if ( it != qt_postselect_handler->end() ) qt_postselect_handler->remove( it ); } @@ -305,7 +305,7 @@ bool TQEventLoop::processEvents( ProcessEventsFlags flags ) if (nsel == -1) { if (errno == EBADF) { - // it seems a socket notifier has a bad fd... tqfind out + // it seems a socket notifier has a bad fd... find out // which one it is and disable it fd_set fdset; zerotm.tv_sec = zerotm.tv_usec = 0l; diff --git a/tqtinterface/qt4/src/kernel/tqfocusdata.cpp b/tqtinterface/qt4/src/kernel/tqfocusdata.cpp index 0259940..d46553e 100644 --- a/tqtinterface/qt4/src/kernel/tqfocusdata.cpp +++ b/tqtinterface/qt4/src/kernel/tqfocusdata.cpp @@ -47,7 +47,7 @@ \ingroup misc - This read-only list always tqcontains at least one widget (i.e. the + This read-only list always contains at least one widget (i.e. the top-level widget). It provides a simple cursor which can be reset to the current focus widget using home(), or moved to its neighboring widgets using next() and prev(). You can also retrieve @@ -65,7 +65,7 @@ When reimplementing TQWidget::focusNextPrevChild() to provide special focus flow, you will usually call TQWidget::focusData() to retrieve the focus data stored at the top-level widget. A - top-level widget's focus data tqcontains the focus list for its + top-level widget's focus data contains the focus list for its hierarchy of widgets. The cursor may change at any time. @@ -94,7 +94,7 @@ */ TQWidget* TQFocusData::home() { - tqfocusWidgets.tqfind(it.current()); + tqfocusWidgets.find(it.current()); return tqfocusWidgets.current(); } diff --git a/tqtinterface/qt4/src/kernel/tqfont.cpp b/tqtinterface/qt4/src/kernel/tqfont.cpp index 48fe5a0..5570afd 100644 --- a/tqtinterface/qt4/src/kernel/tqfont.cpp +++ b/tqtinterface/qt4/src/kernel/tqfont.cpp @@ -275,7 +275,7 @@ TQFontEngineData::~TQFontEngineData() Use TQApplication::setFont() to set the application's default font. If a choosen X11 font does not include all the characters that - need to be displayed, TQFont will try to tqfind the characters in the + need to be displayed, TQFont will try to find the characters in the nearest equivalent fonts. When a TQPainter draws a character from a font the TQFont will report whether or not it has the character; if it does not, TQPainter will draw an unfilled square. @@ -328,7 +328,7 @@ TQFontEngineData::~TQFontEngineData() Under the X Window System you can set a font using its system specific name with setRawName(). - Loading fonts can be expensive, especially on X11. TQFont tqcontains + Loading fonts can be expensive, especially on X11. TQFont contains extensive optimizations to make the copying of TQFont objects fast, and to cache the results of the slow window system functions it depends upon. @@ -337,9 +337,9 @@ TQFontEngineData::~TQFontEngineData() The font matching algorithm works as follows: \list 1 \i The specified font family is searched for. - \i If not found, the tqstyleHint() is used to select a tqreplacement + \i If not found, the tqstyleHint() is used to select a replacement family. - \i Each tqreplacement font family is searched for. + \i Each replacement font family is searched for. \i If none of these are found or there was no tqstyleHint(), "helvetica" will be searched for. \i If "helvetica" isn't found TQt will try the lastResortFamily(). @@ -395,7 +395,7 @@ TQFontEngineData::~TQFontEngineData() TQString family = info.family(); \endcode - To tqfind out font metrics use a TQFontMetrics object, e.g. + To find out font metrics use a TQFontMetrics object, e.g. \code TQFontMetrics fm( f1 ); int pixelWidth = fm.width( "How many pixels wide is this text?" ); @@ -427,7 +427,7 @@ TQFontEngineData::~TQFontEngineData() \value Greek covers ancient and modern Greek and Coptic. \value Cyrillic covers the Slavic and non-Slavic languages using cyrillic alphabets. - \value Armenian tqcontains the Armenian alphabet used with the + \value Armenian contains the Armenian alphabet used with the Armenian language. \value Georgian covers at least the language Georgian. \value Runic covers the known constituents of the Runic alphabets used @@ -512,14 +512,14 @@ TQFontEngineData::~TQFontEngineData() Symbols: - \value CurrencySymbols tqcontains currency symbols not encoded in other scripts. + \value CurrencySymbols contains currency symbols not encoded in other scripts. \value LetterlikeSymbols consists of symbols derived from ordinary letters of an alphabetical script. \value NumberForms are provided for compatibility with other existing character sets. \value MathematicalOperators consists of encodings for operators, relations and other symbols like arrows used in a mathematical context. - \value TechnicalSymbols tqcontains representations for control + \value TechnicalSymbols contains representations for control codes, the space symbol, APL symbols and other symbols mainly used in the context of electronic data processing. \value GeometricSymbols covers block elements and geometric tqshapes. @@ -890,7 +890,7 @@ int TQFont::weight() const same as, the scales used in Windows or CSS. A weight of 0 is ultralight, whilst 99 will be an extremely black. - This enum tqcontains the predefined font weights: + This enum contains the predefined font weights: \value Light 25 \value Normal 50 @@ -1071,7 +1071,7 @@ TQFont::StyleHint TQFont::tqstyleHint() const \enum TQFont::StyleHint Style hints are used by the \link #fontmatching font - matching\endlink algorithm to tqfind an appropriate default family + matching\endlink algorithm to find an appropriate default family if a selected font family is not available. \value AnyStyle leaves the font matching algorithm to choose the @@ -1097,7 +1097,7 @@ TQFont::StyleHint TQFont::tqstyleHint() const The style strategy tells the \link #fontmatching font matching\endlink algorithm what type of fonts should be used to - tqfind an appropriate default family. + find an appropriate default family. The following strategies are available: @@ -1446,7 +1446,7 @@ TQString TQFont::substitute( const TQString &familyName ) { initFontSubst(); - TQStringList *list = fontSubst->tqfind(familyName); + TQStringList *list = fontSubst->find(familyName); if (list && list->count() > 0) return *(list->at(0)); @@ -1467,7 +1467,7 @@ TQStringList TQFont::substitutes(const TQString &familyName) { initFontSubst(); - TQStringList ret, *list = fontSubst->tqfind(familyName); + TQStringList ret, *list = fontSubst->find(familyName); if (list) ret += *list; return ret; @@ -1485,13 +1485,13 @@ void TQFont::insertSubstitution(const TQString &familyName, { initFontSubst(); - TQStringList *list = fontSubst->tqfind(familyName); + TQStringList *list = fontSubst->find(familyName); if (! list) { list = new TQStringList; fontSubst->insert(familyName, list); } - if (! list->tqcontains(substituteName)) + if (! list->contains(substituteName)) list->append(substituteName); } @@ -1507,7 +1507,7 @@ void TQFont::insertSubstitutions(const TQString &familyName, { initFontSubst(); - TQStringList *list = fontSubst->tqfind(familyName); + TQStringList *list = fontSubst->find(familyName); if (! list) { list = new TQStringList; fontSubst->insert(familyName, list); @@ -1515,7 +1515,7 @@ void TQFont::insertSubstitutions(const TQString &familyName, TQStringList::ConstIterator it = substituteNames.begin(); while (it != substituteNames.end()) { - if (! list->tqcontains(*it)) + if (! list->contains(*it)) list->append(*it); it++; } @@ -1665,12 +1665,12 @@ bool TQFont::fromString(const TQString &descrip) int count = 0; TQString l[11]; int from = 0; - int to = descrip.tqfind( ',' ); + int to = descrip.find( ',' ); while ( to > 0 && count < 11 ) { l[count] = descrip.mid( from, to-from ); count++; from = to+1; - to = descrip.tqfind( ',', from ); + to = descrip.find( ',', from ); } #endif // TQT_NO_STRINGLIST if ( !count || ( count > 2 && count < 9 ) || count > 11 ) { @@ -1873,7 +1873,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font ) possible. For each character, you can get its width(), leftBearing() and - rightBearing() and tqfind out whether it is in the font using + rightBearing() and find out whether it is in the font using inFont(). You can also treat the character as a string, and use the string functions on it. @@ -3039,9 +3039,9 @@ void TQFontCache::clear() } #endif -TQFontEngineData *TQFontCache::tqfindEngineData( const Key &key ) const +TQFontEngineData *TQFontCache::findEngineData( const Key &key ) const { - EngineDataCache::ConstIterator it = engineDataCache.tqfind( key ), + EngineDataCache::ConstIterator it = engineDataCache.find( key ), end = engineDataCache.end(); if ( it == end ) return 0; @@ -3057,9 +3057,9 @@ void TQFontCache::insertEngineData( const Key &key, TQFontEngineData *engineData increaseCost( sizeof( TQFontEngineData ) ); } -TQFontEngine *TQFontCache::tqfindEngine( const Key &key ) +TQFontEngine *TQFontCache::findEngine( const Key &key ) { - EngineCache::Iterator it = engineCache.tqfind( key ), + EngineCache::Iterator it = engineCache.find( key ), end = engineCache.end(); if ( it == end ) return 0; @@ -3231,7 +3231,7 @@ void TQFontCache::timerEvent( TQTimerEvent * ) // print out all engines for ( int i = 0; i < TQFont::LastPrivateScript; ++i ) { if ( ! it.data()->engines[i] ) continue; - FC_DEBUG( " tqcontains %p", it.data()->engines[i] ); + FC_DEBUG( " contains %p", it.data()->engines[i] ); } # endif // TQ_WS_X11 || TQ_WS_WIN #endif // TQFONTCACHE_DEBUG diff --git a/tqtinterface/qt4/src/kernel/tqfont_x11.cpp b/tqtinterface/qt4/src/kernel/tqfont_x11.cpp index 84ea2d6..fda292f 100644 --- a/tqtinterface/qt4/src/kernel/tqfont_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqfont_x11.cpp @@ -168,7 +168,7 @@ TQString qt_fallback_font_family( TQFont::Script script ) if ( fallbackMap ) { FallbackMap::ConstIterator it, end = fallbackMap->end(); - it = fallbackMap->tqfind( script ); + it = fallbackMap->find( script ); if ( it != end ) ret = it.data(); } @@ -370,7 +370,7 @@ void TQFontPrivate::load( TQFont::Script script ) TQFontCache::Key key( req, TQFont::NoScript, screen, painttqdevice ); // look for the requested font in the engine data cache - engineData = TQFontCache::instance->tqfindEngineData( key ); + engineData = TQFontCache::instance->findEngineData( key ); if ( ! engineData ) { // create a new one @@ -407,12 +407,12 @@ void TQFontPrivate::load( TQFont::Script script ) // append the default fallback font for the specified script TQString fallback = qt_fallback_font_family( script ); - if ( ! fallback.isEmpty() && ! family_list.tqcontains( fallback ) ) + if ( ! fallback.isEmpty() && ! family_list.contains( fallback ) ) family_list << fallback; // add the default family TQString defaultFamily = TQApplication::font().family(); - if ( ! family_list.tqcontains( defaultFamily ) ) + if ( ! family_list.contains( defaultFamily ) ) family_list << defaultFamily; // add TQFont::defaultFamily() to the list, for compatibility with @@ -421,14 +421,14 @@ void TQFontPrivate::load( TQFont::Script script ) #endif // TQT_XFT2 } - // null family means tqfind the first font matching the specified script + // null family means find the first font matching the specified script family_list << TQString::null; TQStringList::ConstIterator it = family_list.begin(), end = family_list.end(); for ( ; ! engine && it != end; ++it ) { req.family = *it; - engine = TQFontDatabase::tqfindFont( script, this, req ); + engine = TQFontDatabase::findFont( script, this, req ); if ( engine ) { if ( engine->type() != TQFontEngine::Box ) break; @@ -543,7 +543,7 @@ void TQFont::setRawName( const TQString &name ) Returns the "last resort" font family name. The current implementation tries a wide variety of common fonts, - returning the first one it tqfinds. Is is possible that no family is + returning the first one it finds. Is is possible that no family is found in which case a null string is returned. \sa lastResortFont() @@ -583,7 +583,7 @@ TQString TQFont::defaultFamily() const This is used if even the last resort family is not available. It returns \e something, almost no matter what. The current implementation tries a wide variety of common fonts, returning the - first one it tqfinds. The implementation may change at any time. + first one it finds. The implementation may change at any time. */ static const char * const tryFonts[] = { "-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*", @@ -625,7 +625,7 @@ static bool fontExists( const TQString &fontName ) "fixed" or "system". The current implementation tries a wide variety of common fonts, - returning the first one it tqfinds. The implementation may change + returning the first one it finds. The implementation may change at any time, but this function will always return a string containing something. diff --git a/tqtinterface/qt4/src/kernel/tqfontdata_p.h b/tqtinterface/qt4/src/kernel/tqfontdata_p.h index b6d7a54..36b709f 100644 --- a/tqtinterface/qt4/src/kernel/tqfontdata_p.h +++ b/tqtinterface/qt4/src/kernel/tqfontdata_p.h @@ -240,7 +240,7 @@ public: typedef TQMap<Key,TQFontEngineData*> EngineDataCache; EngineDataCache engineDataCache; - TQFontEngineData *tqfindEngineData( const Key &key ) const; + TQFontEngineData *findEngineData( const Key &key ) const; void insertEngineData( const Key &key, TQFontEngineData *engineData ); // TQFontEngine cache @@ -256,7 +256,7 @@ public: typedef TQMap<Key,Engine> EngineCache; EngineCache engineCache; - TQFontEngine *tqfindEngine( const Key &key ); + TQFontEngine *findEngine( const Key &key ); void insertEngine( const Key &key, TQFontEngine *engine ); #if defined(TQ_WS_WIN) || defined(TQ_WS_TQWS) diff --git a/tqtinterface/qt4/src/kernel/tqfontdatabase.cpp b/tqtinterface/qt4/src/kernel/tqfontdatabase.cpp index e70be03..219aa98 100644 --- a/tqtinterface/qt4/src/kernel/tqfontdatabase.cpp +++ b/tqtinterface/qt4/src/kernel/tqfontdatabase.cpp @@ -126,16 +126,16 @@ static int getFontWeight( const TQString &weightString ) if (s == "light") return TQFont::Light; - if (s.tqcontains("bold")) { - if (s.tqcontains("demi")) + if (s.contains("bold")) { + if (s.contains("demi")) return (int) TQFont::DemiBold; return (int) TQFont::Bold; } - if (s.tqcontains("light")) + if (s.contains("light")) return (int) TQFont::Light; - if (s.tqcontains("black")) + if (s.contains("black")) return (int) TQFont::Black; return (int) TQFont::Normal; @@ -261,9 +261,9 @@ TQtFontStyle::Key::Key( const TQString &styleString ) { weight = getFontWeight( styleString ); - if ( styleString.tqcontains( "Italic" ) ) + if ( styleString.contains( "Italic" ) ) italic = TRUE; - else if ( styleString.tqcontains( "Oblique" ) ) + else if ( styleString.contains( "Oblique" ) ) oblique = TRUE; } @@ -715,7 +715,7 @@ static TQtFontStyle *bestStyle(TQtFontFoundry *foundry, const TQtFontStyle::Key } #if defined(TQ_WS_X11) -static TQtFontEncoding *tqfindEncoding(TQFont::Script script, int styleStrategy, +static TQtFontEncoding *findEncoding(TQFont::Script script, int styleStrategy, TQtFontSize *size, int force_encoding_id) { TQtFontEncoding *encoding = 0; @@ -734,11 +734,11 @@ static TQtFontEncoding *tqfindEncoding(TQFont::Script script, int styleStrategy, if (encoding) return encoding; } - // Xft not available, tqfind an XLFD font, trying the default encoding first + // Xft not available, find an XLFD font, trying the default encoding first encoding = size->encodingID(TQFontPrivate::defaultEncodingID); if (!encoding || !scripts_for_xlfd_encoding[encoding->encoding][script]) { - // tqfind the first encoding that supports the requested script + // find the first encoding that supports the requested script encoding = 0; for (int x = 0; !encoding && x < size->count; ++x) { const int enc = size->encodings[x].encoding; @@ -821,13 +821,13 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt TQtFontEncoding *encoding = 0; #endif - // 4. tqfind closest size match + // 4. find closest size match if (! size) { unsigned int distance = ~0u; for (int x = 0; x < style->count; ++x) { #ifdef TQ_WS_X11 encoding = - tqfindEncoding(script, styleStrategy, style->pixelSizes + x, force_encoding_id); + findEncoding(script, styleStrategy, style->pixelSizes + x, force_encoding_id); if (!encoding) { FM_DEBUG(" size %3d does not support the script we want", style->pixelSizes[x].pixelSize); @@ -861,7 +861,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt #ifdef TQ_WS_X11 if (size) { - encoding = tqfindEncoding(script, styleStrategy, size, force_encoding_id); + encoding = findEncoding(script, styleStrategy, size, force_encoding_id); if (!encoding) size = 0; } if ( ! encoding ) { @@ -929,7 +929,7 @@ unsigned int bestFoundry( TQFont::Script script, unsigned int score, int styleSt \internal */ TQFontEngine * -TQFontDatabase::tqfindFont( TQFont::Script script, const TQFontPrivate *fp, +TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp, const TQFontDef &request, int force_encoding_id ) { #ifndef TQ_WS_X11 @@ -961,7 +961,7 @@ TQFontDatabase::tqfindFont( TQFont::Script script, const TQFontPrivate *fp, #endif fp->painttqdevice ); - fe = TQFontCache::instance->tqfindEngine( key ); + fe = TQFontCache::instance->findEngine( key ); if ( fe ) return fe; } @@ -988,13 +988,13 @@ TQFontDatabase::tqfindFont( TQFont::Script script, const TQFontPrivate *fp, static TQFont::Script defaultHan; TQCString locale = setlocale(LC_ALL, NULL); - if (locale.tqcontains("ko")) + if (locale.contains("ko")) defaultHan = TQFont::Han_Korean; - else if (locale.tqcontains("zh_TW") || locale.tqcontains("zh_HK")) + else if (locale.contains("zh_TW") || locale.contains("zh_HK")) defaultHan = TQFont::Han_TraditionalChinese; - else if (locale.tqcontains("zh")) + else if (locale.contains("zh")) defaultHan = TQFont::Han_SimplifiedChinese; - else if (locale.tqcontains("ja")) + else if (locale.contains("ja")) defaultHan = TQFont::Han_Japanese; else defaultHan = TQFont::Han; // don't change @@ -1003,7 +1003,7 @@ TQFontDatabase::tqfindFont( TQFont::Script script, const TQFontPrivate *fp, } #endif - FM_DEBUG( "TQFontDatabase::tqfindFont\n" + FM_DEBUG( "TQFontDatabase::findFont\n" " request:\n" " family: %s [%s], script: %d (%s)\n" " weight: %d, italic: %d\n" @@ -1104,7 +1104,7 @@ TQFontDatabase::tqfindFont( TQFont::Script script, const TQFontPrivate *fp, #endif // TQ_WS_X11 // as we know the script is supported, we can be sure - // to tqfind a matching font here. + // to find a matching font here. unsigned int newscore = bestFoundry( override_script, score, request.styleStrategy, try_family, foundry_name, styleKey, request.pixelSize, pitch, @@ -1206,7 +1206,7 @@ TQFontDatabase::tqfindFont( TQFont::Script script, const TQFontPrivate *fp, TQFontDef def = request; if (def.family.isEmpty()) { def.family = fp->request.family; - def.family = def.family.left(def.family.tqfind(',')); + def.family = def.family.left(def.family.find(',')); } TQFontCache::Key key( def, script, #ifdef TQ_WS_WIN @@ -1748,7 +1748,7 @@ TQValueList<int> TQFontDatabase::pointSizes( const TQString &family, #else const uint pointSize = size->pixelSize; // embedded uses 72dpi #endif - if (! sizes.tqcontains(pointSize)) + if (! sizes.contains(pointSize)) sizes.append(pointSize); } } @@ -1849,7 +1849,7 @@ TQValueList<int> TQFontDatabase::smoothSizes( const TQString &family, #else const uint pointSize = size->pixelSize; // embedded uses 72dpi #endif - if (! sizes.tqcontains(pointSize)) + if (! sizes.contains(pointSize)) sizes.append( pointSize ); } } @@ -2476,23 +2476,23 @@ TQString TQFontDatabase::scriptSample(TQFont::Script script) This makes sense of the font family name: - 1) if the family name tqcontains a '-' (ie. "Adobe-Courier"), then we + 1) if the family name contains a '-' (ie. "Adobe-Courier"), then we split at the '-', and use the string as the foundry, and the string to the right as the family - 2) if the family name tqcontains a '[' and a ']', then we take the text + 2) if the family name contains a '[' and a ']', then we take the text between the square brackets as the foundry, and the text before the square brackets as the family (ie. "Arial [Monotype]") */ void TQFontDatabase::parseFontName(const TQString &name, TQString &foundry, TQString &family) { - if ( name.tqcontains('-') ) { - int i = name.tqfind('-'); + if ( name.contains('-') ) { + int i = name.find('-'); foundry = name.left( i ); family = name.right( name.length() - i - 1 ); - } else if ( name.tqcontains('[') && name.tqcontains(']')) { - int i = name.tqfind('['); - int li = name.tqfindRev(']'); + } else if ( name.contains('[') && name.contains(']')) { + int i = name.find('['); + int li = name.findRev(']'); if (i < li) { foundry = name.mid(i + 1, li - i - 1); diff --git a/tqtinterface/qt4/src/kernel/tqfontdatabase.h b/tqtinterface/qt4/src/kernel/tqfontdatabase.h index f2556ef..e6af3f8 100644 --- a/tqtinterface/qt4/src/kernel/tqfontdatabase.h +++ b/tqtinterface/qt4/src/kernel/tqfontdatabase.h @@ -83,7 +83,7 @@ public: TQFontDatabase() : QFontDatabase() {} // private: -// static inline TQFontEngine *tqfindFont( TQFont::Script script, const QFontPrivate *fp, const QFontDef &request, int force_encoding_id = -1 ) { return findFont(script, fp, request, force_encoding_id); } +// static inline TQFontEngine *findFont( TQFont::Script script, const QFontPrivate *fp, const QFontDef &request, int force_encoding_id = -1 ) { return findFont(script, fp, request, force_encoding_id); } static inline TQString scriptName( TQFont::Script s ) { return writingSystemName((QFontDatabase::WritingSystem)s); } static inline TQString scriptSample( TQFont::Script s ) { return writingSystemSample((QFontDatabase::WritingSystem)s); } @@ -196,7 +196,7 @@ public: private: #if defined(TQ_WS_X11) || defined(TQ_WS_WIN) - static TQFontEngine *tqfindFont( TQFont::Script script, const TQFontPrivate *fp, + static TQFontEngine *findFont( TQFont::Script script, const TQFontPrivate *fp, const TQFontDef &request, int force_encoding_id = -1 ); #endif // TQ_WS_X11 diff --git a/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp b/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp index 97cb544..66c2362 100644 --- a/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp @@ -488,7 +488,7 @@ int qt_xlfd_encoding_id( const char *encoding ) ++e; } } - // qDebug( "couldn't tqfind encoding %s", encoding ); + // qDebug( "couldn't find encoding %s", encoding ); return -1; } @@ -955,8 +955,8 @@ static bool loadXftFont( FcPattern* font ) return false; // capitalize( value ); rawName = familyName = TQString::fromUtf8(value); - familyName.tqreplace('-', ' '); - familyName.tqreplace("/", ""); + familyName.replace('-', ' '); + familyName.replace("/", ""); slant_value = XFT_SLANT_ROMAN; weight_value = XFT_WEIGHT_MEDIUM; @@ -1134,7 +1134,7 @@ static TQ_UINT16 getGlyphIndex( unsigned char *table, TQ_UINT16 format, unsigned static inline void checkXftCoverage( TQtFontFamily *family ) { #ifdef _POSIX_MAPPED_FILES - TQCString ext = family->fontFilename.mid( family->fontFilename.tqfindRev( '.' ) ).lower(); + TQCString ext = family->fontFilename.mid( family->fontFilename.findRev( '.' ) ).lower(); if ( family->fontFileIndex == 0 && ( ext == ".ttf" || ext == ".otf" ) ) { void *map; // qDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() ); @@ -1350,8 +1350,8 @@ static void load( const TQString &family = TQString::null, int script = -1 ) for (int i = 0; i < fonts->nfont; i++) loadXftFont( fonts->fonts[i] ); XftFontSetDestroy (fonts); - if (mfamily.tqcontains(' ')) { - mfamily.tqreplace(TQChar(' '), TQChar('-')); + if (mfamily.contains(' ')) { + mfamily.replace(TQChar(' '), TQChar('-')); goto redo; } f->fullyLoaded = TRUE; @@ -1658,7 +1658,7 @@ TQFontEngine *loadEngine( TQFont::Script script, XftPattern *dup = XftPatternDuplicate( result ); XftFont *xftfs = XftFontOpenPattern( TQPaintDevice::x11AppDisplay(), dup ); - if ( ! xftfs ) // Xft couldn't tqfind a font? + if ( ! xftfs ) // Xft couldn't find a font? return 0; TQFontEngine *fe = new TQFontEngineXft( xftfs, result, symbol ? 1 : 0 ); @@ -1744,9 +1744,9 @@ TQFontEngine *loadEngine( TQFont::Script script, static void parseFontName(const TQString &name, TQString &foundry, TQString &family) { - if ( name.tqcontains('[') && name.tqcontains(']')) { - int i = name.tqfind('['); - int li = name.tqfindRev(']'); + if ( name.contains('[') && name.contains(']')) { + int i = name.find('['); + int li = name.findRev(']'); if (i < li) { foundry = name.mid(i + 1, li - i - 1); @@ -1809,7 +1809,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef double scale = addPatternProps(pattern, key, FALSE, TRUE, fp, request); #ifdef FONT_MATCH_DEBUG - qDebug("original pattern tqcontains:"); + qDebug("original pattern contains:"); FcPatternPrint(pattern); #endif @@ -1818,7 +1818,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef FcConfigSubstitute(0, pattern, FcMatchPattern); XftDefaultSubstitute(TQPaintDevice::x11AppDisplay(), TQPaintDevice::x11AppScreen(), pattern); -// qDebug("1: pattern tqcontains:"); +// qDebug("1: pattern contains:"); // FcPatternPrint(pattern); { @@ -1829,7 +1829,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef // append the default fallback font for the specified script extern TQString qt_fallback_font_family( TQFont::Script ); TQString fallback = qt_fallback_font_family( script ); - if ( ! fallback.isEmpty() && ! family_list.tqcontains( fallback ) ) { + if ( ! fallback.isEmpty() && ! family_list.contains( fallback ) ) { TQCString cs = fallback.utf8(); value.u.s = (const FcChar8 *)cs.data(); FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); @@ -1837,7 +1837,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef // add the default family TQString defaultFamily = TQApplication::font().family(); - if ( ! family_list.tqcontains( defaultFamily ) ) { + if ( ! family_list.contains( defaultFamily ) ) { TQCString cs = defaultFamily.utf8(); value.u.s = (const FcChar8 *)cs.data(); FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); @@ -1846,7 +1846,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef // add TQFont::defaultFamily() to the list, for compatibility with // previous versions defaultFamily = TQApplication::font().defaultFamily(); - if ( ! family_list.tqcontains( defaultFamily ) ) { + if ( ! family_list.contains( defaultFamily ) ) { TQCString cs = defaultFamily.utf8(); value.u.s = (const FcChar8 *)cs.data(); FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue); @@ -1865,7 +1865,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef } #ifdef FONT_MATCH_DEBUG - printf("final pattern tqcontains:\n"); + printf("final pattern contains:\n"); FcPatternPrint(pattern); #endif @@ -1889,7 +1889,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef #ifdef FONT_MATCH_DEBUG if( use_fontsort ) { - printf("fontset tqcontains:\n"); + printf("fontset contains:\n"); for (int i = 0; i < fs->nfont; ++i) { FcPattern *test = fs->fonts[i]; FcChar8 *fam; @@ -1950,7 +1950,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef XftFont *xftfs = XftFontOpenPattern( TQPaintDevice::x11AppDisplay(), dup ); if ( !xftfs ) { - // Xft couldn't tqfind a font? + // Xft couldn't find a font? qDebug("couldn't open fontconfigs chosen font with Xft!!!"); } else { fe = new TQFontEngineXft( xftfs, result, 0 ); diff --git a/tqtinterface/qt4/src/kernel/tqfontengine_p.h b/tqtinterface/qt4/src/kernel/tqfontengine_p.h index cba46a7..37aba1c 100644 --- a/tqtinterface/qt4/src/kernel/tqfontengine_p.h +++ b/tqtinterface/qt4/src/kernel/tqfontengine_p.h @@ -466,7 +466,7 @@ public: TQt::HANDLE handle() const { return ((TQFontEngineXLFD *) _engines[0])->handle(); } private: - void tqfindEngine( const TQChar &ch ); + void findEngine( const TQChar &ch ); TQFontEngine **_engines; int _count; diff --git a/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp b/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp index 8d76e0b..02cf60c 100644 --- a/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp @@ -653,7 +653,7 @@ void TQFontEngineXLFD::draw( TQPainter *p, int x, int y, const TQTextEngine *eng } matrix += ']'; //qDebug("m: %2.2f %2.2f %2.2f %2.2f, matrix=%s", p->m11(), p->m12(), p->m21(), p->m22(), matrix.data()); - xlfd_transformed.tqreplace( pos, endPos-pos, matrix ); + xlfd_transformed.replace( pos, endPos-pos, matrix ); x_font_load_error = FALSE; XErrorHandler old_handler = XSetErrorHandler( x_font_errorhandler ); @@ -1016,7 +1016,7 @@ TQFontEngineLatinXLFD::~TQFontEngineLatinXLFD() _engines = 0; } -void TQFontEngineLatinXLFD::tqfindEngine( const TQChar &ch ) +void TQFontEngineLatinXLFD::findEngine( const TQChar &ch ) { if ( ch.tqunicode() == 0 ) return; @@ -1061,10 +1061,10 @@ void TQFontEngineLatinXLFD::tqfindEngine( const TQChar &ch ) const int enc_id = qt_xlfd_encoding_id( alternate_encodings[which] ); TQFontDef req = fontDef; - TQFontEngine *engine = TQFontDatabase::tqfindFont( TQFont::Latin, 0, req, enc_id ); + TQFontEngine *engine = TQFontDatabase::findFont( TQFont::Latin, 0, req, enc_id ); if ( ! engine ) { req.family = TQString::null; - engine = TQFontDatabase::tqfindFont( TQFont::Latin, 0, req, enc_id ); + engine = TQFontDatabase::findFont( TQFont::Latin, 0, req, enc_id ); if ( ! engine ) return; } engine->setScale( scale() ); @@ -1188,7 +1188,7 @@ TQFontEngineLatinXLFD::stringToCMap( const TQChar *str, int len, glyph_t *glyphs continue; TQFontEngineLatinXLFD *that = (TQFontEngineLatinXLFD *) this; - that->tqfindEngine( str[i] ); + that->findEngine( str[i] ); glyphs[i] = (uc == 0x20ac ? euroIndex : that->glyphIndices[uc]); if ( advances ) advances[i] = (uc == 0x20ac ? euroAdvance : glyphAdvances[uc]); @@ -1414,7 +1414,7 @@ bool TQFontEngineLatinXLFD::canRender( const TQChar *string, int len ) if (euroIndex) continue; - tqfindEngine(string[i]); + findEngine(string[i]); if (euroIndex) continue; } @@ -1423,7 +1423,7 @@ bool TQFontEngineLatinXLFD::canRender( const TQChar *string, int len ) } if ( glyphIndices[string[i].tqunicode()] != 0 ) continue; - tqfindEngine( string[i] ); + findEngine( string[i] ); if ( glyphIndices[string[i].tqunicode()] == 0 ) { all = FALSE; break; @@ -2334,7 +2334,7 @@ static const OTScripts ot_scripts [] = { // Malayalam, { FT_MAKE_TAG( 'm', 'l', 'y', 'm' ), 1 }, // Sinhala, - // ### could not tqfind any OT specs on this + // ### could not find any OT specs on this { FT_MAKE_TAG( 's', 'i', 'n', 'h' ), 1 }, // Thai, { FT_MAKE_TAG( 't', 'h', 'a', 'i' ), 1 }, @@ -2497,7 +2497,7 @@ void TQOpenType::selectScript(unsigned int script, const Features *features) return; assert(script < TQFont::NScripts); - // tqfind script in our list of supported scripts. + // find script in our list of supported scripts. uint tag = ot_scripts[script].tag; if (gsub && features) { diff --git a/tqtinterface/qt4/src/kernel/tqiconset.cpp b/tqtinterface/qt4/src/kernel/tqiconset.cpp index e5769f8..09a1126 100644 --- a/tqtinterface/qt4/src/kernel/tqiconset.cpp +++ b/tqtinterface/qt4/src/kernel/tqiconset.cpp @@ -57,7 +57,7 @@ static short widths[2] = { 22, 32 }; static short heights[2] = { 22, 32 }; enum TQIconSetIconOrigin { - SuppliedFileName, // 'fileName' tqcontains the name of the file + SuppliedFileName, // 'fileName' contains the name of the file SuppliedPixmap, // 'pixmap' is a pointer to the user-supplied pixmap Manufactured, // 'pixmap' is a factory-generated pixmap (or 0) Generated // 'pixmap' is a TQIconSet-generated pixmap (or 0) @@ -763,7 +763,7 @@ void TQIconSet::setIconSize( Size which, const TQSize& size ) */ const TQSize& TQIconSet::iconSize( Size which ) { - // ### tqreplace 'const TQSize&' with TQSize in TQt 4 and simply this code + // ### replace 'const TQSize&' with TQSize in TQt 4 and simply this code static TQSize size; size = TQSize( widths[(int) which - 1], heights[(int) which - 1] ); return size; diff --git a/tqtinterface/qt4/src/kernel/tqimage.cpp b/tqtinterface/qt4/src/kernel/tqimage.cpp index 0c97e64..2a99fc9 100644 --- a/tqtinterface/qt4/src/kernel/tqimage.cpp +++ b/tqtinterface/qt4/src/kernel/tqimage.cpp @@ -657,9 +657,9 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of TQString s = fileName; if ( !s.isEmpty() ) { int i; - if ( (i = s.tqfindRev('/')) >= 0 ) + if ( (i = s.findRev('/')) >= 0 ) s = s.mid( i ); - if ( (i = s.tqfindRev('\\')) >= 0 ) + if ( (i = s.findRev('\\')) >= 0 ) s = s.mid( i ); TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); int p = r.search( s ); @@ -705,14 +705,14 @@ static void swapPixel01( TQImage *image ) // 1-bpp: swap 0 and 1 pixels /*! \class TQImageIO tqimage.h - \brief The TQImageIO class tqcontains parameters for loading and + \brief The TQImageIO class contains parameters for loading and saving images. \ingroup images \ingroup graphics \ingroup io - TQImageIO tqcontains a TQIODevice object that is used for image data + TQImageIO contains a TQIODevice object that is used for image data I/O. The programmer can install new image file formats in addition to those that TQt provides. @@ -834,11 +834,11 @@ TQImageHandler::TQImageHandler( const char *f, const char *h, const TQCString& f : format(f), header(TQString::tqfromLatin1(h)) { text_mode = Untranslated; - if ( fl.tqcontains('t') ) + if ( fl.contains('t') ) text_mode = TranslateIn; - else if ( fl.tqcontains('T') ) + else if ( fl.contains('T') ) text_mode = TranslateInOut; - obsolete = fl.tqcontains('O'); + obsolete = fl.contains('O'); read_image = r; write_image = w; } @@ -1328,7 +1328,7 @@ TQStrList TQImageIO::inputFormats() while ( p ) { if ( p->read_image && !p->obsolete - && !result.tqcontains(p->format) ) + && !result.contains(p->format) ) { result.inSort(p->format); } @@ -1356,7 +1356,7 @@ TQStrList TQImageIO::outputFormats() while ( p ) { if ( p->write_image && !p->obsolete - && !result.tqcontains(p->format) ) + && !result.contains(p->format) ) { result.inSort(p->format); } @@ -2684,15 +2684,15 @@ static bool read_xpm_string( TQCString &buf, TQIODevice *d, static int nextColorSpec(const TQCString & buf) { - int i = buf.tqfind(" c "); + int i = buf.find(" c "); if (i < 0) - i = buf.tqfind(" g "); + i = buf.find(" g "); if (i < 0) - i = buf.tqfind(" g4 "); + i = buf.find(" g4 "); if (i < 0) - i = buf.tqfind(" m "); + i = buf.find(" m "); if (i < 0) - i = buf.tqfind(" s "); + i = buf.find(" s "); return i; } @@ -2717,7 +2717,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc d = iio ? iio->ioDevice() : 0; d->readLine( buf.data(), buf.size() ); // "/* XPM */" TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") ); - if ( buf.tqfind(r) == -1 ) + if ( buf.find(r) == -1 ) return; // bad magic } else if ( !source ) { return; @@ -2909,7 +2909,7 @@ static void write_xpm_image( TQImageIO * iio ) TQRgb * yp = (TQRgb *)image.scanLine( y ); for( x=0; x<w; x++ ) { TQRgb color = *(yp + x); - if ( !colorMap.tqcontains(color) ) + if ( !colorMap.contains(color) ) colorMap.insert( color, ncolors++ ); } } @@ -3159,7 +3159,7 @@ TQImage TQImage::createHeuristicMask( bool clipTight ) const { *(image.scanLine(y) + x) = 19; \endcode - 32-bpp images ignore the color table; instead, each pixel tqcontains + 32-bpp images ignore the color table; instead, each pixel contains the RGB triplet. 24 bits contain the RGB value; the most significant byte is reserved for the alpha buffer. @@ -3232,7 +3232,7 @@ TQImage TQImage::createHeuristicMask( bool clipTight ) const { Color/Mono preference (ignored for TQBitmap) \value AutoColor (default) - If the image has \link - TQImage::depth() depth\endlink 1 and tqcontains only + TQImage::depth() depth\endlink 1 and contains only black and white pixels, the pixmap becomes monochrome. \value ColorOnly The pixmap is dithered/converted to the \link TQPixmap::defaultDepth() native display depth\endlink. @@ -4080,7 +4080,7 @@ void TQImage::fill( uint pixel ) If the depth is not 32, the argument \a invertAlpha has no meaning. - Note that inverting an 8-bit image means to tqreplace all pixels + Note that inverting an 8-bit image means to replace all pixels using color index \e i with a pixel using color index 255 minus \e i. Similarly for a 1-bit image. The color table is not changed. @@ -4216,7 +4216,7 @@ void TQImage::setNumColors( int numColors ) it. The default setting is disabled. An 8-bpp image has 8-bit pixels. A pixel is an index into the - \link color() color table\endlink, which tqcontains 32-bit color + \link color() color table\endlink, which contains 32-bit color values. In a 32-bpp image, the 32-bit pixels are the color values. This 32-bit value is encoded as follows: The lower 24 bits are @@ -5969,7 +5969,7 @@ TQImage TQImage::scaleHeight( int h ) const The transformation \a matrix is internally adjusted to compensate for unwanted translation, i.e. xForm() returns the smallest image - that tqcontains all the transformed points of the original image. + that contains all the transformed points of the original image. \sa scale() TQPixmap::xForm() TQPixmap::trueMatrix() TQWMatrix */ @@ -6697,9 +6697,9 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of TQString s = fileName; if ( !s.isEmpty() ) { int i; - if ( (i = s.tqfindRev('/')) >= 0 ) + if ( (i = s.findRev('/')) >= 0 ) s = s.mid( i ); - if ( (i = s.tqfindRev('\\')) >= 0 ) + if ( (i = s.findRev('\\')) >= 0 ) s = s.mid( i ); TQRegExp r( TQString::tqfromLatin1("[a-zA-Z][a-zA-Z0-9_]*") ); int p = r.search( s ); @@ -6745,14 +6745,14 @@ static void swapPixel01( TQImage *image ) // 1-bpp: swap 0 and 1 pixels /*! \class TQImageIO tqimage.h - \brief The TQImageIO class tqcontains parameters for loading and + \brief The TQImageIO class contains parameters for loading and saving images. \ingroup images \ingroup graphics \ingroup io - TQImageIO tqcontains a TQIODevice object that is used for image data + TQImageIO contains a TQIODevice object that is used for image data I/O. The programmer can install new image file formats in addition to those that TQt provides. @@ -6871,11 +6871,11 @@ TQImageHandler::TQImageHandler( const char *f, const char *h, const TQCString& f : format(f), header(TQString::tqfromLatin1(h)) { text_mode = Untranslated; - if ( fl.tqcontains('t') ) + if ( fl.contains('t') ) text_mode = TranslateIn; - else if ( fl.tqcontains('T') ) + else if ( fl.contains('T') ) text_mode = TranslateInOut; - obsolete = fl.tqcontains('O'); + obsolete = fl.contains('O'); read_image = r; write_image = w; } @@ -7365,7 +7365,7 @@ TQStrList TQImageIO::inputFormats() while ( p ) { if ( p->read_image && !p->obsolete - && !result.tqcontains(p->format) ) + && !result.contains(p->format) ) { result.inSort(p->format); } @@ -7393,7 +7393,7 @@ TQStrList TQImageIO::outputFormats() while ( p ) { if ( p->write_image && !p->obsolete - && !result.tqcontains(p->format) ) + && !result.contains(p->format) ) { result.inSort(p->format); } @@ -8722,15 +8722,15 @@ static bool read_xpm_string( TQCString &buf, TQIODevice *d, static int nextColorSpec(const TQCString & buf) { - int i = buf.tqfind(" c "); + int i = buf.find(" c "); if (i < 0) - i = buf.tqfind(" g "); + i = buf.find(" g "); if (i < 0) - i = buf.tqfind(" g4 "); + i = buf.find(" g4 "); if (i < 0) - i = buf.tqfind(" m "); + i = buf.find(" m "); if (i < 0) - i = buf.tqfind(" s "); + i = buf.find(" s "); return i; } @@ -8755,7 +8755,7 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc d = iio ? iio->ioDevice() : 0; d->readLine( buf.data(), buf.size() ); // "/* XPM */" TQRegExp r( TQString::tqfromLatin1("/\\*.XPM.\\*/") ); - if ( buf.tqfind(r) == -1 ) + if ( buf.find(r) == -1 ) return; // bad magic } else if ( !source ) { return; @@ -8947,7 +8947,7 @@ static void write_xpm_image( TQImageIO * iio ) TQRgb * yp = (TQRgb *)image.scanLine( y ); for( x=0; x<w; x++ ) { TQRgb color = *(yp + x); - if ( !colorMap.tqcontains(color) ) + if ( !colorMap.contains(color) ) colorMap.insert( color, ncolors++ ); } } @@ -9488,7 +9488,7 @@ TQValueList<TQImageTextKeyLang> TQImage::textList() const void TQImage::setText(const char* key, const char* lang, const TQString& s) { TQImageTextKeyLang x(key,lang); - misc().text_lang.tqreplace(x,s); + misc().text_lang.replace(x,s); } #endif // TQT_NO_IMAGE_TEXT diff --git a/tqtinterface/qt4/src/kernel/tqjpegio.cpp b/tqtinterface/qt4/src/kernel/tqjpegio.cpp index 20b7b17..dbaa301 100644 --- a/tqtinterface/qt4/src/kernel/tqjpegio.cpp +++ b/tqtinterface/qt4/src/kernel/tqjpegio.cpp @@ -225,7 +225,7 @@ void read_jpeg_image(TQImageIO* iio) char sModeStr[1024] = ""; TQ_ScaleMode sMode; - if ( params.tqcontains( "GetHeaderInformation" ) ) { + if ( params.contains( "GetHeaderInformation" ) ) { // Create TQImage's without allocating the data if ( cinfo.output_components == 3 || cinfo.output_components == 4) { @@ -237,7 +237,7 @@ void read_jpeg_image(TQImageIO* iio) } - } else if ( params.tqcontains( "Scale" ) ) { + } else if ( params.contains( "Scale" ) ) { sscanf( params.latin1(), "Scale( %i, %i, %1023s )", &sWidth, &sHeight, sModeStr ); diff --git a/tqtinterface/qt4/src/kernel/tqkeysequence.cpp b/tqtinterface/qt4/src/kernel/tqkeysequence.cpp index f34f697..7b06b22 100644 --- a/tqtinterface/qt4/src/kernel/tqkeysequence.cpp +++ b/tqtinterface/qt4/src/kernel/tqkeysequence.cpp @@ -217,7 +217,7 @@ TQKeySequence::TQKeySequence() with commas, e.g. "Alt+X,Ctrl+S,Q". This contructor is typically used with \link TQObject::tr() tr - \endlink(), so that accelerator keys can be tqreplaced in + \endlink(), so that accelerator keys can be replaced in translations: \code @@ -359,7 +359,7 @@ int TQKeySequence::assign( TQString keyseq ) // We MUST use something to seperate each sequence, and space // does not cut it, since some of the key names have space // in them.. (Let's hope no one translate with a comma in it:) - p = keyseq.tqfind( ',' ); + p = keyseq.find( ',' ); if ( -1 != p ) { if ( ',' == keyseq[p+1] ) // e.g. 'Ctrl+,, Shift+,,' p++; @@ -414,7 +414,7 @@ int TQKeySequence::decodeString( const TQString& str ) modifs << ModifKeyName( META, "meta+" ) << ModifKeyName( ALT, TQAccel::tqtr("Meta").lower().append('+') ); TQString sl = accel.lower(); for( TQValueList<ModifKeyName>::iterator it = modifs.begin(); it != modifs.end(); ++it ) { - if ( sl.tqcontains( (*it).name ) ) { + if ( sl.contains( (*it).name ) ) { ret |= (*it).qt_key; #ifndef TQT_NO_REGEXP accel.remove( TQRegExp(TQRegExp::escape((*it).name), FALSE) ); @@ -425,7 +425,7 @@ int TQKeySequence::decodeString( const TQString& str ) } } - int p = accel.tqfindRev( '+', str.length() - 2 ); // -2 so that Ctrl++ works + int p = accel.findRev( '+', str.length() - 2 ); // -2 so that Ctrl++ works if( p > 0 ) accel = accel.mid( p + 1 ); @@ -523,7 +523,7 @@ TQString TQKeySequence::encodeString( int key ) } ++i; } - // If we can't tqfind the actual translatable keyname, + // If we can't find the actual translatable keyname, // fall back on the tqunicode representation of it... // Or else characters like Key_aring may not get displayed // ( Really depends on you locale ) diff --git a/tqtinterface/qt4/src/kernel/tqlayout.cpp b/tqtinterface/qt4/src/kernel/tqlayout.cpp index 9a74fce..9c3132a 100644 --- a/tqtinterface/qt4/src/kernel/tqlayout.cpp +++ b/tqtinterface/qt4/src/kernel/tqlayout.cpp @@ -1538,7 +1538,7 @@ public: int heightForWidth( int, int, int ); int minimumHeightForWidth( int, int, int ); - bool tqfindWidget( TQWidget* w, int *row, int *col ); + bool findWidget( TQWidget* w, int *row, int *col ); inline void getNextPos( int &row, int &col ) { row = nextR; col = nextC; } inline uint count() const @@ -1550,7 +1550,7 @@ private: void recalcHFW( int w, int s ); void addHfwData ( TQGridBox *box, int width ); void init(); - TQSize tqfindSize( TQCOORD TQLayoutStruct::*, int ) const; + TQSize findSize( TQCOORD TQLayoutStruct::*, int ) const; void addData( TQGridBox *b, bool r = TRUE, bool c = TRUE ); void setSize( int rows, int cols ); void setupLayoutData( int space ); @@ -1683,7 +1683,7 @@ int TQGridLayoutData::minimumHeightForWidth( int w, int margin, int spacing ) return has_hfw ? (hfw_minheight + 2*margin) : -1; } -bool TQGridLayoutData::tqfindWidget( TQWidget* w, int *row, int *col ) +bool TQGridLayoutData::findWidget( TQWidget* w, int *row, int *col ) { TQPtrListIterator<TQGridBox> it( things ); TQGridBox * box; @@ -1716,7 +1716,7 @@ bool TQGridLayoutData::tqfindWidget( TQWidget* w, int *row, int *col ) return FALSE; } -TQSize TQGridLayoutData::tqfindSize( TQCOORD TQLayoutStruct::*size, int spacer ) const +TQSize TQGridLayoutData::findSize( TQCOORD TQLayoutStruct::*size, int spacer ) const { TQGridLayoutData *that = (TQGridLayoutData *)this; that->setupLayoutData( spacer ); @@ -1767,17 +1767,17 @@ TQ_SPExpandData TQGridLayoutData::expanding( int spacing ) QSize TQGridLayoutData::tqsizeHint( int spacer ) const { - return tqfindSize( &TQLayoutStruct::tqsizeHint, spacer ); + return findSize( &TQLayoutStruct::tqsizeHint, spacer ); } QSize TQGridLayoutData::tqmaximumSize( int spacer ) const { - return tqfindSize( &TQLayoutStruct::tqmaximumSize, spacer ); + return findSize( &TQLayoutStruct::tqmaximumSize, spacer ); } QSize TQGridLayoutData::tqminimumSize( int spacer ) const { - return tqfindSize( &TQLayoutStruct::tqminimumSize, spacer ); + return findSize( &TQLayoutStruct::tqminimumSize, spacer ); } void TQGridLayoutData::setSize( int r, int c ) @@ -2526,9 +2526,9 @@ int TQGridLayout::minimumHeightForWidth( int w ) const Note: if a widget spans multiple rows/columns, the top-left cell is returned. */ -bool TQGridLayout::tqfindWidget( TQWidget* w, int *row, int *col ) +bool TQGridLayout::findWidget( TQWidget* w, int *row, int *col ) { - return data->tqfindWidget( w, row, col ); + return data->findWidget( w, row, col ); } /*! @@ -3419,7 +3419,7 @@ void TQBoxLayout::addItem( QLayoutItem *item ) \warning Does not call TQLayout::insertChildLayout() if \a item is a TQLayout. - \sa addItem(), tqfindWidget() + \sa addItem(), findWidget() */ void TQBoxLayout::insertItem( int index, TQLayoutItem *item ) { @@ -3644,7 +3644,7 @@ void TQBoxLayout::addStrut( int size ) Returns the index of \a w, or -1 if \a w is not found. */ -int TQBoxLayout::tqfindWidget( TQWidget* w ) +int TQBoxLayout::findWidget( TQWidget* w ) { const int n = data->list.count(); for ( int i = 0; i < n; i++ ) { diff --git a/tqtinterface/qt4/src/kernel/tqlayout.h b/tqtinterface/qt4/src/kernel/tqlayout.h index 5423cad..38dd33e 100644 --- a/tqtinterface/qt4/src/kernel/tqlayout.h +++ b/tqtinterface/qt4/src/kernel/tqlayout.h @@ -1011,7 +1011,7 @@ public: #endif // USE_QT4 protected: - bool tqfindWidget( TQWidget* w, int *r, int *c ); + bool findWidget( TQWidget* w, int *r, int *c ); void add( TQLayoutItem*, int row, int col ); private: @@ -1077,7 +1077,7 @@ public: // TQLayoutIterator iterator(); void setGeometry( const TQRect& ); - int tqfindWidget( TQWidget* w ); + int findWidget( TQWidget* w ); #ifdef USE_QT4 diff --git a/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp b/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp index 7dca5e0..7833b27 100644 --- a/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp +++ b/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp @@ -59,7 +59,7 @@ static inline int fRound( int i ) { is computed mirror-reversed, and it's the caller's responsibility do reverse the values before use. - chain tqcontains input and output parameters describing the tqgeometry. + chain contains input and output parameters describing the tqgeometry. count is the count of items in the chain; pos and space give the interval (relative to parentWidget topLeft). */ diff --git a/tqtinterface/qt4/src/kernel/tqmetaobject.cpp b/tqtinterface/qt4/src/kernel/tqmetaobject.cpp index 09d8439..6b2b17f 100644 --- a/tqtinterface/qt4/src/kernel/tqmetaobject.cpp +++ b/tqtinterface/qt4/src/kernel/tqmetaobject.cpp @@ -406,7 +406,7 @@ const TQMetaData* TQMetaObject::signal( int index, bool super ) const [FIXME]: Superclass handling is badly broken */ -int TQMetaObject::tqfindSlot( const char* n, bool super ) const +int TQMetaObject::findSlot( const char* n, bool super ) const { // TQStrList l( FALSE ); // int m = methodCount(); @@ -420,7 +420,7 @@ int TQMetaObject::tqfindSlot( const char* n, bool super ) const // } // return -1; - if (super) printf("[WARNING] In TQMetaObject::tqfindSlot(), superclasses are not being searched for the slot\n\r"); + if (super) printf("[WARNING] In TQMetaObject::findSlot(), superclasses are not being searched for the slot\n\r"); return indexOfSlot(normalizedSignature(n)); } @@ -431,7 +431,7 @@ int TQMetaObject::tqfindSlot( const char* n, bool super ) const [FIXME]: Superclass handling is badly broken */ -int TQMetaObject::tqfindSignal( const char* n, bool super ) const +int TQMetaObject::findSignal( const char* n, bool super ) const { // TQStrList l( FALSE ); // int m = methodCount(); @@ -445,7 +445,7 @@ int TQMetaObject::tqfindSignal( const char* n, bool super ) const // } // return -1; - if (super) printf("[WARNING] In TQMetaObject::tqfindSignal(), superclasses are not being searched for the signal\n\r"); + if (super) printf("[WARNING] In TQMetaObject::findSignal(), superclasses are not being searched for the signal\n\r"); return indexOfSignal(normalizedSignature(n)); } @@ -498,7 +498,7 @@ const TQMetaProperty* TQMetaObject::property( int index, bool super ) const return tqsuperClass()->property( index, super ); } -int TQMetaObject::tqfindProperty( const char *name, bool super ) const { +int TQMetaObject::findProperty( const char *name, bool super ) const { TQ_UNUSED(name); return indexOfProperty(name); } @@ -621,7 +621,7 @@ const TQMetaEnum* TQMetaObject::enumerator( const char* name, bool super ) const /*! \class TQMetaObject tqmetaobject.h - \brief The TQMetaObject class tqcontains meta information about TQt objects. + \brief The TQMetaObject class contains meta information about TQt objects. \ingroup objectmodel @@ -632,7 +632,7 @@ const TQMetaEnum* TQMetaObject::enumerator( const char* name, bool super ) const This class is not normally required for application programming. But if you write meta applications, such as scripting engines or - GUI builders, you might tqfind these functions useful: + GUI builders, you might find these functions useful: \list \i className() to get the name of a class. \i superClassName() to get the name of the superclass. @@ -952,17 +952,17 @@ const TQMetaData* TQMetaObject::signal( int index, bool super ) const If \a super is TRUE, inherited Q_SIGNALS are included. */ -int TQMetaObject::tqfindSignal( const char* n, bool super ) const +int TQMetaObject::findSignal( const char* n, bool super ) const { const TQMetaObject *mo = this; int offset = -1; do { - const TQMetaData *md = mo->signalDict ? mo->signalDict->tqfind( n ) : 0; + const TQMetaData *md = mo->signalDict ? mo->signalDict->find( n ) : 0; if ( md ) { #if defined(TQT_CHECK_RANGE) if ( offset != -1 ) { - qWarning( "TQMetaObject::tqfindSignal:%s: Conflict with %s::%s", + qWarning( "TQMetaObject::findSignal:%s: Conflict with %s::%s", className(), mo->className(), n ); return offset; } @@ -991,14 +991,14 @@ int TQMetaObject::tqfindSignal( const char* n, bool super ) const If \a super is TRUE, inherited Q_SLOTS are included. */ -int TQMetaObject::tqfindSlot( const char* n, bool super ) const +int TQMetaObject::findSlot( const char* n, bool super ) const { - const TQMetaData *md = slotDict ? slotDict->tqfind( n ) : 0; + const TQMetaData *md = slotDict ? slotDict->find( n ) : 0; if ( md ) return slotOffset() + ( md - slotData ); if ( !super || !superclass) return -1; - return superclass->tqfindSlot( n, super ); + return superclass->findSlot( n, super ); } /*!\internal @@ -1149,7 +1149,7 @@ const TQMetaProperty* TQMetaObject::property( int index, bool super ) const \sa property(), propertyNames() */ -int TQMetaObject::tqfindProperty( const char *name, bool super ) const +int TQMetaObject::findProperty( const char *name, bool super ) const { for( int i = 0; i < d->numPropData; ++i ) { if ( d->propData[i].isValid() && qstrcmp( d->propData[i].name(), name ) == 0 ) { @@ -1158,7 +1158,7 @@ int TQMetaObject::tqfindProperty( const char *name, bool super ) const } if ( !super || !superclass ) return -1; - return superclass->tqfindProperty( name, super ); + return superclass->findProperty( name, super ); } /*! \internal @@ -1192,7 +1192,7 @@ const TQMetaProperty* TQMetaObject::resolveProperty( const TQMetaProperty* p ) c { if ( !superclass ) return 0; - return superclass->property( superclass->tqfindProperty( p->n, TRUE ), TRUE ); + return superclass->property( superclass->findProperty( p->n, TRUE ), TRUE ); } /*!\internal @@ -1207,7 +1207,7 @@ int TQMetaObject::resolveProperty( int index ) const if ( !superclass ) return -1; const TQMetaProperty* p = d->propData + ( index - propertyOffset() ); - return superclass->tqfindProperty( p->n, TRUE ); + return superclass->findProperty( p->n, TRUE ); } @@ -1342,7 +1342,7 @@ TQMetaObject *TQMetaObject::tqmetaObject( const char *class_name ) TQMutexLocker( tqt_global_mutexpool ? tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // TQT_THREAD_SUPPORT - TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->tqfind( class_name ); + TQtStaticMetaObjectFunction func = (TQtStaticMetaObjectFunction)qt_metaobjects->find( class_name ); if ( func ) return func(); return 0; @@ -1357,7 +1357,7 @@ bool TQMetaObject::hasMetaObject( const char *class_name ) TQMutexLocker( tqt_global_mutexpool ? tqt_global_mutexpool->get( &qt_metaobjects ) : 0 ); #endif // TQT_THREAD_SUPPORT - return !!qt_metaobjects->tqfind( class_name ); + return !!qt_metaobjects->find( class_name ); } #ifndef TQT_NO_PROPERTIES diff --git a/tqtinterface/qt4/src/kernel/tqmetaobject.h b/tqtinterface/qt4/src/kernel/tqmetaobject.h index 5502743..f6e1631 100644 --- a/tqtinterface/qt4/src/kernel/tqmetaobject.h +++ b/tqtinterface/qt4/src/kernel/tqmetaobject.h @@ -138,7 +138,7 @@ public: TQStrList signalNames( bool super = FALSE ) const; #ifndef TQT_NO_PROPERTIES - int tqfindProperty( const char *name, bool super = FALSE ) const; + int findProperty( const char *name, bool super = FALSE ) const; TQMetaObject *tqsuperClass() const; const char *tqsuperClassName() const; TQStrList propertyNames( bool super = FALSE ) const; @@ -150,8 +150,8 @@ public: const TQMetaData *slot( int index, bool super = FALSE ) const; const TQMetaData *signal( int index, bool super = FALSE ) const; - int tqfindSlot( const char *, bool super = FALSE ) const; - int tqfindSignal( const char *, bool super = FALSE ) const; + int findSlot( const char *, bool super = FALSE ) const; + int findSignal( const char *, bool super = FALSE ) const; int numProperties( bool super = FALSE ) const; const TQMetaProperty *property( int index, bool super = FALSE ) const; @@ -290,8 +290,8 @@ public: int numSlots( bool super = FALSE ) const; int numSignals( bool super = FALSE ) const; - int tqfindSlot( const char *, bool super = FALSE ) const; - int tqfindSignal( const char *, bool super = FALSE ) const; + int findSlot( const char *, bool super = FALSE ) const; + int findSignal( const char *, bool super = FALSE ) const; const TQMetaData *slot( int index, bool super = FALSE ) const; const TQMetaData *signal( int index, bool super = FALSE ) const; @@ -309,7 +309,7 @@ public: #ifndef TQT_NO_PROPERTIES const TQMetaProperty *property( int index, bool super = FALSE ) const; - int tqfindProperty( const char *name, bool super = FALSE ) const; + int findProperty( const char *name, bool super = FALSE ) const; int indexOfProperty( const TQMetaProperty*, bool super = FALSE ) const; const TQMetaProperty* resolveProperty( const TQMetaProperty* ) const; int resolveProperty( int ) const; diff --git a/tqtinterface/qt4/src/kernel/tqmime.cpp b/tqtinterface/qt4/src/kernel/tqmime.cpp index 46d07d3..943ba55 100644 --- a/tqtinterface/qt4/src/kernel/tqmime.cpp +++ b/tqtinterface/qt4/src/kernel/tqmime.cpp @@ -747,7 +747,7 @@ public: TQMessageBox) always use the default factory. A factory can also be used as a container to store data associated - with a name. This technique is useful whenever rich text tqcontains + with a name. This technique is useful whenever rich text contains images that are stored in the program itself, not loaded from the hard disk. Your program may, for example, define some image data as: @@ -817,7 +817,7 @@ TQMimeSource* TQMimeSourceFactory::dataInternal(const TQString& abs_name, const TQString e = fi.extension(FALSE); TQCString mimetype = "application/octet-stream"; const char* imgfmt; - if ( extensions.tqcontains(e) ) + if ( extensions.contains(e) ) mimetype = extensions[e].latin1(); else if ( ( imgfmt = TQImage::imageFormat( abs_name ) ) ) mimetype = TQCString("image/")+TQCString(imgfmt).lower(); @@ -833,7 +833,7 @@ TQMimeSource* TQMimeSourceFactory::dataInternal(const TQString& abs_name, const } } - // we didn't tqfind the mime-source, so ask the default factory for + // we didn't find the mime-source, so ask the default factory for // the mime-source (this one will iterate over all installed ones) // // this looks dangerous, as this dataInternal() function will be @@ -894,7 +894,7 @@ TQMimeSource* TQMimeSourceFactory::dataInternal(const TQString& abs_name, const */ const TQMimeSource* TQMimeSourceFactory::data(const TQString& abs_name) const { - if ( d->stored.tqcontains(abs_name) ) + if ( d->stored.contains(abs_name) ) return d->stored[abs_name]; TQMimeSource* r = 0; @@ -987,7 +987,7 @@ void TQMimeSourceFactory::addFilePath( const TQString& p ) */ void TQMimeSourceFactory::setExtensionType( const TQString& ext, const char* mimetype ) { - d->extensions.tqreplace(ext, mimetype); + d->extensions.replace(ext, mimetype); } /*! @@ -1074,9 +1074,9 @@ void TQMimeSourceFactory::setPixmap( const TQString& abs_name, const TQPixmap& p */ void TQMimeSourceFactory::setData( const TQString& abs_name, TQMimeSource* data ) { - if ( d->stored.tqcontains(abs_name) ) + if ( d->stored.contains(abs_name) ) delete d->stored[abs_name]; - d->stored.tqreplace(abs_name,data); + d->stored.replace(abs_name,data); } diff --git a/tqtinterface/qt4/src/kernel/tqmovie.cpp b/tqtinterface/qt4/src/kernel/tqmovie.cpp index 4b77249..87a339c 100644 --- a/tqtinterface/qt4/src/kernel/tqmovie.cpp +++ b/tqtinterface/qt4/src/kernel/tqmovie.cpp @@ -368,7 +368,7 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off, // this frame already. TQString key; key.sprintf( "%08lx:%04d", ( long )this, framenumber ); - if ( !TQPixmapCache::tqfind( key, lines ) ) { + if ( !TQPixmapCache::find( key, lines ) ) { lines.convertFromImage(img, TQt::ColorOnly); TQPixmapCache::insert( key, lines ); dirty_cache = TRUE; diff --git a/tqtinterface/qt4/src/kernel/tqnetworkprotocol.cpp b/tqtinterface/qt4/src/kernel/tqnetworkprotocol.cpp index 83cc094..d980b35 100644 --- a/tqtinterface/qt4/src/kernel/tqnetworkprotocol.cpp +++ b/tqtinterface/qt4/src/kernel/tqnetworkprotocol.cpp @@ -138,7 +138,7 @@ public: This signal is emitted after listChildren() was called and new tqchildren (files) have been read from the list of files. \a i holds the information about the new tqchildren. \a op is the pointer to - the operation object which tqcontains all the information about the + the operation object which contains all the information about the operation, including the state, etc. When a protocol emits this signal, TQNetworkProtocol is smart @@ -160,7 +160,7 @@ public: TQNetworkProtocol automatically connects it to a slot which creates a list of TQUrlInfo objects (with just one TQUrlInfo \a i) and emits the newChildren() signal with this list. \a op is the pointer to - the operation object which tqcontains all the information about the + the operation object which contains all the information about the operation that has finished, including the state, etc. This is just a convenience signal useful for implementing your own @@ -173,7 +173,7 @@ public: This signal is emitted when an operation finishes. This signal is always emitted, for both success and failure. \a op is the pointer - to the operation object which tqcontains all the information about + to the operation object which contains all the information about the operation, including the state, etc. Check the state and error code of the operation object to determine whether or not the operation was successful. @@ -188,7 +188,7 @@ public: Some operations (such as listChildren()) emit this signal when they start processing the operation. \a op is the pointer to the - operation object which tqcontains all the information about the + operation object which contains all the information about the operation, including the state, etc. When a protocol emits this signal, TQNetworkProtocol is smart @@ -202,7 +202,7 @@ public: This signal is emitted when mkdir() has been succesful and the directory has been created. \a i holds the information about the new directory. \a op is the pointer to the operation object which - tqcontains all the information about the operation, including the + contains all the information about the operation, including the state, etc. Using op->arg( 0 ), you can get the file name of the new directory. @@ -217,7 +217,7 @@ public: This signal is emitted when remove() has been succesful and the file has been removed. \a op holds the file name of the removed file in the first argument, accessible with op->arg( 0 ). \a op is - the pointer to the operation object which tqcontains all the + the pointer to the operation object which contains all the information about the operation, including the state, etc. When a protocol emits this signal, TQNetworkProtocol is smart @@ -233,7 +233,7 @@ public: holds the original and the new file names in the first and second arguments, accessible with op->arg( 0 ) and op->arg( 1 ) respectively. \a op is the pointer to the operation object which - tqcontains all the information about the operation, including the + contains all the information about the operation, including the state, etc. When a protocol emits this signal, TQNetworkProtocol is smart @@ -250,7 +250,7 @@ public: which data is retrieved or uploaded in its first argument, and the (raw) data in its second argument. You can get them with op->arg( 0 ) and op->rawArg( 1 ). \a op is the pointer to the - operation object, which tqcontains all the information about the + operation object, which contains all the information about the operation, including the state, etc. When a protocol emits this signal, TQNetworkProtocol is smart @@ -265,7 +265,7 @@ public: get()). \a bytesDone is how many bytes of \a bytesTotal have been transferred. \a bytesTotal may be -1, which means that the total number of bytes is not known. \a op is the pointer to the - operation object which tqcontains all the information about the + operation object which contains all the information about the operation, including the state, etc. When a protocol emits this signal, TQNetworkProtocol is smart @@ -285,7 +285,7 @@ public: /*! \enum TQNetworkProtocol::State - This enum tqcontains the state that a TQNetworkOperation can have. + This enum contains the state that a TQNetworkOperation can have. \value StWaiting The operation is in the TQNetworkProtocol's queue waiting to be prcessed. @@ -604,7 +604,7 @@ TQNetworkProtocol *TQNetworkProtocol::getNetworkProtocol( const TQString &protoc if ( protocol.isNull() ) return 0; - TQNetworkProtocolFactoryBase *factory = qNetworkProtocolRegister->tqfind( protocol ); + TQNetworkProtocolFactoryBase *factory = qNetworkProtocolRegister->find( protocol ); if ( factory ) return factory->createObject(); @@ -689,7 +689,7 @@ void TQNetworkProtocol::processOperation( TQNetworkOperation *op ) at the example implementation in examples/network/networkprotocol/nntp.cpp. - \a op is the pointer to the operation object which tqcontains all + \a op is the pointer to the operation object which contains all the information on the operation that has finished, including the state, etc. */ @@ -711,7 +711,7 @@ void TQNetworkProtocol::operationListChildren( TQNetworkOperation * ) at the example implementation in examples/network/networkprotocol/nntp.cpp. - \a op is the pointer to the operation object which tqcontains all + \a op is the pointer to the operation object which contains all the information on the operation that has finished, including the state, etc. */ @@ -733,7 +733,7 @@ void TQNetworkProtocol::operationMkDir( TQNetworkOperation * ) look at the example implementation in examples/network/networkprotocol/nntp.cpp. - \a op is the pointer to the operation object which tqcontains all + \a op is the pointer to the operation object which contains all the information on the operation that has finished, including the state, etc. */ @@ -755,7 +755,7 @@ void TQNetworkProtocol::operationRemove( TQNetworkOperation * ) at the example implementation in examples/network/networkprotocol/nntp.cpp. - \a op is the pointer to the operation object which tqcontains all + \a op is the pointer to the operation object which contains all the information on the operation that has finished, including the state, etc. */ @@ -777,7 +777,7 @@ void TQNetworkProtocol::operationRename( TQNetworkOperation * ) at the example implementation in examples/network/networkprotocol/nntp.cpp. - \a op is the pointer to the operation object which tqcontains all + \a op is the pointer to the operation object which contains all the information on the operation that has finished, including the state, etc. */ @@ -799,7 +799,7 @@ void TQNetworkProtocol::operationGet( TQNetworkOperation * ) at the example implementation in examples/network/networkprotocol/nntp.cpp. - \a op is the pointer to the operation object which tqcontains all + \a op is the pointer to the operation object which contains all the information on the operation that has finished, including the state, etc. */ diff --git a/tqtinterface/qt4/src/kernel/tqobject.cpp b/tqtinterface/qt4/src/kernel/tqobject.cpp index 9bec024..4f465d1 100644 --- a/tqtinterface/qt4/src/kernel/tqobject.cpp +++ b/tqtinterface/qt4/src/kernel/tqobject.cpp @@ -284,7 +284,7 @@ static TQObject* qt_spy_signal_sender = 0; // mo = sender->tqmetaObject(); // while ( mo ) { // s.sprintf( "%s_%s", mo->className(), sigData->name ); -// int slot = qt_preliminary_signal_spy->tqmetaObject()->tqfindSlot( s, TRUE ); +// int slot = qt_preliminary_signal_spy->tqmetaObject()->findSlot( s, TRUE ); // if ( slot >= 0 ) { // #ifdef TQT_THREAD_SUPPORT // // protect access to qt_spy_signal_sender @@ -350,7 +350,7 @@ static TQCString qt_rmWS( const char *s ) } *d = '\0'; result.truncate( (int)(d - result.data()) ); - int void_pos = result.tqfind("(void)"); + int void_pos = result.find("(void)"); if ( void_pos >= 0 ) result.remove( void_pos+1, (uint)strlen("void") ); return result; @@ -463,7 +463,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) // #ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY // if ( qt_preliminary_signal_spy ) -// qt_spy_signal( this, connections->tqfindRef( clist), o ); +// qt_spy_signal( this, connections->findRef( clist), o ); // #endif TQObject *object; @@ -671,7 +671,7 @@ static void objSearch( TQObjectList *result, file. \warning Delete the list as soon you have finished using it. The - list tqcontains pointers that may become invalid at almost any time + list contains pointers that may become invalid at almost any time without notice (as soon as the user closes a window you may have dangling pointers, for example). @@ -911,14 +911,14 @@ bool TQObject::eventFilter( TQObject * /* watched */, TQEvent * /* e */ ) Returns 0 if there is no such child. \code - TQListBox *c = (TQListBox *) qt_tqfind_obj_child( myWidget, "TQListBox", + TQListBox *c = (TQListBox *) qt_find_obj_child( myWidget, "TQListBox", "my list box" ); if ( c ) c->insertItem( "another string" ); \endcode */ -void *qt_tqfind_obj_child( TQObject *tqparent, const char *type, const char *name ) +void *qt_find_obj_child( TQObject *tqparent, const char *type, const char *name ) { if ( !tqparent->childrenListObject().isEmpty() ) { TQObjectListIt it( tqparent->childrenListObject() ); @@ -1184,7 +1184,7 @@ static TQCString qt_rmWS( const char *s ) } *d = '\0'; result.truncate( (int)(d - result.data()) ); - int void_pos = result.tqfind("(void)"); + int void_pos = result.find("(void)"); if ( void_pos >= 0 ) result.remove( void_pos+1, (uint)strlen("void") ); return result; @@ -1202,12 +1202,12 @@ static void removeObjFromList( TQObjectList *objList, const TQObject *obj, { if ( !objList ) return; - int index = objList->tqfindRef( obj ); + int index = objList->findRef( obj ); while ( index >= 0 ) { objList->remove(); if ( single ) return; - index = objList->tqfindNextRef( obj ); + index = objList->findNextRef( obj ); } } @@ -1221,14 +1221,14 @@ static void removeObjFromList( TQObjectList *objList, const TQObject *obj, Returns 0 if there is no such child. \code - TQListBox *c = (TQListBox *) qt_tqfind_obj_child( myWidget, "TQListBox", + TQListBox *c = (TQListBox *) qt_find_obj_child( myWidget, "TQListBox", "my list box" ); if ( c ) c->insertItem( "another string" ); \endcode */ -void *qt_tqfind_obj_child( TQObject *tqparent, const char *type, const char *name ) +void *qt_find_obj_child( TQObject *tqparent, const char *type, const char *name ) { if ( !tqparent->childrenListObject().isEmpty() ) { TQObjectListIt it( tqparent->childrenListObject() ); @@ -1266,7 +1266,7 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o ) mo = sender->tqmetaObject(); while ( mo ) { s.sprintf( "%s_%s", mo->className(), sigData->name ); - int slot = qt_preliminary_signal_spy->tqmetaObject()->tqfindSlot( s, TRUE ); + int slot = qt_preliminary_signal_spy->tqmetaObject()->findSlot( s, TRUE ); if ( slot >= 0 ) { #ifdef TQT_THREAD_SUPPORT // protect access to qt_spy_signal_sender @@ -1344,7 +1344,7 @@ static void remove_tree( TQObject* obj ) The tqparent of an object may be viewed as the object's owner. For instance, a \link TQDialog dialog box\endlink is the tqparent of the - "OK" and "Cancel" buttons it tqcontains. + "OK" and "Cancel" buttons it contains. The destructor of a tqparent object destroys all child objects. @@ -1353,8 +1353,8 @@ static void remove_tree( TQObject* obj ) The object name is some text that can be used to identify a TQObject. It's particularly useful in conjunction with \link - designer-manual.book <i>TQt Designer</i>\endlink. You can tqfind an - object by name (and type) using child(). To tqfind several objects + designer-manual.book <i>TQt Designer</i>\endlink. You can find an + object by name (and type) using child(). To find several objects use queryList(). \sa tqparent(), name(), child(), queryList() @@ -1485,9 +1485,9 @@ TQObject::~TQObject() Returns a pointer to the meta object of this object. - A meta object tqcontains information about a class that inherits + A meta object contains information about a class that inherits TQObject, e.g. class name, superclass name, properties, Q_SIGNALS and - Q_SLOTS. Every class that tqcontains the TQ_OBJECT macro will also have + Q_SLOTS. Every class that contains the TQ_OBJECT macro will also have a meta object. The meta object information is required by the signal/slot @@ -1584,8 +1584,8 @@ void *qt_inheritedBy( TQMetaObject *superClass, const TQObject *object ) \brief the name of this object - You can tqfind an object by name (and type) using child(). You can - tqfind a set of objects with queryList(). + You can find an object by name (and type) using child(). You can + find a set of objects with queryList(). The object name is set by the constructor or by the setName() function. The object name is not very useful in the current @@ -1930,7 +1930,7 @@ void TQObject::blockSignals( bool block ) function to get timer events. If multiple timers are running, the TQTimerEvent::timerId() can be - used to tqfind out which timer was activated. + used to find out which timer was activated. Example: \code @@ -1993,7 +1993,7 @@ void TQObject::killTimer( int id ) /*! Kills all timers that this object has started. - \warning Using this function can cause hard-to-tqfind bugs: it kills + \warning Using this function can cause hard-to-find bugs: it kills timers started by sub- and superclasses as well as those started by you, which is often not what you want. We recommend using a TQTimer or perhaps killTimer(). @@ -2136,7 +2136,7 @@ const TQObjectList *TQObject::objectTrees() file. \warning Delete the list as soon you have finished using it. The - list tqcontains pointers that may become invalid at almost any time + list contains pointers that may become invalid at almost any time without notice (as soon as the user closes a window you may have dangling pointers, for example). @@ -2178,9 +2178,9 @@ TQConnectionList *TQObject::tqreceivers( const char* signal ) const if ( connections && signal ) { if ( *signal == '2' ) { // tag == 2, i.e. signal TQCString s = qt_rmWS( signal+1 ); - return tqreceivers( tqmetaObject()->tqfindSignal( (const char*)s, TRUE ) ); + return tqreceivers( tqmetaObject()->findSignal( (const char*)s, TRUE ) ); } else { - return tqreceivers( tqmetaObject()->tqfindSignal(signal, TRUE ) ); + return tqreceivers( tqmetaObject()->findSignal(signal, TRUE ) ); } } return 0; @@ -2355,7 +2355,7 @@ void TQObject::installEventFilter( const TQObject *obj ) if ( !obj ) return; if ( eventFilters ) { - int c = eventFilters->tqfindRef( obj ); + int c = eventFilters->findRef( obj ); if ( c >= 0 ) eventFilters->take( c ); disconnect( obj, TQT_SIGNAL(destroyed(TQObject*)), @@ -2464,16 +2464,16 @@ static void err_info_about_candidates( int code, // porting help TQCString newname = member; int p; - while ( (p=newname.tqfind("const char*")) >= 0 ) { - newname.tqreplace(p, 11, "const TQString&"); + while ( (p=newname.find("const char*")) >= 0 ) { + newname.replace(p, 11, "const TQString&"); } const TQMetaData *rm = 0; switch ( code ) { case TQSLOT_CODE: - rm = mo->slot( mo->tqfindSlot( newname, TRUE ), TRUE ); + rm = mo->slot( mo->findSlot( newname, TRUE ), TRUE ); break; case TQSIGNAL_CODE: - rm = mo->signal( mo->tqfindSignal( newname, TRUE ), TRUE ); + rm = mo->signal( mo->findSignal( newname, TRUE ), TRUE ); break; } if ( rm ) { @@ -2524,7 +2524,7 @@ const TQObject *TQObject::sender() * which gets cleaned on both destruction and disconnect. */ - senderObjects->tqfindRef( senderObjects->currentSender ) != -1 ) + senderObjects->findRef( senderObjects->currentSender ) != -1 ) return senderObjects->currentSender; return 0; } @@ -2718,11 +2718,11 @@ bool TQObject::connect( const TQObject *sender, const char *signal, TQCString nw_signal(signal); // Assume already normalized ++signal; // skip member type code - int signal_index = smeta->tqfindSignal( signal, TRUE ); + int signal_index = smeta->findSignal( signal, TRUE ); if ( signal_index < 0 ) { // normalize and retry nw_signal = qt_rmWS( signal-1 ); // remove whitespace signal = nw_signal.data()+1; // skip member type code - signal_index = smeta->tqfindSignal( signal, TRUE ); + signal_index = smeta->findSignal( signal, TRUE ); } if ( signal_index < 0 ) { // no such signal @@ -2752,19 +2752,19 @@ bool TQObject::connect( const TQObject *sender, const char *signal, int member_index = -1; switch ( membcode ) { // get receiver member case TQSLOT_CODE: - member_index = rmeta->tqfindSlot( member, TRUE ); + member_index = rmeta->findSlot( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace member = nw_member; - member_index = rmeta->tqfindSlot( member, TRUE ); + member_index = rmeta->findSlot( member, TRUE ); } break; case TQSIGNAL_CODE: - member_index = rmeta->tqfindSignal( member, TRUE ); + member_index = rmeta->findSignal( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace member = nw_member; - member_index = rmeta->tqfindSignal( member, TRUE ); + member_index = rmeta->findSignal( member, TRUE ); } break; } @@ -2964,19 +2964,19 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, switch ( membcode ) { // get receiver member case TQSLOT_CODE: - member_index = rmeta->tqfindSlot( member, TRUE ); + member_index = rmeta->findSlot( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace member = nw_member; - member_index = rmeta->tqfindSlot( member, TRUE ); + member_index = rmeta->findSlot( member, TRUE ); } break; case TQSIGNAL_CODE: - member_index = rmeta->tqfindSignal( member, TRUE ); + member_index = rmeta->findSignal( member, TRUE ); if ( member_index < 0 ) { // normalize and retry nw_member = qt_rmWS(member); // remove whitespace member = nw_member; - member_index = rmeta->tqfindSignal( member, TRUE ); + member_index = rmeta->findSignal( member, TRUE ); } break; } @@ -3006,11 +3006,11 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, TQMetaObject *smeta = s->tqmetaObject(); if ( !smeta ) // no meta object return FALSE; - int signal_index = smeta->tqfindSignal( signal, TRUE ); + int signal_index = smeta->findSignal( signal, TRUE ); if ( signal_index < 0 ) { // normalize and retry nw_signal = qt_rmWS( signal-1 ); // remove whitespace signal = nw_signal.data()+1; // skip member type code - signal_index = smeta->tqfindSignal( signal, TRUE ); + signal_index = smeta->findSignal( signal, TRUE ); } if ( signal_index < 0 ) { #if defined(TQT_CHECK_RANGE) @@ -3026,7 +3026,7 @@ bool TQObject::disconnect( const TQObject *sender, const char *signal, if ( membcode == TQSLOT_CODE && r ) { TQMetaObject * rmeta = r->tqmetaObject(); do { - int mi = rmeta->tqfindSlot( member ); + int mi = rmeta->findSlot( member ); if ( mi != -1 ) res |= disconnectInternal( s, signal_index, r, membcode, mi ); } while ( (rmeta = rmeta->superClass()) ); @@ -3314,7 +3314,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o ) #ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY if ( qt_preliminary_signal_spy ) - qt_spy_signal( this, connections->tqfindRef( clist), o ); + qt_spy_signal( this, connections->findRef( clist), o ); #endif TQObject *object; @@ -3560,7 +3560,7 @@ bool TQObject::setProperty( const char *name, const TQVariant& value ) TQMetaObject* meta = tqmetaObject(); if ( !meta ) return FALSE; - int id = meta->tqfindProperty( name, TRUE ); + int id = meta->findProperty( name, TRUE ); const TQMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() || !p->writable() ) { qWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist", @@ -3612,7 +3612,7 @@ TQVariant TQObject::property( const char *name ) const TQMetaObject* meta = tqmetaObject(); if ( !meta ) return v; - int id = meta->tqfindProperty( name, TRUE ); + int id = meta->findProperty( name, TRUE ); const TQMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() ) { qWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist", diff --git a/tqtinterface/qt4/src/kernel/tqobjectcleanuphandler.cpp b/tqtinterface/qt4/src/kernel/tqobjectcleanuphandler.cpp index fdee282..f9a5937 100644 --- a/tqtinterface/qt4/src/kernel/tqobjectcleanuphandler.cpp +++ b/tqtinterface/qt4/src/kernel/tqobjectcleanuphandler.cpp @@ -135,7 +135,7 @@ void TQObjectCleanupHandler::remove( TQObject *object ) { if ( !cleanupObjects ) return; - if ( cleanupObjects->tqfindRef( object ) >= 0 ) { + if ( cleanupObjects->findRef( object ) >= 0 ) { (void) cleanupObjects->take(); disconnect( object, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(objectDestroyed(TQObject*)) ); } diff --git a/tqtinterface/qt4/src/kernel/tqobjectdefs.h b/tqtinterface/qt4/src/kernel/tqobjectdefs.h index 794d1f0..c876898 100644 --- a/tqtinterface/qt4/src/kernel/tqobjectdefs.h +++ b/tqtinterface/qt4/src/kernel/tqobjectdefs.h @@ -247,9 +247,9 @@ class TQObjectList; class TQObjectListIt; class TQMemberDict; -TQ_EXPORT void *qt_tqfind_obj_child( TQObject *, const char *, const char * ); +TQ_EXPORT void *qt_find_obj_child( TQObject *, const char *, const char * ); #define TQ_CHILD(tqparent,type,name) \ - ((type*)qt_tqfind_obj_child(tqparent,#type,name)) + ((type*)qt_find_obj_child(tqparent,#type,name)) TQ_EXPORT void *qt_inheritedBy( TQMetaObject *super, const TQObject *cls ); diff --git a/tqtinterface/qt4/src/kernel/tqpaintdevice.h b/tqtinterface/qt4/src/kernel/tqpaintdevice.h index 5c7a2c7..738dd76 100644 --- a/tqtinterface/qt4/src/kernel/tqpaintdevice.h +++ b/tqtinterface/qt4/src/kernel/tqpaintdevice.h @@ -248,7 +248,7 @@ private: static void *x_appvisual; static bool x_appdefvisual; - // ### in 4.0, remove the above, and tqreplace with the below + // ### in 4.0, remove the above, and replace with the below static int *x_appdepth_arr; static int *x_appcells_arr; static TQt::HANDLE *x_approotwindow_arr; @@ -539,7 +539,7 @@ private: static void *x_appvisual; static bool x_appdefvisual; - // ### in 4.0, remove the above, and tqreplace with the below + // ### in 4.0, remove the above, and replace with the below static int *x_appdepth_arr; static int *x_appcells_arr; static TQt::HANDLE *x_approotwindow_arr; diff --git a/tqtinterface/qt4/src/kernel/tqpaintdevicemetrics.cpp b/tqtinterface/qt4/src/kernel/tqpaintdevicemetrics.cpp index 6013062..0763352 100644 --- a/tqtinterface/qt4/src/kernel/tqpaintdevicemetrics.cpp +++ b/tqtinterface/qt4/src/kernel/tqpaintdevicemetrics.cpp @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE \snippet doc/src/snippets/code/src_qt3support_painting_q3painttqdevicemetrics.cpp 0 - TQPaintDeviceMetrics tqcontains methods to provide the width and + TQPaintDeviceMetrics contains methods to provide the width and height of a tqdevice in both pixels (width() and height()) and millimeters (widthMM() and heightMM()), the number of colors the tqdevice supports (numColors()), the number of bit planes (depth()), @@ -210,7 +210,7 @@ QT_END_NAMESPACE double aspect = (double)pdm.widthMM() / (double)pdm.heightMM(); \endcode - TQPaintDeviceMetrics tqcontains methods to provide the width and + TQPaintDeviceMetrics contains methods to provide the width and height of a tqdevice in both pixels (width() and height()) and millimeters (widthMM() and heightMM()), the number of colors the tqdevice supports (numColors()), the number of bit planes (depth()), diff --git a/tqtinterface/qt4/src/kernel/tqpainter.cpp b/tqtinterface/qt4/src/kernel/tqpainter.cpp index 66596f5..6d48128 100644 --- a/tqtinterface/qt4/src/kernel/tqpainter.cpp +++ b/tqtinterface/qt4/src/kernel/tqpainter.cpp @@ -1518,7 +1518,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; \list \i font() is the currently set font. If you set a font that isn't - available, TQt tqfinds a close match. In fact font() returns what + available, TQt finds a close match. In fact font() returns what you set using setFont() and fontInfo() returns the font actually being used (which may be the same). @@ -1594,7 +1594,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; The most common functions used are scale(), rotate(), translate() and shear(), all of which operate on the tqworldMatrix(). - setWorldMatrix() can tqreplace or add to the currently set + setWorldMatrix() can replace or add to the currently set tqworldMatrix(). setViewport() sets the rectangle on which TQPainter operates. The @@ -1739,7 +1739,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; /*! \enum TQt::AlignmentFlags - This enum type is used to describe tqalignment. It tqcontains + This enum type is used to describe tqalignment. It contains horizontal and vertical flags. The horizontal flags are: @@ -2232,17 +2232,17 @@ static TQPaintDeviceDict *pdev_dict = 0; /*! Redirects all paint commands for a paint tqdevice, \a pdev, to - another paint tqdevice, \a tqreplacement, unless \a tqreplacement is 0. - If \a tqreplacement is 0, the redirection for \a pdev is removed. + another paint tqdevice, \a replacement, unless \a replacement is 0. + If \a replacement is 0, the redirection for \a pdev is removed. - In general, you'll probably tqfind calling TQPixmap::grabWidget() or + In general, you'll probably find calling TQPixmap::grabWidget() or TQPixmap::grabWindow() is an easier solution. */ -void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *tqreplacement ) +void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *replacement ) { if ( pdev_dict == 0 ) { - if ( tqreplacement == 0 ) + if ( replacement == 0 ) return; pdev_dict = new TQPaintDeviceDict; TQ_CHECK_PTR( pdev_dict ); @@ -2251,8 +2251,8 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *tqreplacement ) if ( pdev == 0 ) qWarning( "TQPainter::redirect: The pdev argument cannot be 0" ); #endif - if ( tqreplacement ) { - pdev_dict->insert( pdev, tqreplacement ); + if ( replacement ) { + pdev_dict->insert( pdev, replacement ); } else { pdev_dict->remove( pdev ); if ( pdev_dict->count() == 0 ) { @@ -2264,11 +2264,11 @@ void TQPainter::redirect( TQPaintDevice *pdev, TQPaintDevice *tqreplacement ) /*! \internal - Returns the tqreplacement for \a pdev, or 0 if there is no tqreplacement. + Returns the replacement for \a pdev, or 0 if there is no replacement. */ TQPaintDevice *TQPainter::redirect( TQPaintDevice *pdev ) { - return pdev_dict ? pdev_dict->tqfind( pdev ) : 0; + return pdev_dict ? pdev_dict->find( pdev ) : 0; } /*! @@ -2799,7 +2799,7 @@ const TQWMatrix &TQPainter::tqworldMatrix() const transformation. If \a combine is TRUE, then \a m is combined with the current - transformation matrix, otherwise \a m tqreplaces the current + transformation matrix, otherwise \a m replaces the current transformation matrix. If \a m is the identity matrix and \a combine is FALSE, this @@ -4136,7 +4136,7 @@ void TQPainter::fix_neg_rect( int *x, int *y, int *w, int *h ) // // The drawText function takes two special parameters; 'internal' and 'brect'. // -// The 'internal' parameter tqcontains a pointer to an array of encoded +// The 'internal' parameter contains a pointer to an array of encoded // information that keeps internal tqgeometry data. // If the drawText function is called repeatedly to display the same text, // it makes sense to calculate text width and linebreaks the first time, @@ -4145,7 +4145,7 @@ void TQPainter::fix_neg_rect( int *x, int *y, int *w, int *h ) // The 'internal' parameter will not be used if it is a null pointer. // The 'internal' parameter will be generated if it is not null, but points // to a null pointer, i.e. internal != 0 && *internal == 0. -// The 'internal' parameter will be used if it tqcontains a non-null pointer. +// The 'internal' parameter will be used if it contains a non-null pointer. // // If the 'brect parameter is a non-null pointer, then the bounding rectangle // of the text will be returned in 'brect'. @@ -4255,7 +4255,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r, TQFontMetrics fm( fnt ); TQString text = str; - // str.setLength() always does a deep copy, so the tqreplacement + // str.setLength() always does a deep copy, so the replacement // code below is safe. text.setLength( len ); // compatible behaviour to the old implementation. Replace diff --git a/tqtinterface/qt4/src/kernel/tqpainter.h b/tqtinterface/qt4/src/kernel/tqpainter.h index c491f8b..c1a5092 100644 --- a/tqtinterface/qt4/src/kernel/tqpainter.h +++ b/tqtinterface/qt4/src/kernel/tqpainter.h @@ -385,7 +385,7 @@ public: #endif #endif - static void redirect( TQPaintDevice *pdev, TQPaintDevice *tqreplacement ); + static void redirect( TQPaintDevice *pdev, TQPaintDevice *replacement ); static TQPaintDevice *redirect( TQPaintDevice *pdev ); bool isActive() const; diff --git a/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp b/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp index ac788d4..05d5c76 100644 --- a/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp @@ -1148,7 +1148,7 @@ void TQPainter::updateBrush() if ( pat ) { TQString key; key.sprintf( "$qt-brush$%d", bs ); - pm = TQPixmapCache::tqfind( key ); + pm = TQPixmapCache::find( key ); bool del = FALSE; if ( !pm ) { // not already in pm dict pm = new TQBitmap( d, d, pat, TRUE ); @@ -3093,7 +3093,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h, #if 0 // // Generate a string that describes a transformed bitmap. This string is used -// to insert and tqfind bitmaps in the global pixmap cache. +// to insert and find bitmaps in the global pixmap cache. // static TQString gen_text_bitmap_key( const TQWMatrix &m, const TQFont &font, @@ -3124,7 +3124,7 @@ static TQString gen_text_bitmap_key( const TQWMatrix &m, const TQFont &font, static TQBitmap *get_text_bitmap( const TQString &key ) { - return (TQBitmap*)TQPixmapCache::tqfind( key ); + return (TQBitmap*)TQPixmapCache::find( key ); } static void ins_text_bitmap( const TQString &key, TQBitmap *bm ) diff --git a/tqtinterface/qt4/src/kernel/tqpalette.cpp b/tqtinterface/qt4/src/kernel/tqpalette.cpp index 2e9e49e..6935d09 100644 --- a/tqtinterface/qt4/src/kernel/tqpalette.cpp +++ b/tqtinterface/qt4/src/kernel/tqpalette.cpp @@ -173,13 +173,13 @@ TQPalette::ColorRole TQPalette::backgroundRoleFromMode( TQt::BackgroundMode mode /*! \class TQColorGroup tqpalette.h - \brief The TQColorGroup class tqcontains a group of widget colors. + \brief The TQColorGroup class contains a group of widget colors. \ingroup appearance \ingroup graphics \ingroup images - A color group tqcontains a group of colors used by widgets for + A color group contains a group of colors used by widgets for drawing themselves. We recommend that widgets use color group roles such as "foreground" and "base" rather than literal colors like "red" or "turquoise". The color roles are enumerated and @@ -637,7 +637,7 @@ bool TQColorGroup::operator==( const TQColorGroup &g ) const /*! \class TQPalette tqpalette.h - \brief The TQPalette class tqcontains color groups for each widget state. + \brief The TQPalette class contains color groups for each widget state. \ingroup appearance \ingroup shared diff --git a/tqtinterface/qt4/src/kernel/tqpicture.cpp b/tqtinterface/qt4/src/kernel/tqpicture.cpp index c9c5c0e..8a6fff1 100644 --- a/tqtinterface/qt4/src/kernel/tqpicture.cpp +++ b/tqtinterface/qt4/src/kernel/tqpicture.cpp @@ -180,7 +180,7 @@ TQPicture::~TQPicture() /*! \fn bool TQPicture::isNull() const - Returns TRUE if the picture tqcontains no data; otherwise returns + Returns TRUE if the picture contains no data; otherwise returns FALSE. */ @@ -197,7 +197,7 @@ TQPicture::~TQPicture() Returns a pointer to the picture data. The pointer is only valid until the next non-const function is called on this picture. The - returned pointer is 0 if the picture tqcontains no data. + returned pointer is 0 if the picture contains no data. \sa size(), isNull() */ @@ -357,7 +357,7 @@ bool TQPicture::save( TQIODevice *dev, const char *format ) /*! Returns the picture's bounding rectangle or an invalid rectangle - if the picture tqcontains no data. + if the picture contains no data. */ TQRect TQPicture::boundingRect() const diff --git a/tqtinterface/qt4/src/kernel/tqpixmap.cpp b/tqtinterface/qt4/src/kernel/tqpixmap.cpp index f47fb38..8fb5380 100644 --- a/tqtinterface/qt4/src/kernel/tqpixmap.cpp +++ b/tqtinterface/qt4/src/kernel/tqpixmap.cpp @@ -637,7 +637,7 @@ TQPixmap::TQPixmap( const TQSize &size, int depth, Optimization optimization ) The \a fileName, \a format and \a conversion_flags parameters are passed on to load(). This means that the data in \a fileName is - not compiled into the binary. If \a fileName tqcontains a relative + not compiled into the binary. If \a fileName contains a relative path (e.g. the filename only) the relevant file must be found relative to the runtime working directory. @@ -663,7 +663,7 @@ TQPixmap::TQPixmap( const TQString& fileName, const char *format, The \a fileName, \a format and \a mode parameters are passed on to load(). This means that the data in \a fileName is not compiled - into the binary. If \a fileName tqcontains a relative path (e.g. the + into the binary. If \a fileName contains a relative path (e.g. the filename only) the relevant file must be found relative to the runtime working directory. @@ -1698,7 +1698,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPixmap &pixmap ) TQPixmap (and TQImage) helper functions *****************************************************************************/ /* - This internal function tqcontains the common (i.e. platform independent) code + This internal function contains the common (i.e. platform independent) code to do a transformation of pixel data. It is used by TQPixmap::xForm() and by TQImage::xForm(). diff --git a/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp b/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp index a16235c..37bb0ee 100644 --- a/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp @@ -2053,7 +2053,7 @@ TQPixmap TQPixmap::grabWindow( WId window, int x, int y, int w, int h ) The transformation \a matrix is internally adjusted to compensate for unwanted translation, i.e. xForm() returns the smallest image - that tqcontains all the transformed points of the original image. + that contains all the transformed points of the original image. This function is slow because it involves transformation to a TQImage, non-trivial computations and a transformation back to a diff --git a/tqtinterface/qt4/src/kernel/tqpixmapcache.cpp b/tqtinterface/qt4/src/kernel/tqpixmapcache.cpp index 6724d82..e42ec38 100644 --- a/tqtinterface/qt4/src/kernel/tqpixmapcache.cpp +++ b/tqtinterface/qt4/src/kernel/tqpixmapcache.cpp @@ -58,7 +58,7 @@ This class is a tool for optimized drawing with TQPixmap. You can use it to store temporary pixmaps that are expensive to generate without using more storage space than cacheLimit(). Use insert() - to insert pixmaps, tqfind() to tqfind them and clear() to empty the + to insert pixmaps, find() to find them and clear() to empty the cache. For example, TQRadioButton has a non-trivial visual representation @@ -75,7 +75,7 @@ radio button. All radio buttons in the program share the cached pixmap since TQPixmapCache is application-global. - TQPixmapCache tqcontains no member data, only static functions to + TQPixmapCache contains no member data, only static functions to access the global pixmap cache. It creates an internal TQCache for caching the pixmaps. @@ -171,13 +171,13 @@ static TQSingleCleanupHandler<TQPMCache> qpm_cleanup_cache; \warning If valid, you should copy the pixmap immediately (this is fast). Subsequent insertions into the cache could cause the pointer to become invalid. For this reason, we recommend you use - tqfind(const TQString&, TQPixmap&) instead. + find(const TQString&, TQPixmap&) instead. Example: \code TQPixmap* pp; TQPixmap p; - if ( (pp=TQPixmapCache::tqfind("my_big_image", pm)) ) { + if ( (pp=TQPixmapCache::find("my_big_image", pm)) ) { p = *pp; } else { p.load("bigimage.png"); @@ -187,9 +187,9 @@ static TQSingleCleanupHandler<TQPMCache> qpm_cleanup_cache; \endcode */ -TQPixmap *TQPixmapCache::tqfind( const TQString &key ) +TQPixmap *TQPixmapCache::find( const TQString &key ) { - return pm_cache ? pm_cache->tqfind(key) : 0; + return pm_cache ? pm_cache->find(key) : 0; } @@ -203,7 +203,7 @@ TQPixmap *TQPixmapCache::tqfind( const TQString &key ) Example: \code TQPixmap p; - if ( !TQPixmapCache::tqfind("my_big_image", pm) ) { + if ( !TQPixmapCache::find("my_big_image", pm) ) { pm.load("bigimage.png"); TQPixmapCache::insert("my_big_image", pm); } @@ -211,9 +211,9 @@ TQPixmap *TQPixmapCache::tqfind( const TQString &key ) \endcode */ -bool TQPixmapCache::tqfind( const TQString &key, TQPixmap& pm ) +bool TQPixmapCache::find( const TQString &key, TQPixmap& pm ) { - TQPixmap* p = pm_cache ? pm_cache->tqfind(key) : 0; + TQPixmap* p = pm_cache ? pm_cache->find(key) : 0; if ( p ) pm = *p; return !!p; } diff --git a/tqtinterface/qt4/src/kernel/tqpixmapcache.h b/tqtinterface/qt4/src/kernel/tqpixmapcache.h index ba543ac..c1c6bce 100644 --- a/tqtinterface/qt4/src/kernel/tqpixmapcache.h +++ b/tqtinterface/qt4/src/kernel/tqpixmapcache.h @@ -51,8 +51,8 @@ class TQ_EXPORT TQPixmapCache // global pixmap cache public: static int cacheLimit(); static void setCacheLimit( int ); - static TQPixmap *tqfind( const TQString &key ); - static bool tqfind( const TQString &key, TQPixmap& ); + static TQPixmap *find( const TQString &key ); + static bool find( const TQString &key, TQPixmap& ); static bool insert( const TQString &key, TQPixmap * ); static bool insert( const TQString &key, const TQPixmap& ); static void remove( const TQString &key ); diff --git a/tqtinterface/qt4/src/kernel/tqpointarray.cpp b/tqtinterface/qt4/src/kernel/tqpointarray.cpp index f5d0016..c634210 100644 --- a/tqtinterface/qt4/src/kernel/tqpointarray.cpp +++ b/tqtinterface/qt4/src/kernel/tqpointarray.cpp @@ -323,7 +323,7 @@ const double TQ_PI = 3.14159265358979323846; // pi // one more useful comment /*! Constructs a point array from the rectangle \a r. - If \a closed is FALSE, then the point array just tqcontains the + If \a closed is FALSE, then the point array just contains the following four points in the listed order: r.topLeft(), r.topRight(), r.bottomRight() and r.bottomLeft(). @@ -645,7 +645,7 @@ TQRect TQPointArray::boundingRect() const minx = maxx = pd->x(); miny = maxy = pd->y(); pd++; - for ( int i=1; i<(int)size(); i++ ) { // tqfind min+max x and y + for ( int i=1; i<(int)size(); i++ ) { // find min+max x and y if ( pd->x() < minx ) minx = pd->x(); else if ( pd->x() > maxx ) @@ -1018,7 +1018,7 @@ int pnt_on_line( const int* p, const int* q, const int* t ) * Point-Line distance is normalized with the Infinity Norm * avoiding square-root code and tightening the test vs the * Manhattan Norm. All math is done on the field of integers. - * The latter tqreplaces the initial ">= MAX(...)" test with + * The latter replaces the initial ">= MAX(...)" test with * "> (ABS(qx-px) + ABS(qy-py))" loosening both inequality * and norm, yielding a broader target line for selection. * The tightest test is employed here for best discrimination diff --git a/tqtinterface/qt4/src/kernel/tqpolygonscanner.cpp b/tqtinterface/qt4/src/kernel/tqpolygonscanner.cpp index 78e35ab..20f65da 100644 --- a/tqtinterface/qt4/src/kernel/tqpolygonscanner.cpp +++ b/tqtinterface/qt4/src/kernel/tqpolygonscanner.cpp @@ -137,7 +137,7 @@ from the X Consortium. * * Written by Brian Kelleher; Jan 1985 * - * This file tqcontains a few macros to help track + * This file contains a few macros to help track * the edge of a filled object. The object is assumed * to be filled in scanline order, and thus the * algorithm used is an extension of Bresenham's line @@ -220,7 +220,7 @@ from the X Consortium. /* - * This structure tqcontains all of the information needed + * This structure contains all of the information needed * to run the bresenham algorithm. * The variables may be hardcoded into the declarations * instead of using this structure to make use of @@ -390,7 +390,7 @@ SOFTWARE. * * Written by Brian Kelleher; Oct. 1985 * - * This module tqcontains all of the utility functions + * This module contains all of the utility functions * needed to scan convert a polygon. * */ @@ -398,8 +398,8 @@ SOFTWARE. * InsertEdgeInET * * Insert the given edge into the edge table. - * First we must tqfind the correct bucket in the - * Edge table, then tqfind the right slot in the + * First we must find the correct bucket in the + * Edge table, then find the right slot in the * bucket. Finally, we can insert it. * */ @@ -412,7 +412,7 @@ miInsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, ScanLineListBlock *tmpSLLBlock; /* - * tqfind the right bucket to put the edge into + * find the right bucket to put the edge into */ pPrevSLL = &ET->scanlines; pSLL = pPrevSLL->next; @@ -555,7 +555,7 @@ miCreateETandAET(int count, DDXPointPtr pts, EdgeTable *ET, CurrPt = pts++; /* - * tqfind out which point is above and which is below. + * find out which point is above and which is below. */ if (PrevPt->y > CurrPt->y) { diff --git a/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp b/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp index f9ff932..0472479 100644 --- a/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp +++ b/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp @@ -135,7 +135,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) // if ( fork() > 0 ) { // closeAllOpenFds(); // -// // try to tqreplace this process with "true" - this prevents +// // try to replace this process with "true" - this prevents // // global destructors from being called (that could possibly // // do wrong things to the tqparent process) // (void)execlp("true", "true", (char *)0); @@ -554,7 +554,7 @@ bool TQPrinter::cmd( int c, TQPainter *paint, TQPDevCmdParam *p ) if ( fork() > 0 ) { closeAllOpenFds(); - // try to tqreplace this process with "true" - this prevents + // try to replace this process with "true" - this prevents // global destructors from being called (that could possibly // do wrong things to the tqparent process) (void)execlp("true", "true", (char *)0); diff --git a/tqtinterface/qt4/src/kernel/tqprocess.cpp b/tqtinterface/qt4/src/kernel/tqprocess.cpp index a809996..c85e2de 100644 --- a/tqtinterface/qt4/src/kernel/tqprocess.cpp +++ b/tqtinterface/qt4/src/kernel/tqprocess.cpp @@ -143,7 +143,7 @@ \printline } Although you may need quotes for a file named on the command line - (e.g. if it tqcontains spaces) you shouldn't use extra quotes for + (e.g. if it contains spaces) you shouldn't use extra quotes for arguments passed to addArgument() or setArguments(). The readyReadStdout() signal is emitted when there is new data on @@ -164,8 +164,8 @@ Please note that TQProcess does not emulate a shell. This means that TQProcess does not do any expansion of arguments: a '*' is passed as a '*' - to the program and is \e not tqreplaced by all the files, a '$HOME' is also - passed literally and is \e not tqreplaced by the environment variable HOME + to the program and is \e not replaced by all the files, a '$HOME' is also + passed literally and is \e not replaced by the environment variable HOME and the special characters for IO redirection ('>', '|', etc.) are also passed literally and do \e not have the special meaning as they have in a shell. diff --git a/tqtinterface/qt4/src/kernel/tqprocess_unix.cpp b/tqtinterface/qt4/src/kernel/tqprocess_unix.cpp index 0895ae2..5b60f6a 100644 --- a/tqtinterface/qt4/src/kernel/tqprocess_unix.cpp +++ b/tqtinterface/qt4/src/kernel/tqprocess_unix.cpp @@ -771,7 +771,7 @@ bool TQProcess::start( TQStringList *env ) TQFileInfo fi(arg_bundle); if(fi.exists() && fi.isDir() && arg_bundle.right(4) == ".app") { TQCString exe = arg_bundle; - int lslash = exe.tqfindRev('/'); + int lslash = exe.findRev('/'); if(lslash != -1) exe = exe.mid(lslash+1); exe = TQCString(arg_bundle + "/Contents/MacOS/" + exe); @@ -858,7 +858,7 @@ bool TQProcess::start( TQStringList *env ) // look for the executable in the search path if ( _arguments.count()>0 && getenv("PATH")!=0 ) { TQString command = _arguments[0]; - if ( !command.tqcontains( '/' ) ) { + if ( !command.contains( '/' ) ) { TQStringList pathList = TQStringList::split( ':', getenv( "PATH" ) ); for (TQStringList::Iterator it = pathList.begin(); it != pathList.end(); ++it ) { TQString dir = *it; diff --git a/tqtinterface/qt4/src/kernel/tqpsprinter.cpp b/tqtinterface/qt4/src/kernel/tqpsprinter.cpp index 18227cf..f881bf8 100644 --- a/tqtinterface/qt4/src/kernel/tqpsprinter.cpp +++ b/tqtinterface/qt4/src/kernel/tqpsprinter.cpp @@ -187,13 +187,13 @@ static const char *const ps_header = "div 3 1 roll}D/BC{CRGB BkCol sp}D/BR{CRGB BCol sp/BSt ED}D/WB{1 W BR}D/NB{0\n" "B BR}D/PE{setlinejoin setlinecap CRGB PCol sp/LWi ED/PSt ED LWi 0 eq{0.25\n" "/LWi ED}if PCol SC}D/P1{1 0 5 2 roll 0 0 PE}D/ST{defM SM concat}D/MF{true\n" -"exch true exch{exch pop exch pop dup 0 get dup tqfindfont dup/FontName get 3\n" +"exch true exch{exch pop exch pop dup 0 get dup findfont dup/FontName get 3\n" "-1 roll eq{exit}if}forall exch dup 1 get/fxscale ED 2 get/fslant ED exch\n" "/fencoding ED[fxscale 0 fslant 1 0 0]makefont fencoding false eq{}{dup\n" "maxlength dict begin{1 i/FID ne{def}{pop pop}ifelse}forall/Encoding\n" -"fencoding d currentdict end}ie definefont pop}D/MFEmb{tqfindfont dup length\n" +"fencoding d currentdict end}ie definefont pop}D/MFEmb{findfont dup length\n" "dict begin{1 i/FID ne{d}{pop pop}ifelse}forall/Encoding ED currentdict end\n" -"definefont pop}D/DF{tqfindfont/fs 3 -1 roll d[fs 0 0 fs -1 mul 0 0]makefont d}\n" +"definefont pop}D/DF{findfont/fs 3 -1 roll d[fs 0 0 fs -1 mul 0 0]makefont d}\n" "D/ty 0 d/Y{/ty ED}D/Tl{gsave SW NP 1 i exch MT 1 i 0 RL S grestore}D/XYT{ty\n" "MT/xyshow where{pop pop xyshow}{exch pop 1 i dup length 2 div exch\n" "stringwidth pop 3 -1 roll exch sub exch div exch 0 exch ashow}ie}D/AT{ty MT\n" @@ -222,7 +222,7 @@ static const char *const ps_header = // http://partners.adobe.com:80/asn/developer/type/tqunicodegn.html // // IMPORTANT NOTE: -// the list tqcontains glyphs in the private use area of tqunicode. These should get removed when regenerating the glyphlist. +// the list contains glyphs in the private use area of tqunicode. These should get removed when regenerating the glyphlist. // also 0 shout be mapped to .notdef static const struct { TQ_UINT16 u; @@ -1300,7 +1300,7 @@ static const psfont * const VerdanaReplacements[] = { static const struct { const char * input; // spaces are stripped in here, and everything lowercase const psfont * ps; - const psfont *const * tqreplacements; + const psfont *const * replacements; } postscriptFonts [] = { { "arial", Arial, SansSerifReplacements }, { "arialmt", Arial, SansSerifReplacements }, @@ -1469,7 +1469,7 @@ public: protected: TQString psname; - TQStringList tqreplacementList; + TQStringList replacementList; TQMap<unsigned short, unsigned short> subset; // tqunicode subset in the global font TQMap<unsigned short, unsigned short> page_subset; // subset added in this page @@ -1577,16 +1577,16 @@ static TQString makePSFontName( const TQFontEngine *fe, int *listpos = 0, int *f return ps; } -static void appendReplacements( TQStringList &list, const psfont * const * tqreplacements, int type, float xscale = 100. ) +static void appendReplacements( TQStringList &list, const psfont * const * replacements, int type, float xscale = 100. ) { - // iterate through the tqreplacement fonts - while ( *tqreplacements ) { - const psfont *psf = *tqreplacements; + // iterate through the replacement fonts + while ( *replacements ) { + const psfont *psf = *replacements; TQString ps = "[ /" + TQString::tqfromLatin1( psf[type].psname ) + " " + toString( xscale / psf[type].xscale ) + " " + toString( psf[type].slant ) + " ]"; list.append( ps ); - ++tqreplacements; + ++replacements; } } @@ -1605,20 +1605,20 @@ static TQStringList makePSFontNameList( const TQFontEngine *fe, const TQString & ps = makePSFontName( fe, &i, &type ); const psfont *psf = postscriptFonts[i].ps; - const psfont * const * tqreplacements = postscriptFonts[i].tqreplacements; + const psfont * const * replacements = postscriptFonts[i].replacements; float xscale = 100; if ( psf ) { - // xscale for the "right" font is always 1. We scale the tqreplacements... + // xscale for the "right" font is always 1. We scale the replacements... xscale = psf->xscale; ps = "[ /" + TQString::tqfromLatin1( psf[type].psname ) + " 1.0 " + toString( psf[type].slant ) + " ]"; } else { ps = "[ /" + ps + " 1.0 0.0 ]"; - // only add default tqreplacement fonts in case this font was unknown. + // only add default replacement fonts in case this font was unknown. if ( fe->fontDef.fixedPitch ) { - tqreplacements = FixedReplacements; + replacements = FixedReplacements; } else { - tqreplacements = SansSerifReplacements; + replacements = SansSerifReplacements; // 100 is courier, but most fonts are not as wide as courier. Using 100 // here would make letters overlap for some fonts. This value is empirical. xscale = 83; @@ -1626,8 +1626,8 @@ static TQStringList makePSFontNameList( const TQFontEngine *fe, const TQString & } list.append( ps ); - if ( tqreplacements ) - appendReplacements( list, tqreplacements, type, xscale); + if ( replacements ) + appendReplacements( list, replacements, type, xscale); return list; } @@ -1666,13 +1666,13 @@ TQPSPrinterFontPrivate::TQPSPrinterFontPrivate() unsigned short TQPSPrinterFontPrivate::insertIntoSubset( unsigned short u ) { unsigned short retval = 0; - if ( subset.tqfind(u) == subset.end() ) { + if ( subset.find(u) == subset.end() ) { if ( !downloaded ) { // we need to add to the page subset subset.insert( u, subsetCount ); // mark it as used //printf("GLOBAL SUBSET ADDED %04x = %04x\n",u, subsetCount); retval = subsetCount; subsetCount++; - } else if ( page_subset.tqfind(u) == page_subset.end() ) { + } else if ( page_subset.find(u) == page_subset.end() ) { page_subset.insert( u, pageSubsetCount ); // mark it as used //printf("PAGE SUBSET ADDED %04x = %04x\n",u, pageSubsetCount); retval = pageSubsetCount + (subsetCount/256 + 1) * 256; @@ -1809,14 +1809,14 @@ TQString TQPSPrinterFontPrivate::defineFont( TQTextStream &stream, const TQStrin unsigned short TQPSPrinterFontPrivate::mapUnicode( unsigned short tqunicode ) { TQMap<unsigned short, unsigned short>::iterator res; - res = subset.tqfind( tqunicode ); + res = subset.find( tqunicode ); unsigned short offset = 0; bool found = FALSE; if ( res != subset.end() ) { found = TRUE; } else { if ( downloaded ) { - res = page_subset.tqfind( tqunicode ); + res = page_subset.find( tqunicode ); offset = (subsetCount/256 + 1) * 256; if ( res != page_subset.end() ) found = TRUE; @@ -2075,7 +2075,7 @@ void TQPSPrinterFontPrivate::downloadMapping( TQTextStream &s, bool global ) s << psname; s << "-Uni-"; s << toHex( range ); - s << " tqfindfont\n"; + s << " findfont\n"; } s << "]def\n"; @@ -2351,7 +2351,7 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) BYTE* table_ptr = getTable("name"); /* pointer to table */ if ( !table_ptr ) { defective = TRUE; - qDebug("couldn't tqfind name table" ); + qDebug("couldn't find name table" ); return; } int numrecords = getUSHORT( table_ptr + 2 ); /* number of names */ @@ -2388,8 +2388,8 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) Trademark.setLatin1(strings+offset,length); } - psname.tqreplace(' ', '-'); - psname.tqreplace("/", ""); + psname.replace(' ', '-'); + psname.replace("/", ""); if (psname.isEmpty()) psname = makePSFontName(f); @@ -2418,7 +2418,7 @@ TQPSPrinterFontTTF::TQPSPrinterFontTTF(const TQFontEngine *f, TQByteArray& d) } numGlyphs = getUSHORT( maxp + 4 ); // qDebug("number of glyphs is %d", numGlyphs); - tqreplacementList = makePSFontNameList( f, psname ); + replacementList = makePSFontNameList( f, psname ); uni2glyphSetup(); } @@ -2448,7 +2448,7 @@ void TQPSPrinterFontTTF::drawText( TQTextStream &stream, const TQPoint &p, TQTex int type = si.fontEngine->type(); bool glyphIndices = (type == TQFontEngine::Xft); // This helps us get arabic for XLFD fonts working. In that case we have a Unicode - // cmap (== 0), and the glyphs array tqcontains the tqshaped string. + // cmap (== 0), and the glyphs array contains the tqshaped string. bool useGlyphAsUnicode = (type == TQFontEngine::XLFD && si.fontEngine->cmap() == 0); #else // TQ_WS_TQWS const bool glyphIndices = FALSE; @@ -2510,7 +2510,7 @@ void TQPSPrinterFontTTF::drawText( TQTextStream &stream, const TQPoint &p, TQTex void TQPSPrinterFontTTF::download(TQTextStream& s,bool global) { - emitPSFontNameList( s, psname, tqreplacementList); + emitPSFontNameList( s, psname, replacementList); if ( !embedFonts ) { downloadMapping(s, global); return; @@ -2783,7 +2783,7 @@ void TQPSPrinterFontTTF::download(TQTextStream& s,bool global) s << " {true}ifelse\n"; /* If true, execute code to produce an error message if */ - /* we can't tqfind Apple's TrueDict in VM. */ + /* we can't find Apple's TrueDict in VM. */ s << "{/TrueDict where{pop}{(%%[ Error: no TrueType rasterizer ]%%)= flush}ifelse\n"; /* Since we are expected to use Apple's TrueDict TrueType */ @@ -2808,7 +2808,7 @@ void TQPSPrinterFontTTF::download(TQTextStream& s,bool global) /* is a procedure. If it is, it executes it, otherwise, it */ /* lets the TrueType rasterizer loose on it. */ - /* When this proceedure is executed the stack tqcontains */ + /* When this proceedure is executed the stack contains */ /* the font dictionary and the character name. We */ /* exchange arguments and move the dictionary to the */ /* dictionary stack. */ @@ -2822,7 +2822,7 @@ void TQPSPrinterFontTTF::download(TQTextStream& s,bool global) /* stack: charname CharStrings bool */ /* Exchange the CharStrings dictionary and the charname, */ - /* but if the answer was false, tqreplace the character name */ + /* but if the answer was false, replace the character name */ /* with ".notdef". */ s << " {exch}{exch pop /.notdef}ifelse\n"; /* stack: CharStrings charname */ @@ -3015,7 +3015,7 @@ USHORT TQPSPrinterFontTTF::glyph_for_tqunicode(unsigned short tqunicode) /*------------------------------------------------------------------- ** sfnts routines ** These routines generate the PostScript "sfnts" array which -** tqcontains one or more strings which contain a reduced version +** contains one or more strings which contain a reduced version ** of the TrueType font. ** ** A number of functions are required to accomplish this rather @@ -3156,7 +3156,7 @@ void TQPSPrinterFontTTF::sfnts_glyf_table(ULONG oldoffset, ** two byte boundary. */ if( length % 2 ) { - qWarning("TrueType font tqcontains a 'glyf' table without 2 byte padding"); + qWarning("TrueType font contains a 'glyf' table without 2 byte padding"); defective = TRUE; return; } @@ -3216,7 +3216,7 @@ void TQPSPrinterFontTTF::download_sfnts(TQTextStream& s) int c; /* Input character. */ int diff; - int count; /* How many `important' tables did we tqfind? */ + int count; /* How many `important' tables did we find? */ BYTE* ptr = offset_table + 12; // original table directory ULONG nextoffset=0; @@ -3536,7 +3536,7 @@ static double intest( int co, int ci, charproc_data *cd ) } /* -** tqfind the nearest out contour to a specified in contour. +** find the nearest out contour to a specified in contour. */ static int nearout(int ci, charproc_data* cd) { @@ -3802,7 +3802,7 @@ void TQPSPrinterFontTTF::subsetGlyph(int charindex,bool* glyphset) glyphset[ glyphIndex ] = TRUE; subsetGlyph( glyphIndex, glyphset ); - //printf("subset tqcontains: %d %s ",glyphIndex, glyphName(glyphIndex).latin1()); + //printf("subset contains: %d %s ",glyphIndex, glyphName(glyphIndex).latin1()); if(flags & ARG_1_AND_2_ARE_WORDS) { glyph += 2; @@ -4078,12 +4078,12 @@ TQPSPrinterFontPFA::TQPSPrinterFontPFA(const TQFontEngine *f, TQByteArray& d) while (fontnameptr[l] != ' ') l++; psname = TQString::tqfromLatin1(fontnameptr,l); - tqreplacementList = makePSFontNameList( f, psname ); + replacementList = makePSFontNameList( f, psname ); } void TQPSPrinterFontPFA::download(TQTextStream& s, bool global) { - emitPSFontNameList( s, psname, tqreplacementList); + emitPSFontNameList( s, psname, replacementList); if ( !embedFonts ) { downloadMapping(s, global); @@ -4145,12 +4145,12 @@ TQPSPrinterFontPFB::TQPSPrinterFontPFB(const TQFontEngine *f, TQByteArray& d) while (fontnameptr[l] != ' ') l++; psname = TQString::tqfromLatin1(fontnameptr,l); - tqreplacementList = makePSFontNameList( f, psname ); + replacementList = makePSFontNameList( f, psname ); } void TQPSPrinterFontPFB::download(TQTextStream& s, bool global) { - emitPSFontNameList( s, psname, tqreplacementList); + emitPSFontNameList( s, psname, replacementList); if ( !embedFonts ) { downloadMapping(s, global); @@ -4239,13 +4239,13 @@ private: TQPSPrinterFontNotFound::TQPSPrinterFontNotFound(const TQFontEngine* f) { psname = makePSFontName( f ); - tqreplacementList = makePSFontNameList( f ); + replacementList = makePSFontNameList( f ); } void TQPSPrinterFontNotFound::download(TQTextStream& s, bool) { //qDebug("downloading not found font %s", psname.latin1() ); - emitPSFontNameList( s, psname, tqreplacementList ); + emitPSFontNameList( s, psname, replacementList ); s << "% No embeddable font for "; s << psname; s << " found\n"; @@ -4328,7 +4328,7 @@ TQString TQPSPrinterFontAsian::defineFont( TQTextStream &stream, const TQString TQString fontName; TQString fontName2; - TQString *tmp = d->headerFontNames.tqfind( ps ); + TQString *tmp = d->headerFontNames.find( ps ); if ( d->buffer ) { if ( tmp ) { @@ -4364,7 +4364,7 @@ void TQPSPrinterFontAsian::download(TQTextStream& s, bool) //qDebug("downloading asian font %s", psname.latin1() ); s << "% Asian postscript font requested. Using " << psname << endl; - emitPSFontNameList( s, psname, tqreplacementList ); + emitPSFontNameList( s, psname, replacementList ); } void TQPSPrinterFontAsian::drawText( TQTextStream &stream, const TQPoint &p, TQTextEngine *engine, int item, @@ -4516,10 +4516,10 @@ TQPSPrinterFontJapanese::TQPSPrinterFontJapanese(const TQFontEngine* f) int type = getPsFontType( f ); psname = makePSFontName( f, type ); TQString best = "[ /" + psname + " 1.0 0.0 ]"; - tqreplacementList.append( best ); + replacementList.append( best ); - const psfont *const *tqreplacements = ( psname.tqcontains( "Helvetica" ) ? Japanese2Replacements : Japanese1Replacements ); - appendReplacements( tqreplacementList, tqreplacements, type ); + const psfont *const *replacements = ( psname.contains( "Helvetica" ) ? Japanese2Replacements : Japanese1Replacements ); + appendReplacements( replacementList, replacements, type ); } TQString TQPSPrinterFontJapanese::extension() const @@ -4615,8 +4615,8 @@ TQPSPrinterFontKorean::TQPSPrinterFontKorean(const TQFontEngine* f) int type = getPsFontType( f ); psname = makePSFontName( f, type ); TQString best = "[ /" + psname + " 1.0 0.0 ]"; - tqreplacementList.append( best ); - appendReplacements( tqreplacementList, KoreanReplacements, type ); + replacementList.append( best ); + appendReplacements( replacementList, KoreanReplacements, type ); } TQString TQPSPrinterFontKorean::extension() const @@ -4756,8 +4756,8 @@ TQPSPrinterFontTraditionalChinese::TQPSPrinterFontTraditionalChinese(const TQFon int type = getPsFontType( f ); psname = makePSFontName( f, type ); TQString best = "[ /" + psname + " 1.0 0.0 ]"; - tqreplacementList.append( best ); - appendReplacements( tqreplacementList, TraditionalReplacements, type ); + replacementList.append( best ); + appendReplacements( replacementList, TraditionalReplacements, type ); } TQString TQPSPrinterFontTraditionalChinese::extension() const @@ -4869,18 +4869,18 @@ TQPSPrinterFontSimplifiedChinese::TQPSPrinterFontSimplifiedChinese(const TQFontE codec = TQTextCodec::codecForMib( 114 ); // GB18030 int type = getPsFontType( f ); TQString family = f->fontDef.family.lower(); - if( family.tqcontains("kai",FALSE) ) { + if( family.contains("kai",FALSE) ) { psname = KaiGBK2K[type].psname; - appendReplacements( tqreplacementList, KaiGBK2KReplacements, type ); - } else if( family.tqcontains("fangsong",FALSE) ) { + appendReplacements( replacementList, KaiGBK2KReplacements, type ); + } else if( family.contains("fangsong",FALSE) ) { psname = FangSongGBK2K[type].psname; - appendReplacements( tqreplacementList, FangSongGBK2KReplacements, type ); - } else if( family.tqcontains("hei",FALSE) ) { + appendReplacements( replacementList, FangSongGBK2KReplacements, type ); + } else if( family.contains("hei",FALSE) ) { psname = HeiGBK2K[type].psname; - appendReplacements( tqreplacementList, HeiGBK2KReplacements, type ); + appendReplacements( replacementList, HeiGBK2KReplacements, type ); } else { psname = SongGBK2K[type].psname; - appendReplacements( tqreplacementList, SimplifiedReplacements, type ); + appendReplacements( replacementList, SimplifiedReplacements, type ); } //qDebug("simplified chinese: fontname is %s, psname=%s", f.family().latin1(), psname.latin1() ); } @@ -4950,11 +4950,11 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate TQString rawName; if ( engine && engine != (TQFontEngine *)-1 ) rawName = engine->name(); - int index = rawName.tqfind('-'); + int index = rawName.find('-'); if (index == 0) { // this is an XLFD font name for (int i=0; i < 6; i++) { - index = rawName.tqfind('-',index+1); + index = rawName.find('-',index+1); } xfontname = rawName.mid(0,index); if ( xfontname.endsWith( "*" ) ) @@ -5008,7 +5008,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate #endif //qDebug("looking for font %s in dict", xfontname.latin1() ); - p = priv->fonts.tqfind(xfontname); + p = priv->fonts.find(xfontname); if ( p ) return; @@ -5034,12 +5034,12 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate // fold to lower (since X folds to lowercase) //qWarning(xfontname); //qWarning(mapping); - if (mapping.lower().tqcontains(searchname.lower())) { - int index = mapping.tqfind(' ',0); + if (mapping.lower().contains(searchname.lower())) { + int index = mapping.find(' ',0); TQString ffn = mapping.mid(0,index); // remove the most common bitmap formats - if( !ffn.tqcontains( ".pcf" ) && !ffn.tqcontains( ".bdf" ) && - !ffn.tqcontains( ".spd" ) && !ffn.tqcontains( ".phont" ) ) { + if( !ffn.contains( ".pcf" ) && !ffn.contains( ".bdf" ) && + !ffn.contains( ".spd" ) && !ffn.contains( ".phont" ) ) { fontfilename = (*it) + TQString("/") + ffn; if ( TQFile::exists(fontfilename) ) { //qDebug("found font file %s", fontfilename.latin1()); @@ -5127,7 +5127,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate } } else #endif - //qDebug("didnt tqfind font for %s", xfontname.latin1()); + //qDebug("didnt find font for %s", xfontname.latin1()); p = new TQPSPrinterFontNotFound( engine ); break; } @@ -5195,15 +5195,15 @@ TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes ) TQString fs; f.readLine(fs, 1024); fs=fs.stripWhiteSpace(); - if (fs.left(9)=="catalogue" && fs.tqcontains('=')) { - fs=fs.mid(fs.tqfind('=')+1).stripWhiteSpace(); + if (fs.left(9)=="catalogue" && fs.contains('=')) { + fs=fs.mid(fs.find('=')+1).stripWhiteSpace(); bool end = FALSE; while( f.status()==IO_Ok && !end ) { if ( fs[int(fs.length())-1] == ',' ) fs = fs.left(fs.length()-1); else end = TRUE; - if (fs[0] != '#' && !fs.tqcontains(":unscaled")) + if (fs[0] != '#' && !fs.contains(":unscaled")) fontpath += fs; f.readLine(fs, 1024); fs=fs.stripWhiteSpace(); @@ -5268,9 +5268,9 @@ void TQPSPrinterPrivate::setFont( const TQFont & fnt, int script ) key += " px" + toString( f.pixelSize() ); TQString * tmp; if ( !buffer ) - tmp = pageFontNames.tqfind( key ); + tmp = pageFontNames.find( key ); else - tmp = headerFontNames.tqfind( key ); + tmp = headerFontNames.find( key ); TQString fontName; if ( tmp ) @@ -5283,7 +5283,7 @@ void TQPSPrinterPrivate::setFont( const TQFont & fnt, int script ) ps.append( ' ' ); ps.prepend( ' ' ); - if ( !fontsUsed.tqcontains( ps ) ) + if ( !fontsUsed.contains( ps ) ) fontsUsed += ps; #ifndef TQT_NO_TEXTCODEC @@ -5465,7 +5465,7 @@ static TQByteArray compress( const TQImage & image, bool gray ) { looking for some spot where those pixels of those two colours occur at the right distance from each other. - when we tqfind a spot, we'll try a string-compare of all the + when we find a spot, we'll try a string-compare of all the intervening pixels. we only do a maximum of 128 both-ends compares or 64 full-string compares. it's more important to be fast than get the ultimate in compression. @@ -5991,9 +5991,9 @@ void TQPSPrinterPrivate::emitHeader( bool finished ) " [ m s s s ] [ s m s s ]" // dash dot line " [ m s s s s ] [ s m s s s s ]" // dash dot dot line " ] d\n"; - lineStyles.tqreplace( TQRegExp( "w" ), toString( 10./scale ) ); - lineStyles.tqreplace( TQRegExp( "m" ), toString( 5./scale ) ); - lineStyles.tqreplace( TQRegExp( "s" ), toString( 3./scale ) ); + lineStyles.replace( TQRegExp( "w" ), toString( 10./scale ) ); + lineStyles.replace( TQRegExp( "m" ), toString( 5./scale ) ); + lineStyles.replace( TQRegExp( "s" ), toString( 3./scale ) ); outStream << lineStyles; diff --git a/tqtinterface/qt4/src/kernel/tqrect.cpp b/tqtinterface/qt4/src/kernel/tqrect.cpp index aa16303..2c9b9f3 100644 --- a/tqtinterface/qt4/src/kernel/tqrect.cpp +++ b/tqtinterface/qt4/src/kernel/tqrect.cpp @@ -130,8 +130,8 @@ void TQRect::coords( int *xp1, int *yp1, int *xp2, int *yp2 ) const moveBottomRight(), etc. You can also add coordinates to a rectangle with addCoords(). - You can test to see if a TQRect tqcontains a specific point with - tqcontains(). You can also test to see if two TQRects intersect with + You can test to see if a TQRect contains a specific point with + contains(). You can also test to see if two TQRects intersect with intersects() (see also intersect()). To get the bounding rectangle of two TQRects use unite(). @@ -789,7 +789,7 @@ void TQRect::setSize( const TQSize &s ) inside (not on the edge). */ -bool TQRect::tqcontains( const TQPoint &p, bool proper ) const +bool TQRect::contains( const TQPoint &p, bool proper ) const { if ( proper ) return p.x() > x1 && p.x() < x2 && @@ -800,7 +800,7 @@ bool TQRect::tqcontains( const TQPoint &p, bool proper ) const } /*! - \overload bool TQRect::tqcontains( int x, int y, bool proper ) const + \overload bool TQRect::contains( int x, int y, bool proper ) const Returns TRUE if the point \a x, \a y is inside this rectangle; otherwise returns FALSE. @@ -810,7 +810,7 @@ bool TQRect::tqcontains( const TQPoint &p, bool proper ) const */ /*! - \overload bool TQRect::tqcontains( int x, int y ) const + \overload bool TQRect::contains( int x, int y ) const Returns TRUE if the point \a x, \a y is inside this rectangle; otherwise returns FALSE. @@ -828,7 +828,7 @@ bool TQRect::tqcontains( const TQPoint &p, bool proper ) const \sa unite(), intersect(), intersects() */ -bool TQRect::tqcontains( const TQRect &r, bool proper ) const +bool TQRect::contains( const TQRect &r, bool proper ) const { if ( proper ) return r.x1 > x1 && r.x2 < x2 && r.y1 > y1 && r.y2 < y2; @@ -862,7 +862,7 @@ TQRect& TQRect::operator&=(const TQRect &r) The bounding rectangle of a nonempty rectangle and an empty or invalid rectangle is defined to be the nonempty rectangle. - \sa operator|=(), operator&(), intersects(), tqcontains() + \sa operator|=(), operator&(), intersects(), contains() */ TQRect TQRect::operator|(const TQRect &r) const @@ -898,7 +898,7 @@ TQRect TQRect::unite( const TQRect &r ) const Returns an empty rectangle if there is no intersection. - \sa operator&=(), operator|(), isEmpty(), intersects(), tqcontains() + \sa operator&=(), operator|(), isEmpty(), intersects(), contains() */ TQRect TQRect::operator&( const TQRect &r ) const @@ -925,7 +925,7 @@ TQRect TQRect::intersect( const TQRect &r ) const (there is at least one pixel that is within both rectangles); otherwise returns FALSE. - \sa intersect(), tqcontains() + \sa intersect(), contains() */ bool TQRect::intersects( const TQRect &r ) const diff --git a/tqtinterface/qt4/src/kernel/tqrect.h b/tqtinterface/qt4/src/kernel/tqrect.h index e208978..8d5dc2b 100644 --- a/tqtinterface/qt4/src/kernel/tqrect.h +++ b/tqtinterface/qt4/src/kernel/tqrect.h @@ -66,10 +66,10 @@ public: void moveBy( int dx, int dy ) { translate(dx, dy); } - inline bool tqcontains( const TQPoint &p, bool proper=FALSE ) const { return contains(p, proper); } - inline bool tqcontains( int x, int y ) const { return contains(x, y); } - inline bool tqcontains( int x, int y, bool proper ) const { return contains(x, y, proper); } - inline bool tqcontains( const TQRect &r, bool proper=FALSE ) const { return contains(r, proper); } + inline bool contains( const TQPoint &p, bool proper=FALSE ) const { return contains(p, proper); } + inline bool contains( int x, int y ) const { return contains(x, y); } + inline bool contains( int x, int y, bool proper ) const { return contains(x, y, proper); } + inline bool contains( const TQRect &r, bool proper=FALSE ) const { return contains(r, proper); } inline void addCoords( int x1, int y1, int x2, int y2 ) { adjust(x1, y1, x2, y2); } @@ -172,10 +172,10 @@ public: TQRect& operator|=(const TQRect &r); TQRect& operator&=(const TQRect &r); - bool tqcontains( const TQPoint &p, bool proper=FALSE ) const; - bool tqcontains( int x, int y ) const; // inline methods, _don't_ merge these - bool tqcontains( int x, int y, bool proper ) const; - bool tqcontains( const TQRect &r, bool proper=FALSE ) const; + bool contains( const TQPoint &p, bool proper=FALSE ) const; + bool contains( int x, int y ) const; // inline methods, _don't_ merge these + bool contains( int x, int y, bool proper ) const; + bool contains( const TQRect &r, bool proper=FALSE ) const; TQRect unite( const TQRect &r ) const; TQRect intersect( const TQRect &r ) const; bool intersects( const TQRect &r ) const; @@ -305,7 +305,7 @@ inline int TQRect::height() const inline TQSize TQRect::size() const { return TQSize(x2-x1+1, y2-y1+1); } -inline bool TQRect::tqcontains( int x, int y, bool proper ) const +inline bool TQRect::contains( int x, int y, bool proper ) const { if ( proper ) return x > x1 && x < x2 && @@ -315,7 +315,7 @@ inline bool TQRect::tqcontains( int x, int y, bool proper ) const y >= y1 && y <= y2; } -inline bool TQRect::tqcontains( int x, int y ) const +inline bool TQRect::contains( int x, int y ) const { return x >= x1 && x <= x2 && y >= y1 && y <= y2; diff --git a/tqtinterface/qt4/src/kernel/tqregion.cpp b/tqtinterface/qt4/src/kernel/tqregion.cpp index 58bf4eb..20d42c3 100644 --- a/tqtinterface/qt4/src/kernel/tqregion.cpp +++ b/tqtinterface/qt4/src/kernel/tqregion.cpp @@ -75,7 +75,7 @@ TQRegion::TQRegion(const QPolygon &pa, bool winding) or). You can move a region using translate(). You can test whether a region isNull(), isEmpty() or if it - tqcontains() a TQPoint or TQRect. The bounding rectangle is given by + contains() a TQPoint or TQRect. The bounding rectangle is given by boundingRect(). The function rects() gives a decomposition of the region into diff --git a/tqtinterface/qt4/src/kernel/tqregion.h b/tqtinterface/qt4/src/kernel/tqregion.h index 179d33d..d8a5d29 100644 --- a/tqtinterface/qt4/src/kernel/tqregion.h +++ b/tqtinterface/qt4/src/kernel/tqregion.h @@ -70,8 +70,8 @@ public: inline bool isNull() const { return isEmpty(); } - inline bool tqcontains( const QPoint &p ) const { return contains(p); } - inline bool tqcontains( const QRect &r ) const { return contains(r); } + inline bool contains( const QPoint &p ) const { return contains(p); } + inline bool contains( const QRect &r ) const { return contains(r); } inline TQMemArray<TQRect> tqrects() const { QVector<QRect> qvr = rects(); @@ -116,8 +116,8 @@ public: bool isNull() const; bool isEmpty() const; - bool tqcontains( const TQPoint &p ) const; - bool tqcontains( const TQRect &r ) const; + bool contains( const TQPoint &p ) const; + bool contains( const TQRect &r ) const; void translate( int dx, int dy ); diff --git a/tqtinterface/qt4/src/kernel/tqregion_x11.cpp b/tqtinterface/qt4/src/kernel/tqregion_x11.cpp index 4e573c9..ddc80a0 100644 --- a/tqtinterface/qt4/src/kernel/tqregion_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqregion_x11.cpp @@ -563,7 +563,7 @@ miCoalesce (register TQRegionPrivate *pReg, int prevStart, int curStart) if (pCurBox != pRegEnd) { /* - * If more than one band was added, we have to tqfind the start + * If more than one band was added, we have to find the start * of the last band added so the next coalescing job can start * at the right place... (given when multiple bands are added, * this may be pointless -- see above). @@ -1494,7 +1494,7 @@ SOFTWARE. ************************************************************************/ /* - * This file tqcontains a few macros to help track + * This file contains a few macros to help track * the edge of a filled object. The object is assumed * to be filled in scanline order, and thus the * algorithm used is an extension of Bresenham's line @@ -1578,7 +1578,7 @@ SOFTWARE. /* - * This structure tqcontains all of the information needed + * This structure contains all of the information needed * to run the bresenham algorithm. * The variables may be hardcoded into the declarations * instead of using this structure to make use of @@ -1799,8 +1799,8 @@ SOFTWARE. * InsertEdgeInET * * Insert the given edge into the edge table. - * First we must tqfind the correct bucket in the - * Edge table, then tqfind the right slot in the + * First we must find the correct bucket in the + * Edge table, then find the right slot in the * bucket. Finally, we can insert it. * */ @@ -1813,7 +1813,7 @@ InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE, int scanline, ScanLineListBlock *tmpSLLBlock; /* - * tqfind the right bucket to put the edge into + * find the right bucket to put the edge into */ pPrevSLL = &ET->scanlines; pSLL = pPrevSLL->next; @@ -1928,7 +1928,7 @@ CreateETandAET(register int count, register TQPoint *pts, CurrPt = pts++; /* - * tqfind out which point is above and which is below. + * find out which point is above and which is below. */ if (PrevPt->y() > CurrPt->y() ) { @@ -2643,7 +2643,7 @@ bool TQRegion::isNull() const /*! Returns TRUE if the region is empty; otherwise returns FALSE. An - empty region is a region that tqcontains no points. + empty region is a region that contains no points. Example: \code @@ -2672,11 +2672,11 @@ bool TQRegion::isEmpty() const /*! - Returns TRUE if the region tqcontains the point \a p; otherwise + Returns TRUE if the region contains the point \a p; otherwise returns FALSE. */ -bool TQRegion::tqcontains( const TQPoint &p ) const +bool TQRegion::contains( const TQPoint &p ) const { return PointInRegion( data->region, p.x(), p.y() ); } @@ -2688,7 +2688,7 @@ bool TQRegion::tqcontains( const TQPoint &p ) const returns FALSE. */ -bool TQRegion::tqcontains( const TQRect &r ) const +bool TQRegion::contains( const TQRect &r ) const { return RectInRegion( data->region, r.left(), r.top(), r.width(), r.height() ) != RectangleOut; diff --git a/tqtinterface/qt4/src/kernel/tqrichtext.cpp b/tqtinterface/qt4/src/kernel/tqrichtext.cpp index 00484d6..e8e91b3 100644 --- a/tqtinterface/qt4/src/kernel/tqrichtext.cpp +++ b/tqtinterface/qt4/src/kernel/tqrichtext.cpp @@ -8885,12 +8885,12 @@ void TQTextCursor::insert( const QString &str, bool checkNewLine, TQMemArray<TQT #if defined(TQ_WS_WIN) if ( checkNewLine ) { int i = 0; - while ( ( i = s.tqfind( '\r', i ) ) != -1 ) + while ( ( i = s.find( '\r', i ) ) != -1 ) s.remove( i ,1 ); } #endif if ( checkNewLine ) - justInsert = s.tqfind( '\n' ) == -1; + justInsert = s.find( '\n' ) == -1; if ( justInsert ) { // we ignore new lines and insert all in the current para at the current index para->insert( idx, s.tqunicode(), s.length() ); if ( formatting ) { @@ -8908,8 +8908,8 @@ void TQTextCursor::insert( const QString &str, bool checkNewLine, TQMemArray<TQT int y = para->rect().y() + para->rect().height(); int lastIndex = 0; do { - end = s.tqfind( '\n', start + 1 ); // tqfind line break - if ( end == -1 ) // didn't tqfind one, so end of line is end of string + end = s.find( '\n', start + 1 ); // find line break + if ( end == -1 ) // didn't find one, so end of line is end of string end = s.length(); int len = (start == -1 ? end : end - start - 1); if ( len > 0 ) // insert the line @@ -9846,7 +9846,7 @@ void TQTextDocument::setPlainText( const TQString &text ) oText = text; int lastNl = 0; - int nl = text.tqfind( '\n' ); + int nl = text.find( '\n' ); if ( nl == -1 ) { lParag = createParagraph( this, lParag, 0 ); if ( !fParag ) @@ -9872,7 +9872,7 @@ void TQTextDocument::setPlainText( const TQString &text ) if ( nl == (int)text.length() ) break; lastNl = nl + 1; - nl = text.tqfind( '\n', nl + 1 ); + nl = text.find( '\n', nl + 1 ); if ( nl == -1 ) nl = text.length(); } @@ -10065,7 +10065,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu #endif // some well-known tags, some have a nstyle, some not - if ( wellKnownTags.tqfind( tagname ) != -1 ) { + if ( wellKnownTags.find( tagname ) != -1 ) { if ( tagname == "br" ) { emptyTag = space = TRUE; int index = TQMAX( curpar->length(),1) - 1; @@ -10086,11 +10086,11 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu custom = parseTable( attr, format, doc, length, pos, curpar ); #endif } else if ( tagname == "qt" || tagname == "body" ) { - if ( attr.tqcontains( "bgcolor" ) ) { + if ( attr.contains( "bgcolor" ) ) { TQBrush *b = new TQBrush( TQColor( attr["bgcolor"] ) ); setPaper( b ); } - if ( attr.tqcontains( "background" ) ) { + if ( attr.contains( "background" ) ) { #ifndef TQT_NO_MIME TQImage img; TQString bg = attr["background"]; @@ -10108,21 +10108,21 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu } #endif } - if ( attr.tqcontains( "text" ) ) { + if ( attr.contains( "text" ) ) { TQColor c( attr["text"] ); initag.format.setColor( c ); curtag.format.setColor( c ); bodyText = c; } - if ( attr.tqcontains( "link" ) ) + if ( attr.contains( "link" ) ) linkColor = TQColor( attr["link"] ); - if ( attr.tqcontains( "title" ) ) - attribs.tqreplace( "title", attr["title"] ); + if ( attr.contains( "title" ) ) + attribs.replace( "title", attr["title"] ); if ( textEditMode ) { - if ( attr.tqcontains("style" ) ) { + if ( attr.contains("style" ) ) { TQString a = attr["style"]; - for ( int s = 0; s < a.tqcontains(';')+1; s++ ) { + for ( int s = 0; s < a.contains(';')+1; s++ ) { TQString style = a.section( ';', s, s ); if ( style.startsWith("font-size:" ) && style.endsWith("pt") ) { scaleFontsFactor = double( formatCollection()->defaultFormat()->fn.pointSize() ) / @@ -10145,7 +10145,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu title += doc[ pos ]; ++pos; } - attribs.tqreplace( "title", title ); + attribs.replace( "title", title ); } } // end of well-known tag handling @@ -10256,7 +10256,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu if ( nstyle->name() == "ul" ) curtag.style = sheet_->item( "ol" ); - if ( attr.tqcontains( "align" ) ) { + if ( attr.contains( "align" ) ) { TQString align = attr["align"].lower(); if ( align == "center" ) curtag.tqalignment = TQt::AlignCenter; @@ -10265,7 +10265,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu else if ( align == "justify" ) curtag.tqalignment = TQt::AlignJustify; } - if ( attr.tqcontains( "dir" ) ) { + if ( attr.contains( "dir" ) ) { TQString dir = attr["dir"]; if ( dir == "rtl" ) curtag.direction = TQChar::DirR; @@ -10276,14 +10276,14 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu NEWPAR; if ( curtag.style->displayMode() == TQStyleSheetItem::DisplayListItem ) { - if ( attr.tqcontains( "value " ) ) + if ( attr.contains( "value " ) ) curpar->setListValue( attr["value"].toInt() ); } - if ( attr.tqcontains( "style" ) ) { + if ( attr.contains( "style" ) ) { TQString a = attr["style"]; bool ok = TRUE; - for ( int s = 0; ok && s < a.tqcontains(';')+1; s++ ) { + for ( int s = 0; ok && s < a.contains(';')+1; s++ ) { TQString style = a.section( ';', s, s ); if ( style.startsWith("margin-top:" ) && style.endsWith("px") ) curpar->utm = 1+style.mid(11, style.length() - 13).toInt(&ok); @@ -10852,7 +10852,7 @@ void TQTextDocument::tqinvalidate() void TQTextDocument::selectionStart( int id, int ¶gId, int &index ) { - QMap<int, TQTextDocumentSelection>::Iterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return; TQTextDocumentSelection &sel = *it; @@ -10862,7 +10862,7 @@ void TQTextDocument::selectionStart( int id, int ¶gId, int &index ) TQTextCursor TQTextDocument::selectionStartCursor( int id) { - QMap<int, TQTextDocumentSelection>::Iterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return TQTextCursor( this ); TQTextDocumentSelection &sel = *it; @@ -10873,7 +10873,7 @@ TQTextCursor TQTextDocument::selectionStartCursor( int id) TQTextCursor TQTextDocument::selectionEndCursor( int id) { - QMap<int, TQTextDocumentSelection>::Iterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return TQTextCursor( this ); TQTextDocumentSelection &sel = *it; @@ -10884,7 +10884,7 @@ TQTextCursor TQTextDocument::selectionEndCursor( int id) void TQTextDocument::selectionEnd( int id, int ¶gId, int &index ) { - QMap<int, TQTextDocumentSelection>::Iterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return; TQTextDocumentSelection &sel = *it; @@ -10923,7 +10923,7 @@ static void setSelectionEndHelper( int id, TQTextDocumentSelection &sel, TQTextC bool TQTextDocument::setSelectionEnd( int id, const TQTextCursor &cursor ) { - QMap<int, TQTextDocumentSelection>::Iterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return FALSE; TQTextDocumentSelection &sel = *it; @@ -11077,7 +11077,7 @@ void TQTextDocument::selectAll( int id ) bool TQTextDocument::removeSelection( int id ) { - if ( !selections.tqcontains( id ) ) + if ( !selections.contains( id ) ) return FALSE; TQTextDocumentSelection &sel = selections[ id ]; @@ -11103,7 +11103,7 @@ bool TQTextDocument::removeSelection( int id ) TQString TQTextDocument::selectedText( int id, bool asRichText ) const { - QMap<int, TQTextDocumentSelection>::ConstIterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::ConstIterator it = selections.find( id ); if ( it == selections.end() ) return TQString::null; @@ -11152,17 +11152,17 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const richTextExportEnd = &c2; TQString sel = richText(); - int from = sel.tqfind( "<!--StartFragment-->" ); + int from = sel.find( "<!--StartFragment-->" ); if ( from >= 0 ) { from += 20; - // tqfind the previous span and move it into the start fragment before we clip it + // find the previous span and move it into the start fragment before we clip it TQString prevspan; - int pspan = sel.tqfindRev( "<span", from-21 ); - if ( pspan > sel.tqfindRev( "</span", from-21 ) ) { - int spanend = sel.tqfind( '>', pspan ); + int pspan = sel.findRev( "<span", from-21 ); + if ( pspan > sel.findRev( "</span", from-21 ) ) { + int spanend = sel.find( '>', pspan ); prevspan = sel.mid( pspan, spanend - pspan + 1 ); } - int to = sel.tqfindRev( "<!--EndFragment-->" ); + int to = sel.findRev( "<!--EndFragment-->" ); if ( from <= to ) sel = "<!--StartFragment-->" + prevspan + sel.mid( from, to - from ); } @@ -11249,7 +11249,7 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const void TQTextDocument::setFormat( int id, TQTextFormat *f, int flags ) { - QMap<int, TQTextDocumentSelection>::ConstIterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::ConstIterator it = selections.find( id ); if ( it == selections.end() ) return; @@ -11281,7 +11281,7 @@ void TQTextDocument::setFormat( int id, TQTextFormat *f, int flags ) void TQTextDocument::removeSelectedText( int id, TQTextCursor *cursor ) { - QMap<int, TQTextDocumentSelection>::Iterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return; @@ -11345,7 +11345,7 @@ void TQTextDocument::removeSelectedText( int id, TQTextCursor *cursor ) void TQTextDocument::indentSelection( int id ) { - QMap<int, TQTextDocumentSelection>::Iterator it = selections.tqfind( id ); + QMap<int, TQTextDocumentSelection>::Iterator it = selections.find( id ); if ( it == selections.end() ) return; @@ -11379,7 +11379,7 @@ TQTextCursor *TQTextDocument::redo( TQTextCursor *c ) return commandHistory->redo( c ); } -bool TQTextDocument::tqfind( TQTextCursor& cursor, const TQString &expr, bool cs, bool wo, bool forward ) +bool TQTextDocument::find( TQTextCursor& cursor, const TQString &expr, bool cs, bool wo, bool forward ) { removeSelection( Standard ); TQTextParagraph *p = 0; @@ -11391,7 +11391,7 @@ bool TQTextDocument::tqfind( TQTextCursor& cursor, const TQString &expr, bool cs TQString s = cursor.paragraph()->string()->toString(); int start = cursor.index(); for ( ;; ) { - int res = forward ? s.tqfind( expr, start, cs ) : s.tqfindRev( expr, start, cs ); + int res = forward ? s.find( expr, start, cs ) : s.findRev( expr, start, cs ); int end = res + expr.length(); if ( res == -1 || ( !forward && start <= res ) ) break; @@ -11436,7 +11436,7 @@ TQt::TextFormat TQTextDocument::textFormat() const bool TQTextDocument::inSelection( int selId, const TQPoint &pos ) const { - QMap<int, TQTextDocumentSelection>::ConstIterator it = selections.tqfind( selId ); + QMap<int, TQTextDocumentSelection>::ConstIterator it = selections.find( selId ); if ( it == selections.end() ) return FALSE; @@ -11453,7 +11453,7 @@ bool TQTextDocument::inSelection( int selId, const TQPoint &pos ) const TQTextParagraph *p = startParag; while ( p ) { - if ( p->rect().tqcontains( pos ) ) { + if ( p->rect().contains( pos ) ) { bool inSel = FALSE; int selStart = p->selectionStart( selId ); int selEnd = p->selectionEnd( selId ); @@ -11465,8 +11465,8 @@ bool TQTextDocument::inSelection( int selId, const TQPoint &pos ) const if ( i == selEnd ) break; if ( p->at( i )->lineStart ) { - y = (*p->lineStarts.tqfind( i ))->y; - h = (*p->lineStarts.tqfind( i ))->h; + y = (*p->lineStarts.find( i ))->y; + h = (*p->lineStarts.find( i ))->h; } if ( pos.y() - p->rect().y() >= y && pos.y() - p->rect().y() <= y + h ) { if ( inSel && pos.x() >= p->at( i )->x && @@ -12780,7 +12780,7 @@ int TQTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const --it; } - qWarning( "TQTextParagraph::lineHeightOfChar: couldn't tqfind lh for %d", i ); + qWarning( "TQTextParagraph::lineHeightOfChar: couldn't find lh for %d", i ); return 15; } @@ -12806,7 +12806,7 @@ TQTextStringChar *TQTextParagraph::lineStartOfChar( int i, int *index, int *line --l; } - qWarning( "TQTextParagraph::lineStartOfChar: couldn't tqfind %d", i ); + qWarning( "TQTextParagraph::lineStartOfChar: couldn't find %d", i ); return 0; } @@ -12833,7 +12833,7 @@ TQTextStringChar *TQTextParagraph::lineStartOfLine( int line, int *index ) const return &str->at( i ); } - qWarning( "TQTextParagraph::lineStartOfLine: couldn't tqfind %d", line ); + qWarning( "TQTextParagraph::lineStartOfLine: couldn't find %d", line ); return 0; } @@ -13047,7 +13047,7 @@ void TQTextParagraph::paint( TQPainter &painter, const TQColorGroup &cg, TQTextC else if ( chr->customItem()->placement() == TQTextCustomItem::PlaceInline ) { bool inSelection = FALSE; if (drawSelections) { - QMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->tqfind( TQTextDocument::Standard ); + QMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->find( TQTextDocument::Standard ); inSelection = (it != mSelections->end() && (*it).start <= i && (*it).end > i); } chr->customItem()->draw( &painter, chr->x, y, @@ -13159,7 +13159,7 @@ void TQTextParagraph::drawString( TQPainter &painter, const TQString &str, int s bool allSelected = FALSE; if (drawSelections) { - QMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->tqfind( TQTextDocument::Standard ); + QMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->find( TQTextDocument::Standard ); allSelected = (it != mSelections->end() && (*it).start <= start && (*it).end >= start+len); } if (!allSelected) @@ -13485,7 +13485,7 @@ TQString TQTextParagraph::richText() const TQTextStringChar *c = &str->at( i ); if ( c->isAnchor() && !c->anchorName().isEmpty() && c->anchorName() != lastAnchorName ) { lastAnchorName = c->anchorName(); - if ( c->anchorName().tqcontains( '#' ) ) { + if ( c->anchorName().contains( '#' ) ) { TQStringList l = TQStringList::split( '#', c->anchorName() ); for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) s += "<a name=\"" + *it + "\"></a>"; @@ -13878,7 +13878,7 @@ TQTextLineStart *TQTextFormatter::bidiReorderLine( TQTextParagraph * /*parag*/, void TQTextFormatter::insertLineStart( TQTextParagraph *parag, int index, TQTextLineStart *ls ) { QMap<int, TQTextLineStart*>::Iterator it; - if ( ( it = parag->lineStartList().tqfind( index ) ) == parag->lineStartList().end() ) { + if ( ( it = parag->lineStartList().find( index ) ) == parag->lineStartList().end() ) { parag->lineStartList().insert( index, ls ); } else { delete *it; @@ -14455,7 +14455,7 @@ TQTextFormat *TQTextFormatCollection::format( TQTextFormat *f ) return lastFormat; } - TQTextFormat *fm = cKey.tqfind( f->key() ); + TQTextFormat *fm = cKey.find( f->key() ); if ( fm ) { lastFormat = fm; lastFormat->addRef(); @@ -14506,7 +14506,7 @@ TQTextFormat *TQTextFormatCollection::format( TQTextFormat *of, TQTextFormat *nf cres->ha = nf->ha; cres->update(); - TQTextFormat *fm = cKey.tqfind( cres->key() ); + TQTextFormat *fm = cKey.find( cres->key() ); if ( !fm ) { cres->collection = this; cKey.insert( cres->key(), cres ); @@ -14527,7 +14527,7 @@ TQTextFormat *TQTextFormatCollection::format( const TQFont &f, const TQColor &c } TQString key = TQTextFormat::getKey( f, c, FALSE, TQTextFormat::AlignNormal ); - cachedFormat = cKey.tqfind( key ); + cachedFormat = cKey.find( key ); cfont = f; ccol = c; @@ -14555,7 +14555,7 @@ void TQTextFormatCollection::remove( TQTextFormat *f ) cres = 0; if ( cachedFormat == f ) cachedFormat = 0; - if (cKey.tqfind(f->key()) == f) + if (cKey.find(f->key()) == f) cKey.remove( f->key() ); } @@ -14843,20 +14843,20 @@ TQTextFormat TQTextFormat::makeTextFormat( const TQStyleSheetItem *style, const if ( style->name() == "font") { - if ( attr.tqcontains("color") ) { + if ( attr.contains("color") ) { TQString s = attr["color"]; if ( !s.isEmpty() ) { format.col.setNamedColor( s ); format.linkColor = FALSE; } } - if ( attr.tqcontains("face") ) { + if ( attr.contains("face") ) { TQString a = attr["face"]; TQString family = a.section( ',', 0, 0 ); if ( !!family ) format.fn.setFamily( family ); } - if ( attr.tqcontains("size") ) { + if ( attr.contains("size") ) { TQString a = attr["size"]; int n = a.toInt(); if ( a[0] == '+' || a[0] == '-' ) @@ -14869,9 +14869,9 @@ TQTextFormat TQTextFormat::makeTextFormat( const TQStyleSheetItem *style, const style->styleSheet()->scaleFont( format.fn, format.logicalFontSize ); } } - if ( attr.tqcontains("style" ) ) { + if ( attr.contains("style" ) ) { TQString a = attr["style"]; - for ( int s = 0; s < a.tqcontains(';')+1; s++ ) { + for ( int s = 0; s < a.contains(';')+1; s++ ) { TQString style = a.section( ';', s, s ); if ( style.startsWith("font-size:" ) && style.endsWith("pt") ) { format.logicalFontSize = 0; @@ -14891,15 +14891,15 @@ TQTextFormat TQTextFormat::makeTextFormat( const TQStyleSheetItem *style, const format.fn.setWeight( n/8 ); } else if ( style.startsWith("font-family:" ) ) { TQString family = style.mid(12).section(',',0,0); - family.tqreplace( '\"', ' ' ); - family.tqreplace( '\'', ' ' ); + family.replace( '\"', ' ' ); + family.replace( '\'', ' ' ); family = family.stripWhiteSpace(); format.fn.setFamily( family ); } else if ( style.startsWith("text-decoration:" ) ) { TQString s = style.mid( 16 ); - format.fn.setOverline( s.tqfind("overline") != -1 ); - format.fn.setStrikeOut( s.tqfind("line-through") != -1 ); - format.fn.setUnderline( s.tqfind("underline") != -1 ); + format.fn.setOverline( s.find("overline") != -1 ); + format.fn.setStrikeOut( s.find("line-through") != -1 ); + format.fn.setUnderline( s.find("underline") != -1 ); } else if ( style.startsWith("vertical-align:" ) ) { TQString s = TQT_TQSTRING(style.mid( 15 )).stripWhiteSpace(); if ( s == "sub" ) @@ -14936,9 +14936,9 @@ TQTextImage::TQTextImage( TQTextDocument *p, const QMap<TQString, TQString> &att : TQTextCustomItem( p ) { width = height = 0; - if ( attr.tqcontains("width") ) + if ( attr.contains("width") ) width = attr["width"].toInt(); - if ( attr.tqcontains("height") ) + if ( attr.contains("height") ) height = attr["height"].toInt(); reg = 0; @@ -14951,7 +14951,7 @@ TQTextImage::TQTextImage( TQTextDocument *p, const QMap<TQString, TQString> &att imgId = TQString( "%1,%2,%3,%4" ).arg( imageName ).arg( width ).arg( height ).arg( (ulong)&factory ); if ( !pixmap_map ) pixmap_map = new QMap<TQString, TQPixmapInt>; - if ( pixmap_map->tqcontains( imgId ) ) { + if ( pixmap_map->contains( imgId ) ) { TQPixmapInt& pmi = pixmap_map->operator[](imgId); pm = pmi.pm; pmi.ref++; @@ -15022,7 +15022,7 @@ TQTextImage::TQTextImage( TQTextDocument *p, const QMap<TQString, TQString> &att TQTextImage::~TQTextImage() { - if ( pixmap_map && pixmap_map->tqcontains( imgId ) ) { + if ( pixmap_map && pixmap_map->contains( imgId ) ) { TQPixmapInt& pmi = pixmap_map->operator[](imgId); pmi.ref--; if ( !pmi.ref ) { @@ -15043,7 +15043,7 @@ TQString TQTextImage::richText() const QMap<TQString, TQString>::ConstIterator it = attributes.begin(); for ( ; it != attributes.end(); ++it ) { s += it.key() + "="; - if ( (*it).tqfind( ' ' ) != -1 ) + if ( (*it).find( ' ' ) != -1 ) s += "\"" + *it + "\"" + " "; else s += *it + " "; @@ -15129,9 +15129,9 @@ TQTextHorizontalLine::TQTextHorizontalLine( TQTextDocument *p, const QMap<TQStri : TQTextCustomItem( p ) { height = tmpheight = 8; - if ( attr.tqfind( "color" ) != attr.end() ) - color = TQColor( *attr.tqfind( "color" ) ); - shade = attr.tqfind( "noshade" ) == attr.end(); + if ( attr.find( "color" ) != attr.end() ) + color = TQColor( *attr.find( "color" ) ); + shade = attr.find( "noshade" ) == attr.end(); } TQTextHorizontalLine::~TQTextHorizontalLine() @@ -15239,13 +15239,13 @@ TQTextCustomItem* TQTextDocument::parseTable( const QMap<TQString, TQString> &at if ( row >= 0 && col >= 0 ) { const TQStyleSheetItem* s = sheet_->item(tagname); - if ( !attr2.tqcontains("bgcolor") ) { + if ( !attr2.contains("bgcolor") ) { if (!rowbgcolor.isEmpty() ) attr2["bgcolor"] = rowbgcolor; else if (!tablebgcolor.isEmpty() ) attr2["bgcolor"] = tablebgcolor; } - if ( !attr2.tqcontains("align") ) { + if ( !attr2.contains("align") ) { if (!rowalign.isEmpty() ) attr2["align"] = rowalign; } @@ -15634,7 +15634,7 @@ TQChar TQTextDocument::parseHTMLSpecialChar(const TQChar* doc, int length, int& if (ok) return num; } else { - QMap<TQString, TQChar>::Iterator it = htmlMap()->tqfind(s); + QMap<TQString, TQChar>::Iterator it = htmlMap()->find(s); if ( it != htmlMap()->end() ) { return *it; } @@ -15871,10 +15871,10 @@ void TQTextFlow::unregisterFloatingItem( TQTextCustomItem* item ) void TQTextFlow::registerFloatingItem( TQTextCustomItem* item ) { if ( item->placement() == TQTextCustomItem::PlaceRight ) { - if ( !rightItems.tqcontains( item ) ) + if ( !rightItems.contains( item ) ) rightItems.append( item ); } else if ( item->placement() == TQTextCustomItem::PlaceLeft && - !leftItems.tqcontains( item ) ) { + !leftItems.contains( item ) ) { leftItems.append( item ); } } @@ -15931,13 +15931,13 @@ TQTextTable::TQTextTable( TQTextDocument *p, const QMap<TQString, TQString> & at { cells.setAutoDelete( FALSE ); cellspacing = 2; - if ( attr.tqcontains("cellspacing") ) + if ( attr.contains("cellspacing") ) cellspacing = attr["cellspacing"].toInt(); cellpadding = 1; - if ( attr.tqcontains("cellpadding") ) + if ( attr.contains("cellpadding") ) cellpadding = attr["cellpadding"].toInt(); border = innerborder = 0; - if ( attr.tqcontains("border" ) ) { + if ( attr.contains("border" ) ) { TQString s( attr["border"] ); if ( s == "TRUE" ) border = 1; @@ -15960,7 +15960,7 @@ TQTextTable::TQTextTable( TQTextDocument *p, const QMap<TQString, TQString> & at fixwidth = 0; stretch = 0; - if ( attr.tqcontains("width") ) { + if ( attr.contains("width") ) { bool b; TQString s( attr["width"] ); int w = s.toInt( &b ); @@ -16248,14 +16248,14 @@ bool TQTextTable::enterAt( TQTextCursor *c, TQTextDocument *&doc, TQTextParagrap if ( i == (int) cells.count() ) return FALSE; // no cell found - if ( currCell.tqfind( c ) == currCell.end() ) { + if ( currCell.find( c ) == currCell.end() ) { if ( lastY != -1 ) currCell.insert( c, lastCell ); else return FALSE; } - TQTextTableCell *cell = cells.at( *currCell.tqfind( c ) ); + TQTextTableCell *cell = cells.at( *currCell.find( c ) ); if ( !cell ) return FALSE; doc = cell->richText(); @@ -16269,8 +16269,8 @@ bool TQTextTable::enterAt( TQTextCursor *c, TQTextDocument *&doc, TQTextParagrap bool TQTextTable::next( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *¶g, int &idx, int &ox, int &oy ) { int cc = -1; - if ( currCell.tqfind( c ) != currCell.end() ) - cc = *currCell.tqfind( c ); + if ( currCell.find( c ) != currCell.end() ) + cc = *currCell.find( c ); if ( cc > (int)cells.count() - 1 || cc < 0 ) cc = -1; currCell.remove( c ); @@ -16286,9 +16286,9 @@ bool TQTextTable::next( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * return TRUE; } - if ( currCell.tqfind( c ) == currCell.end() ) + if ( currCell.find( c ) == currCell.end() ) return FALSE; - TQTextTableCell *cell = cells.at( *currCell.tqfind( c ) ); + TQTextTableCell *cell = cells.at( *currCell.find( c ) ); if ( !cell ) return FALSE; doc = cell->richText(); @@ -16302,8 +16302,8 @@ bool TQTextTable::next( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * bool TQTextTable::prev( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *¶g, int &idx, int &ox, int &oy ) { int cc = -1; - if ( currCell.tqfind( c ) != currCell.end() ) - cc = *currCell.tqfind( c ); + if ( currCell.find( c ) != currCell.end() ) + cc = *currCell.find( c ); if ( cc > (int)cells.count() - 1 || cc < 0 ) cc = cells.count(); currCell.remove( c ); @@ -16319,9 +16319,9 @@ bool TQTextTable::prev( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * return TRUE; } - if ( currCell.tqfind( c ) == currCell.end() ) + if ( currCell.find( c ) == currCell.end() ) return FALSE; - TQTextTableCell *cell = cells.at( *currCell.tqfind( c ) ); + TQTextTableCell *cell = cells.at( *currCell.find( c ) ); if ( !cell ) return FALSE; doc = cell->richText(); @@ -16334,9 +16334,9 @@ bool TQTextTable::prev( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * bool TQTextTable::down( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *¶g, int &idx, int &ox, int &oy ) { - if ( currCell.tqfind( c ) == currCell.end() ) + if ( currCell.find( c ) == currCell.end() ) return FALSE; - TQTextTableCell *cell = cells.at( *currCell.tqfind( c ) ); + TQTextTableCell *cell = cells.at( *currCell.find( c ) ); if ( cell->row_ == tqlayout->numRows() - 1 ) { currCell.insert( c, 0 ); TQTextCustomItem::down( c, doc, parag, idx, ox, oy ); @@ -16350,9 +16350,9 @@ bool TQTextTable::down( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * int oldRow = cell->row_; int oldCol = cell->col_; - if ( currCell.tqfind( c ) == currCell.end() ) + if ( currCell.find( c ) == currCell.end() ) return FALSE; - int cc = *currCell.tqfind( c ); + int cc = *currCell.find( c ); for ( int i = cc; i < (int)cells.count(); ++i ) { cell = cells.at( i ); if ( cell->row_ > oldRow && cell->col_ == oldCol ) { @@ -16372,9 +16372,9 @@ bool TQTextTable::down( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph * bool TQTextTable::up( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *¶g, int &idx, int &ox, int &oy ) { - if ( currCell.tqfind( c ) == currCell.end() ) + if ( currCell.find( c ) == currCell.end() ) return FALSE; - TQTextTableCell *cell = cells.at( *currCell.tqfind( c ) ); + TQTextTableCell *cell = cells.at( *currCell.find( c ) ); if ( cell->row_ == 0 ) { currCell.insert( c, 0 ); TQTextCustomItem::up( c, doc, parag, idx, ox, oy ); @@ -16388,9 +16388,9 @@ bool TQTextTable::up( TQTextCursor *c, TQTextDocument *&doc, TQTextParagraph *&p int oldRow = cell->row_; int oldCol = cell->col_; - if ( currCell.tqfind( c ) == currCell.end() ) + if ( currCell.find( c ) == currCell.end() ) return FALSE; - int cc = *currCell.tqfind( c ); + int cc = *currCell.find( c ); for ( int i = cc; i >= 0; --i ) { cell = cells.at( i ); if ( cell->row_ < oldRow && cell->col_ == oldCol ) { @@ -16430,7 +16430,7 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, richtext->formatCollection()->setPaintDevice( table->tqparent->formatCollection()->paintDevice() ); richtext->bodyText = fmt.color(); richtext->setTableCell( this ); - TQString a = *attr.tqfind( "align" ); + TQString a = *attr.find( "align" ); if ( !a.isEmpty() ) { a = a.lower(); if ( a == "left" ) @@ -16441,7 +16441,7 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, richtext->tqsetAlignment( TQt::AlignRight ); } align = 0; - TQString va = *attr.tqfind( "valign" ); + TQString va = *attr.find( "valign" ); if ( !va.isEmpty() ) { va = va.lower(); if ( va == "top" ) @@ -16458,19 +16458,19 @@ TQTextTableCell::TQTextTableCell( TQTextTable* table, richtext->setRichText( doc, context, &fmt ); rowspan_ = 1; colspan_ = 1; - if ( attr.tqcontains("colspan") ) + if ( attr.contains("colspan") ) colspan_ = attr["colspan"].toInt(); - if ( attr.tqcontains("rowspan") ) + if ( attr.contains("rowspan") ) rowspan_ = attr["rowspan"].toInt(); background = 0; - if ( attr.tqcontains("bgcolor") ) { + if ( attr.contains("bgcolor") ) { background = new TQBrush(TQColor( attr["bgcolor"] )); } hasFixedWidth = FALSE; - if ( attr.tqcontains("width") ) { + if ( attr.contains("width") ) { bool b; TQString s( attr["width"] ); int w = s.toInt( &b ); diff --git a/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp b/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp index d8504df..31649dd 100644 --- a/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp +++ b/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp @@ -811,7 +811,7 @@ void TQTextCursor::gotoPosition( TQTextParagraph* p, int index ) bool TQTextDocument::hasSelection( int id, bool visible ) const { - return ( selections.tqfind( id ) != selections.end() && + return ( selections.find( id ) != selections.end() && ( !visible || ( (TQTextDocument*)this )->selectionStartCursor( id ) != ( (TQTextDocument*)this )->selectionEndCursor( id ) ) ); @@ -1091,7 +1091,7 @@ TQString TQTextString::toString( const TQMemArray<TQTextStringChar> &data ) void TQTextParagraph::setSelection( int id, int start, int end ) { - TQMap<int, TQTextParagraphSelection>::ConstIterator it = selections().tqfind( id ); + TQMap<int, TQTextParagraphSelection>::ConstIterator it = selections().find( id ); if ( it != mSelections->end() ) { if ( start == ( *it ).start && end == ( *it ).end ) return; @@ -1117,7 +1117,7 @@ int TQTextParagraph::selectionStart( int id ) const { if ( !mSelections ) return -1; - TQMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->tqfind( id ); + TQMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) return -1; return ( *it ).start; @@ -1127,7 +1127,7 @@ int TQTextParagraph::selectionEnd( int id ) const { if ( !mSelections ) return -1; - TQMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->tqfind( id ); + TQMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) return -1; return ( *it ).end; @@ -1135,14 +1135,14 @@ int TQTextParagraph::selectionEnd( int id ) const bool TQTextParagraph::hasSelection( int id ) const { - return mSelections ? mSelections->tqcontains( id ) : FALSE; + return mSelections ? mSelections->contains( id ) : FALSE; } bool TQTextParagraph::fullSelected( int id ) const { if ( !mSelections ) return FALSE; - TQMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->tqfind( id ); + TQMap<int, TQTextParagraphSelection>::ConstIterator it = mSelections->find( id ); if ( it == mSelections->end() ) return FALSE; return ( *it ).start == 0 && ( *it ).end == str->length() - 1; diff --git a/tqtinterface/qt4/src/kernel/tqrichtext_p.h b/tqtinterface/qt4/src/kernel/tqrichtext_p.h index edb8c76..bcfdb9b 100644 --- a/tqtinterface/qt4/src/kernel/tqrichtext_p.h +++ b/tqtinterface/qt4/src/kernel/tqrichtext_p.h @@ -853,7 +853,6 @@ public: TQTextFormatCollection *formatCollection() const; bool find(TQTextCursor &cursor, const TQString &expr, bool cs, bool wo, bool forward); - inline bool tqfind(TQTextCursor &cursor, const TQString &expr, bool cs, bool wo, bool forward) { return find(cursor, expr, cs, wo, forward); } void setTextFormat(TQt::TextFormat f); TQt::TextFormat textFormat() const; @@ -3027,7 +3026,7 @@ public: TQTextFormatCollection *formatCollection() const; - bool tqfind( TQTextCursor &cursor, const TQString &expr, bool cs, bool wo, bool forward); + bool find( TQTextCursor &cursor, const TQString &expr, bool cs, bool wo, bool forward); void setTextFormat( TQt::TextFormat f ); TQt::TextFormat textFormat() const; diff --git a/tqtinterface/qt4/src/kernel/tqscriptengine.cpp b/tqtinterface/qt4/src/kernel/tqscriptengine.cpp index a45237f..0bb29fc 100644 --- a/tqtinterface/qt4/src/kernel/tqscriptengine.cpp +++ b/tqtinterface/qt4/src/kernel/tqscriptengine.cpp @@ -559,7 +559,7 @@ static bool hebrew_tqshape(TQShaperItem *item) // and thus have the same enum value // // I'm not sure the mapping of syriac to arabic enums is correct with regards to justification, but as -// I couldn't tqfind any better document I'll hope for the best. +// I couldn't find any better document I'll hope for the best. enum ArabicGroup { // NonJoining ArabicNone, @@ -1339,7 +1339,7 @@ static inline const TQChar prevChar(const TQString *str, int pos) pos--; ch--; } - return TQChar::tqreplacement; + return TQChar::replacement; } static inline const TQChar nextChar(const TQString *str, int pos) @@ -1355,7 +1355,7 @@ static inline const TQChar nextChar(const TQString *str, int pos) pos++; ch++; } - return TQChar::tqreplacement; + return TQChar::replacement; } diff --git a/tqtinterface/qt4/src/kernel/tqscriptengine_x11.cpp b/tqtinterface/qt4/src/kernel/tqscriptengine_x11.cpp index 3cd84d7..d42b8d2 100644 --- a/tqtinterface/qt4/src/kernel/tqscriptengine_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqscriptengine_x11.cpp @@ -1285,9 +1285,9 @@ static bool indic_tqshape_syllable(TQOpenType *openType, TQShaperItem *item, boo unsigned short *uc = reordered.data(); bool beginsWithRa = FALSE; - // Rule 1: tqfind base consonant + // Rule 1: find base consonant // - // The shaping engine tqfinds the base consonant of the + // The shaping engine finds the base consonant of the // syllable, using the following algorithm: starting from the // end of the syllable, move backwards until a consonant is // found that does not have a below-base or post-base form @@ -1301,7 +1301,7 @@ static bool indic_tqshape_syllable(TQOpenType *openType, TQShaperItem *item, boo // // * In Kannada and Telugu, the base consonant cannot be // farther than 3 consonants from the end of the syllable. - // #### tqreplace the HasReph property by testing if the feature exists in the font! + // #### replace the HasReph property by testing if the feature exists in the font! if (form(*uc) == Consonant || (script == TQFont::Bengali && form(*uc) == IndependentVowel)) { beginsWithRa = (properties & HasReph) && ((len > 2) && *uc == ra && *(uc+1) == halant); @@ -1470,7 +1470,7 @@ static bool indic_tqshape_syllable(TQOpenType *openType, TQShaperItem *item, boo position[base] = Base; for (i = base+1; i < len; ++i) { position[i] = indic_position(uc[i]); - // #### tqreplace by adjusting table + // #### replace by adjusting table if (uc[i] == nukta || uc[i] == halant) position[i] = Inherit; } @@ -1679,7 +1679,7 @@ static bool indic_tqshape_syllable(TQOpenType *openType, TQShaperItem *item, boo // move the left matra back to it's correct position in malayalam and tamil if ((script == TQFont::Malayalam || script == TQFont::Tamil) && (form(reordered[0]) == Matra)) { // qDebug("reordering matra, len=%d", newLen); - // need to tqfind the base in the tqshaped string and move the matra there + // need to find the base in the tqshaped string and move the matra there int basePos = 0; while (basePos < newLen && (int)otl_glyphs[basePos].cluster <= base) basePos++; diff --git a/tqtinterface/qt4/src/kernel/tqsignal.cpp b/tqtinterface/qt4/src/kernel/tqsignal.cpp index 262164a..836f870 100644 --- a/tqtinterface/qt4/src/kernel/tqsignal.cpp +++ b/tqtinterface/qt4/src/kernel/tqsignal.cpp @@ -103,8 +103,8 @@ TQSignal::~TQSignal() static inline bool intSignature(const char *member) { TQCString s(member); - int p = s.tqfind('('); - return p > 0 && p < s.tqfindRev("int"); + int p = s.find('('); + return p > 0 && p < s.findRev("int"); } #endif /*! @@ -366,8 +366,8 @@ TQSignal::~TQSignal() static inline bool intSignature( const char *member ) { TQCString s( member ); - int p = s.tqfind( '(' ); - return p > 0 && p < s.tqfindRev( "int" ); + int p = s.find( '(' ); + return p > 0 && p < s.findRev( "int" ); } #endif /*! diff --git a/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp b/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp index 8a99c54..40b08ee 100644 --- a/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp +++ b/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp @@ -143,7 +143,7 @@ void TQSignalMapper::removeMapping() void TQSignalMapper::map() { const TQObject* s = const_cast<const TQObject*>(static_cast<TQObject*>(sender())); - TQSignalMapperRec* rec = d->dict.tqfind( (void*)s ); + TQSignalMapperRec* rec = d->dict.find( (void*)s ); if ( rec ) { if ( rec->has_int ) emit mapped( rec->int_id ); @@ -154,7 +154,7 @@ void TQSignalMapper::map() TQSignalMapperRec* TQSignalMapper::getRec( const TQObject* sender ) { - TQSignalMapperRec* rec = d->dict.tqfind( (void*)sender ); + TQSignalMapperRec* rec = d->dict.find( (void*)sender ); if (!rec) { rec = new TQSignalMapperRec; d->dict.insert( (void*)sender, rec ); diff --git a/tqtinterface/qt4/src/kernel/tqsimplerichtext.cpp b/tqtinterface/qt4/src/kernel/tqsimplerichtext.cpp index 4721fd8..dd4ec7b 100644 --- a/tqtinterface/qt4/src/kernel/tqsimplerichtext.cpp +++ b/tqtinterface/qt4/src/kernel/tqsimplerichtext.cpp @@ -550,7 +550,7 @@ void TQSimpleRichTextData::adjustSize(TQPainter *p) { \endcode \a context is the optional context of the rich text object. This - becomes important if \a text tqcontains relative references, for + becomes important if \a text contains relative references, for example within image tags. TQSimpleRichText always uses the default mime source factory (see \l{TQMimeSourceFactory::defaultFactory()}) to resolve those references. The context will then be used to @@ -590,7 +590,7 @@ TQSimpleRichText::TQSimpleRichText( const TQString& text, const TQFont& fnt, as TQColorGroup's TQColorGroup::link() color is used now. \a context is the optional context of the rich text object. This - becomes important if \a text tqcontains relative references, for + becomes important if \a text contains relative references, for example within image tags. TQSimpleRichText always uses the default mime source factory (see \l{TQMimeSourceFactory::defaultFactory()}) to resolve those references. The context will then be used to @@ -698,7 +698,7 @@ int TQSimpleRichText::width() const Returns the width in pixels that is actually used by the rich text object. This can be smaller or wider than the set width. - It may be wider, for example, if the text tqcontains images or + It may be wider, for example, if the text contains images or non-breakable words that are already wider than the available space. It's smaller when the object only consists of lines that do not fill the width completely. diff --git a/tqtinterface/qt4/src/kernel/tqsound_x11.cpp b/tqtinterface/qt4/src/kernel/tqsound_x11.cpp index 6ffe6e8..80b6dbf 100644 --- a/tqtinterface/qt4/src/kernel/tqsound_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqsound_x11.cpp @@ -164,11 +164,11 @@ void TQAuServerNAS::play(const TQString& filename) static void callback( AuServer*, AuEventHandlerRec*, AuEvent* e, AuPointer p) { - if ( inprogress->tqfind(p) && e ) { + if ( inprogress->find(p) && e ) { if (e->type==AuEventTypeElementNotify && e->auelementnotify.kind==AuElementNotifyKindState) { if ( e->auelementnotify.cur_state == AuStateStop ) - ((TQAuServerNAS*)inprogress->tqfind(p))->setDone((TQSound*)p); + ((TQAuServerNAS*)inprogress->find(p))->setDone((TQSound*)p); } } } diff --git a/tqtinterface/qt4/src/kernel/tqstyle.cpp b/tqtinterface/qt4/src/kernel/tqstyle.cpp index ac14dcb..9aa3a59 100644 --- a/tqtinterface/qt4/src/kernel/tqstyle.cpp +++ b/tqtinterface/qt4/src/kernel/tqstyle.cpp @@ -229,7 +229,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, } else { // color pixmap, no tqmask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::tqfind(k); + TQPixmap *tqmask = TQPixmapCache::find(k); bool del=FALSE; if ( !tqmask ) { tqmask = new TQPixmap( pm.createHeuristicMask() ); @@ -910,7 +910,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, } else { // color pixmap, no tqmask TQString k; k.sprintf( "$qt-drawitem-%x", pm.serialNumber() ); - TQPixmap *tqmask = TQPixmapCache::tqfind(k); + TQPixmap *tqmask = TQPixmapCache::find(k); bool del=FALSE; if ( !tqmask ) { tqmask = new TQPixmap( pm.createHeuristicMask() ); @@ -1357,7 +1357,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \list \i opt.\link TQStyleOption::arrowType() arrowType\endlink() \endlist - \i17 When the tool button only tqcontains an arrow, \e t is the + \i17 When the tool button only contains an arrow, \e t is the arrow's type. \row \i \l Style_HasFocus \i Set if the toolbutton has input focus. \row \i \l Style_Down \i Set if the toolbutton is down (i.e., a @@ -1521,7 +1521,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \value SC_ScrollBarFirst scrollbar first line (i.e. home). \value SC_ScrollBarLast scrollbar last line (i.e. end). \value SC_ScrollBarSlider scrollbar slider handle. - \value SC_ScrollBarGroove special subcontrol which tqcontains the + \value SC_ScrollBarGroove special subcontrol which contains the area in which the slider handle may move. @@ -1537,7 +1537,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \value SC_ComboBoxFrame combobox frame \value SC_ComboBoxListBoxPopup combobox list box - \value SC_SliderGroove special subcontrol which tqcontains the area + \value SC_SliderGroove special subcontrol which contains the area in which the slider handle may move. \value SC_SliderHandle slider handle. \value SC_SliderTickmarks slider tickmarks. @@ -1634,7 +1634,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r, \list \i opt.\link TQStyleOption::arrowType() arrowType\endlink() \endlist - \i16 When the tool button only tqcontains an arrow, \e t is the + \i16 When the tool button only contains an arrow, \e t is the arrow's type. \row \i \l Style_HasFocus \i Set if the toolbutton has input focus. \row \i \l Style_Down \i Set if the toolbutton is down (ie. mouse diff --git a/tqtinterface/qt4/src/kernel/tqstylesheet.cpp b/tqtinterface/qt4/src/kernel/tqstylesheet.cpp index 25f6c0c..08a29dc 100644 --- a/tqtinterface/qt4/src/kernel/tqstylesheet.cpp +++ b/tqtinterface/qt4/src/kernel/tqstylesheet.cpp @@ -790,7 +790,7 @@ bool TQStyleSheetItem::allowedInContext( const TQStyleSheetItem* s) const { if ( d->contxt.isEmpty() ) return TRUE; - return d->contxt.tqfind( TQChar(' ')+s->name()+TQChar(' ')) != -1; + return d->contxt.find( TQChar(' ')+s->name()+TQChar(' ')) != -1; } @@ -1036,7 +1036,7 @@ int TQStyleSheetItem::lineSpacing() const \endtable In addition, rich text supports simple HTML tables. A table - consists of one or more rows each of which tqcontains one or more + consists of one or more rows each of which contains one or more cells. Cells are either data cells or header cells, depending on their content. Cells which span rows and columns are supported. @@ -1370,7 +1370,7 @@ const TQStyleSheetItem* TQStyleSheet::item( const TQString& name) const \a context is the optional context of the document, i.e. the path to look for relative links. This becomes important if the text - tqcontains relative references, for example within image tags. + contains relative references, for example within image tags. TQSimpleRichText always uses the default mime source factory (see \l{TQMimeSourceFactory::defaultFactory()}) to resolve these references. The context will then be used to calculate the @@ -1532,7 +1532,7 @@ bool TQStyleSheet::mightBeRichText( const TQString& text) ++open; } if ( open < (int)text.length() && text[open] == '<' ) { - int close = text.tqfind('>', open); + int close = text.find('>', open); if ( close > -1 ) { TQString tag; for (int i = open+1; i < close; ++i) { diff --git a/tqtinterface/qt4/src/kernel/tqtextengine.cpp b/tqtinterface/qt4/src/kernel/tqtextengine.cpp index dd5d9d3..becf604 100644 --- a/tqtinterface/qt4/src/kernel/tqtextengine.cpp +++ b/tqtinterface/qt4/src/kernel/tqtextengine.cpp @@ -677,7 +677,7 @@ static void bidiItemize( TQTextEngine *engine, bool rightToLeft, int mode ) void TQTextEngine::bidiReorder( int numItems, const TQ_UINT8 *levels, int *visualOrder ) { - // first tqfind highest and lowest levels + // first find highest and lowest levels uchar levelLow = 128; uchar levelHigh = 0; int i = 0; diff --git a/tqtinterface/qt4/src/kernel/tqtextlayout.cpp b/tqtinterface/qt4/src/kernel/tqtextlayout.cpp index 1a007a8..6700470 100644 --- a/tqtinterface/qt4/src/kernel/tqtextlayout.cpp +++ b/tqtinterface/qt4/src/kernel/tqtextlayout.cpp @@ -440,7 +440,7 @@ TQTextItem TQTextLayout::itemAt( int i ) const } -TQTextItem TQTextLayout::tqfindItem( int strPos ) const +TQTextItem TQTextLayout::findItem( int strPos ) const { if ( strPos == 0 && d->items.size() ) return TQTextItem( 0, d ); @@ -565,7 +565,7 @@ TQTextLayout::Result TQTextLayout::endLine( int x, int y, int tqalignment, if ( (tqalignment & (TQt::WordBreak|TQt::BreakAnywhere)) && d->widthUsed > d->lineWidth ) { - // tqfind linebreak + // find linebreak // even though we removed trailing spaces the line was too wide. We'll have to break at an earlier // position. To not confuse the layouting below, reset the number of space items diff --git a/tqtinterface/qt4/src/kernel/tqtextlayout_p.h b/tqtinterface/qt4/src/kernel/tqtextlayout_p.h index 049ede2..f857011 100644 --- a/tqtinterface/qt4/src/kernel/tqtextlayout_p.h +++ b/tqtinterface/qt4/src/kernel/tqtextlayout_p.h @@ -181,7 +181,7 @@ public: int numItems() const { return lineCount(); } TQTextItem itemAt( int i ) const { return convertFromQTextLine(lineAt(i)); } - TQTextItem tqfindItem( int strPos ) const { return convertFromQTextLine(lineForTextPosition(strPos)); } + TQTextItem findItem( int strPos ) const { return convertFromQTextLine(lineForTextPosition(strPos)); } bool atEnd() const; TQTextItem nextItem(); TQTextItem currentItem(); @@ -232,7 +232,7 @@ public: int numItems() const; TQTextItem itemAt( int i ) const; - TQTextItem tqfindItem( int strPos ) const; + TQTextItem findItem( int strPos ) const; enum LayoutMode { NoBidi, diff --git a/tqtinterface/qt4/src/kernel/tqtimer.cpp b/tqtinterface/qt4/src/kernel/tqtimer.cpp index d1a98e1..7062b6a 100644 --- a/tqtinterface/qt4/src/kernel/tqtimer.cpp +++ b/tqtinterface/qt4/src/kernel/tqtimer.cpp @@ -91,7 +91,7 @@ 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 tqreplaced by threading. + that null events will eventually be replaced by threading. Note that TQTimer's accuracy depends on the underlying operating system and hardware. Most platforms support an accuracy of 20ms; diff --git a/tqtinterface/qt4/src/kernel/tqtranslator.cpp b/tqtinterface/qt4/src/kernel/tqtranslator.cpp index ec0856b..fabbb98 100644 --- a/tqtinterface/qt4/src/kernel/tqtranslator.cpp +++ b/tqtinterface/qt4/src/kernel/tqtranslator.cpp @@ -246,7 +246,7 @@ TQValueList<TQTranslatorMessage> TQTranslator::messages() const Saves this message file to \a filename, overwriting the previous contents of \a filename. If \a mode is \c Everything (the default), all the information is preserved. If \a mode is \c - Stripped, any information that is not necessary for tqfindMessage() + Stripped, any information that is not necessary for findMessage() is stripped away. \sa load() @@ -381,7 +381,7 @@ void TQTranslator::squeeze( SaveMode mode ) cpNext = 0; else cpNext = (int) it.key().commonPrefix( next.key() ); - offsets.tqreplace( TQTranslatorPrivate::Offset(it.key(), + offsets.replace( TQTranslatorPrivate::Offset(it.key(), ms.tqdevice()->at()), (void*)0 ); it.key().write( ms, mode == Stripped, (TQTranslatorMessage::Prefix) TQMAX(cpPrev, cpNext + 1) ); @@ -402,7 +402,7 @@ void TQTranslator::squeeze( SaveMode mode ) int baudelaire; for ( it = messages->begin(); it != messages->end(); ++it ) - contextSet.tqreplace( it.key().context(), &baudelaire ); + contextSet.replace( it.key().context(), &baudelaire ); TQ_UINT16 hTableSize; if ( contextSet.count() < 200 ) @@ -439,7 +439,7 @@ void TQTranslator::squeeze( SaveMode mode ) If hTable[h] is 0, "FunnyDialog" is not covered by this translator. Else, we check in the contextPool at offset 2 * hTable[h] to see if "FunnyDialog" is one of the - contexts stored there, until we tqfind it or we meet the + contexts stored there, until we find it or we meet the empty string. */ d->contextArray = new TQByteArray; @@ -454,7 +454,7 @@ void TQTranslator::squeeze( SaveMode mode ) uint upto = 2; for ( int i = 0; i < hTableSize; i++ ) { - const char *con = hDict.tqfind( i ); + const char *con = hDict.find( i ); if ( con == 0 ) { hTable[i] = 0; } else { @@ -466,7 +466,7 @@ void TQTranslator::squeeze( SaveMode mode ) t.writeRawBytes( con, len ); upto += 1 + len; hDict.remove( i ); - } while ( (con = hDict.tqfind(i)) != 0 ); + } while ( (con = hDict.find(i)) != 0 ); do { t << (TQ_UINT8) 0; // empty string (at least one) upto++; @@ -517,18 +517,18 @@ void TQTranslator::unsqueeze() } /*! - Returns TRUE if this message file tqcontains a message with the key + Returns TRUE if this message file contains a message with the key (\a context, \a sourceText, \a comment); otherwise returns FALSE. This function works with stripped translator files. - (This is is a one-liner that calls tqfindMessage().) + (This is is a one-liner that calls findMessage().) */ -bool TQTranslator::tqcontains( const char* context, const char* sourceText, +bool TQTranslator::contains( const char* context, const char* sourceText, const char* comment ) const { - return !tqfindMessage( context, sourceText, comment ).translation().isNull(); + return !findMessage( context, sourceText, comment ).translation().isNull(); } /*! @@ -575,7 +575,7 @@ void TQTranslator::remove( const TQTranslatorMessage& message ) #endif -TQTranslatorMessage TQTranslator::tqfindMessage( const char* context, +TQTranslatorMessage TQTranslator::findMessage( const char* context, const char* sourceText, const char* comment ) const { @@ -590,13 +590,13 @@ TQTranslatorMessage TQTranslator::tqfindMessage( const char* context, if ( d->messages ) { TQMap<TQTranslatorMessage, void *>::ConstIterator it; - it = d->messages->tqfind( TQTranslatorMessage(context, sourceText, + it = d->messages->find( TQTranslatorMessage(context, sourceText, comment) ); if ( it != d->messages->end() ) return it.key(); if ( comment[0] ) { - it = d->messages->tqfind( TQTranslatorMessage(context, sourceText, + it = d->messages->find( TQTranslatorMessage(context, sourceText, "") ); if ( it != d->messages->end() ) return it.key(); @@ -688,7 +688,7 @@ TQTranslatorMessage TQTranslator::tqfindMessage( const char* context, /*! \class TQTranslatorMessage - \brief The TQTranslatorMessage class tqcontains a translator message and its + \brief The TQTranslatorMessage class contains a translator message and its properties. \ingroup i18n @@ -1184,7 +1184,7 @@ public: \ingroup environment \mainclass - An object of this class tqcontains a set of TQTranslatorMessage + An object of this class contains a set of TQTranslatorMessage objects, each of which specifies a translation from a source language to a target language. TQTranslator provides functions to look up translations, add new ones, remove them, load and save @@ -1221,8 +1221,8 @@ public: We call a translation a "messsage". For this reason, translation files are sometimes referred to as "message files". - It is possible to lookup a translation using tqfindMessage() (as - tr() and TQApplication::translate() do) and tqcontains(), to insert a + It is possible to lookup a translation using findMessage() (as + tr() and TQApplication::translate() do) and contains(), to insert a new translation messsage using insert(), and to remove one using remove(). @@ -1232,10 +1232,10 @@ public: usually only need lookup. To cater for these different needs, TQTranslator can use stripped translator files that use the minimum of memory and which support little more functionality than - tqfindMessage(). + findMessage(). Thus, load() may not load enough information to make anything more - than tqfindMessage() work. save() has an argument indicating + than findMessage() work. save() has an argument indicating whether to save just this minimum of information or to save everything. @@ -1254,7 +1254,7 @@ public: \endlist The minimum for each item is just the information necessary for - tqfindMessage() to return the right text. This may include the + findMessage() to return the right text. This may include the source, context and comment, but usually it is just a hash value and the translated text. @@ -1414,7 +1414,7 @@ bool TQTranslator::load( const TQString & filename, const TQString & directory, int rightmost = 0; for ( int i = 0; i < (int)delims.length(); i++ ) { - int k = fname.tqfindRev( delims[i] ); + int k = fname.findRev( delims[i] ); if ( k > rightmost ) rightmost = k; } @@ -1555,7 +1555,7 @@ bool TQTranslator::do_load( const uchar *data, int len ) } array.resetRawData( (const char *) data, len ); - if ( tqApp && tqApp->translators && tqApp->translators->tqcontains(this) ) + if ( tqApp && tqApp->translators && tqApp->translators->contains(this) ) tqApp->setReverseLayout( qt_detectRTLLanguage() ); return ok; } @@ -1566,7 +1566,7 @@ bool TQTranslator::do_load( const uchar *data, int len ) Saves this message file to \a filename, overwriting the previous contents of \a filename. If \a mode is \c Everything (the default), all the information is preserved. If \a mode is \c - Stripped, any information that is not necessary for tqfindMessage() + Stripped, any information that is not necessary for findMessage() is stripped away. \sa load() @@ -1705,7 +1705,7 @@ void TQTranslator::squeeze( SaveMode mode ) cpNext = 0; else cpNext = (int) it.key().commonPrefix( next.key() ); - offsets.tqreplace( TQTranslatorPrivate::Offset(it.key(), + offsets.replace( TQTranslatorPrivate::Offset(it.key(), ms.tqdevice()->at()), (void*)0 ); it.key().write( ms, mode == Stripped, (TQTranslatorMessage::Prefix) TQMAX(cpPrev, cpNext + 1) ); @@ -1726,7 +1726,7 @@ void TQTranslator::squeeze( SaveMode mode ) int baudelaire; for ( it = messages->begin(); it != messages->end(); ++it ) - contextSet.tqreplace( it.key().context(), &baudelaire ); + contextSet.replace( it.key().context(), &baudelaire ); TQ_UINT16 hTableSize; if ( contextSet.count() < 200 ) @@ -1763,7 +1763,7 @@ void TQTranslator::squeeze( SaveMode mode ) If hTable[h] is 0, "FunnyDialog" is not covered by this translator. Else, we check in the contextPool at offset 2 * hTable[h] to see if "FunnyDialog" is one of the - contexts stored there, until we tqfind it or we meet the + contexts stored there, until we find it or we meet the empty string. */ d->contextArray = new TQByteArray; @@ -1778,7 +1778,7 @@ void TQTranslator::squeeze( SaveMode mode ) uint upto = 2; for ( int i = 0; i < hTableSize; i++ ) { - const char *con = hDict.tqfind( i ); + const char *con = hDict.find( i ); if ( con == 0 ) { hTable[i] = 0; } else { @@ -1790,7 +1790,7 @@ void TQTranslator::squeeze( SaveMode mode ) t.writeRawBytes( con, len ); upto += 1 + len; hDict.remove( i ); - } while ( (con = hDict.tqfind(i)) != 0 ); + } while ( (con = hDict.find(i)) != 0 ); do { t << (TQ_UINT8) 0; // empty string (at least one) upto++; @@ -1842,18 +1842,18 @@ void TQTranslator::unsqueeze() /*! - Returns TRUE if this message file tqcontains a message with the key + Returns TRUE if this message file contains a message with the key (\a context, \a sourceText, \a comment); otherwise returns FALSE. This function works with stripped translator files. - (This is is a one-liner that calls tqfindMessage().) + (This is is a one-liner that calls findMessage().) */ -bool TQTranslator::tqcontains( const char* context, const char* sourceText, +bool TQTranslator::contains( const char* context, const char* sourceText, const char* comment ) const { - return !tqfindMessage( context, sourceText, comment ).translation().isNull(); + return !findMessage( context, sourceText, comment ).translation().isNull(); } @@ -1906,10 +1906,10 @@ void TQTranslator::remove( const TQTranslatorMessage& message ) #endif /*! - \fn TQString TQTranslator::tqfind( const char*, const char*, const char* ) const + \fn TQString TQTranslator::find( const char*, const char*, const char* ) const \obsolete - Please use tqfindMessage() instead. + Please use findMessage() instead. Returns the translation for the key (\a context, \a sourceText, \a comment) or TQString::null if there is none in this translator. @@ -1920,7 +1920,7 @@ void TQTranslator::remove( const TQTranslatorMessage& message ) also tries (\a context, \a sourceText, ""). */ -TQTranslatorMessage TQTranslator::tqfindMessage( const char* context, +TQTranslatorMessage TQTranslator::findMessage( const char* context, const char* sourceText, const char* comment ) const { @@ -1935,13 +1935,13 @@ TQTranslatorMessage TQTranslator::tqfindMessage( const char* context, if ( d->messages ) { TQMap<TQTranslatorMessage, void *>::ConstIterator it; - it = d->messages->tqfind( TQTranslatorMessage(context, sourceText, + it = d->messages->find( TQTranslatorMessage(context, sourceText, comment) ); if ( it != d->messages->end() ) return it.key(); if ( comment[0] ) { - it = d->messages->tqfind( TQTranslatorMessage(context, sourceText, + it = d->messages->find( TQTranslatorMessage(context, sourceText, "") ); if ( it != d->messages->end() ) return it.key(); @@ -2079,7 +2079,7 @@ TQValueList<TQTranslatorMessage> TQTranslator::messages() const /*! \class TQTranslatorMessage - \brief The TQTranslatorMessage class tqcontains a translator message and its + \brief The TQTranslatorMessage class contains a translator message and its properties. \ingroup i18n diff --git a/tqtinterface/qt4/src/kernel/tqtranslator.h b/tqtinterface/qt4/src/kernel/tqtranslator.h index b42c983..6713568 100644 --- a/tqtinterface/qt4/src/kernel/tqtranslator.h +++ b/tqtinterface/qt4/src/kernel/tqtranslator.h @@ -125,14 +125,14 @@ class TQ_EXPORT TQTranslator: public QTranslator, virtual public TQt public: TQTranslator( TQObject * tqparent = 0, const char * name = 0 ) : QTranslator( tqparent ) { setObjectName(QString::fromAscii(name)); } - inline TQString find(const char *context, const char *sourceText, const char * comment = 0) const { return translate(context, sourceText, comment); } +// inline TQString find(const char *context, const char *sourceText, const char * comment = 0) const { return translate(context, sourceText, comment); } // Everything below is part of the old API and is therefore incompatible with Qt4 functions which expect a pure QTranslator object or object pointer #ifndef TQT_NO_COMPAT - inline TQString tqfind( const char *context, const char *sourceText, const char * comment = 0 ) const { return tqfindMessage( context, sourceText, comment ).translation(); } + inline TQString find( const char *context, const char *sourceText, const char * comment = 0 ) const { return findMessage( context, sourceText, comment ).translation(); } #endif - virtual TQTranslatorMessage tqfindMessage( const char *, const char *, const char * = 0 ) const; + virtual TQTranslatorMessage findMessage( const char *, const char *, const char * = 0 ) const; #ifndef TQT_NO_TRANSLATION_BUILDER enum SaveMode { Everything, Stripped }; @@ -147,7 +147,7 @@ public: void squeeze( SaveMode = Everything ); void unsqueeze(); - bool tqcontains( const char *, const char *, const char * comment = 0 ) const; + bool contains( const char *, const char *, const char * comment = 0 ) const; TQValueList<TQTranslatorMessage> messages() const; #endif @@ -222,11 +222,11 @@ public: ~TQTranslator(); #ifndef TQT_NO_COMPAT - TQString tqfind( const char *context, const char *sourceText, const char * comment = 0 ) const { - return tqfindMessage( context, sourceText, comment ).translation(); + TQString find( const char *context, const char *sourceText, const char * comment = 0 ) const { + return findMessage( context, sourceText, comment ).translation(); } #endif - virtual TQTranslatorMessage tqfindMessage( const char *, const char *, + virtual TQTranslatorMessage findMessage( const char *, const char *, const char * = 0 ) const; bool load( const TQString & filename, @@ -253,7 +253,7 @@ public: void remove( const char *context, const char *sourceText ) { remove( TQTranslatorMessage(context, sourceText, "") ); } - bool tqcontains( const char *, const char *, const char * comment = 0 ) const; + bool contains( const char *, const char *, const char * comment = 0 ) const; void squeeze( SaveMode = Everything ); void unsqueeze(); diff --git a/tqtinterface/qt4/src/kernel/tqurl.cpp b/tqtinterface/qt4/src/kernel/tqurl.cpp index a355c4a..81f8ca4 100644 --- a/tqtinterface/qt4/src/kernel/tqurl.cpp +++ b/tqtinterface/qt4/src/kernel/tqurl.cpp @@ -224,8 +224,8 @@ TQUrl::TQUrl( const TQUrl& url ) bool TQUrl::isRelativeUrl( const TQString &url ) { - int colon = url.tqfind( ":" ); - int slash = url.tqfind( "/" ); + int colon = url.find( ":" ); + int slash = url.find( "/" ); return ( slash != 0 && ( colon == -1 || ( slash != -1 && colon > slash ) ) ); } @@ -258,8 +258,8 @@ bool TQUrl::isRelativeUrl( const TQString &url ) Normally it is expected that the path of \a url points to a directory, even if the path has no slash at the end. But if you want the constructor to handle the last part of the path as a file - name if there is no slash at the end, and to let it be tqreplaced by - the file name of \a relUrl (if it tqcontains one), set \a checkSlash + name if there is no slash at the end, and to let it be replaced by + the file name of \a relUrl (if it contains one), set \a checkSlash to TRUE. */ @@ -375,7 +375,7 @@ void TQUrl::setUser( const TQString& user ) } /*! - Returns TRUE if the URL tqcontains a username; otherwise returns + Returns TRUE if the URL contains a username; otherwise returns FALSE. \sa setUser() setPassword() @@ -415,7 +415,7 @@ void TQUrl::setPassword( const TQString& pass ) } /*! - Returns TRUE if the URL tqcontains a password; otherwise returns + Returns TRUE if the URL contains a password; otherwise returns FALSE. \warning Passwords passed in URLs are normally \e insecure; this @@ -454,7 +454,7 @@ void TQUrl::setHost( const TQString& host ) } /*! - Returns TRUE if the URL tqcontains a hostname; otherwise returns + Returns TRUE if the URL contains a hostname; otherwise returns FALSE. \sa setHost() @@ -488,7 +488,7 @@ void TQUrl::setPort( int port ) } /*! - Returns TRUE if the URL tqcontains a port; otherwise returns FALSE. + Returns TRUE if the URL contains a port; otherwise returns FALSE. \sa setPort() */ @@ -513,7 +513,7 @@ void TQUrl::setPath( const TQString& path ) } /*! - Returns TRUE if the URL tqcontains a path; otherwise returns FALSE. + Returns TRUE if the URL contains a path; otherwise returns FALSE. \sa path() setPath() */ @@ -675,13 +675,13 @@ bool TQUrl::parse( const TQString& url ) relPath = forceRel = TRUE; int hasNoHost = -1; - int cs = url_.tqfind( ":/" ); - if ( cs != -1 ) // if a protocol is there, tqfind out if there is a host or directly the path after it - hasNoHost = url_.tqfind( "///", cs ); + int cs = url_.find( ":/" ); + if ( cs != -1 ) // if a protocol is there, find out if there is a host or directly the path after it + hasNoHost = url_.find( "///", cs ); table[ 4 ][ 1 ] = User; table[ 4 ][ 2 ] = User; if ( cs == -1 || forceRel ) { // we have a relative file - if ( url.tqfind( ':' ) == -1 || forceRel ) { + if ( url.find( ':' ) == -1 || forceRel ) { table[ 0 ][ 1 ] = Path; // Filenames may also begin with a digit table[ 0 ][ 2 ] = Path; @@ -692,12 +692,12 @@ bool TQUrl::parse( const TQString& url ) } else { // some checking table[ 0 ][ 1 ] = Protocol; - // tqfind the part between the protocol and the path as the meaning + // find the part between the protocol and the path as the meaning // of that part is dependend on some chars ++cs; while ( url_[ cs ] == '/' ) ++cs; - int slash = url_.tqfind( "/", cs ); + int slash = url_.find( "/", cs ); if ( slash == -1 ) slash = url_.length() - 1; TQString tmp = url_.mid( cs, slash - cs + 1 ); @@ -705,7 +705,7 @@ bool TQUrl::parse( const TQString& url ) if ( !tmp.isEmpty() ) { // if this part exists // look for the @ in this part - int at = tmp.tqfind( "@" ); + int at = tmp.find( "@" ); if ( at != -1 ) at += cs; // we have no @, which means host[:port], so directly @@ -928,8 +928,8 @@ bool TQUrl::operator==( const TQString& url ) const } /*! - Sets the file name of the URL to \a name. If this URL tqcontains a - fileName(), the original file name is tqreplaced by \a name. + Sets the file name of the URL to \a name. If this URL contains a + fileName(), the original file name is replaced by \a name. See the documentation of fileName() for a more detailed discussion of what is handled as file name and what is handled as a directory @@ -951,7 +951,7 @@ void TQUrl::setFileName( const TQString& name ) p = "/"; } else { p = path(); - int slash = p.tqfindRev( TQChar( '/' ) ); + int slash = p.findRev( TQChar( '/' ) ); if ( slash == -1 ) { p = "/"; } else if ( p[ (int)p.length() - 1 ] != '/' ) { @@ -997,7 +997,7 @@ TQString TQUrl::encodedPathAndQuery() void TQUrl::setEncodedPathAndQuery( const TQString& pathAndQuery ) { d->cleanPathDirty = TRUE; - int pos = pathAndQuery.tqfind( '?' ); + int pos = pathAndQuery.find( '?' ); if ( pos == -1 ) { d->path = pathAndQuery; d->queryEncoded = ""; @@ -1158,7 +1158,7 @@ TQString TQUrl::dirPath() const return TQString::null; TQString s = path(); - int pos = s.tqfindRev( '/' ); + int pos = s.findRev( '/' ); if ( pos == -1 ) { return TQString::tqfromLatin1("."); } else { @@ -1195,7 +1195,7 @@ void TQUrl::encode( TQString& url ) for ( int i = 0; i < oldlen ;++i ) { uchar inCh = (uchar)curl[ i ]; - if ( inCh >= 128 || special.tqcontains(inCh) ) { + if ( inCh >= 128 || special.contains(inCh) ) { newUrl[ newlen++ ] = TQChar( '%' ); ushort c = inCh / 16; diff --git a/tqtinterface/qt4/src/kernel/tqurlinfo.cpp b/tqtinterface/qt4/src/kernel/tqurlinfo.cpp index 60b9f15..b0b2596 100644 --- a/tqtinterface/qt4/src/kernel/tqurlinfo.cpp +++ b/tqtinterface/qt4/src/kernel/tqurlinfo.cpp @@ -130,7 +130,7 @@ TQUrlInfo::TQUrlInfo() /*! Constructs a TQUrlInfo object with information about the file \a - file in the \a path. It tries to tqfind the information about the \a + file in the \a path. It tries to find the information about the \a file in the TQUrlOperator \a path. If the information is not found, this constructor creates an @@ -745,7 +745,7 @@ bool TQUrlInfo::operator==( const TQUrlInfo &i ) const /*! Returns TRUE if the URL info is valid; otherwise returns FALSE. - Valid means that the TQUrlInfo tqcontains real information. For + Valid means that the TQUrlInfo contains real information. For example, a call to TQUrlOperator::info() might return a an invalid TQUrlInfo, if no information about the requested entry is available. diff --git a/tqtinterface/qt4/src/kernel/tqurloperator.cpp b/tqtinterface/qt4/src/kernel/tqurloperator.cpp index bae40bc..59c485f 100644 --- a/tqtinterface/qt4/src/kernel/tqurloperator.cpp +++ b/tqtinterface/qt4/src/kernel/tqurloperator.cpp @@ -168,7 +168,7 @@ public: This signal is emitted after listChildren() was called and new tqchildren (i.e. files) have been read from a list of files. \a i holds the information about the new files. \a op is a pointer - to the operation object which tqcontains all the information about + to the operation object which contains all the information about the operation, including the state. \sa TQNetworkOperation, TQNetworkProtocol @@ -180,7 +180,7 @@ public: This signal is emitted when an operation of some sort finishes, whether with success or failure. \a op is a pointer to the - operation object, which tqcontains all the information, including + operation object, which contains all the information, including the state, of the operation which has been finished. Check the state and error code of the operation object to see whether or not the operation was successful. @@ -193,7 +193,7 @@ public: Some operations (such as listChildren()) emit this signal when they start processing the operation. \a op is a pointer to the - operation object which tqcontains all the information about the + operation object which contains all the information about the operation, including the state. \sa TQNetworkOperation, TQNetworkProtocol @@ -205,7 +205,7 @@ public: This signal is emitted when mkdir() succeeds and the directory has been created. \a i holds the information about the new directory. - \a op is a pointer to the operation object, which tqcontains all the + \a op is a pointer to the operation object, which contains all the information about the operation, including the state. \c op->arg(0) holds the new directory's name. @@ -218,7 +218,7 @@ public: This signal is emitted when remove() has been succesful and the file has been removed. - \a op is a pointer to the operation object which tqcontains all the + \a op is a pointer to the operation object which contains all the information about the operation, including the state. \c op->arg(0) holds the name of the file that was removed. @@ -230,7 +230,7 @@ public: This signal is emitted whenever a file which is a child of the URL has been changed, for example by successfully calling rename(). - \a op is a pointer to the operation object which tqcontains all the + \a op is a pointer to the operation object which contains all the information about the operation, including the state. \c op->arg(0) holds the original file name and \c op->arg(1) holds the new file name (if it was changed). @@ -243,7 +243,7 @@ public: This signal is emitted when new \a data has been received after calling get() or put(). - \a op is a pointer to the operation object which tqcontains all + \a op is a pointer to the operation object which contains all the information about the operation, including the state. \c op->arg(0) holds the name of the file whose data is retrieved and op->rawArg(1) holds the (raw) data. @@ -268,7 +268,7 @@ public: \fn void TQUrlOperator::startedNextCopy( const TQPtrList<TQNetworkOperation> &lst ) This signal is emitted if copy() starts a new copy operation. \a - lst tqcontains all TQNetworkOperations related to this copy + lst contains all TQNetworkOperations related to this copy operation. \sa copy() @@ -434,7 +434,7 @@ const TQNetworkOperation *TQUrlOperator::startOperation( TQNetworkOperation *op Because the operation may not be executed immediately, a pointer to the TQNetworkOperation object created by this function is - returned. This object tqcontains all the data about the operation + returned. This object contains all the data about the operation and is used to refer to this operation later (e.g. in the Q_SIGNALS that are emitted by the TQUrlOperator). The return value can also be 0 if the operation object couldn't be created. @@ -464,7 +464,7 @@ const TQNetworkOperation *TQUrlOperator::listChildren() Because the operation will not be executed immediately, a pointer to the TQNetworkOperation object created by this function is - returned. This object tqcontains all the data about the operation + returned. This object contains all the data about the operation and is used to refer to this operation later (e.g. in the Q_SIGNALS that are emitted by the TQUrlOperator). The return value can also be 0 if the operation object couldn't be created. @@ -491,7 +491,7 @@ const TQNetworkOperation *TQUrlOperator::mkdir( const TQString &dirname ) Because the operation will not be executed immediately, a pointer to the TQNetworkOperation object created by this function is - returned. This object tqcontains all the data about the operation + returned. This object contains all the data about the operation and is used to refer to this operation later (e.g. in the Q_SIGNALS that are emitted by the TQUrlOperator). The return value can also be 0 if the operation object couldn't be created. @@ -519,7 +519,7 @@ const TQNetworkOperation *TQUrlOperator::remove( const TQString &filename ) Because the operation may not be executed immediately, a pointer to the TQNetworkOperation object created by this function is - returned. This object tqcontains all the data about the operation + returned. This object contains all the data about the operation and is used to refer to this operation later (e.g. in the Q_SIGNALS that are emitted by the TQUrlOperator). The return value can also be 0 if the operation object couldn't be created. @@ -713,7 +713,7 @@ bool TQUrlOperator::isDir( bool *ok ) return FALSE; } - if ( d->entryMap.tqcontains( "." ) ) { + if ( d->entryMap.contains( "." ) ) { return d->entryMap[ "." ].isDir(); } // #### can assume that we are a directory? @@ -901,7 +901,7 @@ void TQUrlOperator::addEntry( const TQValueList<TQUrlInfo> &i ) TQUrlInfo TQUrlOperator::info( const TQString &entry ) const { - if ( d->entryMap.tqcontains( entry.stripWhiteSpace() ) ) { + if ( d->entryMap.contains( entry.stripWhiteSpace() ) ) { return d->entryMap[ entry.stripWhiteSpace() ]; } else if ( entry == "." || entry == ".." ) { // return a faked TQUrlInfo @@ -1202,7 +1202,7 @@ void TQUrlOperator::slotItemChanged( TQNetworkOperation *op ) if ( op->arg( 0 ) == op->arg( 1 ) ) return; - TQMap<TQString, TQUrlInfo>::iterator mi = d->entryMap.tqfind( op->arg( 0 ) ); + TQMap<TQString, TQUrlInfo>::iterator mi = d->entryMap.find( op->arg( 0 ) ); if ( mi != d->entryMap.end() ) { mi.data().setName( op->arg( 1 ) ); d->entryMap[ op->arg( 1 ) ] = mi.data(); @@ -1212,7 +1212,7 @@ void TQUrlOperator::slotItemChanged( TQNetworkOperation *op ) } case TQNetworkProtocol::OpRemove : { - TQMap<TQString, TQUrlInfo>::iterator mi = d->entryMap.tqfind( op->arg( 0 ) ); + TQMap<TQString, TQUrlInfo>::iterator mi = d->entryMap.find( op->arg( 0 ) ); if ( mi != d->entryMap.end() ) d->entryMap.erase( mi ); break; diff --git a/tqtinterface/qt4/src/kernel/tqvariant.cpp b/tqtinterface/qt4/src/kernel/tqvariant.cpp index bd022e1..90a2afd 100644 --- a/tqtinterface/qt4/src/kernel/tqvariant.cpp +++ b/tqtinterface/qt4/src/kernel/tqvariant.cpp @@ -1842,7 +1842,7 @@ void TQVariant::Private::clear() A TQVariant object holds a single value of a single type() at a time. (Some type()s are multi-valued, for example a string list.) - You can tqfind out what type, T, the variant holds, convert it to a + You can find out what type, T, the variant holds, convert it to a different type using one of the asT() functions, e.g. asSize(), get its value using one of the toT() functions, e.g. toSize(), and check whether the type can be converted to a particular type using @@ -1870,11 +1870,11 @@ void TQVariant::Private::clear() \code TQDataStream out(...); - TQVariant v(123); // The variant now tqcontains an int + TQVariant v(123); // The variant now contains an int int x = v.toInt(); // x = 123 out << v; // Writes a type tag and an int to out - v = TQVariant("hello"); // The variant now tqcontains a TQCString - v = TQVariant(tr("hello"));// The variant now tqcontains a TQString + v = TQVariant("hello"); // The variant now contains a TQCString + v = TQVariant(tr("hello"));// The variant now contains a TQString int y = v.toInt(); // y = 0 since v cannot be converted to an int TQString s = v.toString(); // s = tr("hello") (see TQObject::tr()) out << v; // Writes a type tag and a TQString to out @@ -4427,7 +4427,7 @@ TQMap<TQString, TQVariant>& TQVariant::asMap() \row \i Int \i String, CString, ByteArray, Double, Bool, UInt, LongLong, ULongLong, KeySequence \row \i LongLong \i String, CString, ByteArray, Double, Bool, UInt, LongLong, ULongLong, KeySequence \row \i ULongLong \i String, CString, ByteArray, Double, Bool, UInt, LongLong, ULongLong, KeySequence - \row \i List \i StringList (if the list tqcontains only strings or + \row \i List \i StringList (if the list contains only strings or something that can be cast to a string) \row \i String \i CString, ByteArray, CString, Int, UInt, Bool, Double, Date, Time, DateTime, KeySequence, Font, Color diff --git a/tqtinterface/qt4/src/kernel/tqvariant.cpp.new b/tqtinterface/qt4/src/kernel/tqvariant.cpp.new index 22c05b3..b518a7e 100644 --- a/tqtinterface/qt4/src/kernel/tqvariant.cpp.new +++ b/tqtinterface/qt4/src/kernel/tqvariant.cpp.new @@ -1728,7 +1728,7 @@ void TQVariant::Private::clear() A TQVariant object holds a single value of a single type() at a time. (Some type()s are multi-valued, for example a string list.) - You can tqfind out what type, T, the variant holds, convert it to a + You can find out what type, T, the variant holds, convert it to a different type using one of the asT() functions, e.g. asSize(), get its value using one of the toT() functions, e.g. toSize(), and check whether the type can be converted to a particular type using @@ -1756,11 +1756,11 @@ void TQVariant::Private::clear() \code TQDataStream out(...); - TQVariant v(123); // The variant now tqcontains an int + TQVariant v(123); // The variant now contains an int int x = v.toInt(); // x = 123 out << v; // Writes a type tag and an int to out - v = TQVariant("hello"); // The variant now tqcontains a TQCString - v = TQVariant(tr("hello"));// The variant now tqcontains a TQString + v = TQVariant("hello"); // The variant now contains a TQCString + v = TQVariant(tr("hello"));// The variant now contains a TQString int y = v.toInt(); // y = 0 since v cannot be converted to an int TQString s = v.toString(); // s = tr("hello") (see TQObject::tr()) out << v; // Writes a type tag and a TQString to out @@ -4313,7 +4313,7 @@ TQMap<TQString, TQVariant>& TQVariant::asMap() \row \i Int \i String, CString, ByteArray, Double, Bool, UInt, LongLong, ULongLong, KeySequence \row \i LongLong \i String, CString, ByteArray, Double, Bool, UInt, LongLong, ULongLong, KeySequence \row \i ULongLong \i String, CString, ByteArray, Double, Bool, UInt, LongLong, ULongLong, KeySequence - \row \i List \i StringList (if the list tqcontains only strings or + \row \i List \i StringList (if the list contains only strings or something that can be cast to a string) \row \i String \i CString, ByteArray, CString, Int, UInt, Bool, Double, Date, Time, DateTime, KeySequence, Font, Color diff --git a/tqtinterface/qt4/src/kernel/tqvariant.h b/tqtinterface/qt4/src/kernel/tqvariant.h index 5fb5e65..400705c 100644 --- a/tqtinterface/qt4/src/kernel/tqvariant.h +++ b/tqtinterface/qt4/src/kernel/tqvariant.h @@ -321,7 +321,7 @@ inline TQMapConstIterator<TQString,TQVariant> TQVariant::mapFind( const TQString { if ( d.type != Map ) return TQMapConstIterator<TQString,TQVariant>(); - return ((const TQMap<TQString,TQVariant>*)d.data.ptr)->tqfind( key ); + return ((const TQMap<TQString,TQVariant>*)d.data.ptr)->find( key ); } #endif @@ -626,7 +626,7 @@ inline TQMapConstIterator<TQString,TQVariant> TQVariant::mapFind( const TQString { if ( d->typ != Map ) return TQMapConstIterator<TQString,TQVariant>(); - return ((const TQMap<TQString,TQVariant>*)d->value.ptr)->tqfind( key ); + return ((const TQMap<TQString,TQVariant>*)d->value.ptr)->find( key ); } #endif diff --git a/tqtinterface/qt4/src/kernel/tqwidget.cpp b/tqtinterface/qt4/src/kernel/tqwidget.cpp index 67d0e1b..c6523df 100644 --- a/tqtinterface/qt4/src/kernel/tqwidget.cpp +++ b/tqtinterface/qt4/src/kernel/tqwidget.cpp @@ -249,7 +249,7 @@ TQMetaObject *TQWidget::tqmetaObject() const { return TQT_TQOBJECT_CONST(this)->tqmetaObject(); } -TQWidget * TQWidget::tqfind( WId w ) { +TQWidget * TQWidget::find( WId w ) { return static_cast<TQWidget*>(find(w)); } @@ -910,7 +910,7 @@ void TQWidget::setKeyCompression(bool compress) Returns the focus data for this widget's top-level widget. Focus data always belongs to the top-level widget. The focus data - list tqcontains all the widgets in this top-level widget that can + list contains all the widgets in this top-level widget that can accept focus, in tab order. An iterator points to the current focus widget (tqfocusWidget() returns a pointer to this widget). @@ -1886,7 +1886,7 @@ bool TQWidget::event( TQEvent *e ) // // } // // } // // if ( e->type() == TQEvent::LanguageChange ) { -// // int index = tqmetaObject()->tqfindSlot( "languageChange()", TRUE ); +// // int index = tqmetaObject()->findSlot( "languageChange()", TRUE ); // // if ( index >= 0 ) // // qt_invoke( index, 0 ); // // } @@ -2010,7 +2010,7 @@ void TQWidget::mousePressEvent( TQMouseEvent *e ) if (tqApp->activePopupWidget() == w) // widget does not want to dissappear w->hide(); // hide at least } - if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) ){ + if (!TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ){ close(); } } @@ -2931,7 +2931,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { reparent(), polish(), winId(), - tqfind(), + find(), metric(). \row \i What's this help \i @@ -2967,7 +2967,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { \endlist The tictac/tictac.cpp example program is good example of a simple - widget. It tqcontains a few event handlers (as all widgets must), a + widget. It contains a few event handlers (as all widgets must), a few custom routines that are specific to it (as all useful widgets do), and has a few tqchildren and connections. Everything it does is done in response to an event: this is by far the most common way @@ -3012,7 +3012,7 @@ WState TQWidget::testWState( TQt::WidgetState s ) const { \endlist - If your widget only tqcontains child widgets, you probably do not need to + If your widget only contains child widgets, you probably do not need to implement any event handlers. If you want to detect a mouse click in a child widget call the child's hasMouse() function inside the tqparent widget's mousePressEvent(). @@ -3131,7 +3131,7 @@ class TQWidgetMapper : public TQWidgetIntDict public: TQWidgetMapper(); ~TQWidgetMapper(); - TQWidget *tqfind( WId id ); // tqfind widget + TQWidget *find( WId id ); // find widget void insert( const TQWidget * ); // insert widget bool remove( WId id ); // remove widget private: @@ -3153,10 +3153,10 @@ TQWidgetMapper::~TQWidgetMapper() clear(); } -inline TQWidget *TQWidgetMapper::tqfind( WId id ) +inline TQWidget *TQWidgetMapper::find( WId id ) { if ( id != cur_id ) { // need to lookup - cur_widget = TQWidgetIntDict::tqfind((long)id); + cur_widget = TQWidgetIntDict::find((long)id); if ( cur_widget ) cur_id = id; else @@ -3577,7 +3577,7 @@ TQWidget::TQWidget( TQWidget *tqparent, const char *name, WFlags f ) if ( isTopLevel() ) { setWState( WState_ForceHide | WState_CreatedHidden ); TQFocusData *fd = focusData( TRUE ); - if ( fd->tqfocusWidgets.tqfindRef(this) < 0 ) + if ( fd->tqfocusWidgets.findRef(this) < 0 ) fd->tqfocusWidgets.append( this ); } else { // propagate enabled state @@ -3900,9 +3900,9 @@ void TQWidget::deactivateWidgetCleanup() is no widget with this identifier, 0 is returned. */ -TQWidget *TQWidget::tqfind( WId id ) +TQWidget *TQWidget::find( WId id ) { - return mapper ? mapper->tqfind( id ) : 0; + return mapper ? mapper->find( id ) : 0; } /*! @@ -3912,7 +3912,7 @@ TQWidget *TQWidget::tqfind( WId id ) The widget mapper is an internal dictionary that is used to map from window identifiers/handles to widget pointers. - \sa tqfind(), id() + \sa find(), id() */ /*! @@ -3955,7 +3955,7 @@ TQWidget *TQWidget::tqfind( WId id ) Portable in principle, but if you use it you are probably about to do something non-portable. Be careful. - \sa tqfind() + \sa find() */ #ifndef TQT_NO_STYLE @@ -5205,7 +5205,7 @@ void TQWidget::setBackgroundFromMode() This enum describes how the background of a widget changes, as the widget's palette changes. - The background is what the widget tqcontains when \link + The background is what the widget contains when \link TQWidget::paintEvent() paintEvent()\endlink is called. To minimize flicker, this should be the most common color or pixmap in the widget. For \c PaletteBackground, use tqcolorGroup().brush( \c @@ -6054,7 +6054,7 @@ void TQWidget::clearFocus() /*! Finds a new widget to give the keyboard focus to, as appropriate - for Tab and Shift+Tab, and returns TRUE if is can tqfind a new + for Tab and Shift+Tab, and returns TRUE if is can find a new widget and FALSE if it can't, If \a next is TRUE, this function searches "forwards", if \a next @@ -6128,7 +6128,7 @@ TQWidget *TQWidget::tqfocusWidget() const Returns the focus data for this widget's top-level widget. Focus data always belongs to the top-level widget. The focus data - list tqcontains all the widgets in this top-level widget that can + list contains all the widgets in this top-level widget that can accept focus, in tab order. An iterator points to the current focus widget (tqfocusWidget() returns a pointer to this widget). @@ -6223,7 +6223,7 @@ void TQWidget::setKeyCompression(bool compress) \property TQWidget::isActiveWindow \brief whether this widget is the active window - The active window is the window that tqcontains the widget + The active window is the window that contains the widget that has keyboard focus. When popup windows are visible, this property is TRUE for both the @@ -6330,7 +6330,7 @@ void TQWidget::setTabOrder( TQWidget* first, TQWidget *second ) TQFocusData *f = first->focusData( TRUE ); bool focusThere = (f->it.current() == second ); f->tqfocusWidgets.removeRef( second ); - if ( f->tqfocusWidgets.tqfindRef( first ) >= 0 ) + if ( f->tqfocusWidgets.findRef( first ) >= 0 ) f->tqfocusWidgets.insert( f->tqfocusWidgets.at() + 1, second ); else f->tqfocusWidgets.append( second ); @@ -6382,7 +6382,7 @@ void TQWidget::reparentFocusWidgets( TQWidget * oldtlw ) } while( from->tqfocusWidgets.current() ); } - if ( to->tqfocusWidgets.tqfindRef(this) < 0 ) + if ( to->tqfocusWidgets.findRef(this) < 0 ) to->tqfocusWidgets.append( this ); if ( !isTopLevel() && extra && extra->topextra && extra->topextra->focusData ) { @@ -6544,7 +6544,7 @@ void TQWidget::setFocusPolicy( FocusPolicy policy ) focusProxy()->setFocusPolicy( policy ); if ( policy != NoFocus ) { TQFocusData * f = focusData( TRUE ); - if ( f->tqfocusWidgets.tqfindRef( this ) < 0 ) + if ( f->tqfocusWidgets.findRef( this ) < 0 ) f->tqfocusWidgets.append( this ); } focus_policy = (uint) policy; @@ -6957,7 +6957,7 @@ bool TQWidget::close( bool alsoDelete ) bool deleted = FALSE; TQCloseEvent e; TQApplication::sendEvent( this, &e ); - deleted = !TQWidget::tqfind(id); + deleted = !TQWidget::find(id); if ( !deleted && !e.isAccepted() ) { is_closing = 0; return FALSE; @@ -7586,7 +7586,7 @@ bool TQWidget::event( TQEvent *e ) } } if ( e->type() == TQEvent::LanguageChange ) { - int index = tqmetaObject()->tqfindSlot( "languageChange()", TRUE ); + int index = tqmetaObject()->findSlot( "languageChange()", TRUE ); if ( index >= 0 ) qt_invoke( index, 0 ); } @@ -7698,7 +7698,7 @@ void TQWidget::mousePressEvent( TQMouseEvent *e ) if (tqApp->activePopupWidget() == w) // widget does not want to dissappear w->hide(); // hide at least } - if (!rect().tqcontains(e->pos()) ){ + if (!rect().contains(e->pos()) ){ close(); } } @@ -8566,7 +8566,7 @@ bool TQWidget::customWhatsThis() const */ TQWidget *TQWidget::tqchildAt( int x, int y, bool includeThis ) const { - if ( !rect().tqcontains( x, y ) ) + if ( !rect().contains( x, y ) ) return 0; if ( childrenListObject() ) { TQObjectListIt it( *childrenListObject() ); diff --git a/tqtinterface/qt4/src/kernel/tqwidget.h b/tqtinterface/qt4/src/kernel/tqwidget.h index 0a75dad..6af93ed 100644 --- a/tqtinterface/qt4/src/kernel/tqwidget.h +++ b/tqtinterface/qt4/src/kernel/tqwidget.h @@ -158,7 +158,7 @@ typedef QFlags<Qt::WindowState> WState; QPoint gpos = mapToGlobal(e->pos()); \ QPoint npos = newreceiver->mapFromGlobal(gpos); \ if (popup) { \ - while (!TQT_TQRECT_OBJECT(newreceiver->rect()).tqcontains(npos)) { \ + while (!TQT_TQRECT_OBJECT(newreceiver->rect()).contains(npos)) { \ new_receiver_found = TRUE; \ newreceiver = tqwidget_parent_popup_menu(newreceiver); \ if (newreceiver) { \ @@ -169,7 +169,7 @@ typedef QFlags<Qt::WindowState> WState; } \ } \ if ((newreceiver) && (new_receiver_found)) { \ - if (TQT_TQRECT_OBJECT(newreceiver->rect()).tqcontains(npos)) { \ + if (TQT_TQRECT_OBJECT(newreceiver->rect()).contains(npos)) { \ if (tqwidget_is_popup_menu(newreceiver)) { \ npos = newreceiver->mapFromGlobal(gpos); \ QMouseEvent fixedevent(e->type(), npos, e->globalPos(), e->button(), e->buttons(), e->modifiers()); \ @@ -230,7 +230,7 @@ public: TQWidget * parentWidget( bool sameWindow = FALSE ) const; static TQCString normalizeSignalSlot( const char *signalSlot ); TQMetaObject *tqmetaObject() const; - static TQWidget * tqfind( WId w ); + static TQWidget * find( WId w ); bool isShown() const; TQWidget *tqchildAt( int x, int y, bool includeThis = FALSE ) const; TQWidget *tqchildAt( const TQPoint &p, bool includeThis = FALSE ) const; @@ -992,7 +992,7 @@ public: TQWidget * parentWidget( bool sameWindow = FALSE ) const; WState testWState( WState s ) const; WFlags testWFlags( WFlags f ) const; - static TQWidget * tqfind( WId ); + static TQWidget * find( WId ); static TQWidgetMapper *wmapper(); TQWidget *tqchildAt( int x, int y, bool includeThis = FALSE ) const; diff --git a/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp b/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp index 0a60833..60df412 100644 --- a/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp @@ -483,7 +483,7 @@ extern bool qt_nograb(); // defined in qapplication_x11.cpp extern void qt_deferred_map_add( TQWidget* ); extern void qt_deferred_map_take( TQWidget* ); -extern bool qt_deferred_map_tqcontains(TQWidget *); +extern bool qt_deferred_map_contains(TQWidget *); static TQWidget *mouseGrb = 0; static TQWidget *keyboardGrb = 0; @@ -792,7 +792,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) TQPaintDeviceX11Data* xd = getX11Data( TRUE ); - // tqfind which screen the window is on... + // find which screen the window is on... xd->x_screen = TQPaintDevice::x11AppScreen(); // by default, use the default :) int i; for ( i = 0; i < ScreenCount( dpy ); i++ ) { @@ -812,7 +812,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) setX11Data( xd ); } else if ( desktop ) { // desktop widget id = (WId)parentw; // id = root window - TQWidget *otherDesktop = tqfind( id ); // is there another desktop? + TQWidget *otherDesktop = find( id ); // is there another desktop? if ( otherDesktop && otherDesktop->testWFlags(WPaintDesktop) ) { otherDesktop->setWinId( 0 ); // remove id from widget mapper setWinId( id ); // make sure otherDesktop is @@ -966,7 +966,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow) XSetTransientForHint( dpy, id, root_win ); } - // tqfind the real client leader, i.e. a toplevel without tqparent + // find the real client leader, i.e. a toplevel without tqparent while ( p && p->parentWidget()) p = p->parentWidget()->tqtopLevelWidget(); @@ -1668,7 +1668,7 @@ void TQWidget::setMouseTracking( bool enable ) else clearWState( WState_MouseTracking ); if ( testWFlags(WType_Desktop) ) { // desktop widget? - TQWidget* main_desktop = tqfind( winId() ); + TQWidget* main_desktop = find( winId() ); if ( main_desktop->testWFlags(WPaintDesktop) ) XSelectInput( x11Display(), winId(), stdDesktopEventMask | ExposureMask ); @@ -1900,7 +1900,7 @@ TQWidget *TQWidget::keyboardGrabber() void TQWidget::setActiveWindow() { TQWidget *tlw = tqtopLevelWidget(); - if ( tlw->isVisible() && !tlw->topData()->embedded && !qt_deferred_map_tqcontains(tlw) ) { + if ( tlw->isVisible() && !tlw->topData()->embedded && !qt_deferred_map_contains(tlw) ) { XSetInputFocus( x11Display(), tlw->winId(), RevertToNone, GET_QT_X_TIME()); focusInputContext(); } @@ -1948,8 +1948,8 @@ void TQWidget::update() Calling update() several times normally results in just one paintEvent() call. - If \a w is negative, it is tqreplaced with \c{width() - x}. If \a h - is negative, it is tqreplaced width \c{height() - y}. + If \a w is negative, it is replaced with \c{width() - x}. If \a h + is negative, it is replaced width \c{height() - y}. TQt normally erases the specified area before the paintEvent() call. If the \c WRepaintNoErase widget flag is set, the widget is @@ -2007,8 +2007,8 @@ void TQWidget::update( int x, int y, int w, int h ) If \a erase is TRUE, TQt erases the area \a (x, y, w, h) before the paintEvent() call. - If \a w is negative, it is tqreplaced with \c{width() - x}, and if - \a h is negative, it is tqreplaced width \c{height() - y}. + If \a w is negative, it is replaced with \c{width() - x}, and if + \a h is negative, it is replaced width \c{height() - y}. We suggest only using tqrepaint() if you need an immediate tqrepaint, for example during animation. In almost all circumstances update() @@ -2322,7 +2322,7 @@ void TQWidget::hideWindow() void TQWidget::raise() { TQWidget *p = parentWidget(); - if ( p && p->childObjects && p->childObjects->tqfindRef(this) >= 0 ) + if ( p && p->childObjects && p->childObjects->findRef(this) >= 0 ) p->childObjects->append( p->childObjects->take() ); XRaiseWindow( x11Display(), winId() ); } @@ -2339,7 +2339,7 @@ void TQWidget::raise() void TQWidget::lower() { TQWidget *p = parentWidget(); - if ( p && p->childObjects && p->childObjects->tqfindRef(this) >= 0 ) + if ( p && p->childObjects && p->childObjects->findRef(this) >= 0 ) p->childObjects->insert( 0, p->childObjects->take() ); XLowerWindow( x11Display(), winId() ); } @@ -2357,9 +2357,9 @@ void TQWidget::stackUnder( TQWidget* w) TQWidget *p = parentWidget(); if ( !w || isTopLevel() || p != w->parentWidget() || this == w ) return; - if ( p && p->childObjects && p->childObjects->tqfindRef(w) >= 0 && p->childObjects->tqfindRef(this) >= 0 ) { + if ( p && p->childObjects && p->childObjects->findRef(w) >= 0 && p->childObjects->findRef(this) >= 0 ) { p->childObjects->take(); - p->childObjects->insert( p->childObjects->tqfindRef(w), this ); + p->childObjects->insert( p->childObjects->findRef(w), this ); } Window stack[2]; stack[0] = w->winId();; @@ -2372,7 +2372,7 @@ void TQWidget::stackUnder( TQWidget* w) /* The global variable qt_widget_tlw_gravity defines the window gravity of the next top level window to be created. We do this when setting the - main widget's tqgeometry and the "-tqgeometry" command line option tqcontains + main widget's tqgeometry and the "-tqgeometry" command line option contains a negative position. */ @@ -2645,8 +2645,8 @@ void TQWidget::setBaseSize( int basew, int baseh ) Erases the specified area \a (x, y, w, h) in the widget without generating a \link paintEvent() paint event\endlink. - If \a w is negative, it is tqreplaced with \c{width() - x}. If \a h - is negative, it is tqreplaced width \c{height() - y}. + If \a w is negative, it is replaced with \c{width() - x}. If \a h + is negative, it is replaced width \c{height() - y}. Child widgets are not affected. diff --git a/tqtinterface/qt4/src/kernel/tqwmatrix.cpp b/tqtinterface/qt4/src/kernel/tqwmatrix.cpp index ffa0388..97eccf2 100644 --- a/tqtinterface/qt4/src/kernel/tqwmatrix.cpp +++ b/tqtinterface/qt4/src/kernel/tqwmatrix.cpp @@ -251,7 +251,7 @@ TQWMatrix operator*( const TQWMatrix &m1, const TQWMatrix &m2 ) graphics; the actual transformation is performed by the drawing routines in TQPainter and by TQPixmap::xForm(). - The TQWMatrix class tqcontains a 3x3 matrix of the form: + The TQWMatrix class contains a 3x3 matrix of the form: <table align=center border=1 cellpadding=1 cellspacing=0> <tr align=center><td>m11</td><td>m12</td><td> 0 </td></tr> <tr align=center><td>m21</td><td>m22</td><td> 0 </td></tr> diff --git a/tqtinterface/qt4/src/network/tqdns.cpp b/tqtinterface/qt4/src/network/tqdns.cpp index 24b5401..898ac43 100644 --- a/tqtinterface/qt4/src/network/tqdns.cpp +++ b/tqtinterface/qt4/src/network/tqdns.cpp @@ -762,7 +762,7 @@ void TQDnsAnswer::parse() if ( rr->target.length() && rr->deleteTime > 0 && rr->current ) used.insert( rr->target, (void*)42 ); if ( ( rr->t == TQDns::A || rr->t == TQDns::Aaaa ) && - used.tqfind( rr->domain->name() ) != 0 ) + used.find( rr->domain->name() ) != 0 ) rr->deleteTime = rr->expireTime; } @@ -829,7 +829,7 @@ void TQDnsAnswer::notify() it.toFirst(); while( (dns=(TQDns*)(it.current())) != 0 ) { ++it; - if ( notified.tqfind( (void*)dns ) == 0 ) { + if ( notified.find( (void*)dns ) == 0 ) { notified.insert( (void*)dns, (void*)42 ); if ( rrs->count() == 0 ) { #if defined(TQDNS_DEBUG) @@ -839,7 +839,7 @@ void TQDnsAnswer::notify() ((TQDnsUgleHack*)dns)->ugle( true ); } else { TQStringList n = dns->qualifiedNames(); - if ( query && n.tqcontains(query->l) ) + if ( query && n.contains(query->l) ) ((TQDnsUgleHack*)dns)->ugle(); #if defined(TQDNS_DEBUG) else @@ -1189,7 +1189,7 @@ void TQDnsManager::transmitQuery( int i ) int pp = 12; uint lp = 0; while( lp < (uint) q->l.length() ) { - int le = q->l.tqfind( QLatin1Char('.'), lp ); + int le = q->l.find( QLatin1Char('.'), lp ); if ( le < 0 ) le = q->l.length(); TQString component = q->l.mid( lp, le-lp ); @@ -1241,7 +1241,7 @@ void TQDnsManager::transmitQuery( int i ) TQDns::doResInit(); if ( !theNs || theNs->isEmpty() ) { - // we don't tqfind any name servers. We fake an NXDomain + // we don't find any name servers. We fake an NXDomain // with a very short life time... TQDnsAnswer answer( q ); answer.notify(); @@ -1297,7 +1297,7 @@ void TQDnsManager::transmitQuery( int i ) TQDnsDomain * TQDnsManager::domain( const TQString & label ) { - TQDnsDomain * d = cache.tqfind( label ); + TQDnsDomain * d = cache.find( label ); if ( !d ) { d = new TQDnsDomain( label ); cache.insert( label, d ); @@ -1495,21 +1495,21 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) // we haven't done it before, so maybe we should. but // wait - if it's an unqualified name, only ask when all // the other alternatives are exhausted. - if ( q == m->queries.size() && ( s.tqfind( QLatin1Char('.') ) >= 0 || + if ( q == m->queries.size() && ( s.find( QLatin1Char('.') ) >= 0 || int(l->count()) >= n.count()-1 ) ) { TQDnsQuery * query = new TQDnsQuery; query->started = now(); query->id = ++theId; query->t = r->recordType(); query->l = s; - query->dns->tqreplace( (void*)r, (void*)r ); + query->dns->replace( (void*)r, (void*)r ); TQT_BASE_OBJECT_NAME::connect( query, TQT_SIGNAL(timeout()), TQDnsManager::manager(), TQT_SLOT(retransmit()) ); TQDnsManager::manager()->transmitQuery( query ); } else if ( q < m->queries.size() ) { // if we've found an earlier query for the same // domain/type, subscribe to its answer - m->queries[q]->dns->tqreplace( (void*)r, (void*)r ); + m->queries[q]->dns->replace( (void*)r, (void*)r ); } } } @@ -1822,7 +1822,7 @@ void TQDns::setLabel( const TQHostAddress & address ) \value Mx Mail eXchanger names. Used for mail delivery. - \value Srv SeRVer names. Generic record type for tqfinding + \value Srv SeRVer names. Generic record type for finding servers. So far mostly unused. \value Cname Canonical names. Maps from nicknames to the true @@ -2021,7 +2021,7 @@ TQValueList<TQHostAddress> TQDns::addresses() const /*! Returns a list of mail servers if the record type is \c Mx. The - class TQDns::MailServer tqcontains the following public variables: + class TQDns::MailServer contains the following public variables: \list \i TQString TQDns::MailServer::name \i Q_UINT16 TQDns::MailServer::priority @@ -2065,7 +2065,7 @@ TQValueList<TQDns::MailServer> TQDns::mailServers() const /*! Returns a list of servers if the record type is \c Srv. The class - TQDns::Server tqcontains the following public variables: + TQDns::Server contains the following public variables: \list \i TQString TQDns::Server::name \i Q_UINT16 TQDns::Server::priority @@ -2359,7 +2359,7 @@ void TQDns::doResInit() if ( !nameServer.isEmpty() ) { first = 0; do { - last = nameServer.tqfind( QLatin1Char(separator), first ); + last = nameServer.find( QLatin1Char(separator), first ); if ( last < 0 ) last = nameServer.length(); TQDns tmp( nameServer.mid( first, last-first ), TQDns::A ); @@ -2375,7 +2375,7 @@ void TQDns::doResInit() searchList = searchList.simplifyWhiteSpace().lower(); first = 0; do { - last = searchList.tqfind( QLatin1Char(separator), first ); + last = searchList.find( QLatin1Char(separator), first ); if ( last < 0 ) last = searchList.length(); theDomains->append( qstrdup( searchList.mid( first, last-first ).latin1() ) ); @@ -2496,7 +2496,7 @@ void TQDns::doResInit() struct __res_state res; res_ninit( &res ); int i; - // tqfind the name servers to use + // find the name servers to use for( i=0; i < MAXNS && i < res.nscount; i++ ) theNs->append( new TQHostAddress( ntohl( res.nsaddr_list[i].sin_addr.s_addr ) ) ); # if defined(MAXDFLSRCH) @@ -2512,7 +2512,7 @@ void TQDns::doResInit() #else res_init(); int i; - // tqfind the name servers to use + // find the name servers to use for( i=0; i < MAXNS && i < _res.nscount; i++ ) theNs->append( new TQHostAddress( ntohl( _res.nsaddr_list[i].sin_addr.s_addr ) ) ); # if defined(MAXDFLSRCH) @@ -2541,7 +2541,7 @@ void TQDns::doResInit() QFile hosts( TQString::fromLatin1( "/etc/hosts" ) ); if ( hosts.open( QIODevice::ReadOnly ) ) { // read the /etc/hosts file, creating long-life A and PTR RRs - // for the things we tqfind. + // for the things we find. QTextStream i( &hosts ); TQString line; while( !i.atEnd() ) { @@ -3365,7 +3365,7 @@ void TQDnsAnswer::parse() if ( rr->target.length() && rr->deleteTime > 0 && rr->current ) used.insert( rr->target, (void*)42 ); if ( ( rr->t == TQDns::A || rr->t == TQDns::Aaaa ) && - used.tqfind( rr->domain->name() ) != 0 ) + used.find( rr->domain->name() ) != 0 ) rr->deleteTime = rr->expireTime; } @@ -3432,7 +3432,7 @@ void TQDnsAnswer::notify() it.toFirst(); while( (dns=(TQDns*)(it.current())) != 0 ) { ++it; - if ( notified.tqfind( (void*)dns ) == 0 ) { + if ( notified.find( (void*)dns ) == 0 ) { notified.insert( (void*)dns, (void*)42 ); if ( rrs->count() == 0 ) { #if defined(TQDNS_DEBUG) @@ -3442,7 +3442,7 @@ void TQDnsAnswer::notify() ((TQDnsUgleHack*)dns)->ugle( TRUE ); } else { TQStringList n = dns->qualifiedNames(); - if ( query && n.tqcontains(query->l) ) + if ( query && n.contains(query->l) ) ((TQDnsUgleHack*)dns)->ugle(); #if defined(TQDNS_DEBUG) else @@ -3796,7 +3796,7 @@ void TQDnsManager::transmitQuery( int i ) int pp = 12; uint lp = 0; while( lp < q->l.length() ) { - int le = q->l.tqfind( '.', lp ); + int le = q->l.find( '.', lp ); if ( le < 0 ) le = q->l.length(); TQString component = q->l.mid( lp, le-lp ); @@ -3848,7 +3848,7 @@ void TQDnsManager::transmitQuery( int i ) TQDns::doResInit(); if ( !ns || ns->isEmpty() ) { - // we don't tqfind any name servers. We fake an NXDomain + // we don't find any name servers. We fake an NXDomain // with a very short life time... TQDnsAnswer answer( q ); answer.notify(); @@ -3904,7 +3904,7 @@ void TQDnsManager::transmitQuery( int i ) TQDnsDomain * TQDnsManager::domain( const TQString & label ) { - TQDnsDomain * d = cache.tqfind( label ); + TQDnsDomain * d = cache.find( label ); if ( !d ) { d = new TQDnsDomain( label ); cache.insert( label, d ); @@ -4104,21 +4104,21 @@ TQPtrList<TQDnsRR> * TQDnsDomain::cached( const TQDns * r ) // we haven't done it before, so maybe we should. but // wait - if it's an unqualified name, only ask when all // the other alternatives are exhausted. - if ( q == m->queries.size() && ( s.tqfind( '.' ) >= 0 || + if ( q == m->queries.size() && ( s.find( '.' ) >= 0 || l->count() >= n.count()-1 ) ) { TQDnsQuery * query = new TQDnsQuery; query->started = now(); query->id = ++::id; query->t = r->recordType(); query->l = s; - query->dns->tqreplace( (void*)r, (void*)r ); + query->dns->replace( (void*)r, (void*)r ); TQObject::connect( query, TQT_SIGNAL(timeout()), TQDnsManager::manager(), TQT_SLOT(retransmit()) ); TQDnsManager::manager()->transmitQuery( query ); } else if ( q < m->queries.size() ) { // if we've found an earlier query for the same // domain/type, subscribe to its answer - m->queries[q]->dns->tqreplace( (void*)r, (void*)r ); + m->queries[q]->dns->replace( (void*)r, (void*)r ); } } } @@ -4442,7 +4442,7 @@ void TQDns::setLabel( const TQHostAddress & address ) \value Mx Mail eXchanger names. Used for mail delivery. - \value Srv SeRVer names. Generic record type for tqfinding + \value Srv SeRVer names. Generic record type for finding servers. So far mostly unused. \value Cname Canonical names. Maps from nicknames to the true @@ -4653,7 +4653,7 @@ TQValueList<TQHostAddress> TQDns::addresses() const /*! Returns a list of mail servers if the record type is \c Mx. The - class \c TQDns::MailServer tqcontains the following public variables: + class \c TQDns::MailServer contains the following public variables: \list \i TQString TQDns::MailServer::name \i TQ_UINT16 TQDns::MailServer::priority @@ -4709,7 +4709,7 @@ TQValueList<TQDns::MailServer> TQDns::mailServers() const /*! Returns a list of servers if the record type is \c Srv. The class - \c TQDns::Server tqcontains the following public variables: + \c TQDns::Server contains the following public variables: \list \i TQString TQDns::Server::name \i TQ_UINT16 TQDns::Server::priority @@ -5056,7 +5056,7 @@ void TQDns::doResInit() if ( !nameServer.isEmpty() ) { first = 0; do { - last = nameServer.tqfind( separator, first ); + last = nameServer.find( separator, first ); if ( last < 0 ) last = nameServer.length(); TQDns tmp( nameServer.mid( first, last-first ), TQDns::A ); @@ -5072,7 +5072,7 @@ void TQDns::doResInit() searchList = searchList.simplifyWhiteSpace().lower(); first = 0; do { - last = searchList.tqfind( separator, first ); + last = searchList.find( separator, first ); if ( last < 0 ) last = searchList.length(); domains->append( qstrdup( searchList.mid( first, last-first ) ) ); @@ -5194,7 +5194,7 @@ void TQDns::doResInit() struct __res_state res; res_ninit( &res ); int i; - // tqfind the name servers to use + // find the name servers to use for( i=0; i < MAXNS && i < res.nscount; i++ ) ns->append( new TQHostAddress( ntohl( res.nsaddr_list[i].sin_addr.s_addr ) ) ); # if defined(MAXDFLSRCH) @@ -5210,7 +5210,7 @@ void TQDns::doResInit() #else qdns_res_init(); int i; - // tqfind the name servers to use + // find the name servers to use for( i=0; i < MAXNS && i < _res.nscount; i++ ) ns->append( new TQHostAddress( ntohl( _res.nsaddr_list[i].sin_addr.s_addr ) ) ); # if defined(MAXDFLSRCH) @@ -5239,7 +5239,7 @@ void TQDns::doResInit() TQFile hosts( TQString::tqfromLatin1( "/etc/hosts" ) ); if ( hosts.open( IO_ReadOnly ) ) { // read the /etc/hosts file, creating long-life A and PTR RRs - // for the things we tqfind. + // for the things we find. TQTextStream i( &hosts ); TQString line; while( !i.atEnd() ) { diff --git a/tqtinterface/qt4/src/network/tqdns.h b/tqtinterface/qt4/src/network/tqdns.h index 14a5e65..23c84ee 100644 --- a/tqtinterface/qt4/src/network/tqdns.h +++ b/tqtinterface/qt4/src/network/tqdns.h @@ -364,7 +364,7 @@ private: class TQDnsSocket: public TQObject { Q_OBJECT TQ_OBJECT - // note: Private not public. This class tqcontains NO public API. + // note: Private not public. This class contains NO public API. protected: TQDnsSocket( TQObject *, const char * ); virtual ~TQDnsSocket(); diff --git a/tqtinterface/qt4/src/network/tqftp.cpp b/tqtinterface/qt4/src/network/tqftp.cpp index 7fb239e..7b6acdd 100644 --- a/tqtinterface/qt4/src/network/tqftp.cpp +++ b/tqtinterface/qt4/src/network/tqftp.cpp @@ -481,7 +481,7 @@ bool TQFtpDTP::parseDir( const TQString &buffer, const TQString &userName, TQUrl dateStr += lst[ 6 ]; dateStr += ' '; - if ( lst[ 7 ].tqcontains( ":" ) ) { + if ( lst[ 7 ].contains( ":" ) ) { time = TQTime( lst[ 7 ].left( 2 ).toInt(), lst[ 7 ].right( 2 ).toInt() ); dateStr += TQString::number( TQDate::currentDate().year() ); } else { @@ -491,7 +491,7 @@ bool TQFtpDTP::parseDir( const TQString &buffer, const TQString &userName, TQUrl TQDate date = TQT_TQDATE_OBJECT(TQDate::fromString( dateStr )); info->setLastModified( TQDateTime( date, time ) ); - if ( lst[ 7 ].tqcontains( ":" ) ) { + if ( lst[ 7 ].contains( ":" ) ) { const int futureTolerance = 600; if( info->lastModified().secsTo( TQDateTime::tqcurrentDateTime() ) < -futureTolerance ) { TQDateTime dt = info->lastModified(); @@ -1046,10 +1046,10 @@ static TQFtpPrivate* d( const TQFtp* foo ) d_ptr->setAutoDelete( TRUE ); qAddPostRoutine( cleanup_d_ptr ); } - TQFtpPrivate* ret = d_ptr->tqfind( (void*)foo ); + TQFtpPrivate* ret = d_ptr->find( (void*)foo ); if ( ! ret ) { ret = new TQFtpPrivate; - d_ptr->tqreplace( (void*) foo, ret ); + d_ptr->replace( (void*) foo, ret ); } return ret; } @@ -1347,7 +1347,7 @@ void TQFtp::init() \fn void TQFtp::listInfo( const TQUrlInfo &i ); This signal is emitted for each directory entry the list() command - tqfinds. The details of the entry are stored in \a i. + finds. The details of the entry are stored in \a i. \sa list() */ @@ -1929,7 +1929,7 @@ TQFtp::State TQFtp::state() const } /*! - Returns the last error that occurred. This is useful to tqfind out + Returns the last error that occurred. This is useful to find out what when wrong when receiving a commandFinished() or a done() signal with the \c error argument set to \c TRUE. diff --git a/tqtinterface/qt4/src/network/tqhostaddress.cpp b/tqtinterface/qt4/src/network/tqhostaddress.cpp index f6720e4..5a4e5cf 100644 --- a/tqtinterface/qt4/src/network/tqhostaddress.cpp +++ b/tqtinterface/qt4/src/network/tqhostaddress.cpp @@ -96,7 +96,7 @@ TQHostAddressPrivate::TQHostAddressPrivate(const TQ_IPV6ADDR &a_) : a(0), isIp4( \ingroup io \module network - This class tqcontains an IP address in a platform and protocol + This class contains an IP address in a platform and protocol independent manner. It stores both IPv4 and IPv6 addresses in a way that you can easily access on any platform. @@ -378,7 +378,7 @@ bool TQHostAddress::isIPv6Address() const \code TQ_IPV6ADDR addr = hostAddr.ip6Addr(); - // addr.c[] tqcontains 16 unsigned characters + // addr.c[] contains 16 unsigned characters for (int i = 0; i < 16; ++i) { // process addr.c[i] diff --git a/tqtinterface/qt4/src/network/tqhttp.cpp b/tqtinterface/qt4/src/network/tqhttp.cpp index 7d324ea..53cdbeb 100644 --- a/tqtinterface/qt4/src/network/tqhttp.cpp +++ b/tqtinterface/qt4/src/network/tqhttp.cpp @@ -333,7 +333,7 @@ void TQHttpCloseRequest::start( TQHttp *http ) /*! \class TQHttpHeader tqhttp.h - \brief The TQHttpHeader class tqcontains header information for HTTP. + \brief The TQHttpHeader class contains header information for HTTP. \if defined(commercial) It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>. \endif @@ -445,7 +445,7 @@ bool TQHttpHeader::isValid() const /*! \internal Parses the HTTP header string \a str for header fields and adds - the keys/values it tqfinds. If the string is not parsed successfully + the keys/values it finds. If the string is not parsed successfully the TQHttpHeader becomes \link isValid() invalid\endlink. Returns TRUE if \a str was successfully parsed; otherwise returns FALSE. @@ -455,7 +455,7 @@ bool TQHttpHeader::isValid() const bool TQHttpHeader::parse( const TQString& str ) { TQStringList lst; - int pos = str.tqfind( '\n' ); + int pos = str.find( '\n' ); if ( pos > 0 && str.at( pos - 1 ) == '\r' ) lst = TQStringList::split( "\r\n", str.stripWhiteSpace(), FALSE ); else @@ -526,7 +526,7 @@ TQStringList TQHttpHeader::keys() const */ bool TQHttpHeader::hasKey( const TQString& key ) const { - return values.tqcontains( key.lower() ); + return values.contains( key.lower() ); } /*! @@ -534,7 +534,7 @@ bool TQHttpHeader::hasKey( const TQString& key ) const If no entry with \a key exists, a new entry with the given \a key and \a value is created. If an entry with the \a key already - exists, its value is discarded and tqreplaced with the given \a + exists, its value is discarded and replaced with the given \a value. \sa value() hasKey() removeValue() @@ -564,7 +564,7 @@ void TQHttpHeader::removeValue( const TQString& key ) */ bool TQHttpHeader::parseLine( const TQString& line, int ) { - int i = line.tqfind( ":" ); + int i = line.find( ":" ); if ( i == -1 ) return FALSE; @@ -649,7 +649,7 @@ TQString TQHttpHeader::contentType() const if ( type.isEmpty() ) return TQString::null; - int pos = type.tqfind( ";" ); + int pos = type.find( ";" ); if ( pos == -1 ) return type; @@ -675,7 +675,7 @@ void TQHttpHeader::setContentType( const TQString& type ) /*! \class TQHttpResponseHeader tqhttp.h - \brief The TQHttpResponseHeader class tqcontains response header information for HTTP. + \brief The TQHttpResponseHeader class contains response header information for HTTP. \if defined(commercial) It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>. \endif @@ -807,7 +807,7 @@ bool TQHttpResponseHeader::parseLine( const TQString& line, int number ) majVer = l[5].latin1() - '0'; minVer = l[7].latin1() - '0'; - int pos = l.tqfind( ' ', 9 ); + int pos = l.find( ' ', 9 ); if ( pos != -1 ) { reasonPhr = l.mid( pos + 1 ); statCode = l.mid( 9, pos - 9 ).toInt(); @@ -838,7 +838,7 @@ TQString TQHttpResponseHeader::toString() const /*! \class TQHttpRequestHeader tqhttp.h - \brief The TQHttpRequestHeader class tqcontains request header information for + \brief The TQHttpRequestHeader class contains request header information for \if defined(commercial) It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>. \endif @@ -1166,7 +1166,7 @@ TQString TQHttpRequestHeader::toString() const You can then get details about the error with the error() and errorString() functions. Note that only unexpected behaviour, like network failure is considered as an error. If the server response - tqcontains an error status, like a 404 response, this is reported as + contains an error status, like a 404 response, this is reported as a normal response case. So you should always check the \link TQHttpResponseHeader::statusCode() status code \endlink of the response header. @@ -1985,7 +1985,7 @@ void TQHttp::slotReadyRead() if (d->response.statusCode() != 100) { d->readHeader = FALSE; if ( d->response.hasKey( "transfer-encoding" ) && - d->response.value( "transfer-encoding" ).lower().tqcontains( "chunked" ) ) + d->response.value( "transfer-encoding" ).lower().contains( "chunked" ) ) d->chunkedSize = 0; emit responseHeaderReceived( d->response ); @@ -2008,7 +2008,7 @@ void TQHttp::slotReadyRead() if ( !d->socket.canReadLine() ) break; TQString sizeString = d->socket.readLine(); - int tPos = sizeString.tqfind( ';' ); + int tPos = sizeString.find( ';' ); if ( tPos != -1 ) sizeString.truncate( tPos ); bool ok; @@ -2135,7 +2135,7 @@ TQHttp::State TQHttp::state() const } /*! - Returns the last error that occurred. This is useful to tqfind out + Returns the last error that occurred. This is useful to find out what happened when receiving a requestFinished() or a done() signal with the \c error argument \c TRUE. diff --git a/tqtinterface/qt4/src/network/tqsocket.cpp b/tqtinterface/qt4/src/network/tqsocket.cpp index 52d95cc..c894f3e 100644 --- a/tqtinterface/qt4/src/network/tqsocket.cpp +++ b/tqtinterface/qt4/src/network/tqsocket.cpp @@ -248,7 +248,7 @@ void TQSocketPrivate::setSocketDevice( TQSocket *q, TQSocketDevice *tqdevice ) Most network protocols are either packet-oriented or line-oriented. canReadLine() indicates whether a connection - tqcontains an entire unread line or not, and bytesAvailable() + contains an entire unread line or not, and bytesAvailable() returns the number of bytes available for reading. The Q_SIGNALS error(), connected(), readyRead() and @@ -325,7 +325,7 @@ qint64 TQSocket::readData( char *data, qint64 maxlen ) // readyRead() signal since this might cause a bad recursive behavior. // We can test for this condition by looking at the // sn_read_alreadyCalled flag. - if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.tqfindRef(this) == -1 ) + if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.findRef(this) == -1 ) d->rsn->setEnabled( true ); return maxlen; } @@ -593,7 +593,7 @@ void TQSocket::tryConnecting() return; } - // we've found something. press on with that. if we later tqfind + // we've found something. press on with that. if we later find // more, fine. emit hostFound(); d->state = Connecting; @@ -777,7 +777,7 @@ bool TQSocket::open( int m ) If the output buffer is empty, the state is set to \c TQSocket::Idle and the connection is terminated immediately. If the - output buffer still tqcontains data to be written, TQSocket goes into + output buffer still contains data to be written, TQSocket goes into the \c TQSocket::Closing state and the rest of the data will be written. When all of the outgoing data have been written, the state is set to \c TQSocket::Idle and the connection is terminated. @@ -982,7 +982,7 @@ bool TQSocket::at( Offset index ) // readyRead() signal since this might cause a bad recursive behavior. // We can test for this condition by looking at the // sn_read_alreadyCalled flag. - if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.tqfindRef(this) == -1 ) + if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.findRef(this) == -1 ) d->rsn->setEnabled( TRUE ); return TRUE; } @@ -1038,7 +1038,7 @@ TQ_ULONG TQSocket::bytesAvailable() const If \a timeout is non-null and no error occurred (i.e. it does not return -1): this function sets \a *timeout to TRUE, if the reason for returning was that the timeout was reached; otherwise it sets - \a *timeout to FALSE. This is useful to tqfind out if the peer + \a *timeout to FALSE. This is useful to find out if the peer closed the connection. \warning This is a blocking call and should be avoided in event @@ -1126,7 +1126,7 @@ TQ_LONG TQSocket::readBlock( char *data, TQ_ULONG maxlen ) // readyRead() signal since this might cause a bad recursive behavior. // We can test for this condition by looking at the // sn_read_alreadyCalled flag. - if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.tqfindRef(this) == -1 ) + if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.findRef(this) == -1 ) d->rsn->setEnabled( TRUE ); return maxlen; } @@ -1209,7 +1209,7 @@ int TQSocket::getch() // readyRead() signal since this might cause a bad recursive behavior. // We can test for this condition by looking at the // sn_read_alreadyCalled flag. - if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.tqfindRef(this) == -1 ) + if ( d->rsn && TQSocketPrivate::sn_read_alreadyCalled.findRef(this) == -1 ) d->rsn->setEnabled( TRUE ); return c; } @@ -1331,7 +1331,7 @@ void TQSocket::sn_read( bool force ) // Use TQSocketPrivate::sn_read_alreadyCalled to avoid recursive calls of // sn_read() (and as a result avoid emitting the readyRead() signal in a // slot for readyRead(), if you use bytesAvailable()). - if ( !force && TQSocketPrivate::sn_read_alreadyCalled.tqfindRef(this) != -1 ) + if ( !force && TQSocketPrivate::sn_read_alreadyCalled.findRef(this) != -1 ) return; TQSocketPrivate::sn_read_alreadyCalled.append( this ); diff --git a/tqtinterface/qt4/src/network/tqsocketdevice_unix.cpp b/tqtinterface/qt4/src/network/tqsocketdevice_unix.cpp index a0bf65d..46c3932 100644 --- a/tqtinterface/qt4/src/network/tqsocketdevice_unix.cpp +++ b/tqtinterface/qt4/src/network/tqsocketdevice_unix.cpp @@ -879,7 +879,7 @@ TQ_LONG TQSocketDevice::bytesAvailable() const If \a timeout is non-null and no error occurred (i.e. it does not return -1): this function sets \a *timeout to TRUE, if the reason for returning was that the timeout was reached; otherwise it sets - \a *timeout to FALSE. This is useful to tqfind out if the peer + \a *timeout to FALSE. This is useful to find out if the peer closed the connection. \warning This is a blocking call and should be avoided in event diff --git a/tqtinterface/qt4/src/opengl/tqgl.cpp b/tqtinterface/qt4/src/opengl/tqgl.cpp index 80e3658..7054e8e 100644 --- a/tqtinterface/qt4/src/opengl/tqgl.cpp +++ b/tqtinterface/qt4/src/opengl/tqgl.cpp @@ -79,7 +79,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format; own TQGLWidget subclass you can use the identifiers in the TQGL namespace without qualification. - However, you may occasionally tqfind yourself in situations where you + However, you may occasionally find yourself in situations where you need to refer to these identifiers from outside the TQGL namespace's scope, e.g. in static functions. In such cases, simply write e.g. \c TQGL::DoubleBuffer instead of just \c DoubleBuffer. @@ -149,7 +149,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format; MyGLWidget* myWidget = new MyGLWidget( f, ... ); \endcode - After the widget has been created, you can tqfind out which of the + After the widget has been created, you can find out which of the requested features the system was able to provide: \code TQGLFormat f; @@ -670,7 +670,7 @@ TQGLFormat TQGLFormat::defaultOverlayFormat() TQGLFormat::setDefaultOverlayFormat( f ); \endcode - As usual, you can tqfind out after widget creation whether the + As usual, you can find out after widget creation whether the underlying OpenGL system was able to provide the requested specification: @@ -1058,8 +1058,8 @@ bool TQGLContext::create( const TQGLContext* shareContext ) shareContext as closely as possible. On Windows, it calls the virtual function choosePixelFormat(), - which tqfinds a matching pixel format identifier. On X11, it calls - the virtual function chooseVisual() which tqfinds an appropriate X + which finds a matching pixel format identifier. On X11, it calls + the virtual function chooseVisual() which finds an appropriate X visual. On other platforms it may work differently. */ @@ -1277,10 +1277,10 @@ static TQGLWidgetPrivate * qgl_d( const TQGLWidget * w ) qgl_cleanup_d_ptr.set( &qgl_d_ptr ); qgl_d_ptr->setAutoDelete( TRUE ); } - TQGLWidgetPrivate * ret = qgl_d_ptr->tqfind( (void *) w ); + TQGLWidgetPrivate * ret = qgl_d_ptr->find( (void *) w ); if ( !ret ) { ret = new TQGLWidgetPrivate; - qgl_d_ptr->tqreplace( (void *) w, ret ); + qgl_d_ptr->replace( (void *) w, ret ); } return ret; } @@ -2019,9 +2019,9 @@ void TQGLWidget::qglColor( const TQColor& c ) const else if ( ctx->tqdevice() == context()->tqdevice() && !cmap.isEmpty() ) { // TQGLColormap in use? - int i = cmap.tqfind( c.rgb() ); + int i = cmap.find( c.rgb() ); if ( i < 0 ) - i = cmap.tqfindNearest( c.rgb() ); + i = cmap.findNearest( c.rgb() ); glIndexi( i ); } else glIndexi( ctx->colorIndex( c ) ); @@ -2045,9 +2045,9 @@ void TQGLWidget::qglClearColor( const TQColor& c ) const (GLfloat)c.blue() / 255.0, (GLfloat) 0.0 ); else if ( ctx->tqdevice() == context()->tqdevice() && !cmap.isEmpty() ) { // TQGLColormap in use? - int i = cmap.tqfind( c.rgb() ); + int i = cmap.find( c.rgb() ); if ( i < 0 ) - i = cmap.tqfindNearest( c.rgb() ); + i = cmap.findNearest( c.rgb() ); glClearIndex( i ); } else glClearIndex( ctx->colorIndex( c ) ); @@ -2166,7 +2166,7 @@ int TQGLWidget::displayListBase( const TQFont & fnt, int listBase ) TQString key = fnt.key() + TQString::number((int) regenerate); #endif - if ( !regenerate && (d->displayListCache.tqfind( key ) != d->displayListCache.end()) ) { + if ( !regenerate && (d->displayListCache.find( key ) != d->displayListCache.end()) ) { base = d->displayListCache[ key ]; } else { int maxBase = listBase - 256; diff --git a/tqtinterface/qt4/src/opengl/tqgl_x11.cpp b/tqtinterface/qt4/src/opengl/tqgl_x11.cpp index 70abe7d..2bedfd6 100644 --- a/tqtinterface/qt4/src/opengl/tqgl_x11.cpp +++ b/tqtinterface/qt4/src/opengl/tqgl_x11.cpp @@ -68,7 +68,7 @@ extern "C" { Status XmuLookupStandardColormap( Display *dpy, int screen, VisualID visualid, unsigned int depth, Atom property, - Bool tqreplace, Bool retain ); + Bool replace, Bool retain ); } #endif @@ -189,7 +189,7 @@ bool qt_resolve_gl_symbols(bool fatal) /* The choose_cmap function is internal and used by TQGLWidget::setContext() - and GLX (not Windows). If the application can't tqfind any sharable + and GLX (not Windows). If the application can't find any sharable colormaps, it must at least create as few colormaps as possible. The dictionary solution below ensures only one colormap is created per visual. Colormaps are also deleted when the application terminates. @@ -244,7 +244,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) qAddPostRoutine( cleanup_cmaps ); } - CMapEntry *x = cmap_dict->tqfind( (long) vi->visualid + ( vi->screen * 256 ) ); + CMapEntry *x = cmap_dict->find( (long) vi->visualid + ( vi->screen * 256 ) ); if ( x ) // found colormap for visual return x->cmap; @@ -284,7 +284,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) if ( !x->cmap ) { #ifdef TQT_DLOPEN_OPENGL typedef Status (*_XmuLookupStandardColormap)( Display *dpy, int screen, VisualID visualid, unsigned int depth, - Atom property, Bool tqreplace, Bool retain ); + Atom property, Bool replace, Bool retain ); _XmuLookupStandardColormap qt_XmuLookupStandardColormap; qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) TQLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap"); if (!qt_XmuLookupStandardColormap) @@ -334,7 +334,7 @@ static TQMemArray<TransColor> trans_colors; static int trans_colors_init = FALSE; -static void tqfind_trans_colors() +static void find_trans_colors() { struct OverlayProp { long visual; @@ -407,7 +407,7 @@ bool TQGLFormat::hasOpenGLOverlays() { qt_resolve_gl_symbols(); if ( !trans_colors_init ) - tqfind_trans_colors(); + find_trans_colors(); return trans_colors.size() > 0; } @@ -508,7 +508,7 @@ bool TQGLContext::chooseContext( const TQGLContext* shareContext ) /*! - <strong>X11 only</strong>: This virtual function tries to tqfind a + <strong>X11 only</strong>: This virtual function tries to find a visual that matches the format, reducing the demands if the original request cannot be met. @@ -599,12 +599,12 @@ void *TQGLContext::tryVisual( const TQGLFormat& f, int bufDepth ) if ( f.plane() && !useTranspExtChecked && d->paintDevice ) { TQCString estr( glXQueryExtensionsString( d->paintDevice->x11Display(), d->paintDevice->x11Screen() ) ); - useTranspExt = estr.tqcontains( "GLX_EXT_visual_info" ); + useTranspExt = estr.contains( "GLX_EXT_visual_info" ); //# (A bit simplistic; that could theoretically be a substring) if ( useTranspExt ) { TQCString cstr( glXGetClientString( d->paintDevice->x11Display(), GLX_VENDOR ) ); - useTranspExt = !cstr.tqcontains( "Xi Graphics" ); // bug workaround + useTranspExt = !cstr.contains( "Xi Graphics" ); // bug workaround if ( useTranspExt ) { // bug workaround - some systems (eg. FireGL) refuses to return an overlay // visual if the GLX_TRANSPARENT_TYPE_EXT attribute is specfied, even if @@ -747,7 +747,7 @@ TQColor TQGLContext::overlayTransparentColor() const //### make more efficient using the transpColor member if ( isValid() ) { if ( !trans_colors_init ) - tqfind_trans_colors(); + find_trans_colors(); VisualID myVisualId = ((XVisualInfo*)vi)->visualid; int myScreen = ((XVisualInfo*)vi)->screen; @@ -785,7 +785,7 @@ uint TQGLContext::colorIndex( const TQColor& c ) const return c.pixel( screen ); // We're using TQColor's cmap XVisualInfo *info = (XVisualInfo *) vi; - CMapEntry *x = cmap_dict->tqfind( (long) info->visualid + ( info->screen * 256 ) ); + CMapEntry *x = cmap_dict->find( (long) info->visualid + ( info->screen * 256 ) ); if ( x && !x->alloc) { // It's a standard colormap int rf = (int)(((float)c.red() * (x->scmap.red_max+1))/256.0); int gf = (int)(((float)c.green() * (x->scmap.green_max+1))/256.0); @@ -800,7 +800,7 @@ uint TQGLContext::colorIndex( const TQColor& c ) const qglcmap_dict = new TQIntDict< TQMap<int, TQRgb> >; } TQMap<int, TQRgb> *cmap; - if ((cmap = qglcmap_dict->tqfind((long) info->visualid)) == 0) { + if ((cmap = qglcmap_dict->find((long) info->visualid)) == 0) { cmap = new TQMap<int, TQRgb>; qglcmap_dict->insert((long) info->visualid, cmap); } @@ -1177,7 +1177,7 @@ void TQGLWidget::setContext( TQGLContext *context, XVisualInfo *vi = (XVisualInfo*)glcx->vi; XSetWindowAttributes a; - a.colormap = choose_cmap( x11Display(), vi ); // tqfind best colormap + a.colormap = choose_cmap( x11Display(), vi ); // find best colormap a.background_pixel = backgroundColor().pixel( vi->screen ); a.border_pixel = TQt::black.pixel( vi->screen ); Window p = RootWindow( x11Display(), vi->screen ); @@ -1198,7 +1198,7 @@ void TQGLWidget::setContext( TQGLContext *context, XFree( (char *)cmwret ); int i; for ( i=0; i<count; i++ ) { - if ( cmw[i] == winId() ) { // tqreplace old window + if ( cmw[i] == winId() ) { // replace old window cmw[i] = w; break; } diff --git a/tqtinterface/qt4/src/opengl/tqglcolormap.cpp b/tqtinterface/qt4/src/opengl/tqglcolormap.cpp index 6366e8b..3afdb7c 100644 --- a/tqtinterface/qt4/src/opengl/tqglcolormap.cpp +++ b/tqtinterface/qt4/src/opengl/tqglcolormap.cpp @@ -255,10 +255,10 @@ int TQGLColormap::size() const Returns the index of the color \a color. If \a color is not in the map, -1 is returned. */ -int TQGLColormap::tqfind( TQRgb color ) const +int TQGLColormap::find( TQRgb color ) const { if ( d ) - return d->cells.tqfind( color ); + return d->cells.find( color ); return -1; } @@ -266,9 +266,9 @@ int TQGLColormap::tqfind( TQRgb color ) const Returns the index of the color that is the closest match to color \a color. */ -int TQGLColormap::tqfindNearest( TQRgb color ) const +int TQGLColormap::findNearest( TQRgb color ) const { - int idx = tqfind( color ); + int idx = find( color ); if ( idx >= 0 ) return idx; int mapSize = size(); diff --git a/tqtinterface/qt4/src/opengl/tqglcolormap.h b/tqtinterface/qt4/src/opengl/tqglcolormap.h index d6fec59..2019496 100644 --- a/tqtinterface/qt4/src/opengl/tqglcolormap.h +++ b/tqtinterface/qt4/src/opengl/tqglcolormap.h @@ -72,8 +72,8 @@ public: void setEntry( int idx, const TQColor & color ); TQRgb entryRgb( int idx ) const; TQColor entryColor( int idx ) const; - int tqfind( TQRgb color ) const; - int tqfindNearest( TQRgb color ) const; + int find( TQRgb color ) const; + int findNearest( TQRgb color ) const; private: class Private : public TQShared diff --git a/tqtinterface/qt4/src/qt.pro b/tqtinterface/qt4/src/qt.pro index 070c405..10d0fe6 100644 --- a/tqtinterface/qt4/src/qt.pro +++ b/tqtinterface/qt4/src/qt.pro @@ -44,7 +44,7 @@ STYLES_CPP = styles EMBEDDED_CPP = embedded win32 { - tqcontains(TQT_PRODUCT,qt-internal) { + contains(TQT_PRODUCT,qt-internal) { SQL_H = $$SQL_CPP KERNEL_H = $$KERNEL_CPP WIDGETS_H = $$WIDGETS_CPP diff --git a/tqtinterface/qt4/src/qt_professional.pri b/tqtinterface/qt4/src/qt_professional.pri index f9179d0..181ea08 100644 --- a/tqtinterface/qt4/src/qt_professional.pri +++ b/tqtinterface/qt4/src/qt_professional.pri @@ -1,4 +1,4 @@ -!xml:tqcontains( DEFINES, TQT_INTERNAL_XML ) { +!xml:contains( DEFINES, TQT_INTERNAL_XML ) { CONFIG += xml XML_CPP = $$TQT_SOURCE_TREE/src/xml win32 { @@ -15,7 +15,7 @@ DEFINES *= TQT_MODULE_XML } -!network:tqcontains( DEFINES, TQT_INTERNAL_NETWORK) { +!network:contains( DEFINES, TQT_INTERNAL_NETWORK) { CONFIG += network NETWORK_CPP = $$TQT_SOURCE_TREE/src/network win32 { @@ -31,7 +31,7 @@ DEFINES *= TQT_MODULE_NETWORK } -!workspace:tqcontains( DEFINES, TQT_INTERNAL_WORKSPACE ) { +!workspace:contains( DEFINES, TQT_INTERNAL_WORKSPACE ) { CONFIG += workspace WORKSPACE_CPP = $$TQT_SOURCE_TREE/src/workspace win32 { @@ -46,7 +46,7 @@ DEFINES *= TQT_MODULE_WORKSPACE } -!iconview:tqcontains( DEFINES, TQT_INTERNAL_ICONVIEW ) { +!iconview:contains( DEFINES, TQT_INTERNAL_ICONVIEW ) { CONFIG += iconview ICONVIEW_CPP = $$TQT_SOURCE_TREE/src/iconview win32 { @@ -61,7 +61,7 @@ DEFINES *= TQT_MODULE_ICONVIEW } -!canvas:tqcontains( DEFINES, TQT_INTERNAL_CANVAS ) { +!canvas:contains( DEFINES, TQT_INTERNAL_CANVAS ) { CONFIG += canvas CANVAS_CPP = $$TQT_SOURCE_TREE/src/canvas win32 { @@ -76,7 +76,7 @@ DEFINES *= TQT_MODULE_CANVAS } -!table:tqcontains( DEFINES, TQT_INTERNAL_TABLE ) { +!table:contains( DEFINES, TQT_INTERNAL_TABLE ) { CONFIG += table TABLE_CPP = $$TQT_SOURCE_TREE/src/table win32 { @@ -91,6 +91,6 @@ DEFINES *= TQT_MODULE_TABLE } -tqcontains(TQT_PRODUCT,qt-professional) { +contains(TQT_PRODUCT,qt-professional) { DEFINES *= TQT_LICENSE_PROFESSIONAL } diff --git a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp index f97cd2e..e13f12b 100644 --- a/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp +++ b/tqtinterface/qt4/src/sql/drivers/mysql/tqsql_mysql.cpp @@ -476,7 +476,7 @@ bool TQMYSTQLDriver::open( const TQString& db, for ( it = raw.begin(); it != raw.end(); ++it ) { TQString tmp( *it ); int idx; - if ( (idx = tmp.tqfind( '=' )) != -1 ) { + if ( (idx = tmp.find( '=' )) != -1 ) { TQString val( tmp.mid( idx + 1 ) ); val.simplifyWhiteSpace(); if ( val == "TRUE" || val == "1" ) @@ -764,7 +764,7 @@ TQString TQMYSTQLDriver::formatValue( const TQSqlField* field, bool trimStrings case TQVariant::CString: { // Escape '\' characters r = TQSqlDriver::formatValue( field ); - r.tqreplace( "\\", "\\\\" ); + r.replace( "\\", "\\\\" ); break; } default: diff --git a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp index fda38a8..3401435 100644 --- a/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/tqtinterface/qt4/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -291,7 +291,7 @@ static TQString qGetStringData( STQLHANDLE hStmt, int column, int colSize, bool& } // if STQL_SUCCESS_WITH_INFO is returned, indicating that // more data can be fetched, the length indicator does NOT - // contain the number of bytes returned - it tqcontains the + // contain the number of bytes returned - it contains the // total number of bytes that CAN be fetched // colSize-1: remove 0 termination when there is more data to fetch int rSize = (r == STQL_SUCCESS_WITH_INFO) ? (tqunicode ? colSize-2 : colSize-1) : lengthIndicator; @@ -521,7 +521,7 @@ bool TQODBCPrivate::setConnectionOptions( const TQString& connOpts ) for ( TQStringList::ConstIterator it = raw.begin(); it != raw.end(); ++it ) { TQString tmp( *it ); int idx; - if ( (idx = tmp.tqfind( '=' )) != -1 ) + if ( (idx = tmp.find( '=' )) != -1 ) connMap[ tmp.left( idx ) ] = tmp.mid( idx + 1 ).simplifyWhiteSpace(); else qWarning( "TQODBCDriver::open: Illegal connect option value '%s'", tmp.latin1() ); @@ -863,7 +863,7 @@ TQVariant TQODBCResult::data( int field ) qWarning( "TQODBCResult::data: column %d out of range", field ); return TQVariant(); } - if ( fieldCache.tqcontains( field ) ) + if ( fieldCache.contains( field ) ) return fieldCache[ field ]; STQLRETURN r(0); TQSTQLLEN lengthIndicator = 0; @@ -963,8 +963,8 @@ TQVariant TQODBCResult::data( int field ) bool TQODBCResult::isNull( int field ) { - if ( !fieldCache.tqcontains( field ) ) { - // since there is no good way to tqfind out whether the value is NULL + if ( !fieldCache.contains( field ) ) { + // since there is no good way to find out whether the value is NULL // without fetching the field we'll fetch it here. // (data() also sets the NULL flag) data( field ); @@ -1443,9 +1443,9 @@ bool TQODBCDriver::open( const TQString & db, // Create the connection string TQString connTQStr; // support the "DRIVER={SQL SERVER};SERVER=blah" syntax - if ( db.tqcontains(".dsn") ) + if ( db.contains(".dsn") ) connTQStr = "FILEDSN=" + db; - else if ( db.tqcontains( "DRIVER" ) || db.tqcontains( "SERVER" ) ) + else if ( db.contains( "DRIVER" ) || db.contains( "SERVER" ) ) connTQStr = db; else connTQStr = "DSN=" + db; diff --git a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp index db233ce..b5885bf 100644 --- a/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp +++ b/tqtinterface/qt4/src/sql/drivers/psql/tqsql_psql.cpp @@ -260,7 +260,7 @@ bool TQPSTQLResult::fetchLast() static TQPoint pointFromString( const TQString& s) { // format '(x,y)' - int pivot = s.tqfind( ',' ); + int pivot = s.find( ',' ); if ( pivot != -1 ) { int x = s.mid( 1, pivot-1 ).toInt(); int y = s.mid( pivot+1, s.length()-pivot-2 ).toInt(); @@ -336,7 +336,7 @@ TQVariant TQPSTQLResult::data( int i ) return TQVariant( pointFromString( val ) ); case TQVariant::Rect: // format '(x,y),(x',y')' { - int pivot = val.tqfind( "),(" ); + int pivot = val.find( "),(" ); if ( pivot != -1 ) return TQVariant( TQRect( pointFromString( val.mid(pivot+2,val.length()) ), pointFromString( val.mid(0,pivot+1) ) ) ); return TQVariant( TQRect() ); @@ -344,14 +344,14 @@ TQVariant TQPSTQLResult::data( int i ) case TQVariant::PointArray: // format '((x,y),(x1,y1),...,(xn,yn))' { TQRegExp pointPattern("\\([0-9-]*,[0-9-]*\\)"); - int points = val.tqcontains( pointPattern ); + int points = val.contains( pointPattern ); TQPointArray parray( points ); int idx = 1; for ( int i = 0; i < points; i++ ){ - int start = val.tqfind( pointPattern, idx ); + int start = val.find( pointPattern, idx ); int end = -1; if ( start != -1 ) { - end = val.tqfind( ')', start+1 ); + end = val.find( ')', start+1 ); if ( end != -1 ) { parray.setPoint( i, pointFromString( val.mid(idx, end-idx+1) ) ); } @@ -1080,7 +1080,7 @@ TQString TQPSTQLDriver::formatValue( const TQSqlField* field, default: // Escape '\' characters r = TQSqlDriver::formatValue( field ); - r.tqreplace( "\\", "\\\\" ); + r.replace( "\\", "\\\\" ); break; } break; diff --git a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp index c94f595..864c4c9 100644 --- a/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp +++ b/tqtinterface/qt4/src/sql/drivers/sqlite/tqsql_sqlite.cpp @@ -250,7 +250,7 @@ bool TQSTQLiteResult::reset (const TQString& query) setActive(FALSE); return FALSE; } - // we have to fetch one row to tqfind out about + // we have to fetch one row to find out about // the structure of the result set d->skippedtqStatus = d->fetchNext(0); setSelect(!d->rInf.isEmpty()); @@ -450,7 +450,7 @@ TQSqlIndex TQSTQLiteDriver::primaryIndex(const TQString &tblname) const TQSqlQuery q = createQuery(); q.setForwardOnly(TRUE); - // finrst tqfind a UNITQUE INDEX + // finrst find a UNITQUE INDEX q.exec("PRAGMA index_list('" + tblname + "');"); TQString indexname; while(q.next()) { @@ -468,8 +468,8 @@ TQSqlIndex TQSTQLiteDriver::primaryIndex(const TQString &tblname) const while(q.next()) { TQString name = q.value(2).toString(); TQSqlVariant::Type type = TQSqlVariant::Invalid; - if (rec.tqcontains(name)) - type = rec.tqfind(name).type(); + if (rec.contains(name)) + type = rec.find(name).type(); index.append(TQSqlField(name, type)); } return index; diff --git a/tqtinterface/qt4/src/sql/qt_sql.pri b/tqtinterface/qt4/src/sql/qt_sql.pri index 29845f8..732c674 100644 --- a/tqtinterface/qt4/src/sql/qt_sql.pri +++ b/tqtinterface/qt4/src/sql/qt_sql.pri @@ -53,21 +53,21 @@ sql { $$SQL_CPP/tqsqlselectcursor.cpp \ $$SQL_CPP/drivers/cache/tqsqlcachedresult.cpp - tqcontains(sql-drivers, all ) { + contains(sql-drivers, all ) { sql-driver += psql mysql odbc oci tds db2 sqlite ibase } - tqcontains(sql-drivers, psql) { + contains(sql-drivers, psql) { HEADERS += $$SQL_CPP/drivers/psql/tqsql_psql.h SOURCES += $$SQL_CPP/drivers/psql/tqsql_psql.cpp DEFINES += TQT_SQL_POSTGRES unix { - !tqcontains( LIBS, .*pq.* ) { + !contains( LIBS, .*pq.* ) { LIBS *= -lpq } } win32 { - !tqcontains( LIBS, .*libpq.* ) { + !contains( LIBS, .*libpq.* ) { LIBS *= libpqdll.lib } # win32-msvc: { @@ -80,17 +80,17 @@ sql { } } - tqcontains(sql-drivers, mysql) { + contains(sql-drivers, mysql) { HEADERS += $$SQL_CPP/drivers/mysql/tqsql_mysql.h SOURCES += $$SQL_CPP/drivers/mysql/tqsql_mysql.cpp DEFINES += TQT_SQL_MYSQL unix { - !tqcontains( LIBS, .*mysql.* ) { + !contains( LIBS, .*mysql.* ) { LIBS *= -lmysqlclient } } win32 { - !tqcontains( LIBS, .*mysql.* ) { + !contains( LIBS, .*mysql.* ) { LIBS *= libmysql.lib } # win32-msvc: { @@ -103,19 +103,19 @@ sql { } } - tqcontains(sql-drivers, odbc) { + contains(sql-drivers, odbc) { HEADERS += $$SQL_CPP/drivers/odbc/tqsql_odbc.h SOURCES += $$SQL_CPP/drivers/odbc/tqsql_odbc.cpp DEFINES += TQT_SQL_ODBC mac { - !tqcontains( LIBS, .*odbc.* ) { + !contains( LIBS, .*odbc.* ) { LIBS *= -liodbc } } unix { - !tqcontains( LIBS, .*odbc.* ) { + !contains( LIBS, .*odbc.* ) { LIBS *= -lodbc } } @@ -127,12 +127,12 @@ sql { } - tqcontains(sql-drivers, oci) { + contains(sql-drivers, oci) { HEADERS += $$SQL_CPP/drivers/oci/tqsql_oci.h SOURCES += $$SQL_CPP/drivers/oci/tqsql_oci.cpp DEFINES += TQT_SQL_OCI unix { - !tqcontains( LIBS, .*clnts.* ) { + !contains( LIBS, .*clnts.* ) { LIBS += -lclntsh -lwtc8 } } @@ -148,7 +148,7 @@ sql { } } - tqcontains(sql-drivers, tds) { + contains(sql-drivers, tds) { HEADERS += $$SQL_CPP/drivers/tds/tqsql_tds.h \ $$SQL_CPP/drivers/shared/tqsql_result.h SOURCES += $$SQL_CPP/drivers/tds/tqsql_tds.cpp \ @@ -170,7 +170,7 @@ sql { } } - tqcontains(sql-drivers, db2) { + contains(sql-drivers, db2) { HEADERS += $$SQL_CPP/drivers/db2/tqsql_db2.h SOURCES += $$SQL_CPP/drivers/db2/tqsql_db2.cpp DEFINES += TQT_SQL_DB2 @@ -183,7 +183,7 @@ sql { } } - tqcontains(sql-drivers, ibase) { + contains(sql-drivers, ibase) { HEADERS += $$SQL_CPP/drivers/ibase/tqsql_ibase.h SOURCES += $$SQL_CPP/drivers/ibase/tqsql_ibase.cpp DEFINES += TQT_SQL_IBASE @@ -196,8 +196,8 @@ sql { } } - tqcontains(sql-drivers, sqlite) { - !tqcontains( LIBS, .*sqlite.* ) { + contains(sql-drivers, sqlite) { + !contains( LIBS, .*sqlite.* ) { INCLUDEPATH += $$SQL_CPP/../3rdparty/sqlite/ diff --git a/tqtinterface/qt4/src/sql/tqdatabrowser.cpp b/tqtinterface/qt4/src/sql/tqdatabrowser.cpp index bf27e14..910fb11 100644 --- a/tqtinterface/qt4/src/sql/tqdatabrowser.cpp +++ b/tqtinterface/qt4/src/sql/tqdatabrowser.cpp @@ -964,7 +964,7 @@ bool TQDataBrowser::insertCurrent() updateBoundary(); } else { refresh(); - d->cur.tqfindBuffer( cur->primaryIndex() ); + d->cur.findBuffer( cur->primaryIndex() ); updateBoundary(); cursorChanged( TQSqlCursor::Insert ); return TRUE; @@ -1002,7 +1002,7 @@ bool TQDataBrowser::updateCurrent() updateBoundary(); } else { refresh(); - d->cur.tqfindBuffer( cur->primaryIndex() ); + d->cur.findBuffer( cur->primaryIndex() ); updateBoundary(); cur->editBuffer( TRUE ); cursorChanged( TQSqlCursor::Update ); diff --git a/tqtinterface/qt4/src/sql/tqdatatable.cpp b/tqtinterface/qt4/src/sql/tqdatatable.cpp index 496da9d..647c3a2 100644 --- a/tqtinterface/qt4/src/sql/tqdatatable.cpp +++ b/tqtinterface/qt4/src/sql/tqdatatable.cpp @@ -197,7 +197,7 @@ void qt_debug_buffer( const TQString& msg, TQSqlRecord* cursor ) The contents of a cell is available as a TQString with text() or as a TQVariant with value(). The current record is returned by - currentRecord(). Use the tqfind() function to search for a string in + currentRecord(). Use the find() function to search for a string in the table. Editing actions can be applied programatically. For example, the @@ -377,7 +377,7 @@ void TQDataTable::setColumnWidth( int col, int w ) /*! Resizes column \a col so that the column width is wide enough to - display the widest item the column tqcontains (including the column + display the widest item the column contains (including the column label). If the table's TQSqlCursor is not currently active, the cursor will be refreshed before the column width is calculated. Be aware that this function may be slow on tables that contain large @@ -475,7 +475,7 @@ void TQDataTable::setSort( const TQStringList& sort ) \overload Sets the sort to be applied to the displayed data to \a sort. If - there is no current cursor, nothing happens. A TQSqlIndex tqcontains + there is no current cursor, nothing happens. A TQSqlIndex contains field names and their ordering (ASC or DESC); these are used to compose the ORDER BY clause. @@ -821,7 +821,7 @@ void TQDataTable::contentsMousePressEvent( TQMouseEvent* e ) } /*! \reimp */ -TQWidget* TQDataTable::beginEdit ( int row, int col, bool tqreplace ) +TQWidget* TQDataTable::beginEdit ( int row, int col, bool replace ) { d->editRow = -1; d->editCol = -1; @@ -837,12 +837,12 @@ TQWidget* TQDataTable::beginEdit ( int row, int col, bool tqreplace ) // see comment in beginInsert() bool fakeReadOnly = isColumnReadOnly( col ); setColumnReadOnly( col, FALSE ); - TQWidget* w = TQTable::beginEdit( row, col, tqreplace ); + TQWidget* w = TQTable::beginEdit( row, col, replace ); setColumnReadOnly( col, fakeReadOnly ); return w; } if ( d->dat.mode() == TQSql::None && sqlCursor()->canUpdate() && sqlCursor()->primaryIndex().count() > 0 ) - return beginUpdate( row, col, tqreplace ); + return beginUpdate( row, col, replace ); return 0; } @@ -1009,11 +1009,11 @@ bool TQDataTable::beginInsert() \a row and \a col refer to the row and column in the TQDataTable. - (\a tqreplace is provided for reimplementors and reflects the API of + (\a replace is provided for reimplementors and reflects the API of TQTable::beginEdit().) */ -TQWidget* TQDataTable::beginUpdate ( int row, int col, bool tqreplace ) +TQWidget* TQDataTable::beginUpdate ( int row, int col, bool replace ) { if ( !sqlCursor() || isReadOnly() || isColumnReadOnly( col ) ) return 0; @@ -1023,7 +1023,7 @@ TQWidget* TQDataTable::beginUpdate ( int row, int col, bool tqreplace ) d->editBuffer = sqlCursor()->primeUpdate(); sqlCursor()->seek( currentRow() ); emit primeUpdate( d->editBuffer ); - return TQTable::beginEdit( row, col, tqreplace ); + return TQTable::beginEdit( row, col, replace ); } return 0; } @@ -1075,7 +1075,7 @@ bool TQDataTable::insertCurrent() endInsert(); refresh(); TQSqlIndex idx = sqlCursor()->primaryIndex(); - tqfindBuffer( idx, d->lastAt ); + findBuffer( idx, d->lastAt ); repaintContents( contentsX(), contentsY(), visibleWidth(), visibleHeight(), FALSE ); emit cursorChanged( TQSql::Insert ); } @@ -1276,12 +1276,12 @@ TQSql::Confirm TQDataTable::confirmCancel( TQSql::Op m ) caseSensitive is FALSE the case of \a str will be ignored. The search will wrap, i.e. if the first (or if backwards is TRUE, - last) cell is reached without tqfinding \a str the search will + last) cell is reached without finding \a str the search will continue until it reaches the starting cell. If \a str is not found the search will fail and the current cell will remain unchanged. */ -void TQDataTable::tqfind( const TQString & str, bool caseSensitive, bool backwards ) +void TQDataTable::find( const TQString & str, bool caseSensitive, bool backwards ) { if ( !sqlCursor() ) return; @@ -1312,7 +1312,7 @@ void TQDataTable::tqfind( const TQString & str, bool caseSensitive, bool backwar if( !caseSensitive ){ text = text.lower(); } - if( text.tqcontains( tmp ) ){ + if( text.contains( tmp ) ){ setCurrentCell( row, i ); col = i; found = TRUE; @@ -2147,12 +2147,12 @@ void TQDataTable::refresh() searching. */ -bool TQDataTable::tqfindBuffer( const TQSqlIndex& idx, int atHint ) +bool TQDataTable::findBuffer( const TQSqlIndex& idx, int atHint ) { TQSqlCursor* cur = sqlCursor(); if ( !cur ) return FALSE; - bool found = d->cur.tqfindBuffer( idx, atHint ); + bool found = d->cur.findBuffer( idx, atHint ); if ( found ) setCurrentCell( cur->at(), currentColumn() ); return found; diff --git a/tqtinterface/qt4/src/sql/tqdatatable.h b/tqtinterface/qt4/src/sql/tqdatatable.h index 657dc9c..2f1c5dd 100644 --- a/tqtinterface/qt4/src/sql/tqdatatable.h +++ b/tqtinterface/qt4/src/sql/tqdatatable.h @@ -152,7 +152,7 @@ public: int numRows() const; void setNumCols( int c ); void setNumRows ( int r ); - bool tqfindBuffer( const TQSqlIndex& idx, int atHint = 0 ); + bool findBuffer( const TQSqlIndex& idx, int atHint = 0 ); void hideColumn( int col ); void showColumn( int col ); @@ -167,7 +167,7 @@ Q_SIGNALS: void cursorChanged( TQSql::Op mode ); public Q_SLOTS: - virtual void tqfind( const TQString & str, bool caseSensitive, + virtual void find( const TQString & str, bool caseSensitive, bool backwards ); virtual void sortAscending( int col ); virtual void sortDescending( int col ); @@ -188,14 +188,14 @@ protected: virtual void handleError( const TQSqlError& e ); virtual bool beginInsert(); - virtual TQWidget* beginUpdate ( int row, int col, bool tqreplace ); + virtual TQWidget* beginUpdate ( int row, int col, bool replace ); bool eventFilter( TQObject *o, TQEvent *e ); void keyPressEvent( TQKeyEvent* ); void resizeEvent ( TQResizeEvent * ); void contentsMousePressEvent( TQMouseEvent* e ); void contentsContextMenuEvent( TQContextMenuEvent* e ); - void endEdit( int row, int col, bool accept, bool tqreplace ); + void endEdit( int row, int col, bool accept, bool replace ); TQWidget * createEditor( int row, int col, bool initFromCell ) const; void activateNextCell(); int indexOf( uint i ) const; // ### make this public in 4.0 @@ -229,7 +229,7 @@ private Q_SLOTS: private: TQString fieldToString( const TQSqlField * field ); void init(); - TQWidget* beginEdit ( int row, int col, bool tqreplace ); + TQWidget* beginEdit ( int row, int col, bool replace ); void updateRow( int row ); void endInsert(); void endUpdate(); diff --git a/tqtinterface/qt4/src/sql/tqsqlcursor.cpp b/tqtinterface/qt4/src/sql/tqsqlcursor.cpp index 0d9fc53..621d693 100644 --- a/tqtinterface/qt4/src/sql/tqsqlcursor.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlcursor.cpp @@ -134,11 +134,11 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString& A TQSqlCursor is a database record (see \l TQSqlRecord) that corresponds to a table or view within an SQL database (see \l TQSqlDatabase). There are two buffers in a cursor, one used for - browsing and one used for editing records. Each buffer tqcontains a + browsing and one used for editing records. Each buffer contains a list of fields which correspond to the fields in the table or view. - When positioned on a valid record, the browse buffer tqcontains the + When positioned on a valid record, the browse buffer contains the values of the current record's fields from the database. The edit buffer is separate, and is used for editing existing records and inserting new records. @@ -168,7 +168,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString& When next() returns FALSE, there are no more records to process, and the loop terminates. - For editing records (rows of data), a cursor tqcontains a separate + For editing records (rows of data), a cursor contains a separate edit buffer which is independent of the fields used when browsing. The functions insert(), update() and del() operate on the edit buffer. This allows the cursor to be repositioned to other @@ -216,7 +216,7 @@ TQString qWhereClause( TQSqlRecord* rec, const TQString& prefix, const TQString& from becoming invalid. The edits will still not be visible when navigating the cursor until select() is called. - TQSqlCursor tqcontains virtual methods which allow editing behavior + TQSqlCursor contains virtual methods which allow editing behavior to be customized by subclasses. This allows custom cursors to be created that encapsulate the editing behavior of a database table for an entire application. For example, a cursor can be customized @@ -548,7 +548,7 @@ TQSqlIndex TQSqlCursor::primaryIndex( bool setFromCursor ) const if ( setFromCursor ) { for ( uint i = 0; i < d->priIndx.count(); ++i ) { const TQString fn = d->priIndx.fieldName( i ); - if ( tqcontains( fn ) ) + if ( contains( fn ) ) d->priIndx.setValue( i, value( fn ) ); } } @@ -737,9 +737,9 @@ bool TQSqlCursor::select( const TQSqlIndex& sort ) In this example the TQSqlIndex, pk, is used for two different purposes. When used as the filter (first) argument, the field - names it tqcontains are used to construct the WHERE clause, each set + names it contains are used to construct the WHERE clause, each set to the current cursor value, \c{WHERE id=10}, in this case. When - used as the sort (second) argument the field names it tqcontains are + used as the sort (second) argument the field names it contains are used for the ORDER BY clause, \c{ORDER BY id} in this example. */ diff --git a/tqtinterface/qt4/src/sql/tqsqldatabase.cpp b/tqtinterface/qt4/src/sql/tqsqldatabase.cpp index 45cca58..70a15ae 100644 --- a/tqtinterface/qt4/src/sql/tqsqldatabase.cpp +++ b/tqtinterface/qt4/src/sql/tqsqldatabase.cpp @@ -155,7 +155,7 @@ public: static TQSqlDatabase* addDatabase( TQSqlDatabase* db, const TQString & name ); static void removeDatabase( const TQString& name ); static void removeDatabase( TQSqlDatabase* db ); - static bool tqcontains( const TQString& name ); + static bool contains( const TQString& name ); static TQDriverDict* driverDict(); protected: @@ -229,11 +229,11 @@ TQSqlDatabaseManager* TQSqlDatabaseManager::instance() TQSqlDatabase* TQSqlDatabaseManager::database( const TQString& name, bool open ) { - if ( !tqcontains( name ) ) + if ( !contains( name ) ) return 0; TQSqlDatabaseManager* sqlConnection = instance(); - TQSqlDatabase* db = sqlConnection->dbDict.tqfind( name ); + TQSqlDatabase* db = sqlConnection->dbDict.find( name ); if ( db && !db->isOpen() && open ) { db->open(); #ifdef TQT_CHECK_RANGE @@ -246,14 +246,14 @@ TQSqlDatabase* TQSqlDatabaseManager::database( const TQString& name, bool open ) } /*! - Returns TRUE if the list of database connections tqcontains \a name; + Returns TRUE if the list of database connections contains \a name; otherwise returns FALSE. */ -bool TQSqlDatabaseManager::tqcontains( const TQString& name ) +bool TQSqlDatabaseManager::contains( const TQString& name ) { TQSqlDatabaseManager* sqlConnection = instance(); - TQSqlDatabase* db = sqlConnection->dbDict.tqfind( name ); + TQSqlDatabase* db = sqlConnection->dbDict.find( name ); if ( db ) return TRUE; return FALSE; @@ -280,7 +280,7 @@ TQSqlDatabase* TQSqlDatabaseManager::addDatabase( TQSqlDatabase* db, const TQStr TQSqlDatabaseManager* sqlConnection = instance(); if( sqlConnection == 0 ) return 0; - if ( tqcontains( name ) ) + if ( contains( name ) ) sqlConnection->removeDatabase( name ); sqlConnection->dbDict.insert( name, db ); return db; @@ -365,7 +365,7 @@ public: \module sql Note that transaction handling is not supported by every SQL - database. You can tqfind out whether transactions are supported + database. You can find out whether transactions are supported using TQSqlDriver::hasFeature(). The TQSqlDatabase class provides an abstract interface for @@ -393,7 +393,7 @@ public: database connection. \warning If you add a database with the same name as an - existing database, the new database will tqreplace the old one. + existing database, the new database will replace the old one. This will happen automatically if you call this function more than once without specifying \a connectionName. @@ -486,41 +486,41 @@ TQStringList TQSqlDatabase::drivers() TQDictIterator<TQSqlDriverCreatorBase> itd( *TQSqlDatabaseManager::driverDict() ); while ( itd.current() ) { - if ( !l.tqcontains( itd.currentKey() ) ) + if ( !l.contains( itd.currentKey() ) ) l << itd.currentKey(); ++itd; } #ifdef TQT_STQL_POSTGRES - if ( !l.tqcontains( "TQPSQL7" ) ) + if ( !l.contains( "TQPSQL7" ) ) l << "TQPSQL7"; #endif #ifdef TQT_STQL_MYSQL - if ( !l.tqcontains( "TQMYSQL3" ) ) + if ( !l.contains( "TQMYSQL3" ) ) l << "TQMYSQL3"; #endif #ifdef TQT_STQL_ODBC - if ( !l.tqcontains( "TQODBC3" ) ) + if ( !l.contains( "TQODBC3" ) ) l << "TQODBC3"; #endif #ifdef TQT_STQL_OCI - if ( !l.tqcontains( "TQOCI8" ) ) + if ( !l.contains( "TQOCI8" ) ) l << "TQOCI8"; #endif #ifdef TQT_STQL_TDS - if ( !l.tqcontains( "TQTDS7" ) ) + if ( !l.contains( "TQTDS7" ) ) l << "TQTDS7"; #endif #ifdef TQT_STQL_DB2 - if ( !l.tqcontains( "TQDB2" ) ) + if ( !l.contains( "TQDB2" ) ) l << "TQDB2"; #endif #ifdef TQT_STQL_STQLITE - if ( !l.tqcontains( "TQSQLITE" ) ) + if ( !l.contains( "TQSQLITE" ) ) l << "TQSQLITE"; #endif #ifdef TQT_STQL_IBASE - if ( !l.tqcontains( "TQIBASE" ) ) + if ( !l.contains( "TQIBASE" ) ) l << "TQIBASE"; #endif @@ -551,13 +551,13 @@ void TQSqlDatabase::registerSqlDriver( const TQString& name, const TQSqlDriverCr } /*! - Returns TRUE if the list of database connections tqcontains \a + Returns TRUE if the list of database connections contains \a connectionName; otherwise returns FALSE. */ -bool TQSqlDatabase::tqcontains( const TQString& connectionName ) +bool TQSqlDatabase::contains( const TQString& connectionName ) { - return TQSqlDatabaseManager::tqcontains( connectionName ); + return TQSqlDatabaseManager::contains( connectionName ); } diff --git a/tqtinterface/qt4/src/sql/tqsqldatabase.h b/tqtinterface/qt4/src/sql/tqsqldatabase.h index 730fb44..98e7be2 100644 --- a/tqtinterface/qt4/src/sql/tqsqldatabase.h +++ b/tqtinterface/qt4/src/sql/tqsqldatabase.h @@ -134,7 +134,7 @@ public: static TQSqlDatabase* database( const TQString& connectionName = defaultConnection, bool open = TRUE ); static void removeDatabase( const TQString& connectionName ); static void removeDatabase( TQSqlDatabase* db ); - static bool tqcontains( const TQString& connectionName = defaultConnection ); + static bool contains( const TQString& connectionName = defaultConnection ); static TQStringList drivers(); static void registerSqlDriver( const TQString& name, const TQSqlDriverCreatorBase* creator ); // ### 4.0: creator should not be const static bool isDriverAvailable( const TQString& name ); diff --git a/tqtinterface/qt4/src/sql/tqsqldriver.cpp b/tqtinterface/qt4/src/sql/tqsqldriver.cpp index 3f8cdca..3f6f137 100644 --- a/tqtinterface/qt4/src/sql/tqsqldriver.cpp +++ b/tqtinterface/qt4/src/sql/tqsqldriver.cpp @@ -133,7 +133,7 @@ TQSqlDriver::~TQSqlDriver() bool TQSqlDriver::isOpen() const { if ( !qSqlDriverExtDict()->isEmpty() ) { - TQSqlDriverExtension *ext = qSqlDriverExtDict()->tqfind( (TQSqlDriver *) this ); + TQSqlDriverExtension *ext = qSqlDriverExtDict()->find( (TQSqlDriver *) this ); if ( ext ) return ext->isOpen(); } @@ -154,7 +154,7 @@ bool TQSqlDriver::isOpenError() const /*! \enum TQSqlDriver::DriverFeature - This enum tqcontains a list of features a driver may support. Use + This enum contains a list of features a driver may support. Use hasFeature() to query whether a feature is supported or not. \value Transactions whether the driver supports SQL transactions @@ -274,7 +274,7 @@ void TQSqlDriver::setLastError( const TQSqlError& e ) } /*! - Returns a TQSqlError object which tqcontains information about the + Returns a TQSqlError object which contains information about the last error that occurred on the database. */ @@ -289,7 +289,7 @@ TQSqlError TQSqlDriver::lastError() const The \a tableType argument describes what types of tables should be returned. Due to binary compatibility, the string - tqcontains the value of the enum TQSql::TableTypes as text. + contains the value of the enum TQSql::TableTypes as text. An empty string should be treated as TQSql::Tables for downward compatibility. @@ -386,7 +386,7 @@ TQString TQSqlDriver::nullText() const \i If \a field is character data, the value is returned enclosed in single quotation marks, which is appropriate for many SQL databases. Any embedded single-quote characters are escaped - (tqreplaced with two single-quote characters). If \a trimStrings is + (replaced with two single-quote characters). If \a trimStrings is TRUE (the default is FALSE), all trailing whitespace is trimmed from the field. @@ -448,7 +448,7 @@ TQString TQSqlDriver::formatValue( const TQSqlField* field, bool trimStrings ) c result.truncate( end ); } /* escape the "'" character */ - result.tqreplace( TQChar( '\'' ), "''" ); + result.replace( TQChar( '\'' ), "''" ); r = "'" + result + "'"; break; } @@ -499,7 +499,7 @@ bool TQSqlDriver::open( const TQString& db, const TQString& connOpts ) { if ( !qSqlOpenExtDict()->isEmpty() ) { - TQSqlOpenExtension *ext = qSqlOpenExtDict()->tqfind( (TQSqlDriver *) this ); + TQSqlOpenExtension *ext = qSqlOpenExtDict()->find( (TQSqlDriver *) this ); if ( ext ) return ext->open( db, user, password, host, port, connOpts ); } diff --git a/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp b/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp index dd4f1fb..6f115f7 100644 --- a/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlextension_p.cpp @@ -65,7 +65,7 @@ void TQSqlExtension::bindValue( const TQString& placeholder, const TQVariant& va bindm = BindByName; // if the index has already been set when doing emulated named // bindings - don't reset it - if ( index.tqcontains( (int)values.count() ) ) { + if ( index.contains( (int)values.count() ) ) { index[ (int)values.count() ] = placeholder; } values[ placeholder ] = Param( val, tp ); diff --git a/tqtinterface/qt4/src/sql/tqsqlfield.cpp b/tqtinterface/qt4/src/sql/tqsqlfield.cpp index fcbb08d..b9f9590 100644 --- a/tqtinterface/qt4/src/sql/tqsqlfield.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlfield.cpp @@ -53,7 +53,7 @@ TQSqlField represents the characteristics of a single column in a database table or view, such as the data type and column name. A - field also tqcontains the value of the database column, which can be + field also contains the value of the database column, which can be viewed or changed. Field data values are stored as TQVariants. Using an incompatible diff --git a/tqtinterface/qt4/src/sql/tqsqlform.cpp b/tqtinterface/qt4/src/sql/tqsqlform.cpp index ed1f935..a33c18b 100644 --- a/tqtinterface/qt4/src/sql/tqsqlform.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlform.cpp @@ -102,7 +102,7 @@ public: // Move the cursor to a valid record (the first record) myCursor.next(); // Set the form's record pointer to the cursor's edit buffer (which - // tqcontains the current record's values) + // contains the current record's values) myForm.setRecord( myCursor.primeUpdate() ); // Insert a field into the form that uses myEditor to edit the @@ -200,8 +200,8 @@ void TQSqlForm::insert( TQWidget * widget, const TQString& field ) void TQSqlForm::remove( const TQString& field ) { d->dirty = TRUE; - if ( d->fld.tqfind( field ) != d->fld.end() ) - d->fld.remove( d->fld.tqfind( field ) ); + if ( d->fld.find( field ) != d->fld.end() ) + d->fld.remove( d->fld.find( field ) ); d->wgt.remove( field ); } @@ -296,7 +296,7 @@ TQWidget * TQSqlForm::fieldToWidget( TQSqlField * field ) const */ TQSqlField * TQSqlForm::widgetToField( TQWidget * widget ) const { - if( d->map.tqcontains( widget ) ) + if( d->map.contains( widget ) ) return d->map[widget]; else return 0; diff --git a/tqtinterface/qt4/src/sql/tqsqlindex.cpp b/tqtinterface/qt4/src/sql/tqsqlindex.cpp index 525b1cd..9d5880c 100644 --- a/tqtinterface/qt4/src/sql/tqsqlindex.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlindex.cpp @@ -180,7 +180,7 @@ void TQSqlIndex::setDescending( int i, bool desc ) "\a{prefix}.<fieldname>" If \a sep is specified, each field is separated by \a sep. If \a - verbose is TRUE (the default), each field tqcontains a suffix + verbose is TRUE (the default), each field contains a suffix indicating an ASCending or DESCending sort order. */ @@ -207,7 +207,7 @@ TQString TQSqlIndex::toString( const TQString& prefix, const TQString& sep, bool "\a{prefix}.<fieldname>" - If \a verbose is TRUE (the default), each field tqcontains a suffix + If \a verbose is TRUE (the default), each field contains a suffix indicating an ASCending or DESCending sort order. Note that if you want to iterate over the list, you should iterate @@ -270,7 +270,7 @@ TQSqlIndex TQSqlIndex::fromStringList( const TQStringList& l, const TQSqlCursor* desc = TRUE; f = f.mid( 0, f.length()-4 ); } - int dot = f.tqfindRev( '.' ); + int dot = f.findRev( '.' ); if ( dot != -1 ) f = f.mid( dot+1 ); const TQSqlField* field = cursor->field( f.simplifyWhiteSpace() ); diff --git a/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp b/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp index 8412c94..6a35ef7 100644 --- a/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlmanager_p.cpp @@ -339,16 +339,16 @@ update. For example: ... myCursor->update(); // update current record myCursor->select(); // refresh the cursor - myManager.tqfindBuffer( myCursor->primaryIndex() ); // go to the updated record + myManager.findBuffer( myCursor->primaryIndex() ); // go to the updated record \endcode */ //## possibly add tqsizeHint parameter -bool TQSqlCursorManager::tqfindBuffer( const TQSqlIndex& idx, int atHint ) +bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint ) { #ifdef TQT_DEBUG_DATAMANAGER - qDebug("TQSqlCursorManager::tqfindBuffer:"); + qDebug("TQSqlCursorManager::findBuffer:"); #endif TQSqlCursor* cur = cursor(); if ( !cur ) diff --git a/tqtinterface/qt4/src/sql/tqsqlmanager_p.h b/tqtinterface/qt4/src/sql/tqsqlmanager_p.h index 9f19335..ed892e3 100644 --- a/tqtinterface/qt4/src/sql/tqsqlmanager_p.h +++ b/tqtinterface/qt4/src/sql/tqsqlmanager_p.h @@ -93,7 +93,7 @@ public: bool autoDelete() const; virtual bool refresh(); - virtual bool tqfindBuffer( const TQSqlIndex& idx, int atHint = 0 ); + virtual bool findBuffer( const TQSqlIndex& idx, int atHint = 0 ); private: TQSqlCursorManagerPrivate* d; diff --git a/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp b/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp index 63b7e3a..d1498d9 100644 --- a/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlpropertymap.cpp @@ -110,7 +110,7 @@ public: ... \endcode - You can also tqreplace the global TQSqlPropertyMap that is used by + You can also replace the global TQSqlPropertyMap that is used by default. (Bear in mind that TQSqlPropertyMap takes ownership of the new default map.) @@ -216,7 +216,7 @@ TQVariant TQSqlPropertyMap::property( TQWidget * widget ) { if( !widget ) return TQVariant(); const QMetaObject* mo = widget->metaObject(); - while ( mo && !d->propertyMap.tqcontains( TQString( mo->className() ) ) ) + while ( mo && !d->propertyMap.contains( TQString( mo->className() ) ) ) mo = mo->superClass(); if ( !mo ) { @@ -236,7 +236,7 @@ void TQSqlPropertyMap::setProperty( TQWidget * widget, const TQVariant & value ) if( !widget ) return; QMetaObject* mo = const_cast<QMetaObject*>(widget->metaObject()); - while ( mo && !d->propertyMap.tqcontains( TQString( mo->className() ) ) ) + while ( mo && !d->propertyMap.contains( TQString( mo->className() ) ) ) mo = const_cast<QMetaObject*>(mo->superClass()); if ( !mo ) { #ifdef TQT_CHECK_RANGE diff --git a/tqtinterface/qt4/src/sql/tqsqlquery.cpp b/tqtinterface/qt4/src/sql/tqsqlquery.cpp index 9a6f649..a1a7632 100644 --- a/tqtinterface/qt4/src/sql/tqsqlquery.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlquery.cpp @@ -969,7 +969,7 @@ bool TQSqlQuery::prepare( const TQString& query ) TQRegExp rx(TQString::tqfromLatin1("'[^']*'|\\?")); while ( (i = rx.search( q, i )) != -1 ) { if ( rx.cap(0) == "?" ) { - q = q.tqreplace( i, 1, ":f" + TQString::number(cnt) ); + q = q.replace( i, 1, ":f" + TQString::number(cnt) ); cnt++; } i += rx.matchedLength(); @@ -982,7 +982,7 @@ bool TQSqlQuery::prepare( const TQString& query ) // record the index of the placeholder - needed // for emulating named bindings with ODBC d->sqlResult->extension()->index[ cnt ]= rx.cap(0); - q = q.tqreplace( i, rx.matchedLength(), "?" ); + q = q.replace( i, rx.matchedLength(), "?" ); i++; cnt++; } @@ -1017,7 +1017,7 @@ bool TQSqlQuery::exec() if ( driver()->hasFeature( TQSqlDriver::PreparedQueries ) ) { ret = d->sqlResult->extension()->exec(); } else { - // fake preparation - just tqreplace the placeholders.. + // fake preparation - just replace the placeholders.. TQString query = d->sqlResult->lastQuery(); if ( d->sqlResult->extension()->bindMethod() == TQSqlExtension::BindByName ) { int i; @@ -1031,7 +1031,7 @@ bool TQSqlQuery::exec() f.setNull(); else f.setValue( val ); - query = query.tqreplace( (uint)d->sqlResult->extension()->holders[ (uint)i ].holderPos, + query = query.replace( (uint)d->sqlResult->extension()->holders[ (uint)i ].holderPos, holder.length(), driver()->formatValue( &f ) ); } } else { @@ -1040,7 +1040,7 @@ bool TQSqlQuery::exec() int i = 0; for ( it = d->sqlResult->extension()->index.begin(); it != d->sqlResult->extension()->index.end(); ++it ) { - i = query.tqfind( '?', i ); + i = query.find( '?', i ); if ( i > -1 ) { TQSqlField f( "", d->sqlResult->extension()->values[ it.data() ].value.type() ); if ( d->sqlResult->extension()->values[ it.data() ].value.isNull() ) @@ -1048,7 +1048,7 @@ bool TQSqlQuery::exec() else f.setValue( d->sqlResult->extension()->values[ it.data() ].value ); val = driver()->formatValue( &f ); - query = query.tqreplace( i, 1, driver()->formatValue( &f ) ); + query = query.replace( i, 1, driver()->formatValue( &f ) ); i += val.length(); } } @@ -1202,7 +1202,7 @@ TQMap<TQString,TQVariant> TQSqlQuery::boundValues() const In most cases this function returns the same as lastQuery(). If a prepared query with placeholders is executed on a DBMS that does not support it, the preparation of this query is emulated. The - placeholders in the original query are tqreplaced with their bound + placeholders in the original query are replaced with their bound values to form a new query. This function returns the modified query. Useful for debugging purposes. diff --git a/tqtinterface/qt4/src/sql/tqsqlrecord.cpp b/tqtinterface/qt4/src/sql/tqsqlrecord.cpp index c082d16..00a7acc 100644 --- a/tqtinterface/qt4/src/sql/tqsqlrecord.cpp +++ b/tqtinterface/qt4/src/sql/tqsqlrecord.cpp @@ -137,7 +137,7 @@ public: { return cnt; } - bool tqcontains( int i ) const + bool contains( int i ) const { return i >= 0 && i < (int)fi.count() && fi[ i ].isValid(); } @@ -302,7 +302,7 @@ int TQSqlRecord::position( const TQString& name ) const return i; } #ifdef TQT_CHECK_RANGE - qWarning( "TQSqlRecord::position: unable to tqfind field %s", name.latin1() ); + qWarning( "TQSqlRecord::position: unable to find field %s", name.latin1() ); #endif return -1; } @@ -315,7 +315,7 @@ int TQSqlRecord::position( const TQString& name ) const TQSqlField* TQSqlRecord::field( int i ) { checkDetach(); - if ( !sh->d->tqcontains( i ) ) { + if ( !sh->d->contains( i ) ) { #ifdef TQT_CHECK_RANGE qWarning( "TQSqlRecord::field: index out of range: %d", i ); #endif @@ -334,7 +334,7 @@ TQSqlField* TQSqlRecord::field( int i ) TQSqlField* TQSqlRecord::field( const TQString& name ) { checkDetach(); - if ( !sh->d->tqcontains( position( name ) ) ) + if ( !sh->d->contains( position( name ) ) ) return 0; return &sh->d->fieldInfo( position( name ) )->field; } @@ -346,7 +346,7 @@ TQSqlField* TQSqlRecord::field( const TQString& name ) const TQSqlField* TQSqlRecord::field( int i ) const { - if ( !sh->d->tqcontains( i ) ) { + if ( !sh->d->contains( i ) ) { #ifdef TQT_CHECK_RANGE qWarning( "TQSqlRecord::field: index out of range: %d", i ); #endif // TQT_CHECK_RANGE @@ -364,7 +364,7 @@ const TQSqlField* TQSqlRecord::field( int i ) const const TQSqlField* TQSqlRecord::field( const TQString& name ) const { - if( !sh->d->tqcontains( position( name ) ) ) + if( !sh->d->contains( position( name ) ) ) return 0; return &sh->d->fieldInfo( position( name ) )->field; } @@ -384,7 +384,7 @@ void TQSqlRecord::append( const TQSqlField& field ) exists at \a pos, it is removed. */ -void TQSqlRecord::insert( int pos, const TQSqlField& field ) // ### 4.0: rename to ::tqreplace +void TQSqlRecord::insert( int pos, const TQSqlField& field ) // ### 4.0: rename to ::replace { checkDetach(); sh->d->insert( pos, field ); @@ -429,7 +429,7 @@ bool TQSqlRecord::isEmpty() const otherwise returns FALSE. */ -bool TQSqlRecord::tqcontains( const TQString& name ) const +bool TQSqlRecord::contains( const TQString& name ) const { for ( uint i = 0; i < count(); ++i ) { if ( fieldName(i).upper() == name.upper() ) @@ -695,8 +695,8 @@ void TQSqlRecord::setValue( const TQString& name, const TQVariant& val ) \module sql This class is a TQValueList that holds a set of database field meta - data. Use tqcontains() to see if a given field name exists in the - record, and use tqfind() to get a TQSqlFieldInfo record for a named + data. Use contains() to see if a given field name exists in the + record, and use find() to get a TQSqlFieldInfo record for a named field. \sa TQValueList, TQSqlFieldInfo @@ -718,7 +718,7 @@ TQSqlRecordInfo::TQSqlRecordInfo( const TQSqlRecord& other ) Returns the number of times a field called \a fieldName occurs in the record. Returns 0 if no field by that name could be found. */ -TQSqlRecordInfo::size_type TQSqlRecordInfo::tqcontains( const TQString& fieldName ) const +TQSqlRecordInfo::size_type TQSqlRecordInfo::contains( const TQString& fieldName ) const { size_type i = 0; TQString fName = fieldName.upper(); @@ -735,7 +735,7 @@ TQSqlRecordInfo::size_type TQSqlRecordInfo::tqcontains( const TQString& fieldNam which has the field name \a fieldName. If no matching field is found then an empty TQSqlFieldInfo object is returned. */ -TQSqlFieldInfo TQSqlRecordInfo::tqfind( const TQString& fieldName ) const +TQSqlFieldInfo TQSqlRecordInfo::find( const TQString& fieldName ) const { TQString fName = fieldName.upper(); for( const_iterator it = begin(); it != end(); ++it ) { diff --git a/tqtinterface/qt4/src/sql/tqsqlrecord.h b/tqtinterface/qt4/src/sql/tqsqlrecord.h index 1dd99a3..60c4a30 100644 --- a/tqtinterface/qt4/src/sql/tqsqlrecord.h +++ b/tqtinterface/qt4/src/sql/tqsqlrecord.h @@ -96,7 +96,7 @@ public: virtual void remove( int pos ); bool isEmpty() const; - bool tqcontains( const TQString& name ) const; + bool contains( const TQString& name ) const; virtual void clear(); virtual void clearValues( bool nullify = FALSE ); uint count() const; @@ -130,8 +130,8 @@ public: TQSqlRecordInfo( const TQSqlFieldInfoList& other ): TQSqlFieldInfoList( other ) {} TQSqlRecordInfo( const TQSqlRecord& other ); - size_type tqcontains( const TQString& fieldName ) const; - TQSqlFieldInfo tqfind( const TQString& fieldName ) const; + size_type contains( const TQString& fieldName ) const; + TQSqlFieldInfo find( const TQString& fieldName ) const; TQSqlRecord toRecord() const; }; diff --git a/tqtinterface/qt4/src/styles/qt_styles.pri b/tqtinterface/qt4/src/styles/qt_styles.pri index baf36d5..1dc8983 100644 --- a/tqtinterface/qt4/src/styles/qt_styles.pri +++ b/tqtinterface/qt4/src/styles/qt_styles.pri @@ -10,19 +10,19 @@ styles { $$STYLES_CPP/tqstyleplugin.cpp \ $$STYLES_CPP/tqcommonstyle.cpp - tqcontains( styles, all ) { + contains( styles, all ) { styles += mac cde motifplus sgi platinum compact interlace windows motif } x11|embedded|!macx-*:styles -= mac - tqcontains( styles, mac ) { + contains( styles, mac ) { HEADERS +=$$STYLES_H/tqmacstyle_mac.h \ $$STYLES_H/tqmacstylepixmaps_mac_p.h SOURCES +=$$STYLES_CPP/tqmacstyle_mac.cpp HEADERS *= $$STYLES_CPP/tqaquastyle_p.h SOURCES *= $$STYLES_CPP/tqaquastyle_p.cpp - !tqcontains( styles, windows ) { + !contains( styles, windows ) { message( mac requires windows ) styles += windows } @@ -30,84 +30,84 @@ styles { else:DEFINES += TQT_NO_STYLE_MAC #embedded|!macx-*:styles -= aqua - tqcontains( styles, aqua ) { + contains( styles, aqua ) { HEADERS += $$STYLES_H/tqaquastyle.h SOURCES += $$STYLES_CPP/tqaquastyle.cpp HEADERS *= $$STYLES_CPP/tqaquastyle_p.h SOURCES *= $$STYLES_CPP/tqaquastyle_p.cpp - !tqcontains( styles, windows ) { + !contains( styles, windows ) { message( aqua requires windows ) styles += windows } } else:DEFINES += TQT_NO_STYLE_AQUA - tqcontains( styles, cde ) { + contains( styles, cde ) { HEADERS +=$$STYLES_H/tqcdestyle.h SOURCES +=$$STYLES_CPP/tqcdestyle.cpp - !tqcontains( styles, motif ) { + !contains( styles, motif ) { message( cde requires motif ) styles += motif } } else:DEFINES += TQT_NO_STYLE_CDE - tqcontains( styles, motifplus ) { + contains( styles, motifplus ) { HEADERS +=$$STYLES_H/tqmotifplusstyle.h SOURCES +=$$STYLES_CPP/tqmotifplusstyle.cpp - !tqcontains( styles, motif ) { + !contains( styles, motif ) { message( motifplus requires motif ) styles += motif } } else:DEFINES += TQT_NO_STYLE_MOTIFPLUS - tqcontains( styles, interlace ) { + contains( styles, interlace ) { HEADERS +=$$STYLES_H/tqinterlacestyle.h SOURCES +=$$STYLES_CPP/tqinterlacestyle.cpp - !tqcontains( styles, windows ) { + !contains( styles, windows ) { message( interlace requires windows ) styles += windows } } else:DEFINES += TQT_NO_STYLE_INTERLACE - tqcontains( styles, platinum ) { + contains( styles, platinum ) { HEADERS +=$$STYLES_H/tqplatinumstyle.h SOURCES +=$$STYLES_CPP/tqplatinumstyle.cpp - !tqcontains( styles, windows ) { + !contains( styles, windows ) { message( platinum requires windows ) styles += windows } } else:DEFINES += TQT_NO_STYLE_PLATINUM - tqcontains( styles, windowsxp ) { + contains( styles, windowsxp ) { HEADERS +=$$STYLES_H/tqwindowsxpstyle.h SOURCES +=$$STYLES_CPP/tqwindowsxpstyle.cpp - !tqcontains( styles, windowsxp ) { + !contains( styles, windowsxp ) { message( windowsxp requires windows ) styles += windows } } else:DEFINES += TQT_NO_STYLE_WINDOWSXP - tqcontains( styles, sgi ) { + contains( styles, sgi ) { HEADERS +=$$STYLES_H/tqsgistyle.h SOURCES +=$$STYLES_CPP/tqsgistyle.cpp - !tqcontains( styles, motif ) { + !contains( styles, motif ) { message( sgi requires motif ) styles += motif } } else:DEFINES += TQT_NO_STYLE_SGI - tqcontains( styles, compact ) { + contains( styles, compact ) { HEADERS +=$$STYLES_H/tqcompactstyle.h SOURCES +=$$STYLES_CPP/tqcompactstyle.cpp - !tqcontains( styles, windows ) { + !contains( styles, windows ) { message( compact requires windows ) styles += windows } @@ -115,24 +115,24 @@ styles { else:DEFINES += TQT_NO_STYLE_COMPACT wince-*:styles += pocketpc - tqcontains( styles, pocketpc ) { + contains( styles, pocketpc ) { HEADERS +=$$STYLES_H/tqpocketpcstyle_wce.h SOURCES +=$$STYLES_CPP/tqpocketpcstyle_wce.cpp - !tqcontains( styles, windows ) { + !contains( styles, windows ) { message( pocketpc requires windows ) styles += windows } } else:DEFINES += TQT_NO_STYLE_POCKETPC - tqcontains( styles, windows ) { + contains( styles, windows ) { HEADERS +=$$STYLES_H/tqwindowsstyle.h SOURCES +=$$STYLES_CPP/tqwindowsstyle.cpp } else:DEFINES += TQT_NO_STYLE_WINDOWS - tqcontains( styles, motif ) { + contains( styles, motif ) { HEADERS +=$$STYLES_H/tqmotifstyle.h SOURCES +=$$STYLES_CPP/tqmotifstyle.cpp } diff --git a/tqtinterface/qt4/src/styles/tqcommonstyle.cpp b/tqtinterface/qt4/src/styles/tqcommonstyle.cpp index 79439b9..8ab5d91 100644 --- a/tqtinterface/qt4/src/styles/tqcommonstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqcommonstyle.cpp @@ -2182,7 +2182,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(TQ_ComplexControl control, while (ret == SC_None && ctrl <= SC_ScrollBarGroove) { r = querySubControlMetrics(control, widget, (TQStyle::SubControl) ctrl, opt); - if (r.isValid() && r.tqcontains(pos)) + if (r.isValid() && r.contains(pos)) ret = (TQStyle::SubControl) ctrl; ctrl <<= 1; @@ -2201,7 +2201,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(TQ_ComplexControl control, // we can do this because subcontrols were designed to be masks as well... while (ret == SC_None && ctrl <= SC_TitleBarUnshadeButton) { r = tqvisualRect( querySubControlMetrics( control, widget, (TQStyle::SubControl) ctrl, opt ), widget ); - if (r.isValid() && r.tqcontains(pos)) + if (r.isValid() && r.contains(pos)) ret = (TQStyle::SubControl) ctrl; ctrl <<= 1; @@ -2608,7 +2608,7 @@ TQSize TQCommonStyle::tqsizeFromContents(ContentsType contents, } if (! mi->text().isNull()) { - if (mi->text().tqfind('\t') >= 0) + if (mi->text().find('\t') >= 0) w += 12; } diff --git a/tqtinterface/qt4/src/styles/tqcompactstyle.cpp b/tqtinterface/qt4/src/styles/tqcompactstyle.cpp index 44cd711..7f90df9 100644 --- a/tqtinterface/qt4/src/styles/tqcompactstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqcompactstyle.cpp @@ -94,7 +94,7 @@ static int extraPopupMenuItemWidth( bool checkable, int maxpmw, TQMenuItem* mi, w += mi->pixmap()->width(); // pixmap only if ( !mi->text().isNull() ) { - if ( mi->text().tqfind('\t') >= 0 ) // string tqcontains tab + if ( mi->text().find('\t') >= 0 ) // string contains tab w += motifTabSpacing; } @@ -265,7 +265,7 @@ void TQCompactStyle::tqdrawControl( ControlElement element, TQPainter *p, const } TQString s = mi->text(); if ( !s.isNull() ) { // draw text - int t = s.tqfind( '\t' ); + int t = s.find( '\t' ); int m = motifItemVMargin; const int text_flags = AlignVCenter|ShowPrefix | DontClip | SingleLine; if ( t >= 0 ) { // draw tab text diff --git a/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp b/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp index bef75db..c10183c 100644 --- a/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqmotifplusstyle.cpp @@ -859,7 +859,7 @@ void TQMotifPlusStyle::tqdrawControl( TQ_ControlElement element, TQString s = mi->text(); if ( !s.isNull() ) { // draw text - int t = s.tqfind( '\t' ); + int t = s.find( '\t' ); int m = 2; int text_flags = TQt::AlignVCenter|TQt::ShowPrefix | TQt::DontClip | TQt::SingleLine; text_flags |= (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft ); @@ -1127,15 +1127,15 @@ void TQMotifPlusStyle::tqdrawComplexControl(TQ_ComplexControl control, bool skipUpdate = FALSE; if (singleton->hovering) { - if (addline.tqcontains(singleton->mousePos)) { + if (addline.contains(singleton->mousePos)) { skipUpdate = (singleton->scrollbarElement == SC_ScrollBarAddLine); singleton->scrollbarElement = SC_ScrollBarAddLine; - } else if (subline.tqcontains(singleton->mousePos)) { + } else if (subline.contains(singleton->mousePos)) { skipUpdate = (singleton->scrollbarElement == SC_ScrollBarSubLine); singleton->scrollbarElement = SC_ScrollBarSubLine; - } else if (slider.tqcontains(singleton->mousePos)) { + } else if (slider.contains(singleton->mousePos)) { skipUpdate = (singleton->scrollbarElement == SC_ScrollBarSlider); singleton->scrollbarElement = SC_ScrollBarSlider; @@ -1353,7 +1353,7 @@ void TQMotifPlusStyle::tqdrawComplexControl(TQ_ComplexControl control, } if ((controls & SC_SliderHandle) && handle.isValid()) { - if ((mouseover && handle.tqcontains(singleton->mousePos)) || + if ((mouseover && handle.contains(singleton->mousePos)) || singleton->sliderActive) flags |= Style_MouseOver; else diff --git a/tqtinterface/qt4/src/styles/tqmotifstyle.cpp b/tqtinterface/qt4/src/styles/tqmotifstyle.cpp index 257c0ad..b05c46d 100644 --- a/tqtinterface/qt4/src/styles/tqmotifstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqmotifstyle.cpp @@ -1122,7 +1122,7 @@ void TQMotifStyle::tqdrawControl( TQ_ControlElement element, } TQString s = mi->text(); if ( !s.isNull() ) { // draw text - int t = s.tqfind( '\t' ); + int t = s.find( '\t' ); int m = motifItemVMargin; int text_flags = TQt::AlignVCenter|TQt::ShowPrefix | TQt::DontClip | TQt::SingleLine; text_flags |= (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft ); @@ -1777,8 +1777,8 @@ TQSize TQMotifStyle::tqsizeFromContents( ContentsType contents, // a little bit of border can never harm w += 2*motifItemHMargin + 2*motifItemFrame; - if ( !mi->text().isNull() && mi->text().tqfind('\t') >= 0 ) - // string tqcontains tab + if ( !mi->text().isNull() && mi->text().find('\t') >= 0 ) + // string contains tab w += motifTabSpacing; else if (mi->popup()) // submenu indicator needs some room if we don't have a tab column diff --git a/tqtinterface/qt4/src/styles/tqsgistyle.cpp b/tqtinterface/qt4/src/styles/tqsgistyle.cpp index 6b8a17b..45ac25b 100644 --- a/tqtinterface/qt4/src/styles/tqsgistyle.cpp +++ b/tqtinterface/qt4/src/styles/tqsgistyle.cpp @@ -487,7 +487,7 @@ static void drawSGIPrefix( TQPainter *p, int x, int y, TQString* miText ) if ( miText && (!!(*miText)) ) { int amp = 0; bool nextAmp = FALSE; - while ( ( amp = miText->tqfind( '&', amp ) ) != -1 ) { + while ( ( amp = miText->find( '&', amp ) ) != -1 ) { if ( (uint)amp == miText->length()-1 ) return; miText->remove( amp,1 ); @@ -795,7 +795,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe, break; case PE_ScrollBarSubLine: - if ( !r.tqcontains( d->mousePos ) && !(flags & Style_Active) ) + if ( !r.contains( d->mousePos ) && !(flags & Style_Active) ) flags &= ~Style_MouseOver; tqdrawPrimitive( PE_ButtonCommand, p, r, cg, flags, opt ); tqdrawPrimitive(((flags & Style_Horizontal) ? PE_ArrowLeft : PE_ArrowUp), @@ -803,7 +803,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe, break; case PE_ScrollBarAddLine: - if ( !r.tqcontains( d->mousePos ) ) + if ( !r.contains( d->mousePos ) ) flags &= ~Style_MouseOver; tqdrawPrimitive( PE_ButtonCommand, p, r, cg, flags, opt ); tqdrawPrimitive(((flags & Style_Horizontal) ? PE_ArrowRight : PE_ArrowDown), @@ -812,7 +812,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe, case PE_ScrollBarSubPage: case PE_ScrollBarAddPage: - if ( !r.tqcontains( d->mousePos ) ) + if ( !r.contains( d->mousePos ) ) flags &= ~Style_MouseOver; if ( r.isValid() ) qDrawShadePanel( p, x, y, w, h, cg, FALSE, 1, hot ? &cg.brush( TQColorGroup::Midlight ) : &cg.brush( TQColorGroup::Button ) ); @@ -822,7 +822,7 @@ void TQSGIStyle::tqdrawPrimitiveBase( TQ_PrimitiveElement pe, { if ( !r.isValid() ) break; - if ( !(r.tqcontains( d->mousePos ) || flags & Style_Active) || !(flags & Style_Enabled ) ) + if ( !(r.contains( d->mousePos ) || flags & Style_Active) || !(flags & Style_Enabled ) ) flags &= ~Style_MouseOver; TQPixmap pm( r.width(), r.height() ); @@ -1056,7 +1056,7 @@ void TQSGIStyle::tqdrawControl( TQ_ControlElement element, TQString s = mi->text(); if ( !!s ) { - int t = s.tqfind( '\t' ); + int t = s.find( '\t' ); int m = sgiItemVMargin; const int text_flags = TQt::AlignVCenter | TQt::DontClip | TQt::SingleLine; //special underline for &x @@ -1195,7 +1195,7 @@ void TQSGIStyle::tqdrawComplexControl( TQ_ComplexControl control, } if (( sub & SC_SliderHandle ) && handle.isValid()) { - if ( flags & Style_MouseOver && !handle.tqcontains( d->mousePos ) && subActive != SC_SliderHandle ) + if ( flags & Style_MouseOver && !handle.contains( d->mousePos ) && subActive != SC_SliderHandle ) flags &= ~Style_MouseOver; tqdrawPrimitive( PE_ButtonBevel, p, handle, cg, flags ); diff --git a/tqtinterface/qt4/src/styles/tqstylefactory.cpp b/tqtinterface/qt4/src/styles/tqstylefactory.cpp index 42f1c2f..6d72738 100644 --- a/tqtinterface/qt4/src/styles/tqstylefactory.cpp +++ b/tqtinterface/qt4/src/styles/tqstylefactory.cpp @@ -212,39 +212,39 @@ TQStringList TQStyleFactory::keys() #endif //TQT_NO_COMPONENT #ifndef TQT_NO_STYLE_WINDOWS - if ( !list.tqcontains( "Windows" ) ) + if ( !list.contains( "Windows" ) ) list << "Windows"; #endif #ifndef TQT_NO_STYLE_WINDOWSXP - if ( !list.tqcontains( "WindowsXP" ) && TQWindowsXPStyle::resolveSymbols() ) + if ( !list.contains( "WindowsXP" ) && TQWindowsXPStyle::resolveSymbols() ) list << "WindowsXP"; #endif #ifndef TQT_NO_STYLE_MOTIF - if ( !list.tqcontains( "Motif" ) ) + if ( !list.contains( "Motif" ) ) list << "Motif"; #endif #ifndef TQT_NO_STYLE_CDE - if ( !list.tqcontains( "CDE" ) ) + if ( !list.contains( "CDE" ) ) list << "CDE"; #endif #ifndef TQT_NO_STYLE_MOTIFPLUS - if ( !list.tqcontains( "MotifPlus" ) ) + if ( !list.contains( "MotifPlus" ) ) list << "MotifPlus"; #endif #ifndef TQT_NO_STYLE_PLATINUM - if ( !list.tqcontains( "Platinum" ) ) + if ( !list.contains( "Platinum" ) ) list << "Platinum"; #endif #ifndef TQT_NO_STYLE_SGI - if ( !list.tqcontains( "SGI" ) ) + if ( !list.contains( "SGI" ) ) list << "SGI"; #endif #ifndef TQT_NO_STYLE_COMPACT - if ( !list.tqcontains( "Compact" ) ) + if ( !list.contains( "Compact" ) ) list << "Compact"; #endif #ifndef TQT_NO_STYLE_ATQUA - if ( !list.tqcontains( "Aqua" ) ) + if ( !list.contains( "Aqua" ) ) list << "Aqua"; #endif #if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC ) @@ -257,7 +257,7 @@ TQStringList TQStyleFactory::keys() if(!GetCollectionItem(c, kThemeNameTag, 0, &s, &str)) mstyle += " (" + p2qstring(str) + ")"; } - if (!list.tqcontains(mstyle)) + if (!list.contains(mstyle)) list << mstyle; DisposeCollection(c); #endif diff --git a/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp b/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp index aa65a5b..5a25f3d 100644 --- a/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp +++ b/tqtinterface/qt4/src/styles/tqwindowsstyle.cpp @@ -121,7 +121,7 @@ TQWindowsStyle::Private::Private(TQWindowsStyle *tqparent) bool TQWindowsStyle::Private::hasSeenAlt(const TQWidget *widget) const { widget = widget->tqtopLevelWidget(); - return seenAlt.tqcontains(widget); + return seenAlt.contains(widget); } // Records Alt- and Focus events @@ -137,7 +137,7 @@ bool TQWindowsStyle::Private::eventFilter(TQObject *o, TQEvent *e) if (((TQKeyEvent*)e)->key() == Qt::Key_Alt) { widget = widget->tqtopLevelWidget(); - // Alt has been pressed - tqfind all widgets that care + // Alt has been pressed - find all widgets that care TQObjectList *l = widget->queryList("TQWidget"); TQObjectListIt it( *l ); TQWidget *w; @@ -976,7 +976,7 @@ void TQWindowsStyle::tqdrawControl( TQ_ControlElement element, } TQString s = mi->text(); if ( !s.isNull() ) { // draw text - int t = s.tqfind( '\t' ); + int t = s.find( '\t' ); int text_flags = TQt::AlignVCenter|TQt::ShowPrefix | TQt::DontClip | TQt::SingleLine; if (!tqstyleHint(SH_UnderlineAccelerator, widget)) text_flags |= TQt::NoAccel; @@ -1232,7 +1232,7 @@ TQSize TQWindowsStyle::tqsizeFromContents( ContentsType contents, 2*windowsItemFrame); } - if (! mi->text().isNull() && mi->text().tqfind('\t') >= 0) { + if (! mi->text().isNull() && mi->text().find('\t') >= 0) { if ( use2000style ) w += 20; else diff --git a/tqtinterface/qt4/src/table/tqtable.cpp b/tqtinterface/qt4/src/table/tqtable.cpp index 1e2ccb7..cb1d068 100644 --- a/tqtinterface/qt4/src/table/tqtable.cpp +++ b/tqtinterface/qt4/src/table/tqtable.cpp @@ -214,7 +214,7 @@ static bool isRowSelection( TQTable::SelectionMode selMode ) function expands the selection rectangle to include additional cells. - There are various access functions to tqfind out about the area: + There are various access functions to find out about the area: anchorRow() and anchorCol() return the anchor's position; leftCol(), rightCol(), topRow() and bottomRow() return the rectangle's four edges. All four are part of the selection. @@ -423,7 +423,7 @@ int TQTableSelection::numCols() const to create very large tables you may prefer an alternative approach to using TQTableItems: see the notes on large tables. - A TQTableItem tqcontains a cell's data, by default, a string and a + A TQTableItem contains a cell's data, by default, a string and a pixmap. The table item also holds the cell's display size and how the data should be aligned. The table item specifies the cell's \l EditType and the editor used for in-place editing (by default a @@ -441,7 +441,7 @@ int TQTableSelection::numCols() const customize how your table items will sort. Table items are inserted into a table using TQTable::setItem(). If - you insert an item into a cell that already tqcontains a table item + you insert an item into a cell that already contains a table item the original item will be deleted. Example: @@ -488,7 +488,7 @@ int TQTableSelection::numCols() const } \endcode - By default, table items may be tqreplaced by new TQTableItems + By default, table items may be replaced by new TQTableItems during the lifetime of a TQTable. Therefore, if you create your own subclass of TQTableItem, and you want to ensure that this does not happen, you must call setReplaceable(FALSE) @@ -903,11 +903,11 @@ TQTableItem::EditType TQTableItem::editType() const } /*! - If \a b is TRUE it is acceptable to tqreplace the contents of the + If \a b is TRUE it is acceptable to replace the contents of the cell with the contents of another TQTableItem. If \a b is FALSE the - contents of the cell may not be tqreplaced by the contents of + contents of the cell may not be replaced by the contents of another table item. Table items that span more than one cell may - not have their contents tqreplaced by another table item. + not have their contents replaced by another table item. (This differs from \l EditType because EditType is concerned with whether the \e user is able to change the contents of a cell.) @@ -922,9 +922,9 @@ void TQTableItem::setReplaceable( bool b ) /*! This function returns whether the contents of the cell may be - tqreplaced with the contents of another table item. Regardless of + replaced with the contents of another table item. Regardless of this setting, table items that span more than one cell may not - have their contents tqreplaced by another table item. + have their contents replaced by another table item. (This differs from \l EditType because EditType is concerned with whether the \e user is able to change the contents of a cell.) @@ -975,7 +975,7 @@ TQSize TQTableItem::tqsizeHint() const } TQString t = text(); - if ( !wordwrap && t.tqfind( '\n' ) == -1 ) + if ( !wordwrap && t.find( '\n' ) == -1 ) return TQSize( s.width() + table()->fontMetrics().width( text() ) + 10, TQMAX( s.height(), table()->fontMetrics().height() ) ).expandedTo( strutSize ); @@ -1215,7 +1215,7 @@ int TQComboTableItem::fakeRef = 0; TRUE the user may type in new list items; if \a editable is FALSE the user may only select from the list of items provided. - By default TQComboTableItems cannot be tqreplaced by other table + By default TQComboTableItems cannot be replaced by other table items since isReplaceable() returns FALSE by default. \sa TQTable::clearCell() EditType @@ -1350,7 +1350,7 @@ void TQComboTableItem::setCurrentItem( int i ) void TQComboTableItem::setCurrentItem( const TQString &s ) { - int i = entries.tqfindIndex( s ); + int i = entries.findIndex( s ); if ( i != -1 ) setCurrentItem( i ); } @@ -2210,7 +2210,7 @@ void TQTable::setReadOnly( bool b ) void TQTable::setRowReadOnly( int row, bool ro ) { if ( ro ) - roRows.tqreplace( row, new int( 0 ) ); + roRows.replace( row, new int( 0 ) ); else roRows.remove( row ); @@ -2240,7 +2240,7 @@ void TQTable::setRowReadOnly( int row, bool ro ) void TQTable::setColumnReadOnly( int col, bool ro ) { if ( ro ) - roCols.tqreplace( col, new int( 0 ) ); + roCols.replace( col, new int( 0 ) ); else roCols.remove( col ); @@ -2285,7 +2285,7 @@ bool TQTable::isReadOnly() const bool TQTable::isRowReadOnly( int row ) const { - return (roRows.tqfind( row ) != 0); + return (roRows.find( row ) != 0); } /*! @@ -2301,7 +2301,7 @@ bool TQTable::isRowReadOnly( int row ) const bool TQTable::isColumnReadOnly( int col ) const { - return (roCols.tqfind( col ) != 0); + return (roCols.find( col ) != 0); } void TQTable::setSelectionMode( SelectionMode mode ) @@ -2396,7 +2396,7 @@ void TQTable::updateHeaderStates() /*! Returns the table's top TQHeader. - This header tqcontains the column labels. + This header contains the column labels. To modify a column label use TQHeader::setLabel(), e.g. \quotefile table/statistics/statistics.cpp @@ -2414,7 +2414,7 @@ TQHeader *TQTable::horizontalHeader() const /*! Returns the table's vertical TQHeader. - This header tqcontains the row labels. + This header contains the row labels. \sa horizontalHeader() setLeftMargin() TQHeader */ @@ -3088,7 +3088,7 @@ TQTableItem *TQTable::item( int row, int col ) const /*! Inserts the table item \a item into the table at row \a row, column \a col, and repaints the cell. If a table item already - exists in this cell it is deleted and tqreplaced with \a item. The + exists in this cell it is deleted and replaced with \a item. The table takes ownership of the table item. If you don't use \l{TQTableItem}s you may need to reimplement this @@ -3145,7 +3145,7 @@ void TQTable::clearCell( int row, int col ) If the cell does not contain a table item a TQTableItem is created with an \link TQTableItem::EditType EditType\endlink of \c OnTyping, - otherwise the existing table item's text (if any) is tqreplaced with + otherwise the existing table item's text (if any) is replaced with \a text. \sa text() setPixmap() setItem() TQTableItem::setText() @@ -3170,7 +3170,7 @@ void TQTable::setText( int row, int col, const TQString &text ) If the cell does not contain a table item a TQTableItem is created with an \link TQTableItem::EditType EditType\endlink of \c OnTyping, - otherwise the existing table item's pixmap (if any) is tqreplaced + otherwise the existing table item's pixmap (if any) is replaced with \a pix. Note that \l{TQComboTableItem}s and \l{TQCheckTableItem}s don't show @@ -3209,7 +3209,7 @@ TQString TQTable::text( int row, int col ) const /*! Returns the pixmap set for the cell at \a row, \a col, or a - null-pixmap if the cell tqcontains no pixmap. + null-pixmap if the cell contains no pixmap. \sa setPixmap() */ @@ -3557,7 +3557,7 @@ int TQTable::currentSelection() const { if ( !currentSel ) return -1; - return ( (TQTable*)this )->selections.tqfindRef( currentSel ); + return ( (TQTable*)this )->selections.findRef( currentSel ); } /*! Selects the range starting at \a start_row and \a start_col and @@ -3626,7 +3626,7 @@ void TQTable::contentsMousePressEventEx( TQMouseEvent* e ) { shouldClearSelection = FALSE; if ( isEditing() ) { - if ( !cellGeometry( editRow, editCol ).tqcontains( e->pos() ) ) { + if ( !cellGeometry( editRow, editCol ).contains( e->pos() ) ) { endEdit( editRow, editCol, TRUE, edMode != Editing ); } else { e->ignore(); @@ -4010,7 +4010,7 @@ bool TQTable::eventFilter( TQObject *o, TQEvent *e ) int cc = TQMIN( numCols() - 1, currentColumn() + 1 ); while ( cc < numCols() ) { TQTableItem *i = item( currentRow(), cc ); - if ( !d->hiddenCols.tqfind( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) + if ( !d->hiddenCols.find( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) break; ++cc; } @@ -4021,7 +4021,7 @@ bool TQTable::eventFilter( TQObject *o, TQEvent *e ) int cc = TQMAX( 0, currentColumn() - 1 ); while ( cc >= 0 ) { TQTableItem *i = item( currentRow(), cc ); - if ( !d->hiddenCols.tqfind( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) + if ( !d->hiddenCols.find( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) break; --cc; } @@ -4047,7 +4047,7 @@ bool TQTable::eventFilter( TQObject *o, TQEvent *e ) } } else { TQObjectList *l = viewport()->queryList( "TQWidget" ); - if ( l && l->tqfind( o ) != -1 ) { + if ( l && l->find( o ) != -1 ) { delete l; TQKeyEvent *ke = (TQKeyEvent*)e; if ( ( ke->state() & ControlButton ) == ControlButton || @@ -4191,7 +4191,7 @@ void TQTable::keyPressEvent( TQKeyEvent* e ) int cc = TQMIN( numCols() - 1, currentColumn() + 1 ); while ( cc < numCols() ) { TQTableItem *i = item( currentRow(), cc ); - if ( !d->hiddenCols.tqfind( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) + if ( !d->hiddenCols.find( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) break; ++cc; } @@ -4202,7 +4202,7 @@ void TQTable::keyPressEvent( TQKeyEvent* e ) int cc = TQMAX( 0, currentColumn() - 1 ); while ( cc >= 0 ) { TQTableItem *i = item( currentRow(), cc ); - if ( !d->hiddenCols.tqfind( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) + if ( !d->hiddenCols.find( cc ) && !isColumnReadOnly( cc ) && (!i || i->isEnabled()) ) break; --cc; } @@ -4922,7 +4922,7 @@ void TQTable::setNumRows( int r ) if (r < numRows()) { // Removed rows are no longer hidden, and should thus be removed from "hiddenRows" for (int rr = numRows()-1; rr >= r; --rr) { - if (d->hiddenRows.tqfind(rr)) + if (d->hiddenRows.find(rr)) d->hiddenRows.remove(rr); } } @@ -4971,7 +4971,7 @@ void TQTable::setNumCols( int c ) if (c < numCols()) { // Removed columns are no longer hidden, and should thus be removed from "hiddenCols" for (int cc = numCols()-1; cc >= c; --cc) { - if (d->hiddenCols.tqfind(cc)) + if (d->hiddenCols.find(cc)) d->hiddenCols.remove(cc); } } @@ -5026,7 +5026,7 @@ void TQTable::setColumnLabels( const TQStringList &labels ) If \a initFromCell is TRUE, the editor is used to edit the current contents of the cell (so the editor widget should be initialized with this content). If \a initFromCell is FALSE, the content of - the cell is tqreplaced with the new content which the user entered + the cell is replaced with the new content which the user entered into the widget created by this function. The default functionality is as follows: if \a initFromCell is @@ -5093,8 +5093,8 @@ TQWidget *TQTable::createEditor( int row, int col, bool initFromCell ) const \a row, \a col. Editing is achieved by creating an editor (createEditor() is called) and setting the cell's editor with setCellWidget() to the newly created editor. (After editing is - complete endEdit() will be called to tqreplace the cell's content - with the editor's content.) If \a tqreplace is TRUE the editor will + complete endEdit() will be called to replace the cell's content + with the editor's content.) If \a replace is TRUE the editor will start empty; otherwise it will be initialized with the cell's content (if any), i.e. the user will be modifying the original cell content. @@ -5102,7 +5102,7 @@ TQWidget *TQTable::createEditor( int row, int col, bool initFromCell ) const \sa endEdit() */ -TQWidget *TQTable::beginEdit( int row, int col, bool tqreplace ) +TQWidget *TQTable::beginEdit( int row, int col, bool replace ) { if ( isReadOnly() || isRowReadOnly( row ) || isColumnReadOnly( col ) ) return 0; @@ -5115,7 +5115,7 @@ TQWidget *TQTable::beginEdit( int row, int col, bool tqreplace ) if ( cellWidget( row, col ) ) return 0; ensureCellVisible( row, col ); - TQWidget *e = createEditor( row, col, !tqreplace ); + TQWidget *e = createEditor( row, col, !replace ); if ( !e ) return 0; setCellWidget( row, col, e ); @@ -5133,13 +5133,13 @@ TQWidget *TQTable::beginEdit( int row, int col, bool tqreplace ) returns and the cell's contents are left unchanged. If \a accept is TRUE the content of the editor must be transferred - to the relevant cell. If \a tqreplace is TRUE the current content of - this cell should be tqreplaced by the content of the editor (this + to the relevant cell. If \a replace is TRUE the current content of + this cell should be replaced by the content of the editor (this means removing the current TQTableItem of the cell and creating a new one for the cell). Otherwise (if possible) the content of the editor should just be set to the existing TQTableItem of this cell. - setCellContentFromEditor() is called to tqreplace the contents of + setCellContentFromEditor() is called to replace the contents of the cell with the contents of the cell's editor. Finally clearCellWidget() is called to remove the editor widget. @@ -5147,7 +5147,7 @@ TQWidget *TQTable::beginEdit( int row, int col, bool tqreplace ) \sa setCellContentFromEditor(), beginEdit() */ -void TQTable::endEdit( int row, int col, bool accept, bool tqreplace ) +void TQTable::endEdit( int row, int col, bool accept, bool replace ) { TQWidget *editor = cellWidget( row, col ); if ( !editor ) @@ -5168,7 +5168,7 @@ void TQTable::endEdit( int row, int col, bool accept, bool tqreplace ) if ( i ) oldContent = i->text(); - if ( !i || tqreplace ) { + if ( !i || replace ) { setCellContentFromEditor( row, col ); i = item( row, col ); } else { @@ -5188,7 +5188,7 @@ void TQTable::endEdit( int row, int col, bool accept, bool tqreplace ) } /*! - This function is called to tqreplace the contents of the cell at \a + This function is called to replace the contents of the cell at \a row, \a col with the contents of the cell's editor. If there already exists a TQTableItem for the cell, @@ -5491,17 +5491,17 @@ TQRect TQTable::rangeGeometry( int topRow, int leftCol, void TQTable::activateNextCell() { int firstRow = 0; - while ( d->hiddenRows.tqfind( firstRow ) ) + while ( d->hiddenRows.find( firstRow ) ) firstRow++; int firstCol = 0; - while ( d->hiddenCols.tqfind( firstCol ) ) + while ( d->hiddenCols.find( firstCol ) ) firstCol++; int nextRow = curRow; int nextCol = curCol; - while ( d->hiddenRows.tqfind( ++nextRow ) ); + while ( d->hiddenRows.find( ++nextRow ) ); if ( nextRow >= numRows() ) { nextRow = firstRow; - while ( d->hiddenCols.tqfind( ++nextCol ) ); + while ( d->hiddenCols.find( ++nextCol ) ); if ( nextCol >= numCols() ) nextCol = firstCol; } @@ -5657,9 +5657,9 @@ void TQTable::sortColumn( int col, bool ascending, bool wholeRows ) void TQTable::hideRow( int row ) { - if ( d->hiddenRows.tqfind( row ) ) + if ( d->hiddenRows.find( row ) ) return; - d->hiddenRows.tqreplace( row, new int( leftHeader->sectionSize( row ) ) ); + d->hiddenRows.replace( row, new int( leftHeader->sectionSize( row ) ) ); leftHeader->resizeSection( row, 0 ); leftHeader->setResizeEnabled( FALSE, row ); if ( isRowStretchable(row) ) @@ -5683,9 +5683,9 @@ void TQTable::hideRow( int row ) void TQTable::hideColumn( int col ) { - if ( !numCols() || d->hiddenCols.tqfind( col ) ) + if ( !numCols() || d->hiddenCols.find( col ) ) return; - d->hiddenCols.tqreplace( col, new int( topHeader->sectionSize( col ) ) ); + d->hiddenCols.replace( col, new int( topHeader->sectionSize( col ) ) ); topHeader->resizeSection( col, 0 ); topHeader->setResizeEnabled( FALSE, col ); if ( isColumnStretchable(col) ) @@ -5709,7 +5709,7 @@ void TQTable::hideColumn( int col ) void TQTable::showRow( int row ) { - int *h = d->hiddenRows.tqfind( row ); + int *h = d->hiddenRows.find( row ); if ( h ) { int rh = *h; d->hiddenRows.remove( row ); @@ -5730,7 +5730,7 @@ void TQTable::showRow( int row ) void TQTable::showColumn( int col ) { - int *w = d->hiddenCols.tqfind( col ); + int *w = d->hiddenCols.find( col ); if ( w ) { int cw = *w; d->hiddenCols.remove( col ); @@ -5751,7 +5751,7 @@ void TQTable::showColumn( int col ) */ bool TQTable::isRowHidden( int row ) const { - return d->hiddenRows.tqfind( row ); + return d->hiddenRows.find( row ); } /*! @@ -5762,7 +5762,7 @@ bool TQTable::isRowHidden( int row ) const */ bool TQTable::isColumnHidden( int col ) const { - return d->hiddenCols.tqfind( col ); + return d->hiddenCols.find( col ); } /*! @@ -5773,9 +5773,9 @@ bool TQTable::isColumnHidden( int col ) const void TQTable::setColumnWidth( int col, int w ) { - int *ow = d->hiddenCols.tqfind( col ); + int *ow = d->hiddenCols.find( col ); if ( ow ) { - d->hiddenCols.tqreplace( col, new int( w ) ); + d->hiddenCols.replace( col, new int( w ) ); } else { topHeader->resizeSection( col, w ); columnWidthChanged( col ); @@ -5790,9 +5790,9 @@ void TQTable::setColumnWidth( int col, int w ) void TQTable::setRowHeight( int row, int h ) { - int *oh = d->hiddenRows.tqfind( row ); + int *oh = d->hiddenRows.find( row ); if ( oh ) { - d->hiddenRows.tqreplace( row, new int( h ) ); + d->hiddenRows.replace( row, new int( h ) ); } else { leftHeader->resizeSection( row, h ); rowHeightChanged( row ); @@ -5801,7 +5801,7 @@ void TQTable::setRowHeight( int row, int h ) /*! Resizes column \a col so that the column width is wide enough to - display the widest item the column tqcontains. + display the widest item the column contains. \sa adjustRow() */ @@ -5838,7 +5838,7 @@ void TQTable::adjustColumn( int col ) /*! Resizes row \a row so that the row height is tall enough to - display the tallest item the row tqcontains. + display the tallest item the row contains. \sa adjustColumn() */ @@ -5882,7 +5882,7 @@ void TQTable::setColumnStretchable( int col, bool stretch ) { topHeader->setSectionStretchable( col, stretch ); - if ( stretch && d->hiddenCols.tqfind(col) ) + if ( stretch && d->hiddenCols.find(col) ) topHeader->numStretches--; } @@ -5902,7 +5902,7 @@ void TQTable::setRowStretchable( int row, bool stretch ) { leftHeader->setSectionStretchable( row, stretch ); - if ( stretch && d->hiddenRows.tqfind(row) ) + if ( stretch && d->hiddenRows.find(row) ) leftHeader->numStretches--; } @@ -6091,7 +6091,7 @@ void TQTable::clearCellWidget( int row, int col ) This signal is emitted when a drop event occurred on the table. - \a e tqcontains information about the drop. + \a e contains information about the drop. */ /*! @@ -6244,7 +6244,7 @@ void TQTable::removeRow( int row ) if ( row < 0 || row >= numRows() ) return; if ( row < numRows() - 1 ) { - if (d->hiddenRows.tqfind(row)) + if (d->hiddenRows.find(row)) d->hiddenRows.remove(row); for ( int i = row; i < numRows() - 1; ++i ) @@ -6294,7 +6294,7 @@ void TQTable::removeColumn( int col ) if ( col < 0 || col >= numCols() ) return; if ( col < numCols() - 1 ) { - if (d->hiddenCols.tqfind(col)) + if (d->hiddenCols.find(col)) d->hiddenCols.remove(col); for ( int i = col; i < numCols() - 1; ++i ) @@ -6335,7 +6335,7 @@ void TQTable::removeColumns( const TQMemArray<int> &cols ) /*! Starts editing the cell at \a row, \a col. - If \a tqreplace is TRUE the content of this cell will be tqreplaced by + If \a replace is TRUE the content of this cell will be replaced by the content of the editor when editing is finished, i.e. the user will be entering new data; otherwise the current content of the cell (if any) will be modified in the editor. @@ -6343,12 +6343,12 @@ void TQTable::removeColumns( const TQMemArray<int> &cols ) \sa beginEdit() */ -void TQTable::editCell( int row, int col, bool tqreplace ) +void TQTable::editCell( int row, int col, bool replace ) { if ( row < 0 || col < 0 || row > numRows() - 1 || col > numCols() - 1 ) return; - if ( beginEdit( row, col, tqreplace ) ) { + if ( beginEdit( row, col, replace ) ) { edMode = Editing; editRow = row; editCol = col; diff --git a/tqtinterface/qt4/src/table/tqtable.h b/tqtinterface/qt4/src/table/tqtable.h index d978ad2..47b37fd 100644 --- a/tqtinterface/qt4/src/table/tqtable.h +++ b/tqtinterface/qt4/src/table/tqtable.h @@ -404,7 +404,7 @@ public Q_SLOTS: virtual void removeColumn( int col ); virtual void removeColumns( const TQMemArray<int> &cols ); - virtual void editCell( int row, int col, bool tqreplace = FALSE ); + virtual void editCell( int row, int col, bool replace = FALSE ); void setRowLabels( const TQStringList &labels ); void setColumnLabels( const TQStringList &labels ); @@ -437,8 +437,8 @@ protected: virtual void activateNextCell(); virtual TQWidget *createEditor( int row, int col, bool initFromCell ) const; virtual void setCellContentFromEditor( int row, int col ); - virtual TQWidget *beginEdit( int row, int col, bool tqreplace ); - virtual void endEdit( int row, int col, bool accept, bool tqreplace ); + virtual TQWidget *beginEdit( int row, int col, bool replace ); + virtual void endEdit( int row, int col, bool accept, bool replace ); virtual void resizeData( int len ); virtual void insertWidget( int row, int col, TQWidget *w ); diff --git a/tqtinterface/qt4/src/tools/tqasciicache.h b/tqtinterface/qt4/src/tools/tqasciicache.h index 9a8d820..d783a95 100644 --- a/tqtinterface/qt4/src/tools/tqasciicache.h +++ b/tqtinterface/qt4/src/tools/tqasciicache.h @@ -75,10 +75,10 @@ public: { return TQGCache::remove_other(k); } type *take( const char *k ) { return (type *)TQGCache::take_other(k); } - type *tqfind( const char *k, bool ref=TRUE ) const - { return (type *)TQGCache::tqfind_other(k,ref);} + type *find( const char *k, bool ref=TRUE ) const + { return (type *)TQGCache::find_other(k,ref);} type *operator[]( const char *k ) const - { return (type *)TQGCache::tqfind_other(k);} + { return (type *)TQGCache::find_other(k);} void statistics() const { TQGCache::statistics(); } private: void deleteItem( Item d ); diff --git a/tqtinterface/qt4/src/tools/tqasciidict.h b/tqtinterface/qt4/src/tools/tqasciidict.h index fdab8b2..266d894 100644 --- a/tqtinterface/qt4/src/tools/tqasciidict.h +++ b/tqtinterface/qt4/src/tools/tqasciidict.h @@ -66,11 +66,11 @@ public: void insert( const char *k, const type *d ) { TQGDict::look_ascii(k,(Item)d,1); } - void tqreplace( const char *k, const type *d ) + void replace( const char *k, const type *d ) { TQGDict::look_ascii(k,(Item)d,2); } bool remove( const char *k ) { return TQGDict::remove_ascii(k); } type *take( const char *k ) { return (type *)TQGDict::take_ascii(k); } - type *tqfind( const char *k ) const + type *find( const char *k ) const { return (type *)((TQGDict*)this)->TQGDict::look_ascii(k,0,0); } type *operator[]( const char *k ) const { return (type *)((TQGDict*)this)->TQGDict::look_ascii(k,0,0); } diff --git a/tqtinterface/qt4/src/tools/tqbitarray.cpp b/tqtinterface/qt4/src/tools/tqbitarray.cpp index a741314..93bc527 100644 --- a/tqtinterface/qt4/src/tools/tqbitarray.cpp +++ b/tqtinterface/qt4/src/tools/tqbitarray.cpp @@ -507,7 +507,7 @@ TQBitArray &TQBitArray::operator^=( const TQBitArray &a ) } /*! - Returns a bit array that tqcontains the inverted bits of this bit array. + Returns a bit array that contains the inverted bits of this bit array. Example: \code diff --git a/tqtinterface/qt4/src/tools/tqcache.h b/tqtinterface/qt4/src/tools/tqcache.h index 72881d4..dd50b57 100644 --- a/tqtinterface/qt4/src/tools/tqcache.h +++ b/tqtinterface/qt4/src/tools/tqcache.h @@ -73,10 +73,10 @@ public: { return TQGCache::remove_string(k); } type *take( const TQString &k ) { return (type *)TQGCache::take_string(k); } - type *tqfind( const TQString &k, bool ref=TRUE ) const - { return (type *)TQGCache::tqfind_string(k,ref);} + type *find( const TQString &k, bool ref=TRUE ) const + { return (type *)TQGCache::find_string(k,ref);} type *operator[]( const TQString &k ) const - { return (type *)TQGCache::tqfind_string(k);} + { return (type *)TQGCache::find_string(k);} void statistics() const { TQGCache::statistics(); } private: void deleteItem( Item d ); diff --git a/tqtinterface/qt4/src/tools/tqcleanuphandler.h b/tqtinterface/qt4/src/tools/tqcleanuphandler.h index a7e5ea1..47e3484 100644 --- a/tqtinterface/qt4/src/tools/tqcleanuphandler.h +++ b/tqtinterface/qt4/src/tools/tqcleanuphandler.h @@ -60,7 +60,7 @@ public: void remove( Type **object ) { if ( !cleanupObjects ) return; - if ( cleanupObjects->tqfindRef( object ) >= 0 ) + if ( cleanupObjects->findRef( object ) >= 0 ) (void) cleanupObjects->take(); } diff --git a/tqtinterface/qt4/src/tools/tqcomlibrary.cpp b/tqtinterface/qt4/src/tools/tqcomlibrary.cpp index 253f9bf..4bbeee3 100644 --- a/tqtinterface/qt4/src/tools/tqcomlibrary.cpp +++ b/tqtinterface/qt4/src/tools/tqcomlibrary.cpp @@ -273,11 +273,11 @@ static bool tqt_parse_pattern( const char *s, uint *version, uint *flags, # include <sys/mman.h> #endif // TQ_OS_FREEBSD || TQ_OS_LINUX -static long qt_tqfind_pattern( const char *s, ulong s_len, +static long qt_find_pattern( const char *s, ulong s_len, const char *pattern, ulong p_len ) { /* - this uses the same algorithm as TQString::tqfindRev... + this uses the same algorithm as TQString::findRev... we search from the end of the file because on the supported systems, the read-only data/text segments are placed at the end @@ -358,7 +358,7 @@ static bool tqt_unix_query( const TQString &library, uint *version, uint *flags, // verify that the pattern is present in the plugin const char *pattern = "pattern=TQT_UCM_VERIFICATION_DATA"; const ulong plen = tqstrlen( pattern ); - long pos = qt_tqfind_pattern( filedata, fdlen, pattern, plen ); + long pos = qt_find_pattern( filedata, fdlen, pattern, plen ); bool ret = FALSE; if ( pos >= 0 ) { diff --git a/tqtinterface/qt4/src/tools/tqcomponentfactory.cpp b/tqtinterface/qt4/src/tools/tqcomponentfactory.cpp index 800e2b6..6aea36e 100644 --- a/tqtinterface/qt4/src/tools/tqcomponentfactory.cpp +++ b/tqtinterface/qt4/src/tools/tqcomponentfactory.cpp @@ -318,7 +318,7 @@ bool TQComponentFactory::unregisterComponent( const TQUuid &cid ) TQString version = vName.right( vName.length() - name.length() - 1 ); TQString newVerName; TQString newCidStr; - if ( version.tqfind( '.' ) == -1 ) { + if ( version.find( '.' ) == -1 ) { int ver = version.toInt(); // see if a lesser version is installed, and make that the CurVer while ( ver-- ) { diff --git a/tqtinterface/qt4/src/tools/tqcstring.cpp b/tqtinterface/qt4/src/tools/tqcstring.cpp index f81348f..4227c82 100644 --- a/tqtinterface/qt4/src/tools/tqcstring.cpp +++ b/tqtinterface/qt4/src/tools/tqcstring.cpp @@ -663,7 +663,7 @@ TQCString::TQCString( const char *str ) TQCString str( "helloworld", 6 ); // assigns "hello" to str \endcode - If \a str tqcontains a 0 byte within the first \a maxsize bytes, the + If \a str contains a 0 byte within the first \a maxsize bytes, the resulting TQCString will be terminated by this 0. If \a str is 0 a null string is created. @@ -736,7 +736,7 @@ TQCString &TQCString::operator=(const QByteArray &ba) { \note However, if you ask for the data pointer of a null TQCString by calling data(), then because the internal representation of the - null TQCString is shared, it will be detached and tqreplaced with a + null TQCString is shared, it will be detached and replaced with a non-shared, empty representation, a non-null data pointer will be returned, and subsequent calls to isNull() will return false. But if you ask for the data pointer of a null TQCString by calling @@ -755,12 +755,12 @@ TQCString &TQCString::operator=(const QByteArray &ba) { or right padded with characters using leftJustify() and rightJustify(). Characters, strings and regular expressions can be searched for using find() and findRev(), and counted using - tqcontains(). + contains(). Strings and characters can be inserted with insert() and appended with append(). A string can be prepended with prepend(). Characters can be removed from the string with remove() and - tqreplaced with tqreplace(). + replaced with replace(). Portions of a string can be extracted using left(), right() and mid(). Whitespace can be removed using stripWhiteSpace() and @@ -784,7 +784,7 @@ TQCString &TQCString::operator=(const QByteArray &ba) { Case insensitive operations and comparisons will be accurate if both strings contain only ASCII characters. (If \c $LC_CTYPE is set, most Unix systems do "the right thing".) Functions that this - affects include tqcontains(), find(), findRev(), \l operator<(), \l + affects include contains(), find(), findRev(), \l operator<(), \l operator<=(), \l operator>(), \l operator>=(), lower() and upper(). @@ -867,37 +867,37 @@ TQCString &TQCString::operator=(const QByteArray &ba) { */ /*! - \fn TQCString& TQCString::tqreplace(uint index, uint len, const char *c) + \fn TQCString& TQCString::replace(uint index, uint len, const char *c) \internal */ /*! - \fn TQCString& TQCString::tqreplace(char c, const TQCString &after) + \fn TQCString& TQCString::replace(char c, const TQCString &after) \internal */ /*! - \fn TQCString& TQCString::tqreplace(char c, const char *after) + \fn TQCString& TQCString::replace(char c, const char *after) \internal */ /*! - \fn TQCString& TQCString::tqreplace(const TQCString &b, const TQCString &a) + \fn TQCString& TQCString::replace(const TQCString &b, const TQCString &a) \internal */ /*! - \fn TQCString& TQCString::tqreplace(const char *b, const char *a) + \fn TQCString& TQCString::replace(const char *b, const char *a) \internal */ /*! - \fn TQCString& TQCString::tqreplace(char b, char a) + \fn TQCString& TQCString::replace(char b, char a) \internal */ @@ -949,7 +949,7 @@ TQCString &TQCString::operator=(const QByteArray &ba) { Example: \snippet doc/src/snippets/code/src_qt3support_tools_q3cstring.cpp 0 - If \a str tqcontains a 0 byte within the first \a maxsize bytes, the + If \a str contains a 0 byte within the first \a maxsize bytes, the resulting TQCString will be terminated by this 0. If \a str is 0 a null string is created. @@ -989,7 +989,7 @@ TQCString &TQCString::operator=(const QByteArray &ba) { \note If you ask for the data pointer of a null TQCString by calling data(), then because the internal representation of the - null TQCString is shared, it will be detached and tqreplaced with a + null TQCString is shared, it will be detached and replaced with a non-shared, empty representation, a non-null data pointer will be returned, and subsequent calls to isNull() will return false. But if you ask for the data pointer of a null TQCString by calling @@ -1093,7 +1093,7 @@ TQCString &TQCString::sprintf(const char *format, ...) /*! Returns a string of length \a width (plus one for the terminating - '\0') that tqcontains this string padded with the \a fill character. + '\0') that contains this string padded with the \a fill character. If the length of the string exceeds \a width and \a truncate is false (the default), then the returned string is a copy of the @@ -1126,7 +1126,7 @@ TQCString TQCString::leftJustify(uint width, char fill, bool truncate) const /*! Returns a string of length \a width (plus one for the terminating - '\0') that tqcontains zero or more of the \a fill character followed + '\0') that contains zero or more of the \a fill character followed by this string. If the length of the string exceeds \a width and \a truncate is @@ -1829,7 +1829,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCString &str ) \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqcontains( char c, bool cs ) const +int TQCString::contains( char c, bool cs ) const { int count = 0; const char *d = data(); @@ -1859,20 +1859,20 @@ int TQCString::tqcontains( char c, bool cs ) const \code TQString s = "banana and panama"; TQRegExp r = TQRegExp( "a[nm]a", TRUE, FALSE ); - s.tqcontains( r ); // 4 matches + s.contains( r ); // 4 matches \endcode - \sa tqfind(), tqfindRev() + \sa find(), findRev() \warning If you want to apply this function repeatedly to the same string it is more efficient to convert the string to a TQString and apply the function to that. */ -int TQCString::tqcontains( const QRegExp &rx ) const +int TQCString::contains( const QRegExp &rx ) const { TQString d = TQString::fromAscii( data() ); - return d.tqcontains( rx ); + return d.contains( rx ); } /*! @@ -1884,19 +1884,19 @@ int TQCString::tqcontains( const QRegExp &rx ) const if \a cs if FALSE. This function counts overlapping substrings, for example, "banana" - tqcontains two occurrences of "ana". + contains two occurrences of "ana". - \sa tqfindRev() + \sa findRev() \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqcontains( const char *str, bool cs ) const +int TQCString::contains( const char *str, bool cs ) const { int count = 0; int i = -1; uint l = length(); - // use tqfind for the faster hashing algorithm - while ( ( i = tqfind ( str, i+1, cs, l ) ) != -1 ) + // use find for the faster hashing algorithm + while ( ( i = find ( str, i+1, cs, l ) ) != -1 ) count++; return count; } @@ -1918,7 +1918,7 @@ int TQCString::tqcontains( const char *str, bool cs ) const \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqfind( char c, int index, bool cs ) const +int TQCString::find( char c, int index, bool cs ) const { if ( (uint)index >= size() ) // index outside string return -1; @@ -1951,9 +1951,9 @@ int TQCString::tqfind( char c, int index, bool cs ) const \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqfind( const char *str, int index, bool cs ) const +int TQCString::find( const char *str, int index, bool cs ) const { - return tqfind( str, index, cs, length() ); + return find( str, index, cs, length() ); } #ifndef TQT_NO_REGEXP_CAPTURE @@ -1971,14 +1971,14 @@ int TQCString::tqfind( const char *str, int index, bool cs ) const apply the function to that. */ -int TQCString::tqfind( const QRegExp& rx, int index ) const +int TQCString::find( const QRegExp& rx, int index ) const { TQString d = TQString::fromAscii( data() ); - return d.tqfind( rx, index ); + return d.find( rx, index ); } #endif // TQT_NO_REGEXP_CAPTURE -int TQCString::tqfind( const char *str, int index, bool cs, uint l ) const +int TQCString::find( const char *str, int index, bool cs, uint l ) const { if ( (uint)index >= size() ) return -1; @@ -1991,10 +1991,10 @@ int TQCString::tqfind( const char *str, int index, bool cs, uint l ) const return -1; if ( sl == 1 ) - return tqfind( *str, index, cs ); + return find( *str, index, cs ); /* - See TQString::tqfind() for details. + See TQString::find() for details. */ const char* needle = str; const char* haystack = data() + index; @@ -2050,13 +2050,13 @@ int TQCString::tqfind( const char *str, int index, bool cs, uint l ) const Example: \code TQString s = "banana"; - s.tqreplace( TQRegExp("a.*a"), "" ); // becomes "b" + s.replace( TQRegExp("a.*a"), "" ); // becomes "b" s = "banana"; - s.tqreplace( TQRegExp("^[bn]a"), "X" ); // becomes "Xnana" + s.replace( TQRegExp("^[bn]a"), "X" ); // becomes "Xnana" s = "banana"; - s.tqreplace( TQRegExp("^[bn]a"), "" ); // becomes "nana" + s.replace( TQRegExp("^[bn]a"), "" ); // becomes "nana" \endcode \warning If you want to apply this function repeatedly to the same @@ -2064,11 +2064,11 @@ int TQCString::tqfind( const char *str, int index, bool cs, uint l ) const apply the function to that. */ -TQCString &TQCString::tqreplace( const QRegExp &rx, const char *str ) +TQCString &TQCString::replace( const QRegExp &rx, const char *str ) { TQString d = TQString::fromAscii( data() ); TQString r = TQString::fromAscii( str ); - d.tqreplace( rx, r ); + d.replace( rx, r ); setStr( d.ascii() ); return *this; } @@ -2181,13 +2181,13 @@ QT_END_NAMESPACE can be filled with a character using fill(). Strings can be left or right padded with characters using leftJustify() and rightJustify(). Characters, strings and regular expressions can be - searched for using tqfind() and tqfindRev(), and counted using - tqcontains(). + searched for using find() and findRev(), and counted using + contains(). Strings and characters can be inserted with insert() and appended with append(). A string can be prepended with prepend(). Characters can be removed from the string with remove() and - tqreplaced with tqreplace(). + replaced with replace(). Portions of a string can be extracted using left(), right() and mid(). Whitespace can be removed using stripWhiteSpace() and @@ -2212,7 +2212,7 @@ QT_END_NAMESPACE Case insensitive operations and comparisons will be accurate if both strings contain only ASCII characters. (If \c $LC_CTYPE is set, most Unix systems do "the right thing".) Functions that this - affects include tqcontains(), tqfind(), tqfindRev(), \l operator<(), \l + affects include contains(), find(), findRev(), \l operator<(), \l operator<=(), \l operator>(), \l operator>=(), lower() and upper(). @@ -2286,7 +2286,7 @@ TQCString::TQCString( const char *str ) TQCString str( "helloworld", 6 ); // assigns "hello" to str \endcode - If \a str tqcontains a 0 byte within the first \a maxsize bytes, the + If \a str contains a 0 byte within the first \a maxsize bytes, the resulting TQCString will be terminated by this 0. If \a str is 0 a null string is created. @@ -2515,7 +2515,7 @@ bool TQCString::fill( char c, int len ) \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqfind( char c, int index, bool cs ) const +int TQCString::find( char c, int index, bool cs ) const { if ( (uint)index >= size() ) // index outside string return -1; @@ -2553,12 +2553,12 @@ int TQCString::tqfind( char c, int index, bool cs ) const \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqfind( const char *str, int index, bool cs ) const +int TQCString::find( const char *str, int index, bool cs ) const { - return tqfind( str, index, cs, length() ); + return find( str, index, cs, length() ); } -int TQCString::tqfind( const char *str, int index, bool cs, uint l ) const +int TQCString::find( const char *str, int index, bool cs, uint l ) const { if ( (uint)index >= size() ) return -1; @@ -2571,10 +2571,10 @@ int TQCString::tqfind( const char *str, int index, bool cs, uint l ) const return -1; if ( sl == 1 ) - return tqfind( *str, index, cs ); + return find( *str, index, cs ); /* - See TQString::tqfind() for details. + See TQString::find() for details. */ const char* needle = str; const char* haystack = data() + index; @@ -2633,7 +2633,7 @@ int TQCString::tqfind( const char *str, int index, bool cs, uint l ) const \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqfindRev( char c, int index, bool cs ) const +int TQCString::findRev( char c, int index, bool cs ) const { register const char *b = data(); register const char *d; @@ -2668,10 +2668,10 @@ int TQCString::tqfindRev( char c, int index, bool cs ) const \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqfindRev( const char *str, int index, bool cs ) const +int TQCString::findRev( const char *str, int index, bool cs ) const { /* - See TQString::tqfind() for explanations. + See TQString::find() for explanations. */ const uint sl = tqstrlen( str ); const uint l = length(); @@ -2684,7 +2684,7 @@ int TQCString::tqfindRev( const char *str, int index, bool cs ) const index = delta; if ( sl == 1 ) - return tqfindRev( *str, index, cs ); + return findRev( *str, index, cs ); const char* needle = str; const char* haystack = data() + index; @@ -2735,7 +2735,7 @@ int TQCString::tqfindRev( const char *str, int index, bool cs ) const \sa \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqcontains( char c, bool cs ) const +int TQCString::contains( char c, bool cs ) const { int count = 0; const char *d = data(); @@ -2765,25 +2765,25 @@ int TQCString::tqcontains( char c, bool cs ) const if \a cs if FALSE. This function counts overlapping substrings, for example, "banana" - tqcontains two occurrences of "ana". + contains two occurrences of "ana". - \sa tqfindRev() + \sa findRev() \link #asciinotion Note on character comparisons \endlink */ -int TQCString::tqcontains( const char *str, bool cs ) const +int TQCString::contains( const char *str, bool cs ) const { int count = 0; int i = -1; uint l = length(); - // use tqfind for the faster hashing algorithm - while ( ( i = tqfind ( str, i+1, cs, l ) ) != -1 ) + // use find for the faster hashing algorithm + while ( ( i = find ( str, i+1, cs, l ) ) != -1 ) count++; return count; } /*! - Returns a substring that tqcontains the \a len leftmost characters + Returns a substring that contains the \a len leftmost characters of the string. The whole string is returned if \a len exceeds the length of the @@ -2814,7 +2814,7 @@ TQCString TQCString::left( uint len ) const } /*! - Returns a substring that tqcontains the \a len rightmost characters + Returns a substring that contains the \a len rightmost characters of the string. The whole string is returned if \a len exceeds the length of the @@ -2844,7 +2844,7 @@ TQCString TQCString::right( uint len ) const } /*! - Returns a substring that tqcontains at most \a len characters from + Returns a substring that contains at most \a len characters from this string, starting at position \a index. Returns a null string if the string is empty or if \a index is out @@ -2879,7 +2879,7 @@ TQCString TQCString::mid( uint index, uint len ) const /*! Returns a string of length \a width (plus one for the terminating - '\0') that tqcontains this string padded with the \a fill character. + '\0') that contains this string padded with the \a fill character. If the length of the string exceeds \a width and \a truncate is FALSE (the default), then the returned string is a copy of the @@ -2916,7 +2916,7 @@ TQCString TQCString::leftJustify( uint width, char fill, bool truncate ) const /*! Returns a string of length \a width (plus one for the terminating - '\0') that tqcontains zero or more of the \a fill character followed + '\0') that contains zero or more of the \a fill character followed by this string. If the length of the string exceeds \a width and \a truncate is @@ -3053,7 +3053,7 @@ TQCString TQCString::stripWhiteSpace() const /*! Returns a new string that has white space removed from the start - and the end, plus any sequence of internal white space tqreplaced + and the end, plus any sequence of internal white space replaced with a single space (ASCII 32). White space means the decimal ASCII codes 9, 10, 11, 12, 13 and @@ -3148,7 +3148,7 @@ TQCString &TQCString::insert( uint index, const char *s ) s.insert( 3, '!'); // s == "Yes!" \endcode - \sa remove(), tqreplace() + \sa remove(), replace() */ TQCString &TQCString::insert( uint index, char c ) // insert char @@ -3180,7 +3180,7 @@ TQCString &TQCString::insert( uint index, char c ) // insert char s.remove( 1, 4 ); // s == "Meal" \endcode - \sa insert(), tqreplace() + \sa insert(), replace() */ TQCString &TQCString::remove( uint index, uint len ) @@ -3206,17 +3206,17 @@ TQCString &TQCString::remove( uint index, uint len ) If \a index is out of range, nothing is removed and \a str is appended at the end of the string. If \a index is valid, but \a index + \a len is larger than the length of the string, \a str - tqreplaces the rest of the string from position \a index. + replaces the rest of the string from position \a index. \code TQCString s = "Say yes!"; - s.tqreplace( 4, 3, "NO" ); // s == "Say NO!" + s.replace( 4, 3, "NO" ); // s == "Say NO!" \endcode \sa insert(), remove() */ -TQCString &TQCString::tqreplace( uint index, uint len, const char *str ) +TQCString &TQCString::replace( uint index, uint len, const char *str ) { remove( index, len ); insert( index, str ); @@ -3232,16 +3232,16 @@ TQCString &TQCString::tqreplace( uint index, uint len, const char *str ) Example: \code TQCString s = "a,b,c"; - s.tqreplace( ',', " or " ); + s.replace( ',', " or " ); // s == "a or b or c" \endcode */ -TQCString &TQCString::tqreplace( char c, const char *after ) +TQCString &TQCString::replace( char c, const char *after ) { char str[2]; str[0] = c; str[1] = '\0'; - return tqreplace( str, after ); + return replace( str, after ); } /*! \overload @@ -3252,12 +3252,12 @@ TQCString &TQCString::tqreplace( char c, const char *after ) Example: \code TQCString s = "Greek is Greek"; - s.tqreplace( "Greek", "English" ); + s.replace( "Greek", "English" ); // s == "English is English" \endcode */ -TQCString &TQCString::tqreplace( const char *before, const char *after ) +TQCString &TQCString::replace( const char *before, const char *after ) { if ( before == after || isNull() ) return *this; @@ -3272,7 +3272,7 @@ TQCString &TQCString::tqreplace( const char *before, const char *after ) if ( bl == al ) { if ( bl ) { - while( (index = tqfind( before, index, TRUE, len ) ) != -1 ) { + while( (index = find( before, index, TRUE, len ) ) != -1 ) { memcpy( d+index, after, al ); index += bl; } @@ -3281,7 +3281,7 @@ TQCString &TQCString::tqreplace( const char *before, const char *after ) uint to = 0; uint movestart = 0; uint num = 0; - while( (index = tqfind( before, index, TRUE, len ) ) != -1 ) { + while( (index = find( before, index, TRUE, len ) ) != -1 ) { if ( num ) { int msize = index - movestart; if ( msize > 0 ) { @@ -3312,7 +3312,7 @@ TQCString &TQCString::tqreplace( const char *before, const char *after ) uint indices[4096]; uint pos = 0; while( pos < 4095 ) { - index = tqfind(before, index, TRUE, len); + index = find(before, index, TRUE, len); if ( index == -1 ) break; indices[pos++] = index; @@ -3324,7 +3324,7 @@ TQCString &TQCString::tqreplace( const char *before, const char *after ) if ( !pos ) break; - // we have a table of tqreplacement positions, use them for fast replacing + // we have a table of replacement positions, use them for fast replacing int adjust = pos*(al-bl); // index has to be adjusted in case we get back into the loop above. if ( index != -1 ) @@ -3357,7 +3357,7 @@ TQCString &TQCString::tqreplace( const char *before, const char *after ) Replaces every occurrence of \a c1 with the char \a c2. Returns a reference to the string. */ -TQCString &TQCString::tqreplace( char c1, char c2 ) +TQCString &TQCString::replace( char c1, char c2 ) { detach(); uint i = 0; @@ -3387,10 +3387,10 @@ TQCString &TQCString::tqreplace( char c1, char c2 ) apply the function to that. */ -int TQCString::tqfind( const TQRegExp& rx, int index ) const +int TQCString::find( const TQRegExp& rx, int index ) const { TQString d = TQString::fromAscii( data() ); - return d.tqfind( rx, index ); + return d.find( rx, index ); } /*! @@ -3407,10 +3407,10 @@ int TQCString::tqfind( const TQRegExp& rx, int index ) const apply the function to that. */ -int TQCString::tqfindRev( const TQRegExp& rx, int index ) const +int TQCString::findRev( const TQRegExp& rx, int index ) const { TQString d = TQString::fromAscii( data() ); - return d.tqfindRev( rx, index ); + return d.findRev( rx, index ); } /*! @@ -3422,20 +3422,20 @@ int TQCString::tqfindRev( const TQRegExp& rx, int index ) const \code TQString s = "banana and panama"; TQRegExp r = TQRegExp( "a[nm]a", TRUE, FALSE ); - s.tqcontains( r ); // 4 matches + s.contains( r ); // 4 matches \endcode - \sa tqfind(), tqfindRev() + \sa find(), findRev() \warning If you want to apply this function repeatedly to the same string it is more efficient to convert the string to a TQString and apply the function to that. */ -int TQCString::tqcontains( const TQRegExp &rx ) const +int TQCString::contains( const TQRegExp &rx ) const { TQString d = TQString::fromAscii( data() ); - return d.tqcontains( rx ); + return d.contains( rx ); } @@ -3448,13 +3448,13 @@ int TQCString::tqcontains( const TQRegExp &rx ) const Example: \code TQString s = "banana"; - s.tqreplace( TQRegExp("a.*a"), "" ); // becomes "b" + s.replace( TQRegExp("a.*a"), "" ); // becomes "b" s = "banana"; - s.tqreplace( TQRegExp("^[bn]a"), "X" ); // becomes "Xnana" + s.replace( TQRegExp("^[bn]a"), "X" ); // becomes "Xnana" s = "banana"; - s.tqreplace( TQRegExp("^[bn]a"), "" ); // becomes "nana" + s.replace( TQRegExp("^[bn]a"), "" ); // becomes "nana" \endcode \warning If you want to apply this function repeatedly to the same @@ -3462,11 +3462,11 @@ int TQCString::tqcontains( const TQRegExp &rx ) const apply the function to that. */ -TQCString &TQCString::tqreplace( const TQRegExp &rx, const char *str ) +TQCString &TQCString::replace( const TQRegExp &rx, const char *str ) { TQString d = TQString::fromAscii( data() ); TQString r = TQString::fromAscii( str ); - d.tqreplace( rx, r ); + d.replace( rx, r ); setStr( d.ascii() ); return *this; } diff --git a/tqtinterface/qt4/src/tools/tqcstring.h b/tqtinterface/qt4/src/tools/tqcstring.h index 8568713..2b6a28d 100644 --- a/tqtinterface/qt4/src/tools/tqcstring.h +++ b/tqtinterface/qt4/src/tools/tqcstring.h @@ -147,16 +147,16 @@ public: inline QByteArray upper() const { return toUpper(); } inline QByteArray stripWhiteSpace() const { return trimmed(); } inline QByteArray simplifyWhiteSpace() const { return simplified(); } - inline int tqfind(int c, int from = 0) const { return indexOf(c, from); } - inline int tqfind(char c, int from = 0) const { return indexOf(c, from); } - inline int tqfind(const char *c, int from = 0) const { return indexOf(c, from); } - inline int tqfind(const QByteArray &ba, int from = 0) const { return indexOf(ba, from); } - inline int tqfindRev(char c, int from = -1) const { return lastIndexOf(c, from); } - inline int tqfindRev(const char *c, int from = -1) const { return lastIndexOf(c, from); } - inline int tqfindRev(const QByteArray &ba, int from = -1) const { return lastIndexOf(ba, from); } + inline int find(int c, int from = 0) const { return indexOf(c, from); } + inline int find(char c, int from = 0) const { return indexOf(c, from); } + inline int find(const char *c, int from = 0) const { return indexOf(c, from); } + inline int find(const QByteArray &ba, int from = 0) const { return indexOf(ba, from); } + inline int findRev(char c, int from = -1) const { return lastIndexOf(c, from); } + inline int findRev(const char *c, int from = -1) const { return lastIndexOf(c, from); } + inline int findRev(const QByteArray &ba, int from = -1) const { return lastIndexOf(ba, from); } #ifndef QT_NO_CAST_TO_ASCII - inline int tqfind(const QString &s, int from = 0) const; - inline int tqfindRev(const QString &s, int from = -1) const; + inline int find(const QString &s, int from = 0) const; + inline int findRev(const QString &s, int from = -1) const; #endif inline TQByteArray copy() const { return TQByteArray(*this); } inline QByteRef tqat( int i ) { @@ -311,14 +311,14 @@ public: TQCString &append(const char *c) { QByteArray::append(c); return *this; } TQCString &prepend(const char *c) { QByteArray::prepend(c); return *this; } TQCString &remove(uint index, uint len) { QByteArray::remove(index, len); return *this; } - TQCString &tqreplace(uint index, uint len, const char *c) + TQCString &replace(uint index, uint len, const char *c) { TQByteArray::replace(index, len, c); return *this; } - TQCString &tqreplace(char c, const TQCString &after) { return tqreplace(c, after.constData()); } - TQCString &tqreplace(char c, const char *after) { QByteArray::replace(c, after); return *this; } - TQCString &tqreplace(const TQCString &b, const TQCString &a) - { return tqreplace(b.constData(), a.constData()); } - TQCString &tqreplace(const char *b, const char *a) { QByteArray::replace(b, a); return *this; } - TQCString &tqreplace(char b, char a) { QByteArray::replace(b, a); return *this; } + TQCString &replace(char c, const TQCString &after) { return TQByteArray::replace(c, after.constData()); } + TQCString &replace(char c, const char *after) { QByteArray::replace(c, after); return *this; } + TQCString &replace(const TQCString &b, const TQCString &a) + { return TQByteArray::replace(b.constData(), a.constData()); } + TQCString &replace(const char *b, const char *a) { QByteArray::replace(b, a); return *this; } + TQCString &replace(char b, char a) { QByteArray::replace(b, a); return *this; } short toShort(bool *ok=0) const; ushort toUShort(bool *ok=0) const; @@ -341,20 +341,20 @@ public: bool setExpand(uint index, char c); - int tqcontains( char c, bool cs=TRUE ) const; - int tqcontains( const char *str, bool cs=TRUE ) const; + int contains( char c, bool cs=TRUE ) const; + int contains( const char *str, bool cs=TRUE ) const; #ifndef TQT_NO_REGEXP - int tqcontains( const QRegExp & ) const; + int contains( const QRegExp & ) const; #endif - int tqfind( char c, int index=0, bool cs=TRUE ) const; - int tqfind( const char *str, int index=0, bool cs=TRUE ) const; + int find( char c, int index=0, bool cs=TRUE ) const; + int find( const char *str, int index=0, bool cs=TRUE ) const; #ifndef TQT_NO_REGEXP - int tqfind( const QRegExp &re, int index=0 ) const; + int find( const QRegExp &re, int index=0 ) const; #endif #ifndef TQT_NO_REGEXP - TQCString &tqreplace( const QRegExp &, const char * ); + TQCString &replace( const QRegExp &, const char * ); #endif // inline const char * tqstringFromPos( int index ) { const char & ref = (*this)[index]; return &ref; } @@ -369,7 +369,7 @@ public: TQCString &operator+=( const TQCString tqcs ); private: - int tqfind( const char *str, int index, bool cs, uint l ) const; + int find( const char *str, int index, bool cs, uint l ) const; }; inline TQCString::operator const char *() const @@ -559,20 +559,20 @@ public: TQCString &sprintf( const char *format, ... ); - int tqfind( char c, int index=0, bool cs=TRUE ) const; - int tqfind( const char *str, int index=0, bool cs=TRUE ) const; + int find( char c, int index=0, bool cs=TRUE ) const; + int find( const char *str, int index=0, bool cs=TRUE ) const; #ifndef TQT_NO_REGEXP - int tqfind( const TQRegExp &, int index=0 ) const; + int find( const TQRegExp &, int index=0 ) const; #endif - int tqfindRev( char c, int index=-1, bool cs=TRUE) const; - int tqfindRev( const char *str, int index=-1, bool cs=TRUE) const; + int findRev( char c, int index=-1, bool cs=TRUE) const; + int findRev( const char *str, int index=-1, bool cs=TRUE) const; #ifndef TQT_NO_REGEXP_CAPTURE - int tqfindRev( const TQRegExp &, int index=-1 ) const; + int findRev( const TQRegExp &, int index=-1 ) const; #endif - int tqcontains( char c, bool cs=TRUE ) const; - int tqcontains( const char *str, bool cs=TRUE ) const; + int contains( char c, bool cs=TRUE ) const; + int contains( const char *str, bool cs=TRUE ) const; #ifndef TQT_NO_REGEXP - int tqcontains( const TQRegExp & ) const; + int contains( const TQRegExp & ) const; #endif TQCString left( uint len ) const; TQCString right( uint len ) const; @@ -592,13 +592,13 @@ public: TQCString &append( const char * ); TQCString &prepend( const char * ); TQCString &remove( uint index, uint len ); - TQCString &tqreplace( uint index, uint len, const char * ); + TQCString &replace( uint index, uint len, const char * ); #ifndef TQT_NO_REGEXP - TQCString &tqreplace( const TQRegExp &, const char * ); + TQCString &replace( const TQRegExp &, const char * ); #endif - TQCString &tqreplace( char c, const char *after ); - TQCString &tqreplace( const char *, const char * ); - TQCString &tqreplace( char, char ); + TQCString &replace( char c, const char *after ); + TQCString &replace( const char *, const char * ); + TQCString &replace( char, char ); short toShort( bool *ok=0 ) const; ushort toUShort( bool *ok=0 ) const; @@ -630,7 +630,7 @@ public: TQCString &operator+=( const QByteArray qba ); TQCString &operator+=( const TQCString tqcs ); private: - int tqfind( const char *str, int index, bool cs, uint l ) const; + int find( const char *str, int index, bool cs, uint l ) const; }; /***************************************************************************** diff --git a/tqtinterface/qt4/src/tools/tqdatetime.cpp b/tqtinterface/qt4/src/tools/tqdatetime.cpp index 4f95dd1..2b28868 100644 --- a/tqtinterface/qt4/src/tools/tqdatetime.cpp +++ b/tqtinterface/qt4/src/tools/tqdatetime.cpp @@ -161,7 +161,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa if ( dd && !dd->isValid() ) return TQString::null; - bool ap = ( f.tqcontains( "AP" ) || f.tqcontains( "ap" ) ); + bool ap = ( f.contains( "AP" ) || f.contains( "ap" ) ); TQString buf; TQString frm; @@ -213,7 +213,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa \ingroup time \mainclass - A TQDate object tqcontains a calendar date, i.e. year, month, and day + A TQDate object contains a calendar date, i.e. year, month, and day numbers, in the modern Western (Gregorian) calendar. It can read the current date from the system clock. It provides functions for comparing dates and for manipulating dates, e.g. by adding a @@ -270,7 +270,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa \enum TQt::TimeSpec \value LocalTime Locale dependent time (Timezones and Daylight Savings Time) - \value UTC Coordinated Universal Time, tqreplaces Greenwich Time + \value UTC Coordinated Universal Time, replaces Greenwich Time */ /*! @@ -1101,8 +1101,8 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f ) This will fail gracefully if the input string doesn't contain any space. */ - int monthPos = s.tqfind( ' ' ) + 1; - int dayPos = s.tqfind( ' ', monthPos ) + 1; + int monthPos = s.find( ' ' ) + 1; + int dayPos = s.find( ' ', monthPos ) + 1; TQString monthName( s.mid(monthPos, dayPos - monthPos - 1) ); int month = -1; @@ -1252,7 +1252,7 @@ void TQDate::julianToGregorian( uint jd, int &y, int &m, int &d ) \ingroup time \mainclass - A TQTime object tqcontains a clock time, i.e. the number of hours, + A TQTime object contains a clock time, i.e. the number of hours, minutes, seconds, and milliseconds since midnight. It can read the current time from the system clock and measure a span of elapsed time. It provides functions for comparing times and for @@ -1265,7 +1265,7 @@ void TQDate::julianToGregorian( uint jd, int &y, int &m, int &d ) A TQTime object is typically created either by giving the number of hours, minutes, seconds, and milliseconds explicitly, or by using the static function currentTime(), which creates a TQTime object - that tqcontains the system's clock time. Note that the accuracy + that contains the system's clock time. Note that the accuracy depends on the accuracy of the underlying operating system; not all systems provide 1-millisecond accuracy. @@ -1458,9 +1458,9 @@ TQString TQTime::toString( TQt::DateFormat f ) const \row \i z \i the milliseconds without leading zeroes (0..999) \row \i zzz \i the milliseconds with leading zeroes (000..999) \row \i AP - \i use AM/PM display. \e AP will be tqreplaced by either "AM" or "PM". + \i use AM/PM display. \e AP will be replaced by either "AM" or "PM". \row \i ap - \i use am/pm display. \e ap will be tqreplaced by either "am" or "pm". + \i use am/pm display. \e ap will be replaced by either "am" or "pm". \endtable All other input characters will be ignored. @@ -1873,7 +1873,7 @@ int TQTime::elapsed() const \ingroup time \mainclass - A TQDateTime object tqcontains a calendar date and a clock time (a + A TQDateTime object contains a calendar date and a clock time (a "datetime"). It is a combination of the TQDate and TQTime classes. It can read the current datetime from the system clock. It provides functions for comparing datetimes and for manipulating a @@ -2200,9 +2200,9 @@ TQString TQDateTime::toString( TQt::DateFormat f ) const \row \i z \i the milliseconds without leading zeroes (0..999) \row \i zzz \i the milliseconds with leading zeroes (000..999) \row \i AP - \i use AM/PM display. \e AP will be tqreplaced by either "AM" or "PM". + \i use AM/PM display. \e AP will be replaced by either "AM" or "PM". \row \i ap - \i use am/pm display. \e ap will be tqreplaced by either "am" or "pm". + \i use am/pm display. \e ap will be replaced by either "am" or "pm". \endtable All other input characters will be ignored. @@ -2465,7 +2465,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f ) } #if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE) else if ( f == TQt::TextDate ) { - const int firstSpace = s.tqfind(' '); + const int firstSpace = s.find(' '); TQString monthName( s.mid( firstSpace + 1, 3 ) ); int month = -1; // Assume that English monthnames are the default @@ -2497,7 +2497,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f ) TQDate date( year, month, day ); TQTime time; int hour, minute, second; - int pivot = s.tqfind( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); + int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) ); if ( pivot != -1 ) { hour = s.mid( pivot, 2 ).toInt(); minute = s.mid( pivot+3, 2 ).toInt(); diff --git a/tqtinterface/qt4/src/tools/tqdict.h b/tqtinterface/qt4/src/tools/tqdict.h index 1dc8a48..b9fab7f 100644 --- a/tqtinterface/qt4/src/tools/tqdict.h +++ b/tqtinterface/qt4/src/tools/tqdict.h @@ -66,11 +66,11 @@ public: void insert( const TQString &k, const type *d ) { TQGDict::look_string(k,(Item)d,1); } - void tqreplace( const TQString &k, const type *d ) + void replace( const TQString &k, const type *d ) { TQGDict::look_string(k,(Item)d,2); } bool remove( const TQString &k ) { return TQGDict::remove_string(k); } type *take( const TQString &k ) { return (type *)TQGDict::take_string(k); } - type *tqfind( const TQString &k ) const + type *find( const TQString &k ) const { return (type *)((TQGDict*)this)->TQGDict::look_string(k,0,0); } type *operator[]( const TQString &k ) const { return (type *)((TQGDict*)this)->TQGDict::look_string(k,0,0); } diff --git a/tqtinterface/qt4/src/tools/tqdir.cpp b/tqtinterface/qt4/src/tools/tqdir.cpp index 796162d..99c9094 100644 --- a/tqtinterface/qt4/src/tools/tqdir.cpp +++ b/tqtinterface/qt4/src/tools/tqdir.cpp @@ -304,7 +304,7 @@ void TQDir::setPath( const TQString &path ) \fn TQString TQDir::path() const Returns the path, this may contain symbolic links, but never - tqcontains redundant ".", ".." or multiple separators. + contains redundant ".", ".." or multiple separators. The returned path can be either absolute or relative (see setPath()). @@ -316,7 +316,7 @@ void TQDir::setPath( const TQString &path ) /*! Returns the absolute path (a path that starts with "/" or with a drive specification), which may contain symbolic links, but never - tqcontains redundant ".", ".." or multiple separators. + contains redundant ".", ".." or multiple separators. \sa setPath(), canonicalPath(), exists(), cleanDirPath(), dirName(), absFilePath() @@ -349,7 +349,7 @@ TQString TQDir::absPath() const TQString TQDir::dirName() const { - int pos = dPath.tqfindRev( '/' ); + int pos = dPath.findRev( '/' ); if ( pos == -1 ) return dPath; return dPath.right( dPath.length() - pos - 1 ); @@ -465,7 +465,7 @@ TQString TQDir::convertSeparators( const TQString &pathName ) if ( n[i] == '/' ) n[i] = ':'; } - if(n.tqcontains(':') && n.left(1) != ':') + if(n.contains(':') && n.left(1) != ':') n.prepend(':'); #endif return n; @@ -508,7 +508,7 @@ bool TQDir::cd( const TQString &dirName, bool acceptAbsPath ) } dPath += dirName; - if ( dirName.tqfind('/') >= 0 + if ( dirName.find('/') >= 0 || old == TQString::tqfromLatin1(".") || dirName == TQString::tqfromLatin1("..") ) { dPath = cleanDirPath( dPath ); @@ -1166,8 +1166,8 @@ TQValueList<TQRegExp> qt_makeFilterList( const TQString &filter ) return regExps; TQChar sep( ';' ); - int i = filter.tqfind( sep, 0 ); - if ( i == -1 && filter.tqfind( ' ', 0 ) != -1 ) + int i = filter.find( sep, 0 ); + if ( i == -1 && filter.find( ' ', 0 ) != -1 ) sep = TQChar( ' ' ); TQStringList list = TQStringList::split( sep, filter ); @@ -1263,7 +1263,7 @@ TQString TQDir::cleanDirPath( const TQString &filePath ) upLevel = 0; int len; - while ( pos && (pos = name.tqfindRev('/', pos - 1)) != -1 ) { + while ( pos && (pos = name.findRev('/', pos - 1)) != -1 ) { len = ePos - pos - 1; if ( len == 2 && name.at(pos + 1) == '.' && name.at(pos + 2) == '.' ) { diff --git a/tqtinterface/qt4/src/tools/tqfile_unix.cpp b/tqtinterface/qt4/src/tools/tqfile_unix.cpp index b76a2aa..5e680d4 100644 --- a/tqtinterface/qt4/src/tools/tqfile_unix.cpp +++ b/tqtinterface/qt4/src/tools/tqfile_unix.cpp @@ -553,7 +553,7 @@ bool TQFile::at( Offset pos ) \warning We have experienced problems with some C libraries when a buffered file is opened for both reading and writing. If a read operation takes place - immediately after a write operation, the read buffer tqcontains garbage data. + immediately after a write operation, the read buffer contains garbage data. Worse, the same garbage is written to the file. Calling flush() before readBlock() solved this problem. */ diff --git a/tqtinterface/qt4/src/tools/tqfileinfo.cpp b/tqtinterface/qt4/src/tools/tqfileinfo.cpp index fbc1278..0c937eb 100644 --- a/tqtinterface/qt4/src/tools/tqfileinfo.cpp +++ b/tqtinterface/qt4/src/tools/tqfileinfo.cpp @@ -128,8 +128,8 @@ extern bool qt_file_access( const TQString& fn, int t ); unfortunately not platform independent: on Unix, the rights of the owner of the file are returned and on Windows the rights of the current user are returned. This behavior might change in a future TQt version. If you want to - tqfind the rights of the owner of the file, you should use the flags \c - ReadOwner, \c WriteOwner and \c ExeOwner. If you want to tqfind out the + find the rights of the owner of the file, you should use the flags \c + ReadOwner, \c WriteOwner and \c ExeOwner. If you want to find out the rights of the current user, you should use isReadable(), isWritable() and isExecutable(). */ @@ -435,7 +435,7 @@ TQString TQFileInfo::filePath() const TQString TQFileInfo::baseName( bool complete ) const { TQString tmp = fileName(); - int pos = complete ? tmp.tqfindRev( '.' ) : tmp.tqfind( '.' ); + int pos = complete ? tmp.findRev( '.' ) : tmp.find( '.' ); if ( pos == -1 ) return tmp; else @@ -466,7 +466,7 @@ TQString TQFileInfo::baseName( bool complete ) const TQString TQFileInfo::extension( bool complete ) const { TQString s = fileName(); - int pos = complete ? s.tqfind( '.' ) : s.tqfindRev( '.' ); + int pos = complete ? s.find( '.' ) : s.findRev( '.' ); if ( pos < 0 ) return TQString::tqfromLatin1( "" ); else diff --git a/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp b/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp index 3be62bf..4a08916 100644 --- a/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp +++ b/tqtinterface/qt4/src/tools/tqfileinfo_unix.cpp @@ -366,7 +366,7 @@ TQString TQFileInfo::dirPath( bool absPath ) const s = absFilePath(); else s = fn; - int pos = s.tqfindRev( '/' ); + int pos = s.findRev( '/' ); if ( pos == -1 ) { return TQString::tqfromLatin1( "." ); } else { @@ -391,7 +391,7 @@ TQString TQFileInfo::dirPath( bool absPath ) const TQString TQFileInfo::fileName() const { - int p = fn.tqfindRev( '/' ); + int p = fn.findRev( '/' ); if ( p == -1 ) { return fn; } else { diff --git a/tqtinterface/qt4/src/tools/tqgarray.cpp b/tqtinterface/qt4/src/tools/tqgarray.cpp index f0e89f9..ca26750 100644 --- a/tqtinterface/qt4/src/tools/tqgarray.cpp +++ b/tqtinterface/qt4/src/tools/tqgarray.cpp @@ -84,7 +84,7 @@ \internal - It only tqcontains a reference count and member functions to increment and + It only contains a reference count and member functions to increment and decrement it. Shared classes normally have internal classes that inherit TQShared and @@ -105,7 +105,7 @@ TQGArray is a strictly internal class that acts as base class for the TQMemArray template array. - It tqcontains an array of bytes and has no notion of an array element. + It contains an array of bytes and has no notion of an array element. */ @@ -364,7 +364,7 @@ TQGArray &TQGArray::assign( const TQGArray &a ) /*! Shallow copy. Dereference the current array and references the - array data \a d, which tqcontains \a len bytes. + array data \a d, which contains \a len bytes. Returns a reference to this array. Do not delete \a d later, because TQGArray takes care of that. @@ -596,12 +596,12 @@ void TQGArray::resetRawData( const char *d, uint len ) This function only compares whole cells, not bytes. */ -int TQGArray::tqfind( const char *d, uint index, uint sz ) const +int TQGArray::find( const char *d, uint index, uint sz ) const { index *= sz; if ( index >= shd->len ) { #if defined(TQT_CHECK_RANGE) - qWarning( "TQGArray::tqfind: Index %d out of range", index/sz ); + qWarning( "TQGArray::find: Index %d out of range", index/sz ); #endif return -1; } @@ -657,7 +657,7 @@ int TQGArray::tqfind( const char *d, uint index, uint sz ) const This function only compares whole cells, not bytes. */ -int TQGArray::tqcontains( const char *d, uint sz ) const +int TQGArray::contains( const char *d, uint sz ) const { register uint i = shd->len; int count = 0; diff --git a/tqtinterface/qt4/src/tools/tqgarray.h b/tqtinterface/qt4/src/tools/tqgarray.h index b581621..bfe1f86 100644 --- a/tqtinterface/qt4/src/tools/tqgarray.h +++ b/tqtinterface/qt4/src/tools/tqgarray.h @@ -99,8 +99,8 @@ protected: TQGArray &setRawData( const char *d, uint len ); void resetRawData( const char *d, uint len ); - int tqfind( const char *d, uint index, uint sz ) const; - int tqcontains( const char *d, uint sz ) const; + int find( const char *d, uint index, uint sz ) const; + int contains( const char *d, uint sz ) const; void sort( uint sz ); int bsearch( const char *d, uint sz ) const; diff --git a/tqtinterface/qt4/src/tools/tqgcache.cpp b/tqtinterface/qt4/src/tools/tqgcache.cpp index 1d2d3bb..4e16ad7 100644 --- a/tqtinterface/qt4/src/tools/tqgcache.cpp +++ b/tqtinterface/qt4/src/tools/tqgcache.cpp @@ -106,7 +106,7 @@ public: int inserts; // variables for statistics int insertCosts; int insertMisses; - int tqfinds; + int finds; int hits; int hitCosts; int dumps; @@ -199,11 +199,11 @@ public: void clear() { TQGDict::clear(); } - TQCacheItem *tqfind_string(const TQString &key) const + TQCacheItem *find_string(const TQString &key) const { return (TQCacheItem*)((TQCDict*)this)->look_string(key, 0, 0); } - TQCacheItem *tqfind_ascii(const char *key) const + TQCacheItem *find_ascii(const char *key) const { return (TQCacheItem*)((TQCDict*)this)->look_ascii(key, 0, 0); } - TQCacheItem *tqfind_int(long key) const + TQCacheItem *find_int(long key) const { return (TQCacheItem*)((TQCDict*)this)->look_int(key, 0, 0); } TQCacheItem *take_string(const TQString &key) @@ -267,7 +267,7 @@ TQGCache::TQGCache( int maxCost, uint size, KeyType kt, bool caseSensitive, lruList->inserts = 0; lruList->insertCosts = 0; lruList->insertMisses = 0; - lruList->tqfinds = 0; + lruList->finds = 0; lruList->hits = 0; lruList->hitCosts = 0; lruList->dumps = 0; @@ -536,11 +536,11 @@ void TQGCache::clear() Finds an item for \a key in the cache and adds a reference if \a ref is TRUE. */ -TQPtrCollection::Item TQGCache::tqfind_string( const TQString &key, bool ref ) const +TQPtrCollection::Item TQGCache::find_string( const TQString &key, bool ref ) const { - TQCacheItem *ci = dict->tqfind_string( key ); + TQCacheItem *ci = dict->find_string( key ); #if defined(TQT_DEBUG) - lruList->tqfinds++; + lruList->finds++; #endif if ( ci ) { #if defined(TQT_DEBUG) @@ -559,12 +559,12 @@ TQPtrCollection::Item TQGCache::tqfind_string( const TQString &key, bool ref ) c Finds an item for \a key in the cache and adds a reference if \a ref is TRUE. */ -TQPtrCollection::Item TQGCache::tqfind_other( const char *key, bool ref ) const +TQPtrCollection::Item TQGCache::find_other( const char *key, bool ref ) const { - TQCacheItem *ci = keytype == AsciiKey ? dict->tqfind_ascii(key) - : dict->tqfind_int((long)key); + TQCacheItem *ci = keytype == AsciiKey ? dict->find_ascii(key) + : dict->find_int((long)key); #if defined(TQT_DEBUG) - lruList->tqfinds++; + lruList->finds++; #endif if ( ci ) { #if defined(TQT_DEBUG) @@ -643,12 +643,12 @@ void TQGCache::statistics() const line.fill( '*', 80 ); qDebug( line.ascii() ); qDebug( "CACHE STATISTICS:" ); - qDebug( "cache tqcontains %d item%s, with a total cost of %d", + qDebug( "cache contains %d item%s, with a total cost of %d", count(), count() != 1 ? "s" : "", tCost ); qDebug( "maximum cost is %d, cache is %d%% full.", mCost, (200*tCost + mCost) / (mCost*2) ); - qDebug( "tqfind() has been called %d time%s", - lruList->tqfinds, lruList->tqfinds != 1 ? "s" : "" ); + qDebug( "find() has been called %d time%s", + lruList->finds, lruList->finds != 1 ? "s" : "" ); qDebug( "%d of these were hits, items found had a total cost of %d.", lruList->hits,lruList->hitCosts ); qDebug( "%d item%s %s been inserted with a total cost of %d.", diff --git a/tqtinterface/qt4/src/tools/tqgcache.h b/tqtinterface/qt4/src/tools/tqgcache.h index 7d54656..27887c3 100644 --- a/tqtinterface/qt4/src/tools/tqgcache.h +++ b/tqtinterface/qt4/src/tools/tqgcache.h @@ -82,8 +82,8 @@ protected: TQPtrCollection::Item take_string( const TQString &key ); TQPtrCollection::Item take_other( const char *key ); - TQPtrCollection::Item tqfind_string( const TQString &key, bool ref=TRUE ) const; - TQPtrCollection::Item tqfind_other( const char *key, bool ref=TRUE ) const; + TQPtrCollection::Item find_string( const TQString &key, bool ref=TRUE ) const; + TQPtrCollection::Item find_other( const char *key, bool ref=TRUE ) const; void statistics() const; diff --git a/tqtinterface/qt4/src/tools/tqgdict.cpp b/tqtinterface/qt4/src/tools/tqgdict.cpp index c4c21d9..dc4d450 100644 --- a/tqtinterface/qt4/src/tools/tqgdict.cpp +++ b/tqtinterface/qt4/src/tools/tqgdict.cpp @@ -64,9 +64,9 @@ Normally, you do not have to reimplement any of these functions. */ -static const int op_tqfind = 0; +static const int op_find = 0; static const int op_insert = 1; -static const int op_tqreplace = 2; +static const int op_replace = 2; class TQGDItList : public TQPtrList<TQGDictIterator> @@ -324,7 +324,7 @@ TQGDict &TQGDict::operator=( const TQGDict &dict ) */ /*! - The do-it-all function; \a op is one of op_tqfind, op_insert, op_tqreplace. + The do-it-all function; \a op is one of op_find, op_insert, op_replace. The key is \a key and the item is \a d. */ @@ -333,7 +333,7 @@ TQPtrCollection::Item TQGDict::look_string( const TQString &key, TQPtrCollection { TQStringBucket *n = 0; int index = hashKeyString(key) % vlen; - if ( op == op_tqfind ) { // tqfind + if ( op == op_find ) { // find if ( cases ) { n = (TQStringBucket*)vec[index]; while( n != 0 ) { @@ -352,11 +352,11 @@ TQPtrCollection::Item TQGDict::look_string( const TQString &key, TQPtrCollection } return 0; // not found } - if ( op == op_tqreplace ) { // tqreplace + if ( op == op_replace ) { // replace if ( vec[index] != 0 ) // maybe something there remove_string( key ); } - // op_insert or op_tqreplace + // op_insert or op_replace n = new TQStringBucket(key,newItem(d),vec[index]); TQ_CHECK_PTR( n ); #if defined(TQT_CHECK_NULL) @@ -372,7 +372,7 @@ TQPtrCollection::Item TQGDict::look_ascii( const char *key, TQPtrCollection::Ite { TQAsciiBucket *n; int index = hashKeyAscii(key) % vlen; - if ( op == op_tqfind ) { // tqfind + if ( op == op_find ) { // find if ( cases ) { for ( n=(TQAsciiBucket*)vec[index]; n; n=(TQAsciiBucket*)n->getNext() ) { @@ -388,11 +388,11 @@ TQPtrCollection::Item TQGDict::look_ascii( const char *key, TQPtrCollection::Ite } return 0; // not found } - if ( op == op_tqreplace ) { // tqreplace + if ( op == op_replace ) { // replace if ( vec[index] != 0 ) // maybe something there remove_ascii( key ); } - // op_insert or op_tqreplace + // op_insert or op_replace n = new TQAsciiBucket(copyk ? qstrdup(key) : key,newItem(d),vec[index]); TQ_CHECK_PTR( n ); #if defined(TQT_CHECK_NULL) @@ -408,7 +408,7 @@ TQPtrCollection::Item TQGDict::look_int( long key, TQPtrCollection::Item d, int { TQIntBucket *n; int index = (int)((ulong)key % vlen); // simple hash - if ( op == op_tqfind ) { // tqfind + if ( op == op_find ) { // find for ( n=(TQIntBucket*)vec[index]; n; n=(TQIntBucket*)n->getNext() ) { if ( n->getKey() == key ) @@ -416,11 +416,11 @@ TQPtrCollection::Item TQGDict::look_int( long key, TQPtrCollection::Item d, int } return 0; // not found } - if ( op == op_tqreplace ) { // tqreplace + if ( op == op_replace ) { // replace if ( vec[index] != 0 ) // maybe something there remove_int( key ); } - // op_insert or op_tqreplace + // op_insert or op_replace n = new TQIntBucket(key,newItem(d),vec[index]); TQ_CHECK_PTR( n ); #if defined(TQT_CHECK_NULL) @@ -436,7 +436,7 @@ TQPtrCollection::Item TQGDict::look_ptr( void *key, TQPtrCollection::Item d, int { TQPtrBucket *n; int index = (int)((ulong)key % vlen); // simple hash - if ( op == op_tqfind ) { // tqfind + if ( op == op_find ) { // find for ( n=(TQPtrBucket*)vec[index]; n; n=(TQPtrBucket*)n->getNext() ) { if ( n->getKey() == key ) @@ -444,11 +444,11 @@ TQPtrCollection::Item TQGDict::look_ptr( void *key, TQPtrCollection::Item d, int } return 0; // not found } - if ( op == op_tqreplace ) { // tqreplace + if ( op == op_replace ) { // replace if ( vec[index] != 0 ) // maybe something there remove_ptr( key ); } - // op_insert or op_tqreplace + // op_insert or op_replace n = new TQPtrBucket(key,newItem(d),vec[index]); TQ_CHECK_PTR( n ); #if defined(TQT_CHECK_NULL) diff --git a/tqtinterface/qt4/src/tools/tqglist.cpp b/tqtinterface/qt4/src/tools/tqglist.cpp index 944c27c..07851ba 100644 --- a/tqtinterface/qt4/src/tools/tqglist.cpp +++ b/tqtinterface/qt4/src/tools/tqglist.cpp @@ -371,7 +371,7 @@ void TQGList::inSort( TQPtrCollection::Item d ) { int index = 0; register TQLNode *n = firstNode; - while ( n && compareItems(n->data,d) < 0 ){ // tqfind position in list + while ( n && compareItems(n->data,d) < 0 ){ // find position in list n = n->next; index++; } @@ -530,14 +530,14 @@ bool TQGList::removeNode( TQLNode *n ) } /*! - Removes the item \a d from the list. Uses compareItems() to tqfind the item. + Removes the item \a d from the list. Uses compareItems() to find the item. If \a d is 0, removes the current item. */ bool TQGList::remove( TQPtrCollection::Item d ) { - if ( d && tqfind(d) == -1 ) + if ( d && find(d) == -1 ) return FALSE; TQLNode *n = unlink(); if ( !n ) @@ -553,7 +553,7 @@ bool TQGList::remove( TQPtrCollection::Item d ) bool TQGList::removeRef( TQPtrCollection::Item d ) { - if ( tqfindRef(d) == -1 ) + if ( findRef(d) == -1 ) return FALSE; TQLNode *n = unlink(); if ( !n ) @@ -595,7 +595,7 @@ bool TQGList::removeAt( uint index ) /*! Replaces the item at index \a index with \a d. */ -bool TQGList::tqreplaceAt( uint index, TQPtrCollection::Item d ) +bool TQGList::replaceAt( uint index, TQPtrCollection::Item d ) { TQLNode *n = locate( index ); if ( !n ) @@ -714,7 +714,7 @@ void TQGList::clear() begins at the first node; otherwise it begins at the current node. */ -int TQGList::tqfindRef( TQPtrCollection::Item d, bool fromStart ) +int TQGList::findRef( TQPtrCollection::Item d, bool fromStart ) { register TQLNode *n; int index; @@ -725,7 +725,7 @@ int TQGList::tqfindRef( TQPtrCollection::Item d, bool fromStart ) n = curNode; index = curIndex; } - while ( n && n->data != d ) { // tqfind exact match + while ( n && n->data != d ) { // find exact match n = n->next; index++; } @@ -740,7 +740,7 @@ int TQGList::tqfindRef( TQPtrCollection::Item d, bool fromStart ) current node. */ -int TQGList::tqfind( TQPtrCollection::Item d, bool fromStart ) +int TQGList::find( TQPtrCollection::Item d, bool fromStart ) { register TQLNode *n; int index; @@ -751,7 +751,7 @@ int TQGList::tqfind( TQPtrCollection::Item d, bool fromStart ) n = curNode; index = curIndex; } - while ( n && compareItems(n->data,d) ){ // tqfind equal match + while ( n && compareItems(n->data,d) ){ // find equal match n = n->next; index++; } @@ -765,7 +765,7 @@ int TQGList::tqfind( TQPtrCollection::Item d, bool fromStart ) Counts the number item \a d occurs in the list. */ -uint TQGList::tqcontainsRef( TQPtrCollection::Item d ) const +uint TQGList::containsRef( TQPtrCollection::Item d ) const { register TQLNode *n = firstNode; uint count = 0; @@ -782,7 +782,7 @@ uint TQGList::tqcontainsRef( TQPtrCollection::Item d ) const compareItems(). */ -uint TQGList::tqcontains( TQPtrCollection::Item d ) const +uint TQGList::contains( TQPtrCollection::Item d ) const { register TQLNode *n = firstNode; uint count = 0; diff --git a/tqtinterface/qt4/src/tools/tqglist.h b/tqtinterface/qt4/src/tools/tqglist.h index 4c91453..ebbd616 100644 --- a/tqtinterface/qt4/src/tools/tqglist.h +++ b/tqtinterface/qt4/src/tools/tqglist.h @@ -91,7 +91,7 @@ protected: bool removeFirst(); // remove first item bool removeLast(); // remove last item bool removeAt( uint ); // remove item at i'th position - bool tqreplaceAt( uint, TQPtrCollection::Item ); // tqreplace item at position i with item + bool replaceAt( uint, TQPtrCollection::Item ); // replace item at position i with item TQPtrCollection::Item takeNode( TQLNode * ); // take out node TQPtrCollection::Item take(); // take out current item TQPtrCollection::Item takeAt( uint index ); // take out item at i'th pos @@ -101,11 +101,11 @@ protected: void sort(); // sort all items; void clear(); // remove all items - int tqfindRef( TQPtrCollection::Item, bool = TRUE ); // tqfind exact item in list - int tqfind( TQPtrCollection::Item, bool = TRUE ); // tqfind equal item in list + int findRef( TQPtrCollection::Item, bool = TRUE ); // find exact item in list + int find( TQPtrCollection::Item, bool = TRUE ); // find equal item in list - uint tqcontainsRef( TQPtrCollection::Item ) const; // get number of exact matches - uint tqcontains( TQPtrCollection::Item ) const; // get number of equal matches + uint containsRef( TQPtrCollection::Item ) const; // get number of exact matches + uint contains( TQPtrCollection::Item ) const; // get number of equal matches TQPtrCollection::Item at( uint index ); // access item at i'th pos int at() const; // get current index diff --git a/tqtinterface/qt4/src/tools/tqglobal.cpp b/tqtinterface/qt4/src/tools/tqglobal.cpp index 0d548ed..dd5528b 100644 --- a/tqtinterface/qt4/src/tools/tqglobal.cpp +++ b/tqtinterface/qt4/src/tools/tqglobal.cpp @@ -784,7 +784,7 @@ static bool firstObsoleteWarning(const char *obj, const char *oldfunc ) TQCString s( obj ); s += "::"; s += oldfunc; - if ( obsoleteDict->tqfind(s.data()) == 0 ) { + if ( obsoleteDict->find(s.data()) == 0 ) { obsoleteDict->insert( s.data(), (int*)1 ); // anything different from 0 return TRUE; } @@ -842,7 +842,7 @@ void qObsolete( const char *message ) The message handler is a function that prints out debug messages, warnings and fatal error messages. The TQt library (debug version) - tqcontains hundreds of warning messages that are printed when + contains hundreds of warning messages that are printed when internal errors (usually invalid function arguments) occur. If you implement your own message handler, you get total control of these messages. @@ -898,7 +898,7 @@ TQtMsgHandler tqInstallMsgHandler( TQtMsgHandler h ) /* - Dijkstra's bisection algorithm to tqfind the square root as an integer. + Dijkstra's bisection algorithm to find the square root as an integer. Deliberately not exported as part of the TQt API, but used in both qsimplerichtext.cpp and qgfxraster_qws.cpp */ diff --git a/tqtinterface/qt4/src/tools/tqglobal.h b/tqtinterface/qt4/src/tools/tqglobal.h index 693da3f..6dbb122 100644 --- a/tqtinterface/qt4/src/tools/tqglobal.h +++ b/tqtinterface/qt4/src/tools/tqglobal.h @@ -603,7 +603,7 @@ /* Some classes do not permit copies to be made of an object. - These classes tqcontains a private copy constructor and operator= + These classes contains a private copy constructor and operator= to disable copying (the compiler gives an error message). Undefine TQ_DISABLE_COPY to turn off this checking. */ diff --git a/tqtinterface/qt4/src/tools/tqgpluginmanager.cpp b/tqtinterface/qt4/src/tools/tqgpluginmanager.cpp index ef0ab02..969d424 100644 --- a/tqtinterface/qt4/src/tools/tqgpluginmanager.cpp +++ b/tqtinterface/qt4/src/tools/tqgpluginmanager.cpp @@ -330,7 +330,7 @@ void TQGPluginManager::addLibraryPath( const TQString& path ) TQStringList plugins = TQDir(path).entryList( filter ); for ( TQStringList::Iterator p = plugins.begin(); p != plugins.end(); ++p ) { TQString lib = TQDir::cleanDirPath( path + "/" + *p ); - if ( libList.tqcontains( lib ) ) + if ( libList.contains( lib ) ) continue; libList.append( lib ); } @@ -376,14 +376,14 @@ const TQLibrary* TQGPluginManager::library( const TQString& feature ) const group.sort(); // sort according to the base name TQStringList::ConstIterator git = group.begin(); while ( git != group.end() ) { - TQString lib = (*git).mid( (*git).tqfind( TQChar(0xfffd) ) + 1 ); - TQString basename = (*git).left( (*git).tqfind( TQChar(0xfffd) ) ); + TQString lib = (*git).mid( (*git).find( TQChar(0xfffd) ) + 1 ); + TQString basename = (*git).left( (*git).find( TQChar(0xfffd) ) ); ++git; TQStringList sameBasename; while( git != group.end() && - basename == (*git).left( (*git).tqfind( TQChar(0xfffd) ) ) ) { - sameBasename << (*git).mid( (*git).tqfind( TQChar(0xfffd) ) + 1 ); + basename == (*git).left( (*git).find( TQChar(0xfffd) ) ) ) { + sameBasename << (*git).mid( (*git).find( TQChar(0xfffd) ) + 1 ); ++git; } @@ -402,7 +402,7 @@ const TQLibrary* TQGPluginManager::library( const TQString& feature ) const && ( !bestMatch || candidate->qtVersion() > bestMatch->qtVersion() ) ) bestMatch = candidate; if ( bestMatch ) { - same.tqfind( bestMatch ); + same.find( bestMatch ); that->addLibrary( same.take() ); } } @@ -444,7 +444,7 @@ TQStringList TQGPluginManager::featureList() const } } for ( it = phase2Libs.begin(); it != phase2Libs.end(); ++it ) - if ( !phase2Deny.tqcontains( TQFileInfo( *it ).baseName() ) ) + if ( !phase2Deny.contains( TQFileInfo( *it ).baseName() ) ) that->addLibrary( new TQComLibrary( *it ) ); for ( TQDictIterator<TQLibrary> pit( plugDict ); pit.current(); ++pit ) @@ -485,7 +485,7 @@ bool TQGPluginManager::addLibrary( TQLibrary* lib ) TQLibrary *old = plugDict[*f]; if ( !old ) { useful = TRUE; - plugDict.tqreplace( *f, plugin ); + plugDict.replace( *f, plugin ); } else { // we have old *and* plugin, which one to pick? TQComLibrary* first = (TQComLibrary*)old; @@ -500,7 +500,7 @@ bool TQGPluginManager::addLibrary( TQLibrary* lib ) } if ( !takeFirst ) { useful = TRUE; - plugDict.tqreplace( *f, plugin ); + plugDict.replace( *f, plugin ); qWarning("%s: Discarding feature %s in %s!", (const char*) TQFile::encodeName( plugin->library()), (*f).latin1(), @@ -521,8 +521,8 @@ bool TQGPluginManager::addLibrary( TQLibrary* lib ) } if ( useful ) { - libDict.tqreplace( plugin->library(), plugin ); - if ( !libList.tqcontains( plugin->library() ) ) + libDict.replace( plugin->library(), plugin ); + if ( !libList.contains( plugin->library() ) ) libList.append( plugin->library() ); return TRUE; } diff --git a/tqtinterface/qt4/src/tools/tqgvector.cpp b/tqtinterface/qt4/src/tools/tqgvector.cpp index e30c172..4151d54 100644 --- a/tqtinterface/qt4/src/tools/tqgvector.cpp +++ b/tqtinterface/qt4/src/tools/tqgvector.cpp @@ -453,11 +453,11 @@ int TQGVector::bsearch( Item d ) const // binary search; when sorted return mid; } -int TQGVector::tqfindRef( Item d, uint index) const // tqfind exact item in vector +int TQGVector::findRef( Item d, uint index) const // find exact item in vector { #if defined(TQT_CHECK_RANGE) if ( index > len ) { // range error - qWarning( "TQGVector::tqfindRef: Index %d out of range", index ); + qWarning( "TQGVector::findRef: Index %d out of range", index ); return -1; } #endif @@ -468,11 +468,11 @@ int TQGVector::tqfindRef( Item d, uint index) const // tqfind exact item in vect return -1; } -int TQGVector::tqfind( Item d, uint index ) const // tqfind equal item in vector +int TQGVector::find( Item d, uint index ) const // find equal item in vector { #if defined(TQT_CHECK_RANGE) if ( index >= len ) { // range error - qWarning( "TQGVector::tqfind: Index %d out of range", index ); + qWarning( "TQGVector::find: Index %d out of range", index ); return -1; } #endif @@ -485,7 +485,7 @@ int TQGVector::tqfind( Item d, uint index ) const // tqfind equal item in vector return -1; } -uint TQGVector::tqcontainsRef( Item d ) const // get number of exact matches +uint TQGVector::containsRef( Item d ) const // get number of exact matches { uint count = 0; for ( uint i=0; i<len; i++ ) { @@ -495,7 +495,7 @@ uint TQGVector::tqcontainsRef( Item d ) const // get number of exact matches return count; } -uint TQGVector::tqcontains( Item d ) const // get number of equal matches +uint TQGVector::contains( Item d ) const // get number of equal matches { uint count = 0; for ( uint i=0; i<len; i++ ) { diff --git a/tqtinterface/qt4/src/tools/tqgvector.h b/tqtinterface/qt4/src/tools/tqgvector.h index 1cc5937..ebb5e03 100644 --- a/tqtinterface/qt4/src/tools/tqgvector.h +++ b/tqtinterface/qt4/src/tools/tqgvector.h @@ -81,10 +81,10 @@ protected: void sort(); // sort vector int bsearch( Item ) const; // binary search (when sorted) - int tqfindRef( Item, uint index ) const; // tqfind exact item in vector - int tqfind( Item, uint index ) const; // tqfind equal item in vector - uint tqcontainsRef( Item ) const; // get number of exact matches - uint tqcontains( Item ) const; // get number of equal matches + int findRef( Item, uint index ) const; // find exact item in vector + int find( Item, uint index ) const; // find equal item in vector + uint containsRef( Item ) const; // get number of exact matches + uint contains( Item ) const; // get number of equal matches Item at( uint index ) const // return indexed item { diff --git a/tqtinterface/qt4/src/tools/tqintcache.h b/tqtinterface/qt4/src/tools/tqintcache.h index ed48fc3..239a40c 100644 --- a/tqtinterface/qt4/src/tools/tqintcache.h +++ b/tqtinterface/qt4/src/tools/tqintcache.h @@ -74,10 +74,10 @@ public: type *take( long k ) { return (type *)TQGCache::take_other((const char*)k);} void clear() { TQGCache::clear(); } - type *tqfind( long k, bool ref=TRUE ) const - { return (type *)TQGCache::tqfind_other( (const char*)k,ref);} + type *find( long k, bool ref=TRUE ) const + { return (type *)TQGCache::find_other( (const char*)k,ref);} type *operator[]( long k ) const - { return (type *)TQGCache::tqfind_other( (const char*)k); } + { return (type *)TQGCache::find_other( (const char*)k); } void statistics() const { TQGCache::statistics(); } private: void deleteItem( Item d ); diff --git a/tqtinterface/qt4/src/tools/tqintdict.h b/tqtinterface/qt4/src/tools/tqintdict.h index dc6cc2e..35a821f 100644 --- a/tqtinterface/qt4/src/tools/tqintdict.h +++ b/tqtinterface/qt4/src/tools/tqintdict.h @@ -64,11 +64,11 @@ public: bool isEmpty() const { return TQGDict::count() == 0; } void insert( long k, const type *d ) { TQGDict::look_int(k,(Item)d,1); } - void tqreplace( long k, const type *d ) + void replace( long k, const type *d ) { TQGDict::look_int(k,(Item)d,2); } bool remove( long k ) { return TQGDict::remove_int(k); } type *take( long k ) { return (type*)TQGDict::take_int(k); } - type *tqfind( long k ) const + type *find( long k ) const { return (type *)((TQGDict*)this)->TQGDict::look_int(k,0,0); } type *operator[]( long k ) const { return (type *)((TQGDict*)this)->TQGDict::look_int(k,0,0); } diff --git a/tqtinterface/qt4/src/tools/tqiodevice.cpp b/tqtinterface/qt4/src/tools/tqiodevice.cpp index 299d949..c2e48ce 100644 --- a/tqtinterface/qt4/src/tools/tqiodevice.cpp +++ b/tqtinterface/qt4/src/tools/tqiodevice.cpp @@ -381,7 +381,7 @@ TQIODevice::~TQIODevice() The I/O tqdevice status returns an error code. If open() returns FALSE or readBlock() or writeBlock() return -1, this function can - be called to tqfind out the reason why the operation failed. + be called to find out the reason why the operation failed. \keyword IO_Ok \keyword IO_ReadError diff --git a/tqtinterface/qt4/src/tools/tqlibrary.cpp b/tqtinterface/qt4/src/tools/tqlibrary.cpp index cf34295..5236cd5 100644 --- a/tqtinterface/qt4/src/tools/tqlibrary.cpp +++ b/tqtinterface/qt4/src/tools/tqlibrary.cpp @@ -140,7 +140,7 @@ TQLibraryPrivate::TQLibraryPrivate( TQLibrary *lib ) TQLibrary::TQLibrary( const TQString& filename ) : libfile( filename ), aunload( TRUE ) { - libfile.tqreplace( '\\', '/' ); + libfile.replace( '\\', '/' ); d = new TQLibraryPrivate( this ); } @@ -399,7 +399,7 @@ TQString TQLibrary::library() const TQString filename = libfile; #if defined(TQ_WS_WIN) - if ( filename.tqfindRev( '.' ) <= filename.tqfindRev( '/' ) ) + if ( filename.findRev( '.' ) <= filename.findRev( '/' ) ) filename += ".dll"; #else TQStringList filters = ""; @@ -421,7 +421,7 @@ TQString TQLibrary::library() const break; } else if(!filter.isEmpty()) { TQString tmpfilename = filename; - const int x = tmpfilename.tqfindRev( "/" ); + const int x = tmpfilename.findRev( "/" ); if ( x != -1 ) { TQString path = tmpfilename.left( x + 1 ); TQString file = tmpfilename.right( tmpfilename.length() - x - 1 ); @@ -429,7 +429,7 @@ TQString TQLibrary::library() const } else { tmpfilename = TQString( "lib%1" ).arg( filename ); } - if ( !filename.tqcontains(".so") ) + if ( !filename.contains(".so") ) tmpfilename += filter; if(TQFile::exists(tmpfilename) || it == filters.end()) { filename = tmpfilename; diff --git a/tqtinterface/qt4/src/tools/tqlibrary_unix.cpp b/tqtinterface/qt4/src/tools/tqlibrary_unix.cpp index 62c909c..271a897 100644 --- a/tqtinterface/qt4/src/tools/tqlibrary_unix.cpp +++ b/tqtinterface/qt4/src/tools/tqlibrary_unix.cpp @@ -95,7 +95,7 @@ void* TQLibraryPrivate::resolveSymbol( const char* symbol ) return 0; void* address = 0; - if ( shl_tqfindsym( (shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address ) < 0 ) { + if ( shl_findsym( (shl_t*)&pHnd, symbol, TYPE_UNDEFINED, &address ) < 0 ) { #if defined(TQT_DEBUG_COMPONENT) TQString filename = library->library(); qWarning( "%s: couldn't resolve symbol \"%s\"", filename.latin1(), symbol ); diff --git a/tqtinterface/qt4/src/tools/tqlocale.cpp b/tqtinterface/qt4/src/tools/tqlocale.cpp index 69c8c39..e91cab8 100644 --- a/tqtinterface/qt4/src/tools/tqlocale.cpp +++ b/tqtinterface/qt4/src/tools/tqlocale.cpp @@ -1903,7 +1903,7 @@ const char* TQLocalePrivate::systemLocaleName() return lang; } -static const TQLocalePrivate *tqfindLocale(TQLocale::Language language, +static const TQLocalePrivate *findLocale(TQLocale::Language language, TQLocale::Country country) { unsigned language_id = (unsigned)language; @@ -1965,7 +1965,7 @@ static const TQLocalePrivate *tqfindLocale(TQLocale::Language language, \i TQString::toDouble() interprets the string according to the default locale. If this fails, it falls back on the "C" locale. \i TQString::arg() uses the default locale to format a number when - its position specifier in the format string tqcontains an 'L', + its position specifier in the format string contains an 'L', e.g. "%L1". \endlist @@ -2504,7 +2504,7 @@ TQLocale::TQLocale(const TQString &name) cntry = codeToCountry(name.mid(3, 2)); } while (FALSE); - d = tqfindLocale(lang, cntry); + d = findLocale(lang, cntry); } /*! @@ -2542,7 +2542,7 @@ TQLocale::TQLocale() TQLocale::TQLocale(Language language, Country country) { - d = tqfindLocale(language, country); + d = findLocale(language, country); // If not found, should default to system if (d->languageId() == TQLocale::C && language != TQLocale::C) { diff --git a/tqtinterface/qt4/src/tools/tqmap.h b/tqtinterface/qt4/src/tools/tqmap.h index fe36e97..006f490 100644 --- a/tqtinterface/qt4/src/tools/tqmap.h +++ b/tqtinterface/qt4/src/tools/tqmap.h @@ -392,7 +392,6 @@ public: ConstIterator end() const { return ConstIterator( header ); } ConstIterator find(const Key& k) const; - ConstIterator tqfind(const Key& k) const; void remove( Iterator it ) { NodePtr del = (NodePtr) removeAndRebalance( it.node, header->tqparent, header->left, header->right ); @@ -508,12 +507,6 @@ TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Ke template <class Key, class T> TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const { - return tqfind(k); -} - -template <class Key, class T> -TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::tqfind(const Key& k) const -{ TQMapNodeBase* y = header; // Last node TQMapNodeBase* x = header->tqparent; // Root node. @@ -560,7 +553,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T // Really bigger ? if ( (j.node->key) < k ) return insert(x, y, k ); - // We are going to tqreplace a node + // We are going to replace a node return j; } @@ -709,7 +702,7 @@ public: const_iterator constBegin() const { return begin(); } const_iterator constEnd() const { return end(); } - iterator tqreplace( const Key& k, const T& v ) + iterator replace( const Key& k, const T& v ) { remove( k ); return insert( k, v ); @@ -735,21 +728,18 @@ public: T& operator[] ( const Key& k ); void clear(); - iterator tqfind ( const Key& k ) + iterator find ( const Key& k ) { detach(); - return iterator( sh->tqfind( k ).node ); + return iterator( sh->find( k ).node ); } - const_iterator tqfind ( const Key& k ) const { return sh->tqfind( k ); } - - iterator find ( const Key& k ) { return tqfind(k); } - const_iterator find ( const Key& k ) const { return tqfind(k); } + const_iterator find ( const Key& k ) const { return sh->find( k ); } const T& operator[] ( const Key& k ) const - { TQT_CHECK_INVALID_MAP_ELEMENT; return sh->tqfind( k ).data(); } - bool tqcontains ( const Key& k ) const - { return tqfind( k ) != end(); } - //{ return sh->tqfind( k ) != ((const Priv*)sh)->end(); } + { TQT_CHECK_INVALID_MAP_ELEMENT; return sh->find( k ).data(); } + bool contains ( const Key& k ) const + { return find( k ) != end(); } + //{ return sh->find( k ) != ((const Priv*)sh)->end(); } size_type count() const { return sh->node_count; } @@ -847,7 +837,7 @@ template<class Key, class T> TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) { detach(); - iterator it( sh->tqfind( k ).node ); + iterator it( sh->find( k ).node ); if ( it != end() ) sh->remove( it ); } @@ -855,7 +845,7 @@ TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k ) template<class Key, class T> TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const { - const_iterator it( sh->tqfind( k ).node ); + const_iterator it( sh->find( k ).node ); if ( it != end() ) { size_type c = 0; while ( it != end() ) { @@ -871,7 +861,7 @@ template<class Key, class T> TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k ) { detach(); - TQMapNode<Key,T>* p = sh->tqfind( k ).node; + TQMapNode<Key,T>* p = sh->find( k ).node; if ( p != sh->end().node ) return p->data; return insert( k, T() ).data(); @@ -903,7 +893,7 @@ template<class Key, class T> TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k ) { detach(); - iterator it( sh->tqfind( k ).node ); + iterator it( sh->find( k ).node ); if ( it != end() ) sh->remove( it ); } diff --git a/tqtinterface/qt4/src/tools/tqmemarray.h b/tqtinterface/qt4/src/tools/tqmemarray.h index 99e00b0..df76c98 100644 --- a/tqtinterface/qt4/src/tools/tqmemarray.h +++ b/tqtinterface/qt4/src/tools/tqmemarray.h @@ -91,10 +91,10 @@ public: n*sizeof(type)); } void resetRawData( const type *a, uint n ) { TQGArray::resetRawData((char*)a,n*sizeof(type)); } - int tqfind( const type &d, uint i=0 ) const - { return TQGArray::tqfind((char*)&d,i,sizeof(type)); } - int tqcontains( const type &d ) const - { return TQGArray::tqcontains((char*)&d,sizeof(type)); } + int find( const type &d, uint i=0 ) const + { return TQGArray::find((char*)&d,i,sizeof(type)); } + int contains( const type &d ) const + { return TQGArray::contains((char*)&d,sizeof(type)); } void sort() { TQGArray::sort(sizeof(type)); } int bsearch( const type &d ) const { return TQGArray::bsearch((const char*)&d,sizeof(type)); } diff --git a/tqtinterface/qt4/src/tools/tqptrcollection.cpp b/tqtinterface/qt4/src/tools/tqptrcollection.cpp index 38bbeef..481c272 100644 --- a/tqtinterface/qt4/src/tools/tqptrcollection.cpp +++ b/tqtinterface/qt4/src/tools/tqptrcollection.cpp @@ -114,7 +114,7 @@ if the collection has the only pointer to the items. The default setting is FALSE, for safety. If you turn it on, be - careful about copying the collection - you might tqfind yourself + careful about copying the collection - you might find yourself with two collections deleting the same items. Note that the auto-delete setting may also affect other functions diff --git a/tqtinterface/qt4/src/tools/tqptrdict.h b/tqtinterface/qt4/src/tools/tqptrdict.h index 908907d..882872e 100644 --- a/tqtinterface/qt4/src/tools/tqptrdict.h +++ b/tqtinterface/qt4/src/tools/tqptrdict.h @@ -64,11 +64,11 @@ public: bool isEmpty() const { return TQGDict::count() == 0; } void insert( void *k, const type *d ) { TQGDict::look_ptr(k,(Item)d,1); } - void tqreplace( void *k, const type *d ) + void replace( void *k, const type *d ) { TQGDict::look_ptr(k,(Item)d,2); } bool remove( void *k ) { return TQGDict::remove_ptr(k); } type *take( void *k ) { return (type*)TQGDict::take_ptr(k); } - type *tqfind( void *k ) const + type *find( void *k ) const { return (type *)((TQGDict*)this)->TQGDict::look_ptr(k,0,0); } type *operator[]( void *k ) const { return (type *)((TQGDict*)this)->TQGDict::look_ptr(k,0,0); } diff --git a/tqtinterface/qt4/src/tools/tqptrlist.h b/tqtinterface/qt4/src/tools/tqptrlist.h index 2839df6..25f7e1b 100644 --- a/tqtinterface/qt4/src/tools/tqptrlist.h +++ b/tqtinterface/qt4/src/tools/tqptrlist.h @@ -95,14 +95,14 @@ public: type *takeNode( TQLNode *n ) { return (type *)TQGList::takeNode(n); } void clear() { TQGList::clear(); } void sort() { TQGList::sort(); } - int tqfind( const type *d ) { return TQGList::tqfind((TQPtrCollection::Item)d); } - int tqfindNext( const type *d ) { return TQGList::tqfind((TQPtrCollection::Item)d,FALSE); } - int tqfindRef( const type *d ) { return TQGList::tqfindRef((TQPtrCollection::Item)d); } - int tqfindNextRef( const type *d ){ return TQGList::tqfindRef((TQPtrCollection::Item)d,FALSE);} - uint tqcontains( const type *d ) const { return TQGList::tqcontains((TQPtrCollection::Item)d); } - uint tqcontainsRef( const type *d ) const - { return TQGList::tqcontainsRef((TQPtrCollection::Item)d); } - bool tqreplace( uint i, const type *d ) { return TQGList::tqreplaceAt( i, (TQPtrCollection::Item)d ); } + int find( const type *d ) { return TQGList::find((TQPtrCollection::Item)d); } + int findNext( const type *d ) { return TQGList::find((TQPtrCollection::Item)d,FALSE); } + int findRef( const type *d ) { return TQGList::findRef((TQPtrCollection::Item)d); } + int findNextRef( const type *d ){ return TQGList::findRef((TQPtrCollection::Item)d,FALSE);} + uint contains( const type *d ) const { return TQGList::contains((TQPtrCollection::Item)d); } + uint containsRef( const type *d ) const + { return TQGList::containsRef((TQPtrCollection::Item)d); } + bool replace( uint i, const type *d ) { return TQGList::replaceAt( i, (TQPtrCollection::Item)d ); } type *at( uint i ) { return (type *)TQGList::at(i); } type *tqat( uint i ) { return (type *)TQGList::at(i); } int at() const { return TQGList::at(); } diff --git a/tqtinterface/qt4/src/tools/tqptrvector.h b/tqtinterface/qt4/src/tools/tqptrvector.h index 97934d4..14164ca 100644 --- a/tqtinterface/qt4/src/tools/tqptrvector.h +++ b/tqtinterface/qt4/src/tools/tqptrvector.h @@ -75,14 +75,14 @@ public: { return TQGVector::fill((Item)d,size);} void sort() { TQGVector::sort(); } int bsearch( const type *d ) const{ return TQGVector::bsearch((Item)d); } - int tqfindRef( const type *d, uint i=0 ) const - { return TQGVector::tqfindRef((Item)d,i);} - int tqfind( const type *d, uint i= 0 ) const - { return TQGVector::tqfind((Item)d,i); } - uint tqcontainsRef( const type *d ) const - { return TQGVector::tqcontainsRef((Item)d); } - uint tqcontains( const type *d ) const - { return TQGVector::tqcontains((Item)d); } + int findRef( const type *d, uint i=0 ) const + { return TQGVector::findRef((Item)d,i);} + int find( const type *d, uint i= 0 ) const + { return TQGVector::find((Item)d,i); } + uint containsRef( const type *d ) const + { return TQGVector::containsRef((Item)d); } + uint contains( const type *d ) const + { return TQGVector::contains((Item)d); } type *operator[]( int i ) const { return (type *)TQGVector::at(i); } type *at( uint i ) const { return (type *)TQGVector::at(i); } type *tqat( uint i ) const { return (type *)TQGVector::at(i); } diff --git a/tqtinterface/qt4/src/tools/tqregexp.cpp b/tqtinterface/qt4/src/tools/tqregexp.cpp index cac50e5..5f73872 100644 --- a/tqtinterface/qt4/src/tools/tqregexp.cpp +++ b/tqtinterface/qt4/src/tools/tqregexp.cpp @@ -140,23 +140,23 @@ void TQRegExp::setCaseSensitive( bool sensitive ) \mainclass \keyword regular expression - Regular expressions, or "regexps", provide a way to tqfind patterns + Regular expressions, or "regexps", provide a way to find patterns within text. This is useful in many contexts, for example: \table \row \i Validation \i A regexp can be used to check whether a piece of text - meets some criteria, e.g. is an integer or tqcontains no + meets some criteria, e.g. is an integer or contains no whitespace. \row \i Searching \i Regexps provide a much more powerful means of searching text than simple string matching does. For example we can - create a regexp which says "tqfind one of the words 'mail', + create a regexp which says "find one of the words 'mail', 'letter' or 'correspondence' but not any of the words 'email', 'mailman' 'mailer', 'letterbox' etc." \row \i Search and Replace - \i A regexp can be used to tqreplace a pattern with a piece of - text, for example tqreplace all occurrences of '&' with + \i A regexp can be used to replace a pattern with a piece of + text, for example replace all occurrences of '&' with '\&' except where the '&' is already followed by 'amp;'. \row \i String Splitting \i A regexp can be used to identify where a string should be @@ -227,9 +227,9 @@ void TQRegExp::setCaseSensitive( bool sensitive ) If you've seen regexps elsewhere they may have looked different from the ones above. This is because some sets of characters and some quantifiers are so common that they have special symbols to - represent them. <b>[0-9]</b> can be tqreplaced with the symbol + represent them. <b>[0-9]</b> can be replaced with the symbol <b>\d</b>. The quantifier to match exactly one occurrence, - <b>{1,1}</b>, can be tqreplaced with the expression itself. This means + <b>{1,1}</b>, can be replaced with the expression itself. This means that <b>x{1,1}</b> is exactly the same as <b>x</b> alone. So our 0 to 99 matcher could be written <b>^\d{1,2}$</b>. Another way of writing it would be <b>^\d\d{0,1}$</b>, i.e. from the start of the @@ -250,8 +250,8 @@ void TQRegExp::setCaseSensitive( bool sensitive ) followed by an 'i' followed by an 'l'. The symbol '|' (bar) is used for \e alternation, so our regexp now becomes <b>mail|letter|correspondence</b> which means match 'mail' \e or - 'letter' \e or 'correspondence'. Whilst this regexp will tqfind the - words we want it will also tqfind words we don't want such as + 'letter' \e or 'correspondence'. Whilst this regexp will find the + words we want it will also find words we don't want such as 'email'. We will start by putting our regexp in parentheses, <b>(mail|letter|correspondence)</b>. Parentheses have two effects, firstly they group expressions together and secondly they identify @@ -268,16 +268,16 @@ void TQRegExp::setCaseSensitive( bool sensitive ) boundary is any non-word character such as a space a newline or the beginning or end of the string. - For our third example we want to tqreplace ampersands with the HTML + For our third example we want to replace ampersands with the HTML entity '\&'. The regexp to match is simple: <b>\&</b>, i.e. match one ampersand. Unfortunately this will mess up our text if some of the ampersands have already been turned into HTML - entities. So what we really want to say is tqreplace an ampersand + entities. So what we really want to say is replace an ampersand providing it is not followed by 'amp;'. For this we need the negative lookahead assertion and our regexp becomes: <b>\&(?!amp;)</b>. The negative lookahead assertion is introduced with '(?!' and finishes at the ')'. It means that the text it - tqcontains, 'amp;' in our example, must \e not follow the expression + contains, 'amp;' in our example, must \e not follow the expression that preceeds it. Regexps provide a rich language that can be used in a variety of @@ -403,7 +403,7 @@ void TQRegExp::setCaseSensitive( bool sensitive ) occurrences it will match no occurrences at all. For example if we want to match strings that end in whitespace and use the regexp <b>\s*$</b> we would get a match on every string. - This is because we have said tqfind zero or more whitespace + This is because we have said find zero or more whitespace followed by the end of string, so even strings that don't end in whitespace will match. The regexp we want in this case is <b>\s+$</b> to match strings that have at least one @@ -439,7 +439,7 @@ void TQRegExp::setCaseSensitive( bool sensitive ) Note that quantifiers are "greedy". They will match as much text as they can. For example, <b>0+</b> will match as many zeros as it - can from the first zero it tqfinds, e.g. '2.<u>000</u>5'. + can from the first zero it finds, e.g. '2.<u>000</u>5'. Quantifiers can be made non-greedy, see setMinimal(). \target capturing-text @@ -605,7 +605,7 @@ void TQRegExp::setCaseSensitive( bool sensitive ) ... correspond to cap(1) or capturedTexts()[1], cap(2) or capturedTexts()[2], etc. - To substitute a pattern use TQString::tqreplace(). + To substitute a pattern use TQString::replace(). Perl's extended \c{/x} syntax is not supported, nor are directives, e.g. (?i), or regexp comments, e.g. (?#comment). On @@ -680,15 +680,15 @@ void TQRegExp::setCaseSensitive( bool sensitive ) \code TQRegExp rx( "&(?!amp;)" ); // match ampersands but not & TQString line1 = "This & that"; - line1.tqreplace( rx, "&" ); + line1.replace( rx, "&" ); // line1 == "This & that" TQString line2 = "His & hers & theirs"; - line2.tqreplace( rx, "&" ); + line2.replace( rx, "&" ); // line2 == "His & hers & theirs" \endcode - Here we've passed the TQRegExp to TQString's tqreplace() function to - tqreplace the matched text with new text. + Here we've passed the TQRegExp to TQString's replace() function to + replace the matched text with new text. \code TQString str = "One Eric another Eirik, and an Ericsson." @@ -847,7 +847,7 @@ static void mergeInto( TQMap<int, int> *a, const TQMap<int, int>& b ) */ static int at( const TQMap<int, int>& m, int k ) { - TQMap<int, int>::ConstIterator it = m.tqfind( k ); + TQMap<int, int>::ConstIterator it = m.find( k ); if ( it == m.end() ) return 0; else @@ -1336,7 +1336,7 @@ void TQRegExpEngine::match( const TQString& str, int pos, bool minimal, #ifndef TQT_NO_REGEXP_OPTIM if ( trivial && !oneTest ) { - mmPos = str.tqfind( goodStr, pos, cs ); + mmPos = str.find( goodStr, pos, cs ); mmMatchLen = goodStr.length(); matched = ( mmPos != -1 ); } else @@ -1457,7 +1457,7 @@ void TQRegExpEngine::addPlusTransitions( const TQMemArray<int>& from, if ( st->reenter == 0 ) st->reenter = new TQMap<int, int>; for ( int j = 0; j < (int) to.size(); j++ ) { - if ( !st->reenter->tqcontains(to[j]) && + if ( !st->reenter->contains(to[j]) && oldOuts.bsearch(to[j]) < 0 ) st->reenter->insert( to[j], atom ); } @@ -1512,7 +1512,7 @@ void TQRegExpEngine::addAnchors( int from, int to, int a ) State *st = s[from]; if ( st->anchors == 0 ) st->anchors = new TQMap<int, int>; - if ( st->anchors->tqcontains(to) ) + if ( st->anchors->contains(to) ) a = anchorAlternation( (*st->anchors)[to], a ); st->anchors->insert( to, a ); } @@ -1595,7 +1595,7 @@ void TQRegExpEngine::dump() const for ( j = 0; j < (int) s[i]->outs.size(); j++ ) { int next = s[i]->outs[j]; qDebug( " -> %d", next ); - if ( s[i]->reenter != 0 && s[i]->reenter->tqcontains(next) ) + if ( s[i]->reenter != 0 && s[i]->reenter->contains(next) ) qDebug( " [reenter %d]", (*s[i]->reenter)[next] ); if ( s[i]->anchors != 0 && at(*s[i]->anchors, next) != 0 ) qDebug( " [anchors 0x%.8x]", (*s[i]->anchors)[next] ); @@ -1790,7 +1790,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin ) bool TQRegExpEngine::goodStringMatch() { int k = mmPos + goodEarlyStart; - while ( (k = mmStr->tqfind(goodStr, k, cs)) != -1 ) { + while ( (k = mmStr->find(goodStr, k, cs)) != -1 ) { int from = k - goodLateStart; int to = k - goodEarlyStart; if ( from > mmPos ) @@ -2097,7 +2097,7 @@ bool TQRegExpEngine::matchHere() for c and n. We go up along c's and n's ancestry until - we tqfind x. + we find x. */ } else { p = c; @@ -3239,7 +3239,7 @@ void TQRegExpEngine::parseExpression( Box *box ) } /* - The struct TQRegExpPrivate tqcontains the private data of a regular + The struct TQRegExpPrivate contains the private data of a regular expression other than the automaton. It makes it possible for many TQRegExp objects to use the same TQRegExpEngine object with different TQRegExpPrivate objects. @@ -3685,7 +3685,7 @@ int TQRegExp::search( const TQString& str, int offset ) const } /*! - Attempts to tqfind a match in \a str from position \a offset (0 by + Attempts to find a match in \a str from position \a offset (0 by default). If \a offset is -1, the search starts at the last character; if -2, at the next to last character; etc. @@ -3695,9 +3695,9 @@ int TQRegExp::search( const TQString& str, int offset ) const The \a caretMode parameter can be used to instruct whether <b>^</b> should match at index 0 or at \a offset. - You might prefer to use TQString::tqfind(), TQString::tqcontains() or - even TQStringList::grep(). To tqreplace matches use - TQString::tqreplace(). + You might prefer to use TQString::find(), TQString::contains() or + even TQStringList::grep(). To replace matches use + TQString::replace(). Example: \code @@ -3735,7 +3735,7 @@ int TQRegExp::searchRev( const TQString& str, int offset ) const } /*! - Attempts to tqfind a match backwards in \a str from position \a + Attempts to find a match backwards in \a str from position \a offset. If \a offset is -1 (the default), the search starts at the last character; if -2, at the next to last character; etc. @@ -3801,7 +3801,7 @@ int TQRegExp::numCaptures() const Returns a list of the captured text strings. The first string in the list is the entire matched string. Each - subsequent list element tqcontains a string that matched a + subsequent list element contains a string that matched a (capturing) subexpression of the regexp. For example: @@ -3906,7 +3906,7 @@ TQStringList TQRegExp::capturedTexts() pos += rx.matchedLength(); } } - // list tqcontains "12", "14", "99", "231", "7" + // list contains "12", "14", "99", "231", "7" \endcode \sa capturedTexts() pos() exactMatch() search() searchRev() diff --git a/tqtinterface/qt4/src/tools/tqsettings.cpp b/tqtinterface/qt4/src/tools/tqsettings.cpp index 3ef5e5e..d949940 100644 --- a/tqtinterface/qt4/src/tools/tqsettings.cpp +++ b/tqtinterface/qt4/src/tools/tqsettings.cpp @@ -150,13 +150,13 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode ) \code TQStringList keys = settings.entryList( "/MyApplication" ); - // keys tqcontains 'background color' and 'foreground color'. + // keys contains 'background color' and 'foreground color'. TQStringList keys = settings.entryList( "/MyApplication/recent files" ); - // keys tqcontains '1', '2' and '3'. + // keys contains '1', '2' and '3'. TQStringList subkeys = settings.subkeyList( "/MyApplication" ); - // subkeys tqcontains 'tqgeometry' and 'recent files' + // subkeys contains 'tqgeometry' and 'recent files' TQStringList subkeys = settings.subkeyList( "/MyApplication/recent files" ); // subkeys is empty. @@ -385,9 +385,9 @@ void TQSettingsHeading::parseLine(TQTextStream &stream) if (gname[(int)gname.length() - 1] == TQChar(']')) gname = gname.remove(gname.length() - 1, 1); - git = tqfind(gname); + git = find(gname); if (git == end()) - git = tqreplace(gname, TQSettingsGroup()); + git = replace(gname, TQSettingsGroup()); } else { if (git == end()) { #if defined(TQT_CHECK_STATE) @@ -396,7 +396,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream) return; } - int i = line.tqfind('='); + int i = line.find('='); if (i == -1) { #if defined(TQT_CHECK_STATE) qWarning("TQSettings: malformed line '%s' in group '%s'", @@ -529,27 +529,27 @@ TQSettingsGroup TQSettingsPrivate::readGroup() TQSettingsHeading hd; TQSettingsGroup grp; - TQMap<TQString,TQSettingsHeading>::Iterator headingsit = headings.tqfind(heading); + TQMap<TQString,TQSettingsHeading>::Iterator headingsit = headings.find(heading); if (headingsit != headings.end()) hd = *headingsit; - TQSettingsHeading::Iterator grpit = hd.tqfind(group); + TQSettingsHeading::Iterator grpit = hd.find(group); if (grpit == hd.end()) { TQStringList::Iterator it = searchPaths.begin(); if ( !globalScope ) ++it; while (it != searchPaths.end()) { - TQString filebase = heading.lower().tqreplace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); + TQString filebase = heading.lower().replace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); TQString fn((*it++) + "/" + filebase + "rc"); - if (! hd.tqcontains(fn + "cached")) { + if (! hd.contains(fn + "cached")) { hd.read(fn); hd.insert(fn + "cached", TQSettingsGroup()); } } - headings.tqreplace(heading, hd); + headings.replace(heading, hd); - grpit = hd.tqfind(group); + grpit = hd.find(group); if (grpit != hd.end()) grp = *grpit; } else if (hd.count() != 0) @@ -565,27 +565,27 @@ void TQSettingsPrivate::removeGroup(const TQString &key) TQSettingsGroup grp; bool found = FALSE; - TQMap<TQString,TQSettingsHeading>::Iterator headingsit = headings.tqfind(heading); + TQMap<TQString,TQSettingsHeading>::Iterator headingsit = headings.find(heading); if (headingsit != headings.end()) hd = *headingsit; - TQSettingsHeading::Iterator grpit = hd.tqfind(group); + TQSettingsHeading::Iterator grpit = hd.find(group); if (grpit == hd.end()) { TQStringList::Iterator it = searchPaths.begin(); if ( !globalScope ) ++it; while (it != searchPaths.end()) { - TQString filebase = heading.lower().tqreplace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); + TQString filebase = heading.lower().replace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); TQString fn((*it++) + "/" + filebase + "rc"); - if (! hd.tqcontains(fn + "cached")) { + if (! hd.contains(fn + "cached")) { hd.read(fn); hd.insert(fn + "cached", TQSettingsGroup()); } } - headings.tqreplace(heading, hd); + headings.replace(heading, hd); - grpit = hd.tqfind(group); + grpit = hd.find(group); if (grpit != hd.end()) { found = TRUE; grp = *grpit; @@ -599,12 +599,12 @@ void TQSettingsPrivate::removeGroup(const TQString &key) grp.remove(key); if (grp.count() > 0) - hd.tqreplace(group, grp); + hd.replace(group, grp); else hd.remove(group); if (hd.count() > 0) - headings.tqreplace(heading, hd); + headings.replace(heading, hd); else headings.remove(heading); @@ -618,36 +618,36 @@ void TQSettingsPrivate::writeGroup(const TQString &key, const TQString &value) TQSettingsHeading hd; TQSettingsGroup grp; - TQMap<TQString,TQSettingsHeading>::Iterator headingsit = headings.tqfind(heading); + TQMap<TQString,TQSettingsHeading>::Iterator headingsit = headings.find(heading); if (headingsit != headings.end()) hd = *headingsit; - TQSettingsHeading::Iterator grpit = hd.tqfind(group); + TQSettingsHeading::Iterator grpit = hd.find(group); if (grpit == hd.end()) { TQStringList::Iterator it = searchPaths.begin(); if ( !globalScope ) ++it; while (it != searchPaths.end()) { - TQString filebase = heading.lower().tqreplace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); + TQString filebase = heading.lower().replace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); TQString fn((*it++) + "/" + filebase + "rc"); - if (! hd.tqcontains(fn + "cached")) { + if (! hd.contains(fn + "cached")) { hd.read(fn); hd.insert(fn + "cached", TQSettingsGroup()); } } - headings.tqreplace(heading, hd); + headings.replace(heading, hd); - grpit = hd.tqfind(group); + grpit = hd.find(group); if (grpit != hd.end()) grp = *grpit; } else if (hd.count() != 0) grp = *grpit; grp.modified = TRUE; - grp.tqreplace(key, value); - hd.tqreplace(group, grp); - headings.tqreplace(heading, hd); + grp.replace(key, value); + hd.replace(group, grp); + headings.replace(heading, hd); modified = TRUE; } @@ -674,7 +674,7 @@ TQDateTime TQSettingsPrivate::modificationTime() bool qt_verify_key( const TQString &key ) { - if ( key.isEmpty() || key[0] != '/' || key.tqcontains( TQRegExp(TQString::tqfromLatin1("[=\\r\\n]")) ) ) + if ( key.isEmpty() || key[0] != '/' || key.contains( TQRegExp(TQString::tqfromLatin1("[=\\r\\n]")) ) ) return FALSE; return TRUE; } @@ -683,7 +683,7 @@ static TQString groupKey( const TQString &group, const TQString &key ) { TQString grp_key; if ( group.isEmpty() || ( group.length() == 1 && group[0] == '/' ) ) { - // group is empty, or it tqcontains a single '/', so we just return the key + // group is empty, or it contains a single '/', so we just return the key if ( key.startsWith( "/" ) ) grp_key = key; else @@ -775,7 +775,7 @@ static TQString groupKey( const TQString &group, const TQString &key ) Settings under Unix are stored in files whose names are based on the first subkey of the key (not including the search path). The algorithm - for creating names is essentially: lowercase the first subkey, tqreplace + for creating names is essentially: lowercase the first subkey, replace spaces with underscores and add 'rc', e.g. <tt>/MyCompany/MyApplication/background color</tt> will be stored in <tt>myapplicationrc</tt> (assuming that <tt>/MyCompany</tt> is part of @@ -826,7 +826,7 @@ void TQSettings::insertSearchPath( System s, const TQString &path) realPath = defPath + path; #endif - TQStringList::Iterator it = d->searchPaths.tqfind(d->searchPaths.last()); + TQStringList::Iterator it = d->searchPaths.find(d->searchPaths.last()); if (it != d->searchPaths.end()) { d->searchPaths.insert(it, realPath); } @@ -958,7 +958,7 @@ bool TQSettings::sync() if ( !d->globalScope ) ++pit; while (pit != d->searchPaths.end()) { - TQString filebase = it.key().lower().tqreplace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); + TQString filebase = it.key().lower().replace(TQRegExp(TQString::tqfromLatin1("\\s+")), "_"); TQFileInfo di(*pit); if ( !di.exists() ) { TQDir dir; @@ -1024,8 +1024,8 @@ bool TQSettings::sync() if ( v.isNull() ) { v = TQString::tqfromLatin1("\\0"); // escape null string } else { - v.tqreplace('\\', TQString::tqfromLatin1("\\\\")); // escape backslash - v.tqreplace('\n', TQString::tqfromLatin1("\\n")); // escape newlines + v.replace('\\', TQString::tqfromLatin1("\\\\")); // escape backslash + v.replace('\n', TQString::tqfromLatin1("\\n")); // escape newlines } stream << grpit.key() << "=" << v << endl; @@ -1290,7 +1290,7 @@ TQString TQSettings::readEntry(const TQString &key, const TQString &def, bool *o } TQSettingsGroup grp = d->readGroup(); - TQSettingsGroup::const_iterator it = grp.tqfind( realkey ), end = grp.end(); + TQSettingsGroup::const_iterator it = grp.find( realkey ), end = grp.end(); TQString retval = def; if ( it != end ) { // found the value we needed @@ -1401,7 +1401,7 @@ bool TQSettings::writeEntry(const TQString &key, int value) Writes the entry specified by \a key with the string-literal \a value, replacing any previous setting. If \a value is zero-length or null, the - entry is tqreplaced by an empty setting. + entry is replaced by an empty setting. \e NOTE: This function is provided because some compilers use the writeEntry (const TQString &, bool) overload for this code: @@ -1564,7 +1564,7 @@ bool TQSettings::removeEntry(const TQString &key) In the above example, \c keys will contain 'background color' and 'foreground color'. It will not contain 'tqgeometry' because this key - tqcontains subkeys not entries. + contains subkeys not entries. To access the tqgeometry values, you could either use subkeyList() to read the keys then read each entry, or simply read each entry @@ -1633,7 +1633,7 @@ TQStringList TQSettings::entryList(const TQString &key) const itkey.remove( 0, realkey.length() + 1 ); } - if ( itkey.tqfind( '/' ) != -1 ) + if ( itkey.find( '/' ) != -1 ) continue; ret << itkey; @@ -1734,7 +1734,7 @@ TQStringList TQSettings::subkeyList(const TQString &key) const if ( subkeycount == 1 ) { TQMap<TQString,TQSettingsHeading>::Iterator it = d->headings.begin(); while ( it != d->headings.end() ) { - if ( it.key() != "General" && ! ret.tqcontains( it.key() ) ) + if ( it.key() != "General" && ! ret.contains( it.key() ) ) ret << it.key(); ++it; } @@ -1758,12 +1758,12 @@ TQStringList TQSettings::subkeyList(const TQString &key) const itkey.remove( 0, realkey.length() + 1 ); } - int slash = itkey.tqfind( '/' ); + int slash = itkey.find( '/' ); if ( slash == -1 ) continue; itkey.truncate( slash ); - if ( ! ret.tqcontains( itkey ) ) + if ( ! ret.contains( itkey ) ) ret << itkey; } @@ -1868,7 +1868,7 @@ bool TQSettings::writeEntry(const TQString &key, const TQStringList &value) if ( el.isNull() ) { el = "^0"; } else { - el.tqreplace("^", "^^"); + el.replace("^", "^^"); } s+=el; s+="^e"; // end of element @@ -2005,7 +2005,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope // scope. // // On MacOS X, if there is no "." in domain, append ".com", then reverse the -// order of the elements (Mac OS uses "com.apple.tqfinder" as domain+product). +// order of the elements (Mac OS uses "com.apple.finder" as domain+product). // The Global scope corresponds to /Library/Preferences/*.plist, while the // User scope corresponds to ~/Library/Preferences/*.plist. // Note that on most installations, not all users can write to the System @@ -2013,7 +2013,7 @@ void TQSettings::setPath( const TQString &domain, const TQString &product, Scope d->globalScope = scope == Global; TQString actualSearchPath; - int lastDot = domain.tqfindRev( '.' ); + int lastDot = domain.findRev( '.' ); #if defined(TQ_WS_WIN) actualSearchPath = "/" + domain.mid( 0, lastDot ) + "/" + product; diff --git a/tqtinterface/qt4/src/tools/tqstring.cpp b/tqtinterface/qt4/src/tools/tqstring.cpp index 9c31fcc..c57b539 100644 --- a/tqtinterface/qt4/src/tools/tqstring.cpp +++ b/tqtinterface/qt4/src/tools/tqstring.cpp @@ -86,7 +86,7 @@ // static QHash<void *, QByteArray> *asciiCache = 0; TQT_STATIC_CONST_IMPL TQChar TQChar::null; -TQT_STATIC_CONST_IMPL TQChar TQChar::tqreplacement((ushort)0xfffd); +TQT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); TQT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff); TQT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe); TQT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0); @@ -610,10 +610,10 @@ struct ArgEscapeData uint locale_occurrences; // number of occurences of the lowest escape // sequence number which contain 'L' uint escape_len; // total length of escape sequences which will - // be tqreplaced + // be replaced }; -static ArgEscapeData tqfindArgEscapes(const TQString &s) +static ArgEscapeData findArgEscapes(const TQString &s) { const TQChar *uc_begin = s.tqunicode(); const TQChar *uc_end = uc_begin + s.length(); @@ -658,7 +658,7 @@ static ArgEscapeData tqfindArgEscapes(const TQString &s) #if TQT_VERSION < 0x040000 // ### remove preprocessor in TQt 4.0 - /* Since in TQt < 4.0 only the first instance is tqreplaced, + /* Since in TQt < 4.0 only the first instance is replaced, escape_len should hold the length of only the first escape sequence */ if (d.occurrences == 0) @@ -677,7 +677,7 @@ static ArgEscapeData tqfindArgEscapes(const TQString &s) return d; } -static TQString tqreplaceArgEscapes(const TQString &s, const ArgEscapeData &d, int field_width, +static TQString replaceArgEscapes(const TQString &s, const ArgEscapeData &d, int field_width, const TQString &arg, const TQString &larg) { const TQChar *uc_begin = s.tqunicode(); @@ -766,7 +766,7 @@ static TQString tqreplaceArgEscapes(const TQString &s, const ArgEscapeData &d, i } /*! - This function will return a string that tqreplaces the lowest + This function will return a string that replaces the lowest numbered occurrence of \c %1, \c %2, ..., \c %9 with \a a. The \a fieldWidth value specifies the minimum amount of space that @@ -796,7 +796,7 @@ static TQString tqreplaceArgEscapes(const TQString &s, const ArgEscapeData &d, i */ TQString TQString::tqarg( const TQString& a, int fieldWidth ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::tqarg(): Argument missing: %s, %s", latin1(), @@ -804,7 +804,7 @@ TQString TQString::tqarg( const TQString& a, int fieldWidth ) const return *this; } - return tqreplaceArgEscapes(*this, d, fieldWidth, a, a); + return replaceArgEscapes(*this, d, fieldWidth, a, a); } /*! @@ -813,8 +813,8 @@ TQString TQString::tqarg( const TQString& a, int fieldWidth ) const \overload This is the same as str.tqarg(\a a1).tqarg(\a a2), except that - the strings are tqreplaced in one pass. This can make a difference - if \a a1 tqcontains e.g. \c{%1}: + the strings are replaced in one pass. This can make a difference + if \a a1 contains e.g. \c{%1}: \code TQString str( "%1 %2" ); @@ -832,7 +832,7 @@ TQString TQString::tqarg( const TQString& a, int fieldWidth ) const \overload This is the same as calling str.tqarg(\a a1).tqarg(\a a2).tqarg(\a a3), - except that the strings are tqreplaced in one pass. + except that the strings are replaced in one pass. */ /*! @@ -842,7 +842,7 @@ TQString TQString::tqarg( const TQString& a, int fieldWidth ) const This is the same as calling str.tqarg(\a a1).tqarg(\a a2).tqarg(\a a3).tqarg(\a a4), - except that the strings are tqreplaced in one pass. + except that the strings are replaced in one pass. */ /*! @@ -857,7 +857,7 @@ TQString TQString::tqarg( const TQString& a, int fieldWidth ) const be between 2 and 36. The '%' can be followed by an 'L', in which case the sequence is - tqreplaced with a localized representation of \a a. The conversion + replaced with a localized representation of \a a. The conversion uses the default locale. The default locale is determined from the system's locale settings at application startup. It can be changed using TQLocale::setDefault(). The 'L' flag is ignored if \a base is @@ -903,7 +903,7 @@ TQString TQString::tqarg( ulong a, int fieldWidth, int base ) const */ TQString TQString::tqarg( TQ_LLONG a, int fieldWidth, int base ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::tqarg(): Argument missing: %s, %lld", latin1(), @@ -921,7 +921,7 @@ TQString TQString::tqarg( TQ_LLONG a, int fieldWidth, int base ) const locale_arg = locale.d->longLongToString(a, -1, base, -1, TQLocalePrivate::ThousandsGroup); } - return tqreplaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); + return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); } /*! @@ -933,7 +933,7 @@ TQString TQString::tqarg( TQ_LLONG a, int fieldWidth, int base ) const */ TQString TQString::tqarg( TQ_ULLONG a, int fieldWidth, int base ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::tqarg(): Argument missing: %s, %llu", latin1(), @@ -951,7 +951,7 @@ TQString TQString::tqarg( TQ_ULLONG a, int fieldWidth, int base ) const locale_arg = locale.d->unsLongLongToString(a, -1, base, -1, TQLocalePrivate::ThousandsGroup); } - return tqreplaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); + return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); } /*! @@ -1049,7 +1049,7 @@ TQString TQString::tqarg( TQChar a, int fieldWidth ) const */ TQString TQString::tqarg( double a, int fieldWidth, char fmt, int prec ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::tqarg(): Argument missing: %s, %g", latin1(), @@ -1094,7 +1094,7 @@ TQString TQString::tqarg( double a, int fieldWidth, char fmt, int prec ) const locale_arg = locale.d->doubleToString(a, prec, form, -1, flags); } - return tqreplaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); + return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); } TQString TQString::tqmultiArg( int numArgs, const TQString& a1, const TQString& a2, const TQString& a3, const TQString& a4 ) const @@ -1267,7 +1267,7 @@ TQString TQString::setUnicodeCodes( const ushort* tqunicode_as_ushorts, uint len double d = TQString( "1,234,567.89" ).toDouble(&ok); // ok == false \endcode - \warning If the string tqcontains trailing whitespace this function + \warning If the string contains trailing whitespace this function will fail, and set \a *ok to false if \a ok is not 0. Leading whitespace is ignored. @@ -1317,7 +1317,7 @@ double TQString::toDouble( bool *ok ) const For information on how string-to-number functions in TQString handle localized input, see toDouble(). - \warning If the string tqcontains trailing whitespace this function + \warning If the string contains trailing whitespace this function will fail, settings \a *ok to false if \a ok is not 0. Leading whitespace is ignored. @@ -2345,8 +2345,8 @@ void TQString::compose() // joining info is only needed for Arabic if (format(ligature.tag(), *this, index, len)) { //printf("using ligature 0x%x, len=%d\n",code,len); - // tqreplace letter - composed.tqreplace(cindex, len, TQChar(head)); + // replace letter + composed.replace(cindex, len, TQChar(head)); index += len-1; // we continue searching in case we have a final // form because medial ones are preferred. @@ -2541,11 +2541,11 @@ char* TQString::tqunicodeToLatin1(const TQChar *uc, uint l) check for a non-null string rather than \c{if ( !str )}; see \l operator!() for an explanation. - Note that if you tqfind that you are mixing usage of \l TQCString, + Note that if you find that you are mixing usage of \l TQCString, TQString, and \l TQByteArray, this causes lots of unnecessary copying and might indicate that the true nature of the data you are dealing with is uncertain. If the data is '\0'-terminated 8-bit - data, use \l TQCString; if it is unterminated (i.e. tqcontains '\0's) + data, use \l TQCString; if it is unterminated (i.e. contains '\0's) 8-bit data, use \l TQByteArray; if it is text, use TQString. Lists of strings are handled by the TQStringList class. You can @@ -2618,7 +2618,7 @@ char* TQString::tqunicodeToLatin1(const TQChar *uc, uint l) \value ExactMatch The target and search strings must match exactly. \value BeginsWith The target string begins with the search string. \value EndsWith The target string ends with the search string. - \value Contains The target string tqcontains the search string. + \value Contains The target string contains the search string. If you OR these flags together (excluding \c CaseSensitive), the search criteria be applied in the following order: \c ExactMatch, @@ -2632,7 +2632,7 @@ char* TQString::tqunicodeToLatin1(const TQChar *uc, uint l) TQ_EXPORT TQStringData *TQString::shared_null = 0; TQT_STATIC_CONST_IMPL TQString TQString::null; TQT_STATIC_CONST_IMPL TQChar TQChar::null; -TQT_STATIC_CONST_IMPL TQChar TQChar::tqreplacement((ushort)0xfffd); +TQT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd); TQT_STATIC_CONST_IMPL TQChar TQChar::byteOrderMark((ushort)0xfeff); TQT_STATIC_CONST_IMPL TQChar TQChar::byteOrderSwapped((ushort)0xfffe); TQT_STATIC_CONST_IMPL TQChar TQChar::nbsp((ushort)0x00a0); @@ -3005,7 +3005,7 @@ void TQString::truncate( uint newLen ) /*! Ensures that at least \a newLen characters are allocated to the string, and sets the length of the string to \a newLen. Any new - space allocated tqcontains arbitrary data. + space allocated contains arbitrary data. \sa reserve(), truncate() */ @@ -3121,10 +3121,10 @@ struct ArgEscapeData uint locale_occurrences; // number of occurences of the lowest escape // sequence number which contain 'L' uint escape_len; // total length of escape sequences which will - // be tqreplaced + // be replaced }; -static ArgEscapeData tqfindArgEscapes(const TQString &s) +static ArgEscapeData findArgEscapes(const TQString &s) { const TQChar *uc_begin = s.tqunicode(); const TQChar *uc_end = uc_begin + s.length(); @@ -3169,7 +3169,7 @@ static ArgEscapeData tqfindArgEscapes(const TQString &s) #if TQT_VERSION < 0x040000 // ### remove preprocessor in TQt 4.0 - /* Since in TQt < 4.0 only the first instance is tqreplaced, + /* Since in TQt < 4.0 only the first instance is replaced, escape_len should hold the length of only the first escape sequence */ if (d.occurrences == 0) @@ -3188,7 +3188,7 @@ static ArgEscapeData tqfindArgEscapes(const TQString &s) return d; } -static TQString tqreplaceArgEscapes(const TQString &s, const ArgEscapeData &d, int field_width, +static TQString replaceArgEscapes(const TQString &s, const ArgEscapeData &d, int field_width, const TQString &arg, const TQString &larg) { const TQChar *uc_begin = s.tqunicode(); @@ -3275,7 +3275,7 @@ static TQString tqreplaceArgEscapes(const TQString &s, const ArgEscapeData &d, i } /*! - This function will return a string that tqreplaces the lowest + This function will return a string that replaces the lowest numbered occurrence of \c %1, \c %2, ..., \c %9 with \a a. The \a fieldWidth value specifies the minimum amount of space that @@ -3305,7 +3305,7 @@ static TQString tqreplaceArgEscapes(const TQString &s, const ArgEscapeData &d, i */ TQString TQString::arg( const TQString& a, int fieldWidth ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::arg(): Argument missing: %s, %s", latin1(), @@ -3313,7 +3313,7 @@ TQString TQString::arg( const TQString& a, int fieldWidth ) const return *this; } - return tqreplaceArgEscapes(*this, d, fieldWidth, a, a); + return replaceArgEscapes(*this, d, fieldWidth, a, a); } /*! @@ -3322,8 +3322,8 @@ TQString TQString::arg( const TQString& a, int fieldWidth ) const \overload This is the same as str.arg(\a a1).arg(\a a2), except that - the strings are tqreplaced in one pass. This can make a difference - if \a a1 tqcontains e.g. \c{%1}: + the strings are replaced in one pass. This can make a difference + if \a a1 contains e.g. \c{%1}: \code TQString str( "%1 %2" ); @@ -3341,7 +3341,7 @@ TQString TQString::arg( const TQString& a, int fieldWidth ) const \overload This is the same as calling str.arg(\a a1).arg(\a a2).arg(\a a3), - except that the strings are tqreplaced in one pass. + except that the strings are replaced in one pass. */ /*! @@ -3351,7 +3351,7 @@ TQString TQString::arg( const TQString& a, int fieldWidth ) const This is the same as calling str.arg(\a a1).arg(\a a2).arg(\a a3).arg(\a a4), - except that the strings are tqreplaced in one pass. + except that the strings are replaced in one pass. */ /*! @@ -3366,7 +3366,7 @@ TQString TQString::arg( const TQString& a, int fieldWidth ) const be between 2 and 36. The '%' can be followed by an 'L', in which case the sequence is - tqreplaced with a localized representation of \a a. The conversion + replaced with a localized representation of \a a. The conversion uses the default locale. The default locale is determined from the system's locale settings at application startup. It can be changed using TQLocale::setDefault(). The 'L' flag is ignored if \a base is @@ -3412,7 +3412,7 @@ TQString TQString::arg( ulong a, int fieldWidth, int base ) const */ TQString TQString::arg( TQ_LLONG a, int fieldWidth, int base ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::arg(): Argument missing: %s, %lld", latin1(), @@ -3430,7 +3430,7 @@ TQString TQString::arg( TQ_LLONG a, int fieldWidth, int base ) const locale_arg = locale.d->longLongToString(a, -1, base, -1, TQLocalePrivate::ThousandsGroup); } - return tqreplaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); + return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); } /*! @@ -3442,7 +3442,7 @@ TQString TQString::arg( TQ_LLONG a, int fieldWidth, int base ) const */ TQString TQString::arg( TQ_ULLONG a, int fieldWidth, int base ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::arg(): Argument missing: %s, %llu", latin1(), @@ -3460,7 +3460,7 @@ TQString TQString::arg( TQ_ULLONG a, int fieldWidth, int base ) const locale_arg = locale.d->unsLongLongToString(a, -1, base, -1, TQLocalePrivate::ThousandsGroup); } - return tqreplaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); + return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); } /*! @@ -3558,7 +3558,7 @@ TQString TQString::arg( TQChar a, int fieldWidth ) const */ TQString TQString::arg( double a, int fieldWidth, char fmt, int prec ) const { - ArgEscapeData d = tqfindArgEscapes(*this); + ArgEscapeData d = findArgEscapes(*this); if (d.occurrences == 0) { qWarning( "TQString::arg(): Argument missing: %s, %g", latin1(), @@ -3603,7 +3603,7 @@ TQString TQString::arg( double a, int fieldWidth, char fmt, int prec ) const locale_arg = locale.d->doubleToString(a, prec, form, -1, flags); } - return tqreplaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); + return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg); } TQString TQString::multiArg( int numArgs, const TQString& a1, const TQString& a2, @@ -3685,9 +3685,9 @@ TQString TQString::multiArg( int numArgs, const TQString& a1, const TQString& a2 \endcode For \link TQObject::tr() translations,\endlink especially if the - strings tqcontains more than one escape sequence, you should + strings contains more than one escape sequence, you should consider using the arg() function instead. This allows the order - of the tqreplacements to be controlled by the translator, and has + of the replacements to be controlled by the translator, and has Unicode support. The %lc escape sequence expects a tqunicode character of type ushort @@ -3770,7 +3770,7 @@ TQString &TQString::sprintf( const char* cformat, ... ) width_str.append(*c++); // can't be negative - started with a digit - // tqcontains at least one digit + // contains at least one digit width = width_str.toInt(); } else if (*c == '*') { @@ -3795,7 +3795,7 @@ TQString &TQString::sprintf( const char* cformat, ... ) precision_str.append(*c++); // can't be negative - started with a digit - // tqcontains at least one digit + // contains at least one digit precision = precision_str.toInt(); } else if (*c == '*') { @@ -4080,7 +4080,7 @@ TQString& TQString::fill( TQChar c, int len ) Finds the first occurrence of the character \a c, starting at position \a index. If \a index is -1, the search starts at the last character; if -2, at the next to last character and so on. - (See tqfindRev() for searching backwards.) + (See findRev() for searching backwards.) If \a cs is TRUE (the default), the search is case sensitive; otherwise the search is case insensitive. @@ -4088,7 +4088,7 @@ TQString& TQString::fill( TQChar c, int len ) Returns the position of \a c or -1 if \a c could not be found. */ -int TQString::tqfind( TQChar c, int index, bool cs ) const +int TQString::find( TQChar c, int index, bool cs ) const { const uint l = length(); if ( index < 0 ) @@ -4144,7 +4144,7 @@ static void bm_init_skiptable( const TQString &pattern, uint *skiptable, bool cs } } -static int bm_tqfind( const TQString &str, int index, const TQString &pattern, uint *skiptable, bool cs ) +static int bm_find( const TQString &str, int index, const TQString &pattern, uint *skiptable, bool cs ) { const uint l = str.length(); if ( pattern.isEmpty() ) @@ -4217,7 +4217,7 @@ static int bm_tqfind( const TQString &str, int index, const TQString &pattern, u Finds the first occurrence of the string \a str, starting at position \a index. If \a index is -1, the search starts at the last character, if it is -2, at the next to last character and so - on. (See tqfindRev() for searching backwards.) + on. (See findRev() for searching backwards.) If \a cs is TRUE (the default), the search is case sensitive; otherwise the search is case insensitive. @@ -4225,7 +4225,7 @@ static int bm_tqfind( const TQString &str, int index, const TQString &pattern, u Returns the position of \a str or -1 if \a str could not be found. */ -int TQString::tqfind( const TQString& str, int index, bool cs ) const +int TQString::find( const TQString& str, int index, bool cs ) const { const uint l = length(); const uint sl = str.length(); @@ -4240,7 +4240,7 @@ int TQString::tqfind( const TQString& str, int index, bool cs ) const #if defined(TQ_OS_MACX) && defined(TQT_MACOSX_VERSION) && TQT_MACOSX_VERSION >= 0x1020 if ( sl == 1 ) - return tqfind( *str.tqunicode(), index, cs ); + return find( *str.tqunicode(), index, cs ); #endif // we use the Boyer-Moore algorithm in cases where the overhead @@ -4249,7 +4249,7 @@ int TQString::tqfind( const TQString& str, int index, bool cs ) const if ( l > 500 && sl > 5 ) { uint skiptable[0x100]; bm_init_skiptable( str, skiptable, cs ); - return bm_tqfind( *this, index, str, skiptable, cs ); + return bm_find( *this, index, str, skiptable, cs ); } /* @@ -4303,17 +4303,17 @@ int TQString::tqfind( const TQString& str, int index, bool cs ) const } /*! - \fn int TQString::tqfindRev( const char* str, int index ) const + \fn int TQString::findRev( const char* str, int index ) const - Equivalent to tqfindRev(TQString(\a str), \a index). + Equivalent to findRev(TQString(\a str), \a index). */ /*! - \fn int TQString::tqfind( const char* str, int index ) const + \fn int TQString::find( const char* str, int index ) const \overload - Equivalent to tqfind(TQString(\a str), \a index). + Equivalent to find(TQString(\a str), \a index). */ /*! @@ -4331,14 +4331,14 @@ int TQString::tqfind( const TQString& str, int index, bool cs ) const \code TQString string( "bananas" ); - int i = string.tqfindRev( 'a' ); // i == 5 + int i = string.findRev( 'a' ); // i == 5 \endcode */ -int TQString::tqfindRev( TQChar c, int index, bool cs ) const +int TQString::findRev( TQChar c, int index, bool cs ) const { #if defined(TQ_OS_MACX) && defined(TQT_MACOSX_VERSION) && TQT_MACOSX_VERSION < 0x1020 - return tqfindRev( TQString( c ), index, cs ); + return findRev( TQString( c ), index, cs ); #else const uint l = length(); if ( index < 0 ) @@ -4374,14 +4374,14 @@ int TQString::tqfindRev( TQChar c, int index, bool cs ) const \code TQString string("bananas"); - int i = string.tqfindRev( "ana" ); // i == 3 + int i = string.findRev( "ana" ); // i == 3 \endcode */ -int TQString::tqfindRev( const TQString& str, int index, bool cs ) const +int TQString::findRev( const TQString& str, int index, bool cs ) const { /* - See TQString::tqfind() for explanations. + See TQString::find() for explanations. */ const uint l = length(); if ( index < 0 ) @@ -4395,7 +4395,7 @@ int TQString::tqfindRev( const TQString& str, int index, bool cs ) const #if defined(TQ_OS_MACX) && defined(TQT_MACOSX_VERSION) && TQT_MACOSX_VERSION >= 0x1020 if ( sl == 1 ) - return tqfindRev( *str.tqunicode(), index, cs ); + return findRev( *str.tqunicode(), index, cs ); #endif const TQChar* needle = str.tqunicode(); @@ -4718,12 +4718,12 @@ TQString TQString::section( const TQRegExp ®, int start, int end, int flags ) \code TQString string( "Trolltech and TQt" ); - int n = string.tqcontains( 't', FALSE ); + int n = string.contains( 't', FALSE ); // n == 3 \endcode */ -int TQString::tqcontains( TQChar c, bool cs ) const +int TQString::contains( TQChar c, bool cs ) const { int count = 0; const TQChar *uc = tqunicode(); @@ -4755,19 +4755,19 @@ int TQString::tqcontains( TQChar c, bool cs ) const If \a cs is TRUE (the default), the search is case sensitive; otherwise the search is case insensitive. */ -int TQString::tqcontains( const char* str, bool cs ) const +int TQString::contains( const char* str, bool cs ) const { - return tqcontains( TQString(str), cs ); + return contains( TQString(str), cs ); } /*! - \fn int TQString::tqcontains( char c, bool cs ) const + \fn int TQString::contains( char c, bool cs ) const \overload */ /*! - \fn int TQString::tqfind( char c, int index, bool cs ) const + \fn int TQString::find( char c, int index, bool cs ) const \overload @@ -4778,7 +4778,7 @@ int TQString::tqcontains( const char* str, bool cs ) const */ /*! - \fn int TQString::tqfindRev( char c, int index, bool cs ) const + \fn int TQString::findRev( char c, int index, bool cs ) const \overload @@ -4802,13 +4802,13 @@ int TQString::tqcontains( const char* str, bool cs ) const \code TQString str( "bananas" ); - int i = str.tqcontains( "ana" ); // i == 2 + int i = str.contains( "ana" ); // i == 2 \endcode - \sa tqfindRev() + \sa findRev() */ -int TQString::tqcontains( const TQString &str, bool cs ) const +int TQString::contains( const TQString &str, bool cs ) const { if ( isNull() ) return 0; @@ -4817,13 +4817,13 @@ int TQString::tqcontains( const TQString &str, bool cs ) const bm_init_skiptable( str, skiptable, cs ); int i = -1; // use boyer-moore for the ultimate speed experience - while ( ( i = bm_tqfind( *this, i + 1, str, skiptable, cs ) ) != -1 ) + while ( ( i = bm_find( *this, i + 1, str, skiptable, cs ) ) != -1 ) count++; return count; } /*! - Returns a substring that tqcontains the \a len leftmost characters + Returns a substring that contains the \a len leftmost characters of the string. The whole string is returned if \a len exceeds the length of the @@ -4854,7 +4854,7 @@ TQString TQString::left( uint len ) const } /*! - Returns a string that tqcontains the \a len rightmost characters of + Returns a string that contains the \a len rightmost characters of the string. If \a len is greater than the length of the string then the whole @@ -4886,7 +4886,7 @@ TQString TQString::right( uint len ) const } /*! - Returns a string that tqcontains the \a len characters of this + Returns a string that contains the \a len characters of this string, starting at position \a index. Returns a null string if the string is empty or \a index is out of @@ -4922,7 +4922,7 @@ TQString TQString::mid( uint index, uint len ) const } /*! - Returns a string of length \a width that tqcontains this string + Returns a string of length \a width that contains this string padded by the \a fill character. If \a truncate is FALSE and the length of the string is more than @@ -4962,7 +4962,7 @@ TQString TQString::leftJustify( uint width, TQChar fill, bool truncate ) const } /*! - Returns a string of length \a width that tqcontains the \a fill + Returns a string of length \a width that contains the \a fill character followed by the string. If \a truncate is FALSE and the length of the string is more than @@ -5115,7 +5115,7 @@ TQString TQString::stripWhiteSpace() const /*! Returns a string that has whitespace removed from the start and the end, and which has each sequence of internal whitespace - tqreplaced with a single space. + replaced with a single space. Whitespace means any character for which TQChar::isSpace() returns TRUE. This includes Unicode characters with decimal values 9 @@ -5170,7 +5170,7 @@ TQString TQString::simplifyWhiteSpace() const // str == "I don't like fish" \endcode - \sa remove(), tqreplace() + \sa remove(), replace() */ TQString &TQString::insert( uint index, const TQString &s ) @@ -5388,7 +5388,7 @@ TQString &TQString::prepend( const char *s ) string.remove( 1, 4 ); // string == "Meal" \endcode - \sa insert(), tqreplace() + \sa insert(), replace() */ TQString &TQString::remove( uint index, uint len ) @@ -5412,7 +5412,7 @@ TQString &TQString::remove( uint index, uint len ) Removes every occurrence of the character \a c in the string. Returns a reference to the string. - This is the same as tqreplace(\a c, ""). + This is the same as replace(\a c, ""). */ TQString &TQString::remove( TQChar c ) { @@ -5434,7 +5434,7 @@ TQString &TQString::remove( TQChar c ) Removes every occurrence of the character \a c in the string. Returns a reference to the string. - This is the same as tqreplace(\a c, ""). + This is the same as replace(\a c, ""). */ /*! \overload @@ -5445,7 +5445,7 @@ TQString &TQString::remove( TQChar c ) If \a cs is TRUE (the default), the search is case sensitive; otherwise the search is case insensitive. - This is the same as tqreplace(\a str, "", \a cs). + This is the same as replace(\a str, "", \a cs). */ TQString &TQString::remove( const TQString & str, bool cs ) { @@ -5454,7 +5454,7 @@ TQString &TQString::remove( const TQString & str, bool cs ) real_detach(); } else { int index = 0; - while ( (index = tqfind(str, index, cs)) != -1 ) + while ( (index = find(str, index, cs)) != -1 ) remove( index, str.length() ); } return *this; @@ -5470,7 +5470,7 @@ TQString &TQString::remove( const TQString & str ) Replaces every occurrence of \a c1 with the char \a c2. Returns a reference to the string. */ -TQString &TQString::tqreplace( TQChar c1, TQChar c2 ) +TQString &TQString::replace( TQChar c1, TQChar c2 ) { if ( isEmpty() ) return *this; @@ -5492,12 +5492,12 @@ TQString &TQString::tqreplace( TQChar c1, TQChar c2 ) Removes every occurrence of the regular expression \a rx in the string. Returns a reference to the string. - This is the same as tqreplace(\a rx, ""). + This is the same as replace(\a rx, ""). */ TQString &TQString::remove( const TQRegExp & rx ) { - return tqreplace( rx, TQString::null ); + return replace( rx, TQString::null ); } #endif @@ -5525,7 +5525,7 @@ TQString &TQString::remove( const char *str ) \code TQString string( "Say yes!" ); - string = string.tqreplace( 4, 3, "NO" ); + string = string.replace( 4, 3, "NO" ); // string == "Say NO!" \endcode @@ -5538,24 +5538,24 @@ TQString &TQString::remove( const char *str ) \sa insert(), remove() */ -TQString &TQString::tqreplace( uint index, uint len, const TQString &s ) +TQString &TQString::replace( uint index, uint len, const TQString &s ) { - return tqreplace( index, len, s.tqunicode(), s.length() ); + return replace( index, len, s.tqunicode(), s.length() ); } /*! \overload - This is the same as tqreplace(\a index, \a len, TQString(\a c)). + This is the same as replace(\a index, \a len, TQString(\a c)). */ -TQString &TQString::tqreplace( uint index, uint len, TQChar c ) +TQString &TQString::replace( uint index, uint len, TQChar c ) { - return tqreplace( index, len, &c, 1 ); + return replace( index, len, &c, 1 ); } /*! \overload - \fn TQString &TQString::tqreplace( uint index, uint len, char c ) + \fn TQString &TQString::replace( uint index, uint len, char c ) - This is the same as tqreplace(\a index, \a len, TQChar(\a c)). + This is the same as replace(\a index, \a len, TQChar(\a c)). */ /*! @@ -5568,19 +5568,19 @@ TQString &TQString::tqreplace( uint index, uint len, TQChar c ) \sa insert(), remove() */ -TQString &TQString::tqreplace( uint index, uint len, const TQChar* s, uint slen ) +TQString &TQString::replace( uint index, uint len, const TQChar* s, uint slen ) { if (index > length()) index = length(); real_detach(); if ( len == slen && index + len <= length() ) { - // Optimized common case: tqreplace without size change + // Optimized common case: replace without size change memcpy( d->tqunicode+index, s, len * sizeof(TQChar) ); } else if ( s >= d->tqunicode && (uint)(s - d->tqunicode) < d->maxl ) { // Part of me - take a copy. TQChar *tmp = TQT_ALLOC_TQCHAR_VEC( slen ); memcpy( tmp, s, slen * sizeof(TQChar) ); - tqreplace( index, len, tmp, slen ); + replace( index, len, tmp, slen ); TQT_DELETE_TQCHAR_VEC( tmp ); } else { remove( index, len ); @@ -5600,22 +5600,22 @@ TQString &TQString::tqreplace( uint index, uint len, const TQChar* s, uint slen Example: \code TQString s = "a,b,c"; - s.tqreplace( TQChar(','), " or " ); + s.replace( TQChar(','), " or " ); // s == "a or b or c" \endcode */ -TQString &TQString::tqreplace( TQChar c, const TQString & after, bool cs ) +TQString &TQString::replace( TQChar c, const TQString & after, bool cs ) { - return tqreplace( TQString( c ), after, cs ); + return replace( TQString( c ), after, cs ); } -TQString &TQString::tqreplace( TQChar c, const TQString & after ) +TQString &TQString::replace( TQChar c, const TQString & after ) { - return tqreplace( TQString( c ), after, TRUE ); + return replace( TQString( c ), after, TRUE ); } /*! \overload - \fn TQString &TQString::tqreplace( char c, const TQString & after, bool cs ) + \fn TQString &TQString::replace( char c, const TQString & after, bool cs ) Replaces every occurrence of the character \a c in the string with \a after. Returns a reference to the string. @@ -5635,11 +5635,11 @@ TQString &TQString::tqreplace( TQChar c, const TQString & after ) Example: \code TQString s = "Greek is Greek"; - s.tqreplace( "Greek", "English" ); + s.replace( "Greek", "English" ); // s == "English is English" \endcode */ -TQString &TQString::tqreplace( const TQString & before, const TQString & after, +TQString &TQString::replace( const TQString & before, const TQString & after, bool cs ) { if ( isEmpty() ) { @@ -5661,7 +5661,7 @@ TQString &TQString::tqreplace( const TQString & before, const TQString & after, if ( bl == al ) { if ( bl ) { const TQChar *auc = after.tqunicode(); - while ( (index = bm_tqfind(*this, index, before, skiptable, cs) ) != -1 ) { + while ( (index = bm_find(*this, index, before, skiptable, cs) ) != -1 ) { memcpy( d->tqunicode + index, auc, al * sizeof(TQChar) ); index += bl; } @@ -5671,7 +5671,7 @@ TQString &TQString::tqreplace( const TQString & before, const TQString & after, uint to = 0; uint movestart = 0; uint num = 0; - while ( (index = bm_tqfind(*this, index, before, skiptable, cs)) != -1 ) { + while ( (index = bm_find(*this, index, before, skiptable, cs)) != -1 ) { if ( num ) { int msize = index - movestart; if ( msize > 0 ) { @@ -5702,7 +5702,7 @@ TQString &TQString::tqreplace( const TQString & before, const TQString & after, uint indices[4096]; uint pos = 0; while ( pos < 4095 ) { - index = bm_tqfind( *this, index, before, skiptable, cs ); + index = bm_find( *this, index, before, skiptable, cs ); if ( index == -1 ) break; indices[pos++] = index; @@ -5714,7 +5714,7 @@ TQString &TQString::tqreplace( const TQString & before, const TQString & after, if ( !pos ) break; - // we have a table of tqreplacement positions, use them for fast replacing + // we have a table of replacement positions, use them for fast replacing int adjust = pos*(al-bl); // index has to be adjusted in case we get back into the loop above. if ( index != -1 ) @@ -5738,9 +5738,9 @@ TQString &TQString::tqreplace( const TQString & before, const TQString & after, return *this; } -TQString &TQString::tqreplace( const TQString & before, const TQString & after ) +TQString &TQString::replace( const TQString & before, const TQString & after ) { - return tqreplace( before, after, TRUE ); + return replace( before, after, TRUE ); } #ifndef TQT_NO_REGEXP_CAPTURE @@ -5750,24 +5750,24 @@ TQString &TQString::tqreplace( const TQString & before, const TQString & after ) \a after. Returns a reference to the string. For example: \code TQString s = "banana"; - s.tqreplace( TQRegExp("an"), "" ); + s.replace( TQRegExp("an"), "" ); // s == "ba" \endcode For regexps containing \link tqregexp.html#capturing-text capturing parentheses \endlink, occurrences of <b>\\1</b>, <b>\\2</b>, ..., - in \a after are tqreplaced with \a{rx}.cap(1), cap(2), ... + in \a after are replaced with \a{rx}.cap(1), cap(2), ... \code TQString t = "A <i>bon mot</i>."; - t.tqreplace( TQRegExp("<i>([^<]*)</i>"), "\\emph{\\1}" ); + t.replace( TQRegExp("<i>([^<]*)</i>"), "\\emph{\\1}" ); // t == "A \\emph{bon mot}." \endcode - \sa tqfind(), tqfindRev(), TQRegExp::cap() + \sa find(), findRev(), TQRegExp::cap() */ -TQString &TQString::tqreplace( const TQRegExp &rx, const TQString &after ) +TQString &TQString::replace( const TQRegExp &rx, const TQString &after ) { TQRegExp rx2 = rx; @@ -5823,10 +5823,10 @@ TQString &TQString::tqreplace( const TQRegExp &rx, const TQString &after ) TQString after2 = after; for ( j = numBackRefs - 1; j >= 0; j-- ) - after2.tqreplace( capturePositions[j], 2, + after2.replace( capturePositions[j], 2, rx2.cap(captureNumbers[j]) ); - tqreplace( index, rx2.matchedLength(), after2 ); + replace( index, rx2.matchedLength(), after2 ); index += after2.length(); if ( rx2.matchedLength() == 0 ) { @@ -5849,7 +5849,7 @@ TQString &TQString::tqreplace( const TQRegExp &rx, const TQString &after ) struct { int pos; int length; - } tqreplacements[2048]; + } replacements[2048]; uint pos = 0; int adjust = 0; @@ -5858,8 +5858,8 @@ TQString &TQString::tqreplace( const TQRegExp &rx, const TQString &after ) if ( index == -1 ) break; int ml = rx2.matchedLength(); - tqreplacements[pos].pos = index; - tqreplacements[pos++].length = ml; + replacements[pos].pos = index; + replacements[pos++].length = ml; index += ml; adjust += al - ml; // avoid infinite loop @@ -5868,11 +5868,11 @@ TQString &TQString::tqreplace( const TQRegExp &rx, const TQString &after ) } if ( !pos ) break; - tqreplacements[pos].pos = d->len; + replacements[pos].pos = d->len; uint newlen = d->len + adjust; // to continue searching at the right position after we did - // the first round of tqreplacements + // the first round of replacements if ( index != -1 ) index += adjust; TQChar *newuc = TQT_ALLOC_TQCHAR_VEC( newlen + 1 ); @@ -5880,13 +5880,13 @@ TQString &TQString::tqreplace( const TQRegExp &rx, const TQString &after ) int copystart = 0; uint i = 0; while ( i < pos ) { - int copyend = tqreplacements[i].pos; + int copyend = replacements[i].pos; int size = copyend - copystart; memcpy( uc, d->tqunicode + copystart, size * sizeof(TQChar) ); uc += size; memcpy( uc, after.tqunicode(), al * sizeof(TQChar) ); uc += al; - copystart = copyend + tqreplacements[i].length; + copystart = copyend + replacements[i].length; i++; } memcpy( uc, d->tqunicode + copystart, @@ -5907,20 +5907,20 @@ TQString &TQString::tqreplace( const TQRegExp &rx, const TQString &after ) Finds the first match of the regular expression \a rx, starting from position \a index. If \a index is -1, the search starts at the last character; if -2, at the next to last character and so - on. (See tqfindRev() for searching backwards.) + on. (See findRev() for searching backwards.) Returns the position of the first match of \a rx or -1 if no match was found. \code TQString string( "bananas" ); - int i = string.tqfind( TQRegExp("an"), 0 ); // i == 1 + int i = string.find( TQRegExp("an"), 0 ); // i == 1 \endcode - \sa tqfindRev() tqreplace() tqcontains() + \sa findRev() replace() contains() */ -int TQString::tqfind( const TQRegExp &rx, int index ) const +int TQString::find( const TQRegExp &rx, int index ) const { return rx.search( *this, index ); } @@ -5931,19 +5931,19 @@ int TQString::tqfind( const TQRegExp &rx, int index ) const Finds the first match of the regexp \a rx, starting at position \a index and searching backwards. If the index is -1, the search starts at the last character, if it is -2, at the next to last - character and so on. (See tqfindRev() for searching backwards.) + character and so on. (See findRev() for searching backwards.) Returns the position of the match or -1 if no match was found. \code TQString string( "bananas" ); - int i = string.tqfindRev( TQRegExp("an") ); // i == 3 + int i = string.findRev( TQRegExp("an") ); // i == 3 \endcode - \sa tqfind() + \sa find() */ -int TQString::tqfindRev( const TQRegExp &rx, int index ) const +int TQString::findRev( const TQRegExp &rx, int index ) const { return rx.searchRev( *this, index ); } @@ -5960,13 +5960,13 @@ int TQString::tqfindRev( const TQRegExp &rx, int index ) const \code TQString str = "banana and panama"; TQRegExp rxp = TQRegExp( "a[nm]a", TRUE, FALSE ); - int i = str.tqcontains( rxp ); // i == 4 + int i = str.contains( rxp ); // i == 4 \endcode - \sa tqfind() tqfindRev() + \sa find() findRev() */ -int TQString::tqcontains( const TQRegExp &rx ) const +int TQString::contains( const TQRegExp &rx ) const { int count = 0; int index = -1; @@ -6376,7 +6376,7 @@ uint TQString::toUInt( bool *ok, int base ) const double d = TQString( "1,234,567.89" ).toDouble(&ok); // ok == false \endcode - \warning If the string tqcontains trailing whitespace this function + \warning If the string contains trailing whitespace this function will fail, and set \a *ok to false if \a ok is not 0. Leading whitespace is ignored. @@ -6426,7 +6426,7 @@ double TQString::toDouble( bool *ok ) const For information on how string-to-number functions in TQString handle localized input, see toDouble(). - \warning If the string tqcontains trailing whitespace this function + \warning If the string contains trailing whitespace this function will fail, settings \a *ok to false if \a ok is not 0. Leading whitespace is ignored. @@ -6975,7 +6975,7 @@ TQString &TQString::operator+=( char c ) /*! Returns a Latin-1 representation of the string. The - returned value is undefined if the string tqcontains non-Latin-1 + returned value is undefined if the string contains non-Latin-1 characters. If you want to convert strings into formats other than Unicode, see the TQTextCodec classes. diff --git a/tqtinterface/qt4/src/tools/tqstring.h b/tqtinterface/qt4/src/tools/tqstring.h index 91ceb9d..c82af1f 100644 --- a/tqtinterface/qt4/src/tools/tqstring.h +++ b/tqtinterface/qt4/src/tools/tqstring.h @@ -89,7 +89,7 @@ public: ByteOrderSwapped = ByteOrderSwapped, // null = Null, -// tqreplacement = ReplacementCharacter, +// replacement = ReplacementCharacter, // byteOrderMark = ByteOrderMark, // byteOrderSwapped = ByteOrderSwapped, // nbsp = Nbsp, @@ -99,7 +99,7 @@ public: }; TQT_STATIC_CONST TQChar null; - TQT_STATIC_CONST TQChar tqreplacement; + TQT_STATIC_CONST TQChar replacement; TQT_STATIC_CONST TQChar byteOrderMark; TQT_STATIC_CONST TQChar byteOrderSwapped; TQT_STATIC_CONST TQChar nbsp; @@ -169,23 +169,23 @@ public: TQString( const std::string &str ) : QString(str.c_str()) {} #endif - int tqfind( QChar c, int index=0, bool cs=TRUE ) const { return indexOf(c, index, (Qt::CaseSensitivity)cs); } - int tqfind( char c, int index=0, bool cs=TRUE ) const { return indexOf(c, index, (Qt::CaseSensitivity)cs); } - int tqfind( const QString &str, int index=0, bool cs=TRUE ) const { return indexOf(str, index, (Qt::CaseSensitivity)cs); } + int find( QChar c, int index=0, bool cs=TRUE ) const { return indexOf(c, index, (Qt::CaseSensitivity)cs); } + int find( char c, int index=0, bool cs=TRUE ) const { return indexOf(c, index, (Qt::CaseSensitivity)cs); } + int find( const QString &str, int index=0, bool cs=TRUE ) const { return indexOf(str, index, (Qt::CaseSensitivity)cs); } #ifndef TQT_NO_REGEXP - int tqfind( const QRegExp &qr, int index=0 ) const { return indexOf(qr, index); } + int find( const QRegExp &qr, int index=0 ) const { return indexOf(qr, index); } #endif #ifndef TQT_NO_CAST_ASCII - int tqfind( const char* str, int index=0 ) const { return indexOf(str, index); } + int find( const char* str, int index=0 ) const { return indexOf(str, index); } #endif - int tqfindRev( QChar c, int index=-1, bool cs=TRUE) const { return lastIndexOf(c, index, (Qt::CaseSensitivity)cs); } - int tqfindRev( char c, int index=-1, bool cs=TRUE) const { return lastIndexOf(c, index, (Qt::CaseSensitivity)cs); } - int tqfindRev( const QString &str, int index=-1, bool cs=TRUE) const { return lastIndexOf(str, index, (Qt::CaseSensitivity)cs); } + int findRev( QChar c, int index=-1, bool cs=TRUE) const { return lastIndexOf(c, index, (Qt::CaseSensitivity)cs); } + int findRev( char c, int index=-1, bool cs=TRUE) const { return lastIndexOf(c, index, (Qt::CaseSensitivity)cs); } + int findRev( const QString &str, int index=-1, bool cs=TRUE) const { return lastIndexOf(str, index, (Qt::CaseSensitivity)cs); } #ifndef TQT_NO_REGEXP - int tqfindRev( const QRegExp &qr, int index=-1 ) const { return lastIndexOf(qr, index); } + int findRev( const QRegExp &qr, int index=-1 ) const { return lastIndexOf(qr, index); } #endif #ifndef TQT_NO_CAST_ASCII - int tqfindRev( const char* str, int index=-1 ) const { return lastIndexOf(str, index); } + int findRev( const char* str, int index=-1 ) const { return lastIndexOf(str, index); } #endif const char* latin1() const { return latin1_helper(); } @@ -209,53 +209,53 @@ public: inline TQString(const Null &) : QString() {} inline TQString &operator=(const Null &) { *this = TQString(); return *this; } - int tqcontains( QChar c, bool cs=TRUE ) const { return count(c, (Qt::CaseSensitivity)cs); } - int tqcontains( char c, bool cs=TRUE ) const { return tqcontains(TQChar(c), cs); } + int contains( QChar c, bool cs=TRUE ) const { return count(c, (Qt::CaseSensitivity)cs); } + int contains( char c, bool cs=TRUE ) const { return contains(TQChar(c), cs); } #ifndef TQT_NO_CAST_ASCII - int tqcontains( const char* str, bool cs=TRUE ) const { return count(str, (Qt::CaseSensitivity)cs); } + int contains( const char* str, bool cs=TRUE ) const { return count(str, (Qt::CaseSensitivity)cs); } #endif - int tqcontains( const QString &str, bool cs=TRUE ) const { return count(str, (Qt::CaseSensitivity)cs); } + int contains( const QString &str, bool cs=TRUE ) const { return count(str, (Qt::CaseSensitivity)cs); } #ifndef TQT_NO_REGEXP - int tqcontains( const QRegExp &re ) const { return count(re); } + int contains( const QRegExp &re ) const { return count(re); } #endif #ifndef QT_NO_CAST_TO_ASCII inline operator const char *() const { return ascii_helper(); } #endif - inline bool tqstartsWith( const TQString& str ) const { return startsWith(str); } - inline bool tqstartsWith( const TQString& str, bool cs ) const { return startsWith(str, (cs)?Qt::CaseSensitive:Qt::CaseInsensitive); } - inline bool tqendsWith( const TQString& str ) const { return endsWith(str); } - inline bool tqendsWith( const TQString& str, bool cs ) const { return endsWith(str, (cs)?Qt::CaseSensitive:Qt::CaseInsensitive); } + inline bool tqstartsWith( const TQString& str ) const { return QString::startsWith(str); } + inline bool tqstartsWith( const TQString& str, bool cs ) const { return QString::startsWith(str, (cs)?Qt::CaseSensitive:Qt::CaseInsensitive); } + inline bool tqendsWith( const TQString& str ) const { return QString::endsWith(str); } + inline bool tqendsWith( const TQString& str, bool cs ) const { return QString::endsWith(str, (cs)?Qt::CaseSensitive:Qt::CaseInsensitive); } TQCString utf8() const; inline TQChar constref(uint i) const { return tqat(i); } - inline TQString leftJustify(int width, QChar aFill = QLatin1Char(' '), bool trunc=false) const { return leftJustified(width, aFill, trunc); } - inline TQString rightJustify(int width, QChar aFill = QLatin1Char(' '), bool trunc=false) const { return rightJustified(width, aFill, trunc); } + inline TQString leftJustify(int width, QChar aFill = QLatin1Char(' '), bool trunc=false) const { return QString::leftJustified(width, aFill, trunc); } + inline TQString rightJustify(int width, QChar aFill = QLatin1Char(' '), bool trunc=false) const { return QString::rightJustified(width, aFill, trunc); } inline const TQChar* tqunicode() const { if (length() > 0) return static_cast<const TQChar*>(unicode()); else return static_cast<const TQChar*>(QString().unicode()); } TQCString local8Bit() const; - inline TQString tqreplace(int i, int len, QChar after) { return tqreplace( i, len, &after, 1 ); } - inline TQString tqreplace(int i, int len, const QChar *s, int slen) { + inline TQString replace(int i, int len, QChar after) { return QString::replace( i, len, &after, 1 ); } + inline TQString replace(int i, int len, const QChar *s, int slen) { // Mimic the old (undocumented) behavior int newindex = i; if (newindex > length()) newindex = length(); - return replace( newindex, len, s, slen ); + return QString::replace( newindex, len, s, slen ); } - inline TQString tqreplace(int i, int len, const QString &after) { return tqreplace( i, len, TQString(after).tqunicode(), after.length() ); } - inline TQString tqreplace(QChar before, QChar after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( before, after, cs ); } - inline TQString tqreplace(const QChar *before, int blen, const QChar *after, int alen, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( before, blen, after, alen, cs ); } - inline TQString tqreplace(const QLatin1String &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( before, after, cs ); } - inline TQString tqreplace(const QLatin1String &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( before, after, cs ); } - inline TQString tqreplace(const QString &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( before, after, cs ); } - inline TQString tqreplace(const QString &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( before, after, cs ); } - inline TQString tqreplace(QChar c, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( c, after, cs ); } - inline TQString tqreplace(QChar c, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return replace( c, after, cs ); } + inline TQString replace(int i, int len, const QString &after) { return QString::replace( i, len, TQString(after).tqunicode(), after.length() ); } + inline TQString replace(QChar before, QChar after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( before, after, cs ); } + inline TQString replace(const QChar *before, int blen, const QChar *after, int alen, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( before, blen, after, alen, cs ); } + inline TQString replace(const QLatin1String &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( before, after, cs ); } + inline TQString replace(const QLatin1String &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( before, after, cs ); } + inline TQString replace(const QString &before, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( before, after, cs ); } + inline TQString replace(const QString &before, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( before, after, cs ); } + inline TQString replace(QChar c, const QString &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( c, after, cs ); } + inline TQString replace(QChar c, const QLatin1String &after, Qt::CaseSensitivity cs = Qt::CaseSensitive) { return QString::replace( c, after, cs ); } #ifndef QT_NO_REGEXP - inline TQString tqreplace(const QRegExp &rx, const QString &after) { return replace( rx, after ); } + inline TQString replace(const QRegExp &rx, const QString &after) { return QString::replace( rx, after ); } #endif - inline TQString tqreplace(const QString &before, const QString &after, bool cs) { return tqreplace(before, after, cs?Qt::CaseSensitive:Qt::CaseInsensitive); } + inline TQString replace(const QString &before, const QString &after, bool cs) { return QString::replace(before, after, cs?Qt::CaseSensitive:Qt::CaseInsensitive); } inline TQString tqsetNum( short a, int base=10 ) { return setNum(a, base); } inline TQString tqsetNum( ushort a, int base=10 ) { return setNum(a, base); } @@ -440,7 +440,7 @@ inline bool operator!=(const TQString &s, TQString::Null) { return !s.isNull(); #ifndef TQT_NO_CAST_ASCII inline TQString &TQString::operator+=( const TQByteArray &s ) { - int pos = s.tqfind( 0 ); + int pos = s.find( 0 ); return operatorPlusEqHelper( s, pos==-1 ? s.size() : pos ); } #endif @@ -646,7 +646,7 @@ public: TQChar( int rc ); TQT_STATIC_CONST TQChar null; // 0000 - TQT_STATIC_CONST TQChar tqreplacement; // FFFD + TQT_STATIC_CONST TQChar replacement; // FFFD TQT_STATIC_CONST TQChar byteOrderMark; // FEFF TQT_STATIC_CONST TQChar byteOrderSwapped; // FFFE TQT_STATIC_CONST TQChar nbsp; // 00A0 @@ -1027,33 +1027,33 @@ public: ; #endif - int tqfind( TQChar c, int index=0, bool cs=TRUE ) const; - int tqfind( char c, int index=0, bool cs=TRUE ) const; - int tqfind( const TQString &str, int index=0, bool cs=TRUE ) const; + int find( TQChar c, int index=0, bool cs=TRUE ) const; + int find( char c, int index=0, bool cs=TRUE ) const; + int find( const TQString &str, int index=0, bool cs=TRUE ) const; #ifndef TQT_NO_REGEXP - int tqfind( const TQRegExp &, int index=0 ) const; + int find( const TQRegExp &, int index=0 ) const; #endif #ifndef TQT_NO_CAST_ASCII - int tqfind( const char* str, int index=0 ) const; + int find( const char* str, int index=0 ) const; #endif - int tqfindRev( TQChar c, int index=-1, bool cs=TRUE) const; - int tqfindRev( char c, int index=-1, bool cs=TRUE) const; - int tqfindRev( const TQString &str, int index=-1, bool cs=TRUE) const; + int findRev( TQChar c, int index=-1, bool cs=TRUE) const; + int findRev( char c, int index=-1, bool cs=TRUE) const; + int findRev( const TQString &str, int index=-1, bool cs=TRUE) const; #ifndef TQT_NO_REGEXP - int tqfindRev( const TQRegExp &, int index=-1 ) const; + int findRev( const TQRegExp &, int index=-1 ) const; #endif #ifndef TQT_NO_CAST_ASCII - int tqfindRev( const char* str, int index=-1 ) const; + int findRev( const char* str, int index=-1 ) const; #endif - int tqcontains( TQChar c, bool cs=TRUE ) const; - int tqcontains( char c, bool cs=TRUE ) const - { return tqcontains(TQChar(c), cs); } + int contains( TQChar c, bool cs=TRUE ) const; + int contains( char c, bool cs=TRUE ) const + { return contains(TQChar(c), cs); } #ifndef TQT_NO_CAST_ASCII - int tqcontains( const char* str, bool cs=TRUE ) const; + int contains( const char* str, bool cs=TRUE ) const; #endif - int tqcontains( const TQString &str, bool cs=TRUE ) const; + int contains( const TQString &str, bool cs=TRUE ) const; #ifndef TQT_NO_REGEXP - int tqcontains( const TQRegExp & ) const; + int contains( const TQRegExp & ) const; #endif enum SectionFlags { @@ -1131,35 +1131,35 @@ public: #ifndef TQT_NO_REGEXP TQString &remove( const TQRegExp & ); #endif - TQString &tqreplace( uint index, uint len, const TQString & ); - TQString &tqreplace( uint index, uint len, const TQChar*, uint clen ); - TQString &tqreplace( uint index, uint len, TQChar ); - TQString &tqreplace( uint index, uint len, char c ) - { return tqreplace( index, len, TQChar(c) ); } + TQString &replace( uint index, uint len, const TQString & ); + TQString &replace( uint index, uint len, const TQChar*, uint clen ); + TQString &replace( uint index, uint len, TQChar ); + TQString &replace( uint index, uint len, char c ) + { return replace( index, len, TQChar(c) ); } #if defined(TQ_TQDOC) - TQString &tqreplace( TQChar c, const TQString & after, bool cs = TRUE ); - TQString &tqreplace( char c, const TQString & after, bool cs = TRUE ); - TQString &tqreplace( const TQString & before, const TQString & after, + TQString &replace( TQChar c, const TQString & after, bool cs = TRUE ); + TQString &replace( char c, const TQString & after, bool cs = TRUE ); + TQString &replace( const TQString & before, const TQString & after, bool cs = TRUE ); #else // ### TQt 4.0: merge these two into one, and remove TQ_TQDOC hack - TQString &tqreplace( TQChar c, const TQString & ); - TQString &tqreplace( TQChar c, const TQString &, bool ); + TQString &replace( TQChar c, const TQString & ); + TQString &replace( TQChar c, const TQString &, bool ); // ### TQt 4.0: merge these two into one, and remove TQ_TQDOC hack - TQString &tqreplace( char c, const TQString & after ) - { return tqreplace( TQChar(c), after, TRUE ); } - TQString &tqreplace( char c, const TQString & after, bool cs ) - { return tqreplace( TQChar(c), after, cs ); } + TQString &replace( char c, const TQString & after ) + { return replace( TQChar(c), after, TRUE ); } + TQString &replace( char c, const TQString & after, bool cs ) + { return replace( TQChar(c), after, cs ); } // ### TQt 4.0: merge these two into one, and remove TQ_TQDOC hack - TQString &tqreplace( const TQString &, const TQString & ); - TQString &tqreplace( const TQString &, const TQString &, bool ); + TQString &replace( const TQString &, const TQString & ); + TQString &replace( const TQString &, const TQString &, bool ); #endif #ifndef TQT_NO_REGEXP_CAPTURE - TQString &tqreplace( const TQRegExp &, const TQString & ); + TQString &replace( const TQRegExp &, const TQString & ); #endif - TQString &tqreplace( TQChar, TQChar ); + TQString &replace( TQChar, TQChar ); short toShort( bool *ok=0, int base=10 ) const; ushort toUShort( bool *ok=0, int base=10 ) const; @@ -1464,7 +1464,7 @@ inline TQString &TQString::insert( uint index, const char *s ) inline TQString &TQString::insert( uint index, const TQByteArray &s ) { - int pos = s.tqfind( 0 ); + int pos = s.find( 0 ); return insertHelper( index, s, pos==-1 ? s.size() : pos ); } #endif @@ -1486,7 +1486,7 @@ inline TQString &TQString::prepend( const TQByteArray & s ) #ifndef TQT_NO_CAST_ASCII inline TQString &TQString::operator+=( const TQByteArray &s ) { - int pos = s.tqfind( 0 ); + int pos = s.find( 0 ); return operatorPlusEqHelper( s, pos==-1 ? s.size() : pos ); } #endif @@ -1562,18 +1562,18 @@ inline TQString TQString::arg( const TQString& a1, const TQString& a2, return multiArg( 4, a1, a2, a3, a4 ); } -inline int TQString::tqfind( char c, int index, bool cs ) const -{ return tqfind(TQChar(c), index, cs); } +inline int TQString::find( char c, int index, bool cs ) const +{ return find(TQChar(c), index, cs); } -inline int TQString::tqfindRev( char c, int index, bool cs ) const -{ return tqfindRev( TQChar(c), index, cs ); } +inline int TQString::findRev( char c, int index, bool cs ) const +{ return findRev( TQChar(c), index, cs ); } #ifndef TQT_NO_CAST_ASCII -inline int TQString::tqfind( const char* str, int index ) const -{ return tqfind(TQString::fromAscii(str), index); } +inline int TQString::find( const char* str, int index ) const +{ return find(TQString::fromAscii(str), index); } -inline int TQString::tqfindRev( const char* str, int index ) const -{ return tqfindRev(TQString::fromAscii(str), index); } +inline int TQString::findRev( const char* str, int index ) const +{ return findRev(TQString::fromAscii(str), index); } #endif diff --git a/tqtinterface/qt4/src/tools/tqstringlist.cpp b/tqtinterface/qt4/src/tools/tqstringlist.cpp index 6a10959..502b5dc 100644 --- a/tqtinterface/qt4/src/tools/tqstringlist.cpp +++ b/tqtinterface/qt4/src/tools/tqstringlist.cpp @@ -105,7 +105,7 @@ \endcode You can sort the list with sort(), and extract a new list which - tqcontains only those strings which contain a particular substring + contains only those strings which contain a particular substring (or match a particular regular expression) using the grep() functions, e.g. \code @@ -230,7 +230,7 @@ TQStringList TQStringList::split( const TQString &sep, const TQString &str, TQStringList lst; int j = 0; - int i = str.tqfind( sep, j ); + int i = str.find( sep, j ); while ( i != -1 ) { if ( i > j && i <= (int)str.length() ) @@ -238,7 +238,7 @@ TQStringList TQStringList::split( const TQString &sep, const TQString &str, else if ( allowEmptyEntries ) lst << TQString::null; j = i + sep.length(); - i = str.tqfind( sep, sep.length() > 0 ? j : j+1 ); + i = str.find( sep, sep.length() > 0 ? j : j+1 ); } int l = str.length() - 1; @@ -316,14 +316,14 @@ TQStringList TQStringList::split( const TQRegExp &sep, const TQString &str, // list == ["Bill Gates", "Bill Clinton"] \endcode - \sa TQString::tqfind() + \sa TQString::find() */ TQStringList TQStringList::grep( const TQString &str, bool cs ) const { TQStringList res; for ( TQStringList::ConstIterator it = begin(); it != end(); ++it ) - if ( (*it).tqcontains(str, cs) ) + if ( (*it).contains(str, cs) ) res << *it; return res; @@ -336,14 +336,14 @@ TQStringList TQStringList::grep( const TQString &str, bool cs ) const Returns a list of all the strings that match the regular expression \a rx. - \sa TQString::tqfind() + \sa TQString::find() */ TQStringList TQStringList::grep( const TQRegExp &rx ) const { TQStringList res; for ( TQStringList::ConstIterator it = begin(); it != end(); ++it ) - if ( (*it).tqfind(rx) != -1 ) + if ( (*it).find(rx) != -1 ) res << *it; return res; @@ -366,14 +366,14 @@ TQStringList TQStringList::grep( const TQRegExp &rx ) const // list == ["olpho", "beto", "gommo", "epsilon"] \endcode - \sa TQString::tqreplace() + \sa TQString::replace() */ TQStringList& TQStringList::gres( const TQString &before, const TQString &after, bool cs ) { TQStringList::Iterator it = begin(); while ( it != end() ) { - (*it).tqreplace( before, after, cs ); + (*it).replace( before, after, cs ); ++it; } return *this; @@ -396,7 +396,7 @@ TQStringList& TQStringList::gres( const TQString &before, const TQString &after, For regexps containing \link tqregexp.html#capturing-text capturing parentheses \endlink, occurrences of <b>\\1</b>, - <b>\\2</b>, ..., in \a after are tqreplaced with \a{rx}.cap(1), + <b>\\2</b>, ..., in \a after are replaced with \a{rx}.cap(1), cap(2), ... Example: @@ -407,13 +407,13 @@ TQStringList& TQStringList::gres( const TQString &before, const TQString &after, // list == ["Bill Clinton", "Bill Gates"] \endcode - \sa TQString::tqreplace() + \sa TQString::replace() */ TQStringList& TQStringList::gres( const TQRegExp &rx, const TQString &after ) { TQStringList::Iterator it = begin(); while ( it != end() ) { - (*it).tqreplace( rx, after ); + (*it).replace( rx, after ); ++it; } return *this; diff --git a/tqtinterface/qt4/src/tools/tqtextstream.cpp b/tqtinterface/qt4/src/tools/tqtextstream.cpp index 842cb7e..1225f7b 100644 --- a/tqtinterface/qt4/src/tools/tqtextstream.cpp +++ b/tqtinterface/qt4/src/tools/tqtextstream.cpp @@ -150,7 +150,7 @@ \endcode The setprecision() function returns a TQTSManip object. - The TQTSManip object tqcontains a pointer to a member function in + The TQTSManip object contains a pointer to a member function in TQTextStream and an integer argument. When serializing a TQTSManip into a TQTextStream, the function is executed with the argument. @@ -480,7 +480,7 @@ TQ_LONG TQStringBuffer::writeBlock( const char *p, TQ_ULONG len ) return -1; } #endif - s->tqreplace(pos()/2, len/2, (TQChar*)p, len/2); + s->replace(pos()/2, len/2, (TQChar*)p, len/2); seek(pos()+len); return len; } diff --git a/tqtinterface/qt4/src/tools/tqunicodetables.cpp b/tqtinterface/qt4/src/tools/tqunicodetables.cpp index 750dcd5..df592c8 100644 --- a/tqtinterface/qt4/src/tools/tqunicodetables.cpp +++ b/tqtinterface/qt4/src/tools/tqunicodetables.cpp @@ -315,7 +315,7 @@ for $lig_row ( 0..255 ) { # we need to sort ligatures according to their length. # long ones have to come first! @ligature_sort = sort { $decomposition_len{$b} <=> $decomposition_len{$a} } @ligature; -# now tqreplace each code by its position in +# now replace each code by its position in # the decomposition map. undef(@lig_pos); for $n (@ligature_sort) { diff --git a/tqtinterface/qt4/src/tools/tqvaluelist.h b/tqtinterface/qt4/src/tools/tqvaluelist.h index 799473a..0928f38 100644 --- a/tqtinterface/qt4/src/tools/tqvaluelist.h +++ b/tqtinterface/qt4/src/tools/tqvaluelist.h @@ -247,9 +247,9 @@ public: Iterator insert( Iterator it, const T& x ); Iterator remove( Iterator it ); - NodePtr tqfind( NodePtr start, const T& x ) const; - int tqfindIndex( NodePtr start, const T& x ) const; - uint tqcontains( const T& x ) const; + NodePtr find( NodePtr start, const T& x ) const; + int findIndex( NodePtr start, const T& x ) const; + uint contains( const T& x ) const; uint remove( const T& x ); NodePtr at( size_type i ) const; void clear(); @@ -313,7 +313,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPriva } template <class T> -TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::tqfind( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const +TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const { ConstIterator first( start ); ConstIterator last( node ); @@ -326,7 +326,7 @@ TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivat } template <class T> -TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::tqfindIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const +TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const { ConstIterator first( start ); ConstIterator last( node ); @@ -341,7 +341,7 @@ TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::tqfindIndex( TQ_TYPENAME TQValueL } template <class T> -TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::tqcontains( const T& x ) const +TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const { uint result = 0; Iterator first = Iterator( node->next ); @@ -543,12 +543,12 @@ public: const_iterator at( size_type i ) const { TQT_CHECK_INVALID_LIST_ELEMENT; return const_iterator( sh->at(i) ); } iterator tqat( size_type i ) { TQT_CHECK_INVALID_LIST_ELEMENT; detach(); return iterator( sh->at(i) ); } const_iterator tqat( size_type i ) const { TQT_CHECK_INVALID_LIST_ELEMENT; return const_iterator( sh->at(i) ); } - iterator tqfind ( const T& x ) { detach(); return iterator( sh->tqfind( sh->node->next, x) ); } - const_iterator tqfind ( const T& x ) const { return const_iterator( sh->tqfind( sh->node->next, x) ); } - iterator tqfind ( iterator it, const T& x ) { detach(); return iterator( sh->tqfind( it.node, x ) ); } - const_iterator tqfind ( const_iterator it, const T& x ) const { return const_iterator( sh->tqfind( it.node, x ) ); } - int tqfindIndex( const T& x ) const { return sh->tqfindIndex( sh->node->next, x) ; } - size_type tqcontains( const T& x ) const { return sh->tqcontains( x ); } + iterator find ( const T& x ) { detach(); return iterator( sh->find( sh->node->next, x) ); } + const_iterator find ( const T& x ) const { return const_iterator( sh->find( sh->node->next, x) ); } + iterator find ( iterator it, const T& x ) { detach(); return iterator( sh->find( it.node, x ) ); } + const_iterator find ( const_iterator it, const T& x ) const { return const_iterator( sh->find( it.node, x ) ); } + int findIndex( const T& x ) const { return sh->findIndex( sh->node->next, x) ; } + size_type contains( const T& x ) const { return sh->contains( x ); } size_type count() const { return sh->nodes; } diff --git a/tqtinterface/qt4/src/tqmoc/README b/tqtinterface/qt4/src/tqmoc/README index f616e7c..cf07c8a 100644 --- a/tqtinterface/qt4/src/tqmoc/README +++ b/tqtinterface/qt4/src/tqmoc/README @@ -1,4 +1,4 @@ -This directory tqcontains the source code for the Qt Meta Object +This directory contains the source code for the Qt Meta Object Compiler (tqmoc). The files tqmoc_yacc.cpp, tqmoc_yacc.h and tqmoc_lex.cpp are generated by diff --git a/tqtinterface/qt4/src/tqmoc/tqmoc.l b/tqtinterface/qt4/src/tqmoc/tqmoc.l index ff715cf..d26951a 100644 --- a/tqtinterface/qt4/src/tqmoc/tqmoc.l +++ b/tqtinterface/qt4/src/tqmoc/tqmoc.l @@ -434,14 +434,14 @@ STRING {ALMOSTSTRING}\" ^[ \t]*#.* { /* preprocessor commands are skipped */} "//"[^\n]* { /* C++ comment */ TQCString s = yytext; - if ( s.tqcontains( "TQMOC_SKIP_BEGIN" ) ) { + if ( s.contains( "TQMOC_SKIP_BEGIN" ) ) { skipLevel++; if ( skipLevel == 1 ) { lastState = YYSTATE; BEGIN SKIP; } } else - if ( s.tqcontains( "TQMOC_SKIP_END" ) ) { + if ( s.contains( "TQMOC_SKIP_END" ) ) { if ( skipLevel == 0 ) { tqmoc_warn(" TQMOC_SKIP_END without TQMOC_SKIP_BEGIN"); } else { diff --git a/tqtinterface/qt4/src/tqmoc/tqmoc.pro b/tqtinterface/qt4/src/tqmoc/tqmoc.pro index 559bbbc..b4762db 100644 --- a/tqtinterface/qt4/src/tqmoc/tqmoc.pro +++ b/tqtinterface/qt4/src/tqmoc/tqmoc.pro @@ -38,7 +38,7 @@ SOURCES = ../tools/tqbuffer.cpp \ ../codecs/tqtextcodec.cpp \ ../codecs/tqutfcodec.cpp -isEmpty(TQT_PRODUCT)|tqcontains(TQT_PRODUCT, qt-internal) { +isEmpty(TQT_PRODUCT)|contains(TQT_PRODUCT, qt-internal) { LEXSOURCES = tqmoc.l YACCSOURCES = tqmoc.y } else { diff --git a/tqtinterface/qt4/src/tqmoc/tqmoc.y b/tqtinterface/qt4/src/tqmoc/tqmoc.y index 69ac269..927ec47 100644 --- a/tqtinterface/qt4/src/tqmoc/tqmoc.y +++ b/tqtinterface/qt4/src/tqmoc/tqmoc.y @@ -152,7 +152,7 @@ TQCString castToUType( TQCString ctype ) if ( ctype.right(1) == "&" ) ctype = ctype.left( ctype.length() - 1 ); if( ctype.right(1) == "]") { - int lb = ctype.tqfindRev('['); + int lb = ctype.findRev('['); if(lb != -1) ctype = ctype.left(lb) + "*"; } @@ -316,7 +316,7 @@ bool isVariantType( const char* type ) */ void fixRightAngles( TQCString *str ) { - str->tqreplace( TQRegExp(">>"), "> >" ); + str->replace( TQRegExp(">>"), "> >" ); } static TQCString rmWS( const char * ); @@ -433,7 +433,7 @@ class FuncList : public TQPtrList<Function> { // list of member functions public: FuncList( bool autoDelete = FALSE ) { setAutoDelete( autoDelete ); } - FuncList tqfind( const char* name ) + FuncList find( const char* name ) { FuncList result; for ( TQPtrListIterator<Function> it(*this); it.current(); ++it ) { @@ -500,8 +500,8 @@ struct Property int oredEnum; // If the enums item may be ored. That means the data type is int. // Allowed values are 1 (True), 0 (False), and -1 (Unset) - TQCString enumsettype; // tqcontains the set function type in case of oredEnum - TQCString enumgettype; // tqcontains the get function type in case of oredEnum + TQCString enumsettype; // contains the set function type in case of oredEnum + TQCString enumgettype; // contains the get function type in case of oredEnum enum Specification { Unspecified, Class, Reference, Pointer, ConstCharStar }; Specification sspec; @@ -636,9 +636,9 @@ Access tmpAccess; // current access permission Access subClassPerm; // current access permission bool TQ_OBJECTdetected; // TRUE if current class - // tqcontains the TQ_OBJECT macro + // contains the TQ_OBJECT macro bool Q_PROPERTYdetected; // TRUE if current class - // tqcontains at least one Q_PROPERTY, + // contains at least one Q_PROPERTY, // TQ_OVERRIDE, TQ_SETS or TQ_ENUMS macro bool tmpPropOverride; // current property override setting @@ -1652,7 +1652,7 @@ parser_reg::~parser_reg() int yyparse(); -void tqreplace( char *s, char c1, char c2 ); +void replace( char *s, char c1, char c2 ); void setDefaultIncludeFile() { @@ -1730,7 +1730,7 @@ int main( int argc, char **argv ) } else { g->qtPath = opt.tqstringFromPos(1); } - tqreplace(g->qtPath.data(),'\\','/'); + replace(g->qtPath.data(),'\\','/'); if ( g->qtPath.right(1) != "/" ) g->qtPath += '/'; } else if ( opt == "v" ) { // version number @@ -1759,7 +1759,7 @@ int main( int argc, char **argv ) } if ( autoInclude ) { - int ppos = g->fileName.tqfindRev('.'); + int ppos = g->fileName.findRev('.'); if ( ppos != -1 && tolower( g->fileName[ppos + 1] ) == 'h' ) g->noInclude = FALSE; else @@ -1920,7 +1920,7 @@ tqmoc_status do_tqmoc( CWPluginContext ctx, const TQCString &fin, const TQCStrin return tqmoc_success; } #endif -void tqreplace( char *s, char c1, char c2 ) +void replace( char *s, char c1, char c2 ) { if ( !s ) return; @@ -2097,7 +2097,7 @@ int openNameSpaceForMetaObject( FILE *out ) } TQCString nm = g->className; int pos; - while( (pos = nm.tqfind( "::" )) != -1 ) { + while( (pos = nm.find( "::" )) != -1 ) { TQCString spaceName = nm.left( pos ); nm = nm.right( nm.length() - pos - 2 ); if ( !spaceName.isEmpty() ) { @@ -2336,10 +2336,10 @@ TQCString purestSuperClassName() Make sure qualified template arguments (e.g., foo<bar::baz>) don't interfere. */ - int pos = sc.tqfindRev( "::", sc.tqfind( '<' ) ); + int pos = sc.findRev( "::", sc.find( '<' ) ); if ( pos != -1 ) { sc = sc.right( sc.length() - pos - 2 ); - pos = c.tqfindRev( "::" ); + pos = c.findRev( "::" ); if ( pos != -1 ) c = c.right( c.length() - pos - 2 ); if ( sc == c ) @@ -2351,7 +2351,7 @@ TQCString purestSuperClassName() TQCString callablePurestSuperClassName() { TQCString sc = purestSuperClassName(); -// if (sc.tqfind("TQ") != 0) { +// if (sc.find("TQ") != 0) { return TQCString("static_cast<TQObject*>(static_cast<TQT_BASE_OBJECT_NAME*>(this))->"); // } // else { @@ -2367,7 +2367,7 @@ TQCString qualifiedClassName() TQCString callableQualifiedClassName() { TQCString sc = qualifiedClassName(); -// if (sc.tqfind("TQ") != 0) { +// if (sc.find("TQ") != 0) { return TQCString("static_cast<TQObject*>(static_cast<TQT_BASE_OBJECT_NAME*>(this))->"); // } // else { @@ -2470,7 +2470,7 @@ int enumIndex( const char* type ) bool isEnumType( const char* type ) { - return enumIndex( type ) >= 0 || ( g->qtEnums.tqcontains( type ) || g->qtSets.tqcontains( type ) ); + return enumIndex( type ) >= 0 || ( g->qtEnums.contains( type ) || g->qtSets.contains( type ) ); } bool isPropertyType( const char* type ) @@ -2526,7 +2526,7 @@ int generateProps() // verify get function if ( !p->get.isEmpty() ) { - FuncList candidates = g->propfuncs.tqfind( p->get ); + FuncList candidates = g->propfuncs.find( p->get ); for ( Function* f = candidates.first(); f; f = candidates.next() ) { if ( f->qualifier != "const" ) // get functions must be const continue; @@ -2640,7 +2640,7 @@ int generateProps() // verify set function if ( !p->set.isEmpty() ) { - FuncList candidates = g->propfuncs.tqfind( p->set ); + FuncList candidates = g->propfuncs.find( p->set ); for ( Function* f = candidates.first(); f; f = candidates.next() ) { if ( !f->args || f->args->isEmpty() ) continue; @@ -2756,7 +2756,7 @@ int generateProps() // if ( g->props.count() ) { if ( displayWarnings && !TQ_OBJECTdetected ) - tqmoc_err("The declaration of the class \"%s\" tqcontains properties" + tqmoc_err("The declaration of the class \"%s\" contains properties" " but no TQ_OBJECT macro.", g->className.data()); fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); @@ -2838,7 +2838,7 @@ int generateClassInfos() return 0; if ( displayWarnings && !TQ_OBJECTdetected ) - tqmoc_err("The declaration of the class \"%s\" tqcontains class infos" + tqmoc_err("The declaration of the class \"%s\" contains class infos" " but no TQ_OBJECT macro.", g->className.data()); fprintf( out, " static const TQClassInfo classinfo_tbl[] = {\n" ); @@ -2869,11 +2869,11 @@ void generateClass() // generate C++ source code for a class if ( g->tqsignals.count() == 0 && g->tqslots.count() == 0 && g->props.count() == 0 && g->infos.count() == 0 ) return; if ( displayWarnings && (g->tqsignals.count() + g->tqslots.count()) != 0 ) - tqmoc_err("The declaration of the class \"%s\" tqcontains tqsignals " + tqmoc_err("The declaration of the class \"%s\" contains tqsignals " "or tqslots\n\t but no TQ_OBJECT macro.", g->className.data()); } else { if ( g->superClassName.isEmpty() ) - tqmoc_err("The declaration of the class \"%s\" tqcontains the\n" + tqmoc_err("The declaration of the class \"%s\" contains the\n" "\tTQ_OBJECT macro but does not inherit from any class!\n" "\tInherit from TQObject or one of its descendants" " or remove TQ_OBJECT.", g->className.data() ); @@ -3014,7 +3014,7 @@ void generateClass() // generate C++ source code for a class if ( isTQObject ) fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" ); else if ( !g->superClassName.isEmpty() ) - if (g->superClassName.tqfind("TQ") == 0) { // [FIXME] Verify that this will always be able to detect a TQt base class, even if intermediate classes do not start with TQ + if (g->superClassName.find("TQ") == 0) { // [FIXME] Verify that this will always be able to detect a TQt base class, even if intermediate classes do not start with TQ fprintf( out, " TQMetaObject* parentObject = %s::staticMetaObject();\n", (const char*)g->superClassName ); } else { @@ -3102,8 +3102,8 @@ void generateClass() // generate C++ source code for a class for ( const char* cname = g->multipleSuperClasses.first(); cname; cname = g->multipleSuperClasses.next() ) { fprintf( out, " if ( !qstrcmp( clname, \"%s\" ) )\n", cname); TQCString fixed(cname); - while (fixed.tqfind(">>") != -1) - fixed = fixed.tqreplace(">>", "> >"); + while (fixed.find(">>") != -1) + fixed = fixed.replace(">>", "> >"); fprintf( out, "\treturn (%s*)this;\n", fixed.data()); } if ( !g->superClassName.isEmpty() && !isTQObject ) @@ -3574,10 +3574,10 @@ void addEnum() } // Only look at types mentioned in TQ_ENUMS and TQ_SETS - if ( g->qtEnums.tqcontains( tmpEnum->name ) || g->qtSets.tqcontains( tmpEnum->name ) ) + if ( g->qtEnums.contains( tmpEnum->name ) || g->qtSets.contains( tmpEnum->name ) ) { g->enums.append( tmpEnum ); - if ( g->qtSets.tqcontains( tmpEnum->name ) ) + if ( g->qtSets.contains( tmpEnum->name ) ) tmpEnum->set = TRUE; else tmpEnum->set = FALSE; diff --git a/tqtinterface/qt4/src/tqmoc/tqmoc_lex.cpp b/tqtinterface/qt4/src/tqmoc/tqmoc_lex.cpp index 6f4f275..09016ba 100644 --- a/tqtinterface/qt4/src/tqmoc/tqmoc_lex.cpp +++ b/tqtinterface/qt4/src/tqmoc/tqmoc_lex.cpp @@ -2175,14 +2175,14 @@ YY_RULE_SETUP #line 435 "tqmoc.l" { /* C++ comment */ TQCString s = yytext; - if ( s.tqcontains( "TQMOC_SKIP_BEGIN" ) ) { + if ( s.contains( "TQMOC_SKIP_BEGIN" ) ) { skipLevel++; if ( skipLevel == 1 ) { lastState = YYSTATE; BEGIN SKIP; } } else - if ( s.tqcontains( "TQMOC_SKIP_END" ) ) { + if ( s.contains( "TQMOC_SKIP_END" ) ) { if ( skipLevel == 0 ) { tqmoc_warn(" TQMOC_SKIP_END without TQMOC_SKIP_BEGIN"); } else { diff --git a/tqtinterface/qt4/src/tqmoc/tqmoc_yacc.cpp b/tqtinterface/qt4/src/tqmoc/tqmoc_yacc.cpp index 3d53e57..21f7dc1 100644 --- a/tqtinterface/qt4/src/tqmoc/tqmoc_yacc.cpp +++ b/tqtinterface/qt4/src/tqmoc/tqmoc_yacc.cpp @@ -167,7 +167,7 @@ TQCString castToUType( TQCString ctype ) if ( ctype.right(1) == "&" ) ctype = ctype.left( ctype.length() - 1 ); if( ctype.right(1) == "]") { - int lb = ctype.tqfindRev('['); + int lb = ctype.findRev('['); if(lb != -1) ctype = ctype.left(lb) + "*"; } @@ -331,7 +331,7 @@ bool isVariantType( const char* type ) */ void fixRightAngles( TQCString *str ) { - str->tqreplace( TQRegExp(">>"), "> >" ); + str->replace( TQRegExp(">>"), "> >" ); } static TQCString rmWS( const char * ); @@ -448,7 +448,7 @@ class FuncList : public TQPtrList<Function> { // list of member functions public: FuncList( bool autoDelete = FALSE ) { setAutoDelete( autoDelete ); } - FuncList tqfind( const char* name ) + FuncList find( const char* name ) { FuncList result; for ( TQPtrListIterator<Function> it(*this); it.current(); ++it ) { @@ -515,8 +515,8 @@ struct Property int oredEnum; // If the enums item may be ored. That means the data type is int. // Allowed values are 1 (True), 0 (False), and -1 (Unset) - TQCString enumsettype; // tqcontains the set function type in case of oredEnum - TQCString enumgettype; // tqcontains the get function type in case of oredEnum + TQCString enumsettype; // contains the set function type in case of oredEnum + TQCString enumgettype; // contains the get function type in case of oredEnum enum Specification { Unspecified, Class, Reference, Pointer, ConstCharStar }; Specification sspec; @@ -651,9 +651,9 @@ Access tmpAccess; // current access permission Access subClassPerm; // current access permission bool TQ_OBJECTdetected; // TRUE if current class - // tqcontains the TQ_OBJECT macro + // contains the TQ_OBJECT macro bool Q_PROPERTYdetected; // TRUE if current class - // tqcontains at least one Q_PROPERTY, + // contains at least one Q_PROPERTY, // TQ_OVERRIDE, TQ_SETS or TQ_ENUMS macro bool tmpPropOverride; // current property override setting @@ -4478,7 +4478,7 @@ parser_reg::~parser_reg() int yyparse(); -void tqreplace( char *s, char c1, char c2 ); +void replace( char *s, char c1, char c2 ); void setDefaultIncludeFile() { @@ -4556,7 +4556,7 @@ int main( int argc, char **argv ) } else { g->qtPath = opt.tqstringFromPos(1); } - tqreplace(g->qtPath.data(),'\\','/'); + replace(g->qtPath.data(),'\\','/'); if ( g->qtPath.right(1) != "/" ) g->qtPath += '/'; } else if ( opt == "v" ) { // version number @@ -4585,7 +4585,7 @@ int main( int argc, char **argv ) } if ( autoInclude ) { - int ppos = g->fileName.tqfindRev('.'); + int ppos = g->fileName.findRev('.'); if ( ppos != -1 && tolower( g->fileName[ppos + 1] ) == 'h' ) g->noInclude = FALSE; else @@ -4746,7 +4746,7 @@ tqmoc_status do_tqmoc( CWPluginContext ctx, const TQCString &fin, const TQCStrin return tqmoc_success; } #endif -void tqreplace( char *s, char c1, char c2 ) +void replace( char *s, char c1, char c2 ) { if ( !s ) return; @@ -4923,7 +4923,7 @@ int openNameSpaceForMetaObject( FILE *out ) } TQCString nm = g->className; int pos; - while( (pos = nm.tqfind( "::" )) != -1 ) { + while( (pos = nm.find( "::" )) != -1 ) { TQCString spaceName = nm.left( pos ); nm = nm.right( nm.length() - pos - 2 ); if ( !spaceName.isEmpty() ) { @@ -5162,10 +5162,10 @@ TQCString purestSuperClassName() Make sure qualified template arguments (e.g., foo<bar::baz>) don't interfere. */ - int pos = sc.tqfindRev( "::", sc.tqfind( '<' ) ); + int pos = sc.findRev( "::", sc.find( '<' ) ); if ( pos != -1 ) { sc = sc.right( sc.length() - pos - 2 ); - pos = c.tqfindRev( "::" ); + pos = c.findRev( "::" ); if ( pos != -1 ) c = c.right( c.length() - pos - 2 ); if ( sc == c ) @@ -5177,7 +5177,7 @@ TQCString purestSuperClassName() TQCString callablePurestSuperClassName() { TQCString sc = purestSuperClassName(); -// if (sc.tqfind("TQ") != 0) { +// if (sc.find("TQ") != 0) { return TQCString("static_cast<TQObject*>(static_cast<TQT_BASE_OBJECT_NAME*>(this))->"); // } // else { @@ -5193,7 +5193,7 @@ TQCString qualifiedClassName() TQCString callableQualifiedClassName() { TQCString sc = qualifiedClassName(); -// if (sc.tqfind("TQ") != 0) { +// if (sc.find("TQ") != 0) { return TQCString("static_cast<TQObject*>(static_cast<TQT_BASE_OBJECT_NAME*>(this))->"); // } // else { @@ -5296,7 +5296,7 @@ int enumIndex( const char* type ) bool isEnumType( const char* type ) { - return enumIndex( type ) >= 0 || ( g->qtEnums.tqcontains( type ) || g->qtSets.tqcontains( type ) ); + return enumIndex( type ) >= 0 || ( g->qtEnums.contains( type ) || g->qtSets.contains( type ) ); } bool isPropertyType( const char* type ) @@ -5352,7 +5352,7 @@ int generateProps() // verify get function if ( !p->get.isEmpty() ) { - FuncList candidates = g->propfuncs.tqfind( p->get ); + FuncList candidates = g->propfuncs.find( p->get ); for ( Function* f = candidates.first(); f; f = candidates.next() ) { if ( f->qualifier != "const" ) // get functions must be const continue; @@ -5466,7 +5466,7 @@ int generateProps() // verify set function if ( !p->set.isEmpty() ) { - FuncList candidates = g->propfuncs.tqfind( p->set ); + FuncList candidates = g->propfuncs.find( p->set ); for ( Function* f = candidates.first(); f; f = candidates.next() ) { if ( !f->args || f->args->isEmpty() ) continue; @@ -5582,7 +5582,7 @@ int generateProps() // if ( g->props.count() ) { if ( displayWarnings && !TQ_OBJECTdetected ) - tqmoc_err("The declaration of the class \"%s\" tqcontains properties" + tqmoc_err("The declaration of the class \"%s\" contains properties" " but no TQ_OBJECT macro.", g->className.data()); fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" ); @@ -5664,7 +5664,7 @@ int generateClassInfos() return 0; if ( displayWarnings && !TQ_OBJECTdetected ) - tqmoc_err("The declaration of the class \"%s\" tqcontains class infos" + tqmoc_err("The declaration of the class \"%s\" contains class infos" " but no TQ_OBJECT macro.", g->className.data()); fprintf( out, " static const TQClassInfo classinfo_tbl[] = {\n" ); @@ -5695,11 +5695,11 @@ void generateClass() // generate C++ source code for a class if ( g->tqsignals.count() == 0 && g->tqslots.count() == 0 && g->props.count() == 0 && g->infos.count() == 0 ) return; if ( displayWarnings && (g->tqsignals.count() + g->tqslots.count()) != 0 ) - tqmoc_err("The declaration of the class \"%s\" tqcontains tqsignals " + tqmoc_err("The declaration of the class \"%s\" contains tqsignals " "or tqslots\n\t but no TQ_OBJECT macro.", g->className.data()); } else { if ( g->superClassName.isEmpty() ) - tqmoc_err("The declaration of the class \"%s\" tqcontains the\n" + tqmoc_err("The declaration of the class \"%s\" contains the\n" "\tTQ_OBJECT macro but does not inherit from any class!\n" "\tInherit from TQObject or one of its descendants" " or remove TQ_OBJECT.", g->className.data() ); @@ -5840,7 +5840,7 @@ void generateClass() // generate C++ source code for a class if ( isTQObject ) fprintf( out, " TQMetaObject* parentObject = staticTQtMetaObject();\n" ); else if ( !g->superClassName.isEmpty() ) - if (g->superClassName.tqfind("TQ") == 0) { // [FIXME] Verify that this will always be able to detect a TQt base class, even if intermediate classes do not start with TQ + if (g->superClassName.find("TQ") == 0) { // [FIXME] Verify that this will always be able to detect a TQt base class, even if intermediate classes do not start with TQ fprintf( out, " TQMetaObject* parentObject = %s::staticMetaObject();\n", (const char*)g->superClassName ); } else { @@ -5928,8 +5928,8 @@ void generateClass() // generate C++ source code for a class for ( const char* cname = g->multipleSuperClasses.first(); cname; cname = g->multipleSuperClasses.next() ) { fprintf( out, " if ( !qstrcmp( clname, \"%s\" ) )\n", cname); TQCString fixed(cname); - while (fixed.tqfind(">>") != -1) - fixed = fixed.tqreplace(">>", "> >"); + while (fixed.find(">>") != -1) + fixed = fixed.replace(">>", "> >"); fprintf( out, "\treturn (%s*)this;\n", fixed.data()); } if ( !g->superClassName.isEmpty() && !isTQObject ) @@ -6400,10 +6400,10 @@ void addEnum() } // Only look at types mentioned in TQ_ENUMS and TQ_SETS - if ( g->qtEnums.tqcontains( tmpEnum->name ) || g->qtSets.tqcontains( tmpEnum->name ) ) + if ( g->qtEnums.contains( tmpEnum->name ) || g->qtSets.contains( tmpEnum->name ) ) { g->enums.append( tmpEnum ); - if ( g->qtSets.tqcontains( tmpEnum->name ) ) + if ( g->qtSets.contains( tmpEnum->name ) ) tmpEnum->set = TRUE; else tmpEnum->set = FALSE; diff --git a/tqtinterface/qt4/src/widgets/tqaction.cpp b/tqtinterface/qt4/src/widgets/tqaction.cpp index 8ffa773..8a65d06 100644 --- a/tqtinterface/qt4/src/widgets/tqaction.cpp +++ b/tqtinterface/qt4/src/widgets/tqaction.cpp @@ -210,7 +210,7 @@ TQActionPrivate::~TQActionPrivate() while ( ( mi = itmi.current() ) ) { ++itmi; TQPopupMenu* menu = mi->popup; - if ( menu->tqfindItem( mi->id ) ) + if ( menu->findItem( mi->id ) ) menu->removeItem( mi->id ); } @@ -356,7 +356,7 @@ TQString TQActionPrivate::menuText() const { if ( menutext.isNull() ) { TQString t(text); - t.tqreplace('&', "&&"); + t.replace('&', "&&"); return t; } return menutext; @@ -1105,7 +1105,7 @@ void TQAction::addedTo( int index, TQPopupMenu *menu ) void TQAction::showtqStatusText( const TQString& text ) { #ifndef TQT_NO_STATUSBAR - // tqfind out whether we are clearing the status bar by the popup that actually set the text + // find out whether we are clearing the status bar by the popup that actually set the text static TQPopupMenu *lastmenu = 0; TQObject *s = (TQObject*)sender(); if ( s ) { @@ -1363,7 +1363,7 @@ void TQActionGroupPrivate::update( const TQActionGroup* that ) continue; int index; - tqparent->tqfindPopup( popup, &index ); + tqparent->findPopup( popup, &index ); int id = tqparent->idAt( index ); if ( !that->iconSet().isNull() ) tqparent->changeItem( id, that->iconSet(), that->menuText() ); @@ -1578,7 +1578,7 @@ bool TQActionGroup::usesDropDown() const */ void TQActionGroup::add( TQAction* action ) { - if ( d->actions.tqcontainsRef( action ) ) + if ( d->actions.containsRef( action ) ) return; d->actions.append( action ); @@ -1769,14 +1769,14 @@ bool TQActionGroup::addTo( TQWidget* w ) popup = (TQPopupMenu*)w; } for ( TQPtrListIterator<TQAction> it( d->actions); it.current(); ++it ) { - // #### do an addedTo( index, popup, action), need to tqfind out index + // #### do an addedTo( index, popup, action), need to find out index it.current()->addTo( popup ); } return TRUE; } for ( TQPtrListIterator<TQAction> it( d->actions); it.current(); ++it ) { - // #### do an addedTo( index, popup, action), need to tqfind out index + // #### do an addedTo( index, popup, action), need to find out index it.current()->addTo( w ); } @@ -2051,7 +2051,7 @@ void TQActionGroup::internalComboBoxHighlighted( int index ) */ void TQActionGroup::internalToggle( TQAction *a ) { - int index = d->actions.tqfind( a ); + int index = d->actions.find( a ); if ( index == -1 ) return; diff --git a/tqtinterface/qt4/src/widgets/tqbutton.cpp b/tqtinterface/qt4/src/widgets/tqbutton.cpp index c667fec..e9f8d10 100644 --- a/tqtinterface/qt4/src/widgets/tqbutton.cpp +++ b/tqtinterface/qt4/src/widgets/tqbutton.cpp @@ -663,7 +663,7 @@ void TQButton::setState( ToggleState s ) */ bool TQButton::hitButton( const TQPoint &pos ) const { - return TQT_TQRECT_OBJECT(rect()).tqcontains( pos ); + return TQT_TQRECT_OBJECT(rect()).contains( pos ); } /*! diff --git a/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp b/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp index 1879a8a..41da908 100644 --- a/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp +++ b/tqtinterface/qt4/src/widgets/tqbuttongroup.cpp @@ -84,7 +84,7 @@ \endlist A button can be removed from the group with remove(). A pointer to - a button with a given id can be obtained using tqfind(). The id of a + a button with a given id can be obtained using find(). The id of a button is available using id(). A button can be set \e on with setButton(). The number of buttons in the group is returned by count(). @@ -245,7 +245,7 @@ void TQButtonGroup::setExclusive( bool enable ) other negative integer, for instance -2, a unique identifier (negative integer \<= -2) is generated. No button has an id of -1. - \sa tqfind(), remove(), setExclusive() + \sa find(), remove(), setExclusive() */ int TQButtonGroup::insert( TQButton *button, int id ) @@ -319,7 +319,7 @@ void TQButtonGroup::remove( TQButton *button ) the button was not found. */ -TQButton *TQButtonGroup::tqfind( int id ) const +TQButton *TQButtonGroup::find( int id ) const { // introduce a TQButtonListIt if calling anything for ( TQButtonItem *i=buttons->first(); i; i=buttons->next() ) @@ -477,7 +477,7 @@ void TQButtonGroup::buttonToggled( bool on ) void TQButtonGroup::setButton( int id ) { - TQButton * b = tqfind( id ); + TQButton * b = find( id ); if ( b ) b->setOn( TRUE ); } diff --git a/tqtinterface/qt4/src/widgets/tqbuttongroup.h b/tqtinterface/qt4/src/widgets/tqbuttongroup.h index edbc441..cdef0a8 100644 --- a/tqtinterface/qt4/src/widgets/tqbuttongroup.h +++ b/tqtinterface/qt4/src/widgets/tqbuttongroup.h @@ -78,7 +78,7 @@ public: public: int insert( TQButton *, int id=-1 ); void remove( TQButton * ); - TQButton *tqfind( int id ) const; + TQButton *find( int id ) const; int id( TQButton * ) const; int count() const; diff --git a/tqtinterface/qt4/src/widgets/tqcheckbox.cpp b/tqtinterface/qt4/src/widgets/tqcheckbox.cpp index 37e8eac..49838ec 100644 --- a/tqtinterface/qt4/src/widgets/tqcheckbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqcheckbox.cpp @@ -218,7 +218,7 @@ printf("[WARNING] TQSharedDoubleBuffer double buffering has been disabled\n\r"); TQTextOStream os(&pmkey); os << "$qt_check_" << tqstyle().className() << "_" << palette().serialNumber() << "_" << irect.width() << "x" << irect.height() << "_" << kf; - TQPixmap *pm = TQPixmapCache::tqfind( pmkey ); + TQPixmap *pm = TQPixmapCache::find( pmkey ); if ( pm ) { // pixmap exists p->drawPixmap( irect.topLeft(), *pm ); drawButtonLabel( p ); @@ -362,7 +362,7 @@ bool TQCheckBox::hitButton( const TQPoint &pos ) const } else { r.setLeft( 0 ); } - return r.tqcontains( pos ); + return r.contains( pos ); } #endif diff --git a/tqtinterface/qt4/src/widgets/tqcombobox.cpp b/tqtinterface/qt4/src/widgets/tqcombobox.cpp index 6305993..382258b 100644 --- a/tqtinterface/qt4/src/widgets/tqcombobox.cpp +++ b/tqtinterface/qt4/src/widgets/tqcombobox.cpp @@ -171,7 +171,7 @@ \value AtTop insert the string as the first item in the combobox. - \value AtCurrent tqreplace the previously selected item with the + \value AtCurrent replace the previously selected item with the string the user has entered. \value AtBottom insert the string as the last item in the @@ -239,7 +239,7 @@ This signal is used for editable comboboxes. It is emitted whenever the contents of the text entry field changes. \a string - tqcontains the new text. + contains the new text. */ /*! @@ -356,7 +356,7 @@ public: static inline TQString escapedComboString(const TQString &str) { TQString stringToReturn = str; - return stringToReturn.tqreplace('&', "&&"); + return stringToReturn.replace('&', "&&"); } class TQComboBoxPopupItem : public TQCustomMenuItem @@ -955,7 +955,7 @@ TQString TQComboBox::text( int index ) const return d->listBox()->text( index ); } else { TQString retText = d->popup()->text(index); - retText.tqreplace("&&", "&"); + retText.replace("&&", "&"); return retText; } } @@ -1374,7 +1374,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) // and thus has a rect that doesn't fit the button. arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( count() && ( !editable() || arrowRect.tqcontains( e->pos() ) ) ) { + if ( count() && ( !editable() || arrowRect.contains( e->pos() ) ) ) { d->arrowPressed = FALSE; if ( d->usingListBox() ) { @@ -1383,7 +1383,7 @@ void TQComboBox::mousePressEvent( TQMouseEvent *e ) listBox()->setCurrentItem(d->current); listBox()->blockSignals( FALSE ); popup(); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { d->arrowPressed = TRUE; d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -1625,7 +1625,7 @@ void TQComboBox::popup() lb->blockSignals( TRUE ); TQListBoxItem* currentLBItem = 0; if ( editable() && currentText() != text( currentItem() ) ) - currentLBItem = lb->tqfindItem( currentText() ); + currentLBItem = lb->findItem( currentText() ); currentLBItem = currentLBItem ? currentLBItem : lb->item( d->current ); @@ -1781,7 +1781,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseMove: if ( !d->mouseWasInsidePopup ) { TQPoint pos = e->pos(); - if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).tqcontains( pos ) ) + if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).contains( pos ) ) d->mouseWasInsidePopup = TRUE; // Check if arrow button should toggle if ( d->arrowPressed ) { @@ -1791,7 +1791,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); arrowRect = TQStyle::tqvisualRect(arrowRect, this); - if ( arrowRect.tqcontains( comboPos ) ) { + if ( arrowRect.contains( comboPos ) ) { if ( !d->arrowDown ) { d->arrowDown = TRUE; tqrepaint( FALSE ); @@ -1820,7 +1820,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonRelease: - if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).tqcontains( e->pos() ) ) { + if ( TQT_TQRECT_OBJECT(d->listBox()->rect()).contains( e->pos() ) ) { TQMouseEvent tmp( TQEvent::MouseButtonDblClick, e->pos(), e->button(), e->state() ) ; // will hide popup @@ -1840,7 +1840,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->listBox()->rect()).tqcontains( e->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(d->listBox()->rect()).contains( e->pos() ) ) { TQPoint globalPos = d->listBox()->mapToGlobal(e->pos()); if ( TQApplication::widgetAt( globalPos, TRUE ) == this ) { d->discardNextMousePress = TRUE; @@ -1892,7 +1892,7 @@ bool TQComboBox::eventFilter( TQObject *object, TQEvent *event ) break; case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: - if ( !TQT_TQRECT_OBJECT(d->popup()->rect()).tqcontains( e->pos() ) ) { + if ( !TQT_TQRECT_OBJECT(d->popup()->rect()).contains( e->pos() ) ) { d->poppedUp = FALSE; d->arrowDown = FALSE; // remove filter, event will take down popup: diff --git a/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp b/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp index 4aaea53..346bdd3 100644 --- a/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqdatetimeedit.cpp @@ -150,9 +150,9 @@ static void readLocaleSettings() *lTimeSep = ":"; #endif TQString d = TQDate( 1999, 11, 22 ).toString( Qt::LocalDate ); - dpos = d.tqfind( "22" ); - mpos = d.tqfind( "11" ); - ypos = d.tqfind( "99" ); + dpos = d.find( "22" ); + mpos = d.find( "11" ); + ypos = d.find( "99" ); if ( dpos > -1 && mpos > -1 && ypos > -1 ) { // test for DMY, MDY, YMD, YDM if ( dpos < mpos && mpos < ypos ) { @@ -172,7 +172,7 @@ static void readLocaleSettings() #ifndef TQ_WS_WIN TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 ); - if ( d.tqcontains( sep ) == 2 ) { + if ( d.contains( sep ) == 2 ) { *lDateSep = sep; } #endif @@ -180,9 +180,9 @@ static void readLocaleSettings() #ifndef TQ_WS_WIN TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate ); - dpos = t.tqfind( "11" ); - mpos = t.tqfind( "22" ); - ypos = t.tqfind( "33" ); + dpos = t.find( "11" ); + mpos = t.find( "22" ); + ypos = t.find( "33" ); // We only allow hhmmss if ( dpos > -1 && dpos < mpos && mpos < ypos ) { TQString sep = t.mid( dpos + 2, mpos - dpos - 2 ); diff --git a/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp b/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp index cabc7e8..bb7d5f1 100644 --- a/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp +++ b/tqtinterface/qt4/src/widgets/tqdialogbuttons.cpp @@ -119,7 +119,7 @@ TQDialogButtons::setButtonEnabled(Button button, bool enabled) d->enabled |= button; else d->enabled ^= button; - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->setEnabled(enabled); } @@ -133,11 +133,11 @@ void TQDialogButtons::setButtonVisible(Button button, bool visible) { if(visible) { - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->show(); d->visible |= button; } else { - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->hide(); d->visible ^= button; } @@ -178,12 +178,12 @@ TQDialogButtons::setDefaultButton(Button button) } if(d->def != button) { #ifndef TQT_NO_PROPERTIES - if(d->buttons.tqcontains(d->def)) + if(d->buttons.contains(d->def)) d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0)); #endif d->def = button; #ifndef TQT_NO_PROPERTIES - if(d->buttons.tqcontains(d->def)) + if(d->buttons.contains(d->def)) d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0)); #endif } @@ -200,7 +200,7 @@ TQDialogButtons::setButtonText(Button button, const TQString &str) { d->text[button] = str; #ifndef TQT_NO_PROPERTIES - if(d->buttons.tqcontains(button)) + if(d->buttons.contains(button)) d->buttons[button]->setProperty("text", TQVariant(str)); #endif layoutButtons(); @@ -209,7 +209,7 @@ TQDialogButtons::setButtonText(Button button, const TQString &str) TQString TQDialogButtons::buttonText(Button b) const { - if(d->text.tqcontains(b)) + if(d->text.contains(b)) return d->text[b]; return TQString(); //null if it is default.. } @@ -237,7 +237,7 @@ TQDialogButtons::createButton(Button b) { TQPushButton *ret = new TQPushButton(this, "qdialog_button"); TQObject::connect(ret, TQT_SIGNAL(clicked()), this, TQT_SLOT(handleClicked())); - if(d->text.tqcontains(b)) { + if(d->text.contains(b)) { ret->setText(d->text[b]); } else { switch(b) { @@ -391,7 +391,7 @@ TQDialogButtons::layoutButtons() else if(rects[i] == TQStyle::SR_DialogButtonIgnore) b = Ignore; if(b != None) { - if(d->buttons.tqcontains(b)) { + if(d->buttons.contains(b)) { w = d->buttons[b]; if(!(d->visible & b)) { w->hide(); @@ -437,7 +437,7 @@ TQDialogButtons::tqsizeHint(TQDialogButtons::Button button) const { TQWidget *w = NULL; if(d->visible & button) { - if(!d->buttons.tqcontains(button)) { + if(!d->buttons.contains(button)) { TQDialogButtons *that = (TQDialogButtons*)this; //ick, constness.. w = that->createButton(button); that->d->buttons.insert(button, w); diff --git a/tqtinterface/qt4/src/widgets/tqdockarea.cpp b/tqtinterface/qt4/src/widgets/tqdockarea.cpp index 5aed489..72f65c2 100644 --- a/tqtinterface/qt4/src/widgets/tqdockarea.cpp +++ b/tqtinterface/qt4/src/widgets/tqdockarea.cpp @@ -367,7 +367,7 @@ int TQDockAreaLayout::layoutItems( const TQRect &rect, bool testonly ) if ( dw->isHidden() ) continue; ++visibleWindows; - // tqfind position for the widget: This is the maximum of the + // find position for the widget: This is the maximum of the // end of the previous widget and the offset of the widget. If // the position + the width of the widget dosn't fit into the // dock, try moving it a bit back, if possible. @@ -484,9 +484,9 @@ int TQDockAreaLayout::widthForHeight( int h ) const fill the available space as compactly as possible. TQDockAreas can contain TQToolBars since TQToolBar is a TQDockWindow subclass. - TQMainWindow tqcontains four TQDockAreas which you can use for your + TQMainWindow contains four TQDockAreas which you can use for your TQToolBars and TQDockWindows, so in most situations you do not need - to use the TQDockArea class directly. Although TQMainWindow tqcontains + to use the TQDockArea class directly. Although TQMainWindow contains support for its own dock areas it isn't convenient for adding new TQDockAreas. If you need to create your own dock areas we suggest that you create a subclass of TQWidget and add your TQDockAreas to @@ -517,9 +517,9 @@ int TQDockAreaLayout::widthForHeight( int h ) const To dock or undock a dock window use TQDockWindow::dock() and TQDockWindow::undock() respectively. If you want to control which dock windows can dock in a dock area use setAcceptDockWindow(). To - see if a dock area tqcontains a particular dock window use + see if a dock area contains a particular dock window use \l{hasDockWindow()}; to see how many dock windows a dock area - tqcontains use count(). + contains use count(). The streaming operators can write the positions of the dock windows in the dock area to a TQTextStream. The positions can be @@ -614,7 +614,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, int index ) { invalidateFixedSizes(); TQDockWindow *dockWindow = 0; - int dockWindowIndex = tqfindDockWindow( w ); + int dockWindowIndex = findDockWindow( w ); if ( dockWindowIndex == -1 ) { dockWindow = w; dockWindow->reparent( this, TQPoint( 0, 0 ), TRUE ); @@ -643,15 +643,15 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, int index ) } /*! - Returns TRUE if the dock area tqcontains the dock window \a w; + Returns TRUE if the dock area contains the dock window \a w; otherwise returns FALSE. If \a index is not 0 it will be set as - follows: if the dock area tqcontains the dock window \a *index is + follows: if the dock area contains the dock window \a *index is set to \a w's index position; otherwise \a *index is set to -1. */ bool TQDockArea::hasDockWindow( TQDockWindow *w, int *index ) { - int i = dockWindows->tqfindRef( w ); + int i = dockWindows->findRef( w ); if ( index ) *index = i; return i != -1; @@ -662,7 +662,7 @@ int TQDockArea::lineOf( int index ) TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); int i = 0; for ( TQDockWindow *w = lineStarts.first(); w; w = lineStarts.next(), ++i ) { - if ( dockWindows->tqfind( w ) >= index ) + if ( dockWindows->find( w ) >= index ) return i; } return i; @@ -703,20 +703,20 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect } TQDockWindow *dockWindow = 0; - int dockWindowIndex = tqfindDockWindow( w ); + int dockWindowIndex = findDockWindow( w ); TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); TQValueList<TQRect> lines = tqlayout->lineList(); bool wasAloneInLine = FALSE; TQPoint pos = mapFromGlobal( p ); TQRect lr = *lines.at( lineOf( dockWindowIndex ) ); if ( dockWindowIndex != -1 ) { - if ( lineStarts.tqfind( w ) != -1 && - ( (dockWindowIndex < (int)dockWindows->count() - 1 && lineStarts.tqfind( dockWindows->at( dockWindowIndex + 1 ) ) != -1) || + if ( lineStarts.find( w ) != -1 && + ( (dockWindowIndex < (int)dockWindows->count() - 1 && lineStarts.find( dockWindows->at( dockWindowIndex + 1 ) ) != -1) || dockWindowIndex == (int)dockWindows->count() - 1 ) ) wasAloneInLine = TRUE; dockWindow = dockWindows->take( dockWindowIndex ); if ( !wasAloneInLine ) { // only do the pre-tqlayout if the widget isn't the only one in its line - if ( lineStarts.tqfindRef( dockWindow ) != -1 && dockWindowIndex < (int)dockWindows->count() ) + if ( lineStarts.findRef( dockWindow ) != -1 && dockWindowIndex < (int)dockWindows->count() ) dockWindows->at( dockWindowIndex )->setNewLine( TRUE ); tqlayout->layoutItems( TQRect( 0, 0, width(), height() ), TRUE ); } @@ -754,7 +754,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect bool insertLine = FALSE; int i = 0; TQRect lineRect; - // tqfind the line which we touched with the mouse + // find the line which we touched with the mouse for ( TQValueList<TQRect>::Iterator it = lines.begin(); it != lines.end(); ++it, ++i ) { if ( point_pos( pos, orientation(), TRUE ) >= point_pos( (*it).topLeft(), orientation(), TRUE ) && point_pos( pos, orientation(), TRUE ) <= point_pos( (*it).topLeft(), orientation(), TRUE ) + @@ -782,7 +782,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect } } - if ( !insertLine && wasAloneInLine && lr.tqcontains( pos ) ) // if we are alone in a line and just moved in there, re-insert it + if ( !insertLine && wasAloneInLine && lr.contains( pos ) ) // if we are alone in a line and just moved in there, re-insert it insertLine = TRUE; #if defined(TQDOCKAREA_DEBUG) @@ -807,14 +807,14 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect for ( dw = lineStarts.first(); dw; dw = lineStarts.next() ) dw->setNewLine( TRUE ); - // tqfind the index of the first widget in the search line + // find the index of the first widget in the search line int searchLine = dockLine; #if defined(TQDOCKAREA_DEBUG) qDebug( "search line start of %d", searchLine ); #endif TQDockWindow *lsw = lineStarts.at( searchLine ); - int index = dockWindows->tqfind( lsw ); - if ( index == -1 ) { // the linestart widget hasn't been found, try to tqfind it harder + int index = dockWindows->find( lsw ); + if ( index == -1 ) { // the linestart widget hasn't been found, try to find it harder if ( lsw == w && dockWindowIndex <= (int)dockWindows->count()) index = dockWindowIndex; else @@ -826,7 +826,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect qDebug( " which starts at %d", index ); #endif if ( !insertLine ) { // if we insert the docking widget in the existing line - // tqfind the index for the widget + // find the index for the widget bool inc = TRUE; bool firstTime = TRUE; for ( dw = dockWindows->current(); dw; dw = dockWindows->next() ) { @@ -834,7 +834,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect dw->setFixedExtentWidth( -1 ); else dw->setFixedExtentHeight( -1 ); - if ( !firstTime && lineStarts.tqfind( dw ) != -1 ) // we are in the next line, so break + if ( !firstTime && lineStarts.find( dw ) != -1 ) // we are in the next line, so break break; if ( point_pos( pos, orientation() ) < point_pos( fix_pos( dw ), orientation() ) + size_extent( dw->size(), orientation() ) / 2 ) { @@ -849,7 +849,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect #endif // if we insert it just before a widget which has a new line, transfer the newline to the docking widget // but not if we didn't only mave a widget in its line which was alone in the line before - if ( !( wasAloneInLine && lr.tqcontains( pos ) ) + if ( !( wasAloneInLine && lr.contains( pos ) ) && index >= 0 && index < (int)dockWindows->count() && dockWindows->at( index )->newLine() && lineOf( index ) == dockLine ) { #if defined(TQDOCKAREA_DEBUG) @@ -857,7 +857,7 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect #endif dockWindows->at( index )->setNewLine( FALSE ); dockWindow->setNewLine( TRUE ); - } else if ( wasAloneInLine && lr.tqcontains( pos ) ) { + } else if ( wasAloneInLine && lr.contains( pos ) ) { dockWindow->setNewLine( TRUE ); } else { // if we are somewhere in a line, get rid of the newline dockWindow->setNewLine( FALSE ); @@ -910,13 +910,13 @@ void TQDockArea::removeDockWindow( TQDockWindow *w, bool makeFloating, bool swap { w->removeEventFilter( this ); TQDockWindow *dockWindow = 0; - int i = tqfindDockWindow( w ); + int i = findDockWindow( w ); if ( i == -1 ) return; dockWindow = dockWindows->at( i ); dockWindows->remove( i ); TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); - if ( fixNewLines && lineStarts.tqfindRef( dockWindow ) != -1 && i < (int)dockWindows->count() ) + if ( fixNewLines && lineStarts.findRef( dockWindow ) != -1 && i < (int)dockWindows->count() ) dockWindows->at( i )->setNewLine( TRUE ); if ( makeFloating ) { TQWidget *p = parentWidget() ? parentWidget() : tqtopLevelWidget(); @@ -929,9 +929,9 @@ void TQDockArea::removeDockWindow( TQDockWindow *w, bool makeFloating, bool swap tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) ); } -int TQDockArea::tqfindDockWindow( TQDockWindow *w ) +int TQDockArea::findDockWindow( TQDockWindow *w ) { - return dockWindows ? dockWindows->tqfindRef( w ) : -1; + return dockWindows ? dockWindows->findRef( w ) : -1; } void TQDockArea::updateLayout() @@ -964,7 +964,7 @@ bool TQDockArea::eventFilter( TQObject *o, TQEvent *e ) void TQDockArea::invalidNextOffset( TQDockWindow *dw ) { - int i = dockWindows->tqfind( dw ); + int i = dockWindows->find( dw ); if ( i == -1 || i >= (int)dockWindows->count() - 1 ) return; if ( ( dw = dockWindows->at( ++i ) ) ) @@ -1020,7 +1020,7 @@ void TQDockArea::lineUp( bool keepNewLines ) TQDockArea::DockWindowData *TQDockArea::dockWindowData( TQDockWindow *w ) { DockWindowData *data = new DockWindowData; - data->index = tqfindDockWindow( w ); + data->index = findDockWindow( w ); if ( data->index == -1 ) { delete data; return 0; @@ -1028,7 +1028,7 @@ TQDockArea::DockWindowData *TQDockArea::dockWindowData( TQDockWindow *w ) TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); int i = -1; for ( TQDockWindow *dw = dockWindows->first(); dw; dw = dockWindows->next() ) { - if ( lineStarts.tqfindRef( dw ) != -1 ) + if ( lineStarts.findRef( dw ) != -1 ) ++i; if ( dw == w ) break; @@ -1056,7 +1056,7 @@ void TQDockArea::dockWindow( TQDockWindow *dockWindow, DockWindowData *data ) TQPtrList<TQDockWindow> lineStarts = tqlayout->lineStarts(); int index = 0; if ( (int)lineStarts.count() > data->line ) - index = dockWindows->tqfind( lineStarts.at( data->line ) ); + index = dockWindows->find( lineStarts.at( data->line ) ); if ( index == -1 ) { index = 0; (void)dockWindows->at( index ); @@ -1064,7 +1064,7 @@ void TQDockArea::dockWindow( TQDockWindow *dockWindow, DockWindowData *data ) bool firstTime = TRUE; int offset = data->offset; for ( TQDockWindow *dw = dockWindows->current(); dw; dw = dockWindows->next() ) { - if ( !firstTime && lineStarts.tqfind( dw ) != -1 ) + if ( !firstTime && lineStarts.find( dw ) != -1 ) break; if ( offset < point_pos( fix_pos( dw ), orientation() ) + size_extent( dw->size(), orientation() ) / 2 ) @@ -1104,7 +1104,7 @@ bool TQDockArea::isDockWindowAccepted( TQDockWindow *dw ) { if ( !dw ) return FALSE; - if ( forbiddenWidgets.tqfindRef( dw ) != -1 ) + if ( forbiddenWidgets.findRef( dw ) != -1 ) return FALSE; TQMainWindow *mw = ::tqqt_cast<TQMainWindow*>(parentWidget()); @@ -1131,7 +1131,7 @@ void TQDockArea::setAcceptDockWindow( TQDockWindow *dw, bool accept ) { if ( accept ) forbiddenWidgets.removeRef( dw ); - else if ( forbiddenWidgets.tqfindRef( dw ) == -1 ) + else if ( forbiddenWidgets.findRef( dw ) == -1 ) forbiddenWidgets.append( dw ); } @@ -1147,7 +1147,7 @@ void TQDockArea::invalidateFixedSizes() int TQDockArea::maxSpace( int hint, TQDockWindow *dw ) { - int index = tqfindDockWindow( dw ); + int index = findDockWindow( dw ); if ( index == -1 || index + 1 >= (int)dockWindows->count() ) { if ( orientation() == Qt::Horizontal ) return dw->width(); @@ -1224,7 +1224,7 @@ void TQDockArea::setFixedExtent( int d, TQDockWindow *dw ) bool TQDockArea::isLastDockWindow( TQDockWindow *dw ) { - int i = dockWindows->tqfind( dw ); + int i = dockWindows->find( dw ); if ( i == -1 || i >= (int)dockWindows->count() - 1 ) return TRUE; TQDockWindow *w = 0; diff --git a/tqtinterface/qt4/src/widgets/tqdockarea.h b/tqtinterface/qt4/src/widgets/tqdockarea.h index 34c2a50..550732b 100644 --- a/tqtinterface/qt4/src/widgets/tqdockarea.h +++ b/tqtinterface/qt4/src/widgets/tqdockarea.h @@ -161,7 +161,7 @@ private: TQGuardedPtr<TQDockArea> area; }; - int tqfindDockWindow( TQDockWindow *w ); + int findDockWindow( TQDockWindow *w ); int lineOf( int index ); DockWindowData *dockWindowData( TQDockWindow *w ); void dockWindow( TQDockWindow *dockWindow, DockWindowData *data ); diff --git a/tqtinterface/qt4/src/widgets/tqdockwindow.cpp b/tqtinterface/qt4/src/widgets/tqdockwindow.cpp index e6e6f55..fcf0821 100644 --- a/tqtinterface/qt4/src/widgets/tqdockwindow.cpp +++ b/tqtinterface/qt4/src/widgets/tqdockwindow.cpp @@ -767,7 +767,7 @@ void TQDockWindowTitleBar::mouseDoubleClickEvent( TQMouseEvent * ) A dock window is often used to contain a single widget. In these cases the widget can be set by calling setWidget(). If you're - constructing a dock window that tqcontains multiple widgets, e.g. a + constructing a dock window that contains multiple widgets, e.g. a toolbar, arrange the widgets within a box tqlayout inside the dock window. To do this use the boxLayout() function to get a pointer to the dock window's box tqlayout, then add widgets to the tqlayout @@ -1411,7 +1411,7 @@ void TQDockWindow::updatePosition( const TQPoint &globalPos ) dockArea = 0; TQPoint topLeft = currRect.topLeft(); TQRect screen = tqApp->desktop()->availableGeometry( topLeft ); - if ( !screen.tqcontains( topLeft ) ) { + if ( !screen.contains( topLeft ) ) { topLeft.setY(TQMAX(topLeft.y(), screen.top())); topLeft.setY(TQMIN(topLeft.y(), screen.bottom()-height())); topLeft.setX(TQMAX(topLeft.x(), screen.left())); @@ -1972,7 +1972,7 @@ void TQDockWindow::showEvent( TQShowEvent *e ) { if (curPlace == OutsideDock && (tqparent() && strcmp(tqparent()->name(), "qt_hide_dock") != 0)) { TQRect sr = tqApp->desktop()->availableGeometry( this ); - if ( !sr.tqcontains( pos() ) ) { + if ( !sr.contains( pos() ) ) { int nx = TQMIN( TQMAX( x(), sr.x() ), sr.right()-width() ); int ny = TQMIN( TQMAX( y(), sr.y() ), sr.bottom()-height() ); move( nx, ny ); diff --git a/tqtinterface/qt4/src/widgets/tqframe.cpp b/tqtinterface/qt4/src/widgets/tqframe.cpp index f49b30c..8112924 100644 --- a/tqtinterface/qt4/src/widgets/tqframe.cpp +++ b/tqtinterface/qt4/src/widgets/tqframe.cpp @@ -511,7 +511,7 @@ void TQFrame::paintEvent( TQPaintEvent *event ) TQPainter paint( this ); - if ( !contentsRect().tqcontains( event->rect() ) ) { + if ( !contentsRect().contains( event->rect() ) ) { paint.save(); paint.setClipRegion( event->region().intersect(frameRect()) ); drawFrame( &paint ); diff --git a/tqtinterface/qt4/src/widgets/tqgridview.cpp b/tqtinterface/qt4/src/widgets/tqgridview.cpp index 4f60903..0551c30 100644 --- a/tqtinterface/qt4/src/widgets/tqgridview.cpp +++ b/tqtinterface/qt4/src/widgets/tqgridview.cpp @@ -63,7 +63,7 @@ draw the contents of a cell. With ensureCellVisible(), you can ensure a certain cell is - visible. With rowAt() and columnAt() you can tqfind a cell based on + visible. With rowAt() and columnAt() you can find a cell based on the given x- and y-coordinates. If you need to monitor changes to the grid's dimensions (i.e. when diff --git a/tqtinterface/qt4/src/widgets/tqgroupbox.cpp b/tqtinterface/qt4/src/widgets/tqgroupbox.cpp index f9c341e..228204a 100644 --- a/tqtinterface/qt4/src/widgets/tqgroupbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqgroupbox.cpp @@ -277,7 +277,7 @@ void TQGroupBox::setTitle( const TQString &title ) \brief the group box title text. The group box title text will have a focus-change keyboard - accelerator if the title tqcontains \&, followed by a letter. + accelerator if the title contains \&, followed by a letter. \code g->setTitle( "&User information" ); @@ -658,7 +658,7 @@ void TQGroupBox::skip() /*! \internal - This private slot tqfinds a widget in this group box that can accept + This private slot finds a widget in this group box that can accept focus, and gives the focus to that widget. */ diff --git a/tqtinterface/qt4/src/widgets/tqheader.cpp b/tqtinterface/qt4/src/widgets/tqheader.cpp index 67fb7f0..18d813d 100644 --- a/tqtinterface/qt4/src/widgets/tqheader.cpp +++ b/tqtinterface/qt4/src/widgets/tqheader.cpp @@ -196,7 +196,7 @@ public: \row \i 3 \i 1 \i 2 \endtable - In the example above, if we wanted to tqfind out which section is at + In the example above, if we wanted to find out which section is at index position 3 we'd call mapToSection(3) and get a section number of 1 since section 1 was moved. Similarly, if we wanted to know which index position section 2 occupied we'd call @@ -264,7 +264,7 @@ void TQHeader::showEvent( TQShowEvent *e ) This signal is emitted when the user has changed the size of a \a section from \a oldSize to \a newSize. This signal is typically - connected to a slot that repaints the table or list that tqcontains + connected to a slot that repaints the table or list that contains the header. */ @@ -499,15 +499,15 @@ void TQHeader::unMarkLine( int idx ) Use sectionAt() instead. - Returns the index at which the section is displayed, which tqcontains + Returns the index at which the section is displayed, which contains \a pos in widget coordinates, or -1 if \a pos is outside the header sections. */ /* - Tries to tqfind a line that is not a neighbor of \c handleIdx. + Tries to find a line that is not a neighbor of \c handleIdx. */ -int TQHeader::tqfindLine( int c ) +int TQHeader::findLine( int c ) { int i = 0; if ( c > d->lastPos || (reverse() && c < 0 )) { @@ -716,7 +716,7 @@ void TQHeader::mouseReleaseEvent( TQMouseEvent *e ) case Pressed: { int section = d->i2s[handleIdx]; emit released( section ); - if ( sRect( handleIdx ).tqcontains( e->pos() ) ) { + if ( sRect( handleIdx ).contains( e->pos() ) ) { oldHandleIdx = handleIdx; emit sectionClicked( handleIdx ); emit clicked( section ); @@ -747,7 +747,7 @@ void TQHeader::mouseReleaseEvent( TQMouseEvent *e ) emit released( section ); tqrepaint(); // a bit overkill, but removes the handle as well } else { - if ( sRect( handleIdx).tqcontains( e->pos() ) ) { + if ( sRect( handleIdx).contains( e->pos() ) ) { oldHandleIdx = handleIdx; emit released( section ); emit sectionClicked( handleIdx ); @@ -811,7 +811,7 @@ void TQHeader::mouseMoveEvent( TQMouseEvent *e ) handleColumnResize( handleIdx, c, FALSE, FALSE ); break; case Moving: { - int newPos = tqfindLine( pos ); + int newPos = findLine( pos ); if ( newPos != moveToIdx ) { if ( moveToIdx == handleIdx || moveToIdx == handleIdx + 1 ) tqrepaint( sRect(handleIdx) ); @@ -1104,7 +1104,7 @@ TQSize TQHeader::sectionSizeHint( int section, const TQFontMetrics& fm ) const TQRect bound; TQString *label = d->labels[section]; if ( label ) { - int lines = label->tqcontains( '\n' ) + 1; + int lines = label->contains( '\n' ) + 1; int w = 0; if (lines > 1) { bound.setHeight(fm.height() + fm.lineSpacing() * (lines - 1)); @@ -1733,7 +1733,7 @@ int TQHeader::sectionPos( int section ) const } /*! - Returns the index of the section which tqcontains the position \a + Returns the index of the section which contains the position \a pos given in pixels from the left (or top). \sa offset() diff --git a/tqtinterface/qt4/src/widgets/tqheader.h b/tqtinterface/qt4/src/widgets/tqheader.h index ab0f371..24fcd25 100644 --- a/tqtinterface/qt4/src/widgets/tqheader.h +++ b/tqtinterface/qt4/src/widgets/tqheader.h @@ -173,7 +173,7 @@ private: void unMarkLine( int idx ); int pPos( int i ) const; int pSize( int i ) const; - int tqfindLine( int ); + int findLine( int ); int handleAt( int p ); bool reverse() const; void calculatePositions( bool onlyVisible = FALSE, int start = 0 ); diff --git a/tqtinterface/qt4/src/widgets/tqlabel.cpp b/tqtinterface/qt4/src/widgets/tqlabel.cpp index b29d599..491adab 100644 --- a/tqtinterface/qt4/src/widgets/tqlabel.cpp +++ b/tqtinterface/qt4/src/widgets/tqlabel.cpp @@ -85,7 +85,7 @@ public: \row \i Plain text \i Pass a TQString to setText(). \row \i Rich text - \i Pass a TQString that tqcontains rich text to setText(). + \i Pass a TQString that contains rich text to setText(). \row \i A pixmap \i Pass a TQPixmap to setPixmap(). \row \i A movie @@ -180,7 +180,7 @@ TQLabel::TQLabel( const TQString &text, TQWidget *tqparent, const char *name, Constructs a label that displays the text \a text. The label has a buddy widget, \a buddy. - If the \a text tqcontains an underlined letter (a letter preceded by + If the \a text contains an underlined letter (a letter preceded by an ampersand, \&), and the text is in plain text format, when the user presses Alt+ the underlined letter, focus is passed to the buddy widget. @@ -419,7 +419,7 @@ void TQLabel::setNum( double num ) The tqalignment is a bitwise OR of \c TQt::AlignmentFlags and \c TQt::TextFlags values. The \c ExpandTabs, \c SingleLine and \c - ShowPrefix flags apply only if the label tqcontains plain text; + ShowPrefix flags apply only if the label contains plain text; otherwise they are ignored. The \c DontClip flag is always ignored. \c WordBreak applies to both rich text and plain text labels. The \c BreakAnywhere flag is not supported in TQLabel. @@ -430,7 +430,7 @@ void TQLabel::setNum( double num ) The default tqalignment is \c{AlignAuto | AlignVCenter | ExpandTabs} if the label doesn't have a buddy and \c{AlignAuto | AlignVCenter | ExpandTabs | ShowPrefix} if the label has a buddy. If the label - tqcontains rich text, additionally \c WordBreak is turned on. + contains rich text, additionally \c WordBreak is turned on. \sa TQt::AlignmentFlags, tqalignment, setBuddy(), text */ diff --git a/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp b/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp index 16f225b..e84332c 100644 --- a/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp +++ b/tqtinterface/qt4/src/widgets/tqlcdnumber.cpp @@ -197,7 +197,7 @@ static TQString double2string( double num, int base, int ndigits, bool *oflow ) int nd = ndigits; do { s.sprintf( "%*.*g", ndigits, nd, num ); - int i = s.tqfind('e'); + int i = s.find('e'); if ( i > 0 && s[i+1]=='+' ) { s[i] = ' '; s[i+1] = 'e'; diff --git a/tqtinterface/qt4/src/widgets/tqlineedit.cpp b/tqtinterface/qt4/src/widgets/tqlineedit.cpp index 10c1be8..cca37a7 100644 --- a/tqtinterface/qt4/src/widgets/tqlineedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqlineedit.cpp @@ -130,12 +130,12 @@ struct TQLineEditPrivate : public TQt TQChar blank; MaskInputData *maskData; inline int nextMaskBlank( int pos ) { - int c = tqfindInMask( pos, TRUE, FALSE ); + int c = findInMask( pos, TRUE, FALSE ); separator |= ( c != pos ); return ( c != -1 ? c : maxLength ); } inline int prevMaskBlank( int pos ) { - int c = tqfindInMask( pos, FALSE, FALSE ); + int c = findInMask( pos, FALSE, FALSE ); separator |= ( c != pos ); return ( c != -1 ? c : 0 ); } @@ -250,7 +250,7 @@ struct TQLineEditPrivate : public TQt TQString maskString( uint pos, const TQString &str, bool clear = FALSE ) const; TQString clearString( uint pos, uint len ) const; TQString stripString( const TQString &str ) const; - int tqfindInMask( int pos, bool forward, bool tqfindSeparator, TQChar searchChar = TQChar() ) const; + int findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar = TQChar() ) const; // input methods int imstart, imend, imselstart, imselend; @@ -1842,7 +1842,7 @@ void TQLineEdit::imComposeEvent( TQIMEvent *e ) e->ignore(); return; } - d->text.tqreplace( d->imstart, d->imend - d->imstart, e->text() ); + d->text.replace( d->imstart, d->imend - d->imstart, e->text() ); d->imend = d->imstart + e->text().length(); d->imselstart = d->imstart + e->cursorPos(); d->imselend = d->imselstart + e->selectionLength(); @@ -1948,11 +1948,11 @@ void TQLineEdit::drawContents( TQPainter *p ) // locate cursor position int cix = 0; - TQTextItem ci = d->textLayout.tqfindItem( d->cursor ); + TQTextItem ci = d->textLayout.findItem( d->cursor ); if ( ci.isValid() ) { if ( d->cursor != (int)d->text.length() && d->cursor == ci.from() + ci.length() && ci.isRightToLeft() != d->isRightToLeft() ) - ci = d->textLayout.tqfindItem( d->cursor + 1 ); + ci = d->textLayout.findItem( d->cursor + 1 ); cix = ci.x() + ci.cursorToX( d->cursor - ci.from() ); } @@ -2376,7 +2376,7 @@ void TQLineEditPrivate::init( const TQString& txt ) void TQLineEditPrivate::updateTextLayout() { - // tqreplace all non-printable characters with spaces (to avoid + // replace all non-printable characters with spaces (to avoid // drawing boxes when using fonts that don't have glyphs for such // characters) const TQString &displayText = q->displayText(); @@ -2419,11 +2419,11 @@ TQRect TQLineEditPrivate::cursorRect() const { TQRect cr = q->contentsRect(); int cix = cr.x() - hscroll + innerMargin; - TQTextItem ci = textLayout.tqfindItem( cursor ); + TQTextItem ci = textLayout.findItem( cursor ); if ( ci.isValid() ) { if ( cursor != (int)text.length() && cursor == ci.from() + ci.length() && ci.isRightToLeft() != isRightToLeft() ) - ci = textLayout.tqfindItem( cursor + 1 ); + ci = textLayout.findItem( cursor + 1 ); cix += ci.x() + ci.cursorToX( cursor - ci.from() ); } int ch = q->fontMetrics().height(); @@ -2560,7 +2560,7 @@ void TQLineEditPrivate::setCursorVisible( bool visible ) if ( cursorTimer ) cursorVisible = visible; TQRect r = cursorRect(); - if ( maskData || !q->contentsRect().tqcontains( r ) ) + if ( maskData || !q->contentsRect().contains( r ) ) q->update(); else q->update( r ); @@ -2586,7 +2586,7 @@ void TQLineEditPrivate::insert( const TQString& s ) addCommand ( Command( DeleteSelection, cursor+i, text.at(cursor+i) ) ); addCommand( Command( Insert, cursor+i, ms.at(i) ) ); } - text.tqreplace( cursor, ms.length(), ms ); + text.replace( cursor, ms.length(), ms ); cursor += ms.length(); cursor = nextMaskBlank( cursor ); } else { @@ -2603,7 +2603,7 @@ void TQLineEditPrivate::del( bool wasBackspace ) if ( cursor < (int) text.length() ) { addCommand ( Command( (CommandType)((maskData?2:0)+(wasBackspace?Remove:Delete)), cursor, text.at(cursor) ) ); if ( maskData ) { - text.tqreplace( cursor, 1, clearString( cursor, 1 ) ); + text.replace( cursor, 1, clearString( cursor, 1 ) ); addCommand( Command( Insert, cursor, text.at( cursor ) ) ); } else { text.remove( cursor, 1 ); @@ -2629,7 +2629,7 @@ void TQLineEditPrivate::removeSelectedText() addCommand ( Command( RemoveSelection, i, text.at(i) ) ); } if ( maskData ) { - text.tqreplace( selstart, selend - selstart, clearString( selstart, selend - selstart ) ); + text.replace( selstart, selend - selstart, clearString( selstart, selend - selstart ) ); for ( int i = 0; i < selend - selstart; ++i ) addCommand( Command( Insert, selstart + i, text.at( selstart + i ) ) ); } else { @@ -2832,15 +2832,15 @@ TQString TQLineEditPrivate::maskString( uint pos, const TQString &str, bool clea ++i; } else { // search for separator first - int n = tqfindInMask( i, TRUE, TRUE, str[(int)strIndex] ); + int n = findInMask( i, TRUE, TRUE, str[(int)strIndex] ); if ( n != -1 ) { if ( str.length() != 1 || i == 0 || (i > 0 && (!maskData[i-1].separator || maskData[i-1].maskChar != str[(int)strIndex])) ) { s += fill.mid( i, n-i+1 ); - i = n + 1; // update i to tqfind + 1 + i = n + 1; // update i to find + 1 } } else { // search for valid blank if not - n = tqfindInMask( i, TRUE, FALSE, str[(int)strIndex] ); + n = findInMask( i, TRUE, FALSE, str[(int)strIndex] ); if ( n != -1 ) { s += fill.mid( i, n-i ); switch ( maskData[ n ].caseMode ) { @@ -2853,7 +2853,7 @@ TQString TQLineEditPrivate::maskString( uint pos, const TQString &str, bool clea default: s += str[(int)strIndex]; } - i = n + 1; // updates i to tqfind + 1 + i = n + 1; // updates i to find + 1 } } } @@ -2910,7 +2910,7 @@ TQString TQLineEditPrivate::stripString( const TQString &str ) const } /* searches forward/backward in maskData for either a separator or a blank */ -int TQLineEditPrivate::tqfindInMask( int pos, bool forward, bool tqfindSeparator, TQChar searchChar ) const +int TQLineEditPrivate::findInMask( int pos, bool forward, bool findSeparator, TQChar searchChar ) const { if ( pos >= maxLength || pos < 0 ) return -1; @@ -2920,7 +2920,7 @@ int TQLineEditPrivate::tqfindInMask( int pos, bool forward, bool tqfindSeparator int i = pos; while ( i != end ) { - if ( tqfindSeparator ) { + if ( findSeparator ) { if ( maskData[ i ].separator && maskData[ i ].maskChar == searchChar ) return i; } else { diff --git a/tqtinterface/qt4/src/widgets/tqlistbox.cpp b/tqtinterface/qt4/src/widgets/tqlistbox.cpp index b829780..3b84d03 100644 --- a/tqtinterface/qt4/src/widgets/tqlistbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqlistbox.cpp @@ -89,7 +89,7 @@ public: variableWidth( FALSE ), inMenuMode( FALSE ) {} - int tqfindItemByName( int item, const TQString &text ); + int findItemByName( int item, const TQString &text ); ~TQListBoxPrivate(); TQListBoxItem * head, *last, *cache; @@ -340,7 +340,7 @@ TQListBoxPrivate::~TQListBoxPrivate() /*! \obsolete - \fn int TQListBox::tqfindItem( int yPos ) const + \fn int TQListBox::findItem( int yPos ) const Returns the index of the item a point (0, \a yPos). \sa index() itemAt() */ @@ -488,11 +488,11 @@ void TQListBoxItem::setSelectable( bool b ) { if ( !listBox() ) return; - bool *sel = listBox()->d->selectable.tqfind( this ); + bool *sel = listBox()->d->selectable.find( this ); if ( !sel ) listBox()->d->selectable.insert( this, new bool( b ) ); else - listBox()->d->selectable.tqreplace( this, new bool( b ) ); + listBox()->d->selectable.replace( this, new bool( b ) ); } /*! @@ -506,7 +506,7 @@ bool TQListBoxItem::isSelectable() const { if ( !listBox() ) return TRUE; - bool *sel = listBox()->d->selectable.tqfind( ( (TQListBoxItem*)this ) ); + bool *sel = listBox()->d->selectable.find( ( (TQListBoxItem*)this ) ); if ( !sel ) return TRUE; else @@ -852,7 +852,7 @@ int TQListBoxPixmap::rtti() const The TQListBox's items are TQListBoxItem objects. TQListBox provides methods to insert new items as strings, as pixmaps, and as TQListBoxItem * (insertItem() with various arguments), and to - tqreplace an existing item with a new string, pixmap or TQListBoxItem + replace an existing item with a new string, pixmap or TQListBoxItem (changeItem() with various arguments). You can also remove items singly with removeItem() or clear() the entire list box. Note that if you create a TQListBoxItem yourself and insert it, TQListBox @@ -876,7 +876,7 @@ int TQListBoxPixmap::rtti() const still supports this mode of operation). Everything can be done using the new objects, and most things can be done using indexes. - Each item in a TQListBox tqcontains a TQListBoxItem. One of the items + Each item in a TQListBox contains a TQListBoxItem. One of the items can be the current item. The currentChanged() signal and the highlighted() signal are emitted when a new item becomes current, e.g. because the user clicks on it or TQListBox::setCurrentItem() @@ -2260,7 +2260,7 @@ void TQListBox::mouseMoveEvent( TQMouseEvent *e ) // hack to keep the combo (and what else?) working: if we get a // move outside the listbox without having seen a press, discard // it. - if ( !TQRect( 0, 0, visibleWidth(), visibleHeight() ).tqcontains( e->pos() ) && + if ( !TQRect( 0, 0, visibleWidth(), visibleHeight() ).contains( e->pos() ) && ( (d->mousePressColumn < 0 && d->mousePressRow < 0) || (e->state() == Qt::NoButton && !d->pressedItem) ) ) return; @@ -2643,14 +2643,14 @@ void TQListBox::keyPressEvent( TQKeyEvent *e ) curItem = 0; if ( !d->inputTimer->isActive() ) { d->currInputString = e->text(); - curItem = d->tqfindItemByName( ++curItem, d->currInputString ); + curItem = d->findItemByName( ++curItem, d->currInputString ); } else { d->inputTimer->stop(); d->currInputString += e->text(); int oldCurItem = curItem; - curItem = d->tqfindItemByName( curItem, d->currInputString ); + curItem = d->findItemByName( curItem, d->currInputString ); if ( curItem < 0 ) { - curItem = d->tqfindItemByName( ++oldCurItem, e->text() ); + curItem = d->findItemByName( ++oldCurItem, e->text() ); d->currInputString = e->text(); } } @@ -3531,7 +3531,7 @@ TQListBoxItem * TQListBox::itemAt( const TQPoint& p ) const // take into acount frame margin to get to viewport np -= viewport()->pos(); - if (!TQT_TQRECT_OBJECT(viewport()->rect()).tqcontains(np)) + if (!TQT_TQRECT_OBJECT(viewport()->rect()).contains(np)) return 0; // take into account contents position @@ -3910,7 +3910,7 @@ int TQListBox::rowAt( int y ) const if ( y < 0 ) return -1; - // tqfind the top item, use bsearch for speed + // find the top item, use bsearch for speed int l = 0; int r = d->rowPos.size() - 2; if ( r < 0 ) @@ -4281,7 +4281,7 @@ void TQListBox::takeItem( const TQListBoxItem * item ) Finds the next item after start beginning with \a text. */ -int TQListBoxPrivate::tqfindItemByName( int start, const TQString &text ) +int TQListBoxPrivate::findItemByName( int start, const TQString &text ) { if ( start < 0 || (uint)start >= listBox->count() ) start = 0; @@ -4322,7 +4322,7 @@ void TQListBox::clearInputString() \sa TQt::StringComparisonMode */ -TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags compare ) const +TQListBoxItem *TQListBox::findItem( const TQString &text, TQt::ComparisonFlags compare ) const { if ( text.isEmpty() ) return 0; @@ -4343,7 +4343,7 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags TQListBoxItem *beginsWithItem = 0; TQListBoxItem *endsWithItem = 0; - TQListBoxItem *tqcontainsItem = 0; + TQListBoxItem *containsItem = 0; if ( item ) { for ( ; item; item = item->n ) { @@ -4355,11 +4355,11 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; } if ( d->current && d->head ) { @@ -4373,11 +4373,11 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; } } } @@ -4387,8 +4387,8 @@ TQListBoxItem *TQListBox::tqfindItem( const TQString &text, TQt::ComparisonFlags return beginsWithItem; else if ( endsWithItem ) return endsWithItem; - else if ( tqcontainsItem ) - return tqcontainsItem; + else if ( containsItem ) + return containsItem; return 0; } diff --git a/tqtinterface/qt4/src/widgets/tqlistbox.h b/tqtinterface/qt4/src/widgets/tqlistbox.h index 936c69a..0b464a9 100644 --- a/tqtinterface/qt4/src/widgets/tqlistbox.h +++ b/tqtinterface/qt4/src/widgets/tqlistbox.h @@ -141,7 +141,7 @@ public: TQListBoxItem *item( int index ) const; int index( const TQListBoxItem * ) const; - TQListBoxItem *tqfindItem( const TQString &text, TQt::ComparisonFlags compare = TQt::BeginsWith ) const; + TQListBoxItem *findItem( const TQString &text, TQt::ComparisonFlags compare = TQt::BeginsWith ) const; void triggerUpdate( bool doLayout ); @@ -276,7 +276,7 @@ protected: #ifndef TQT_NO_COMPAT bool itemYPos( int index, int *yPos ) const; - int tqfindItem( int yPos ) const { return index(itemAt(TQPoint(0,yPos)) ); } + int findItem( int yPos ) const { return index(itemAt(TQPoint(0,yPos)) ); } #endif protected Q_SLOTS: diff --git a/tqtinterface/qt4/src/widgets/tqlistview.cpp b/tqtinterface/qt4/src/widgets/tqlistview.cpp index 46060c8..506ec60 100644 --- a/tqtinterface/qt4/src/widgets/tqlistview.cpp +++ b/tqtinterface/qt4/src/widgets/tqlistview.cpp @@ -403,7 +403,7 @@ static TQString qEllipsisText( const TQString &org, const TQFontMetrics &fm, int you can get a pointer to any TQListViewItem in a TQListView using TQListView::selectedItem(), TQListView::currentItem(), TQListView::firstChild(), TQListView::lastItem() and - TQListView::tqfindItem(). + TQListView::findItem(). If you call \c delete on a list view item, it will be deleted as expected, and as usual for \l{TQObject}s, if it has any child items @@ -1115,7 +1115,7 @@ bool TQListViewItem::acceptDrop( const TQMimeSource * ) const /*! This function is called when something was dropped on the item. \a e - tqcontains all the information about the drop. + contains all the information about the drop. The default implementation does nothing, subclasses may need to reimplement this function. @@ -1611,7 +1611,7 @@ void TQListViewItem::setup() if ( mlenabled ) { h = ph; for ( int c = 0; c < lv->columns(); ++c ) { - int lines = text( c ).tqcontains( TQChar('\n') ) + 1; + int lines = text( c ).contains( TQChar('\n') ) + 1; int tmph = lv->d->fontMetricsHeight + lv->fontMetrics().lineSpacing() * ( lines - 1 ); h = TQMAX( h, tmph ); @@ -1884,9 +1884,9 @@ void TQListViewItem::setText( int column, const TQString &text ) int newLc = 0; if ( mlenabled ) { if ( !l->text.isEmpty() ) - oldLc = l->text.tqcontains( TQChar( '\n' ) ) + 1; + oldLc = l->text.contains( TQChar( '\n' ) ) + 1; if ( !text.isEmpty() ) - newLc = text.tqcontains( TQChar( '\n' ) ) + 1; + newLc = text.contains( TQChar( '\n' ) ) + 1; } l->dirty = TRUE; @@ -2860,7 +2860,7 @@ void TQListView::drawContentsOffset( TQPainter * p, int ox, int oy, while( (i = (TQListViewItem *)(it.currentKey())) != 0 ) { ++it; TQRect ir = tqitemRect( i ).intersect( viewport()->rect() ); - if ( ir.isEmpty() || br.tqcontains( ir ) ) + if ( ir.isEmpty() || br.contains( ir ) ) // we're painting this one, or it needs no painting: forget it d->dirtyItems->remove( (void *)i ); } @@ -2896,7 +2896,7 @@ void TQListView::drawContentsOffset( TQPainter * p, int ox, int oy, // need to paint current? if ( ih > 0 && current->y < cy+ch && current->y+ih > cy ) { if ( fx < 0 ) { - // tqfind first interesting column, once + // find first interesting column, once x = 0; c = 0; cs = d->h->cellSize( 0 ); @@ -3125,7 +3125,7 @@ void TQListView::buildDrawableList() const // down again if any tqchildren are not to be painted if ( cur->y < d->topPixel ) d->topPixel = cur->y; - // bottompixel is easy: the bottom item drawn tqcontains it + // bottompixel is easy: the bottom item drawn contains it d->bottomPixel = cur->y + ih - 1; } @@ -3880,7 +3880,7 @@ bool TQListView::eventFilter( TQObject * o, TQEvent * e ) /*! Returns a pointer to the list view containing this item. - Note that this function traverses the items to the root to tqfind the + Note that this function traverses the items to the root to find the listview. This function will return 0 for taken items - see TQListViewItem::takeItem() */ @@ -3916,7 +3916,7 @@ int TQListViewItem::depth() const that this item is visible, or can be made visible by scrolling). This function might be relatively slow because of the tree - traversions needed to tqfind the correct item. + traversions needed to find the correct item. \sa itemBelow() TQListView::tqitemRect() */ @@ -4256,7 +4256,7 @@ void TQListView::contentsMousePressEventEx( TQMouseEvent * e ) d->ignoreEditAfterFocus = FALSE; if ( currentItem() && currentItem()->renameBox && - !tqitemRect( currentItem() ).tqcontains( e->pos() ) ) { + !tqitemRect( currentItem() ).contains( e->pos() ) ) { d->startEdit = FALSE; if ( d->defRenameAction == Reject ) currentItem()->cancelRename( currentItem()->renameCol ); @@ -4557,7 +4557,7 @@ void TQListView::contentsMouseReleaseEventEx( TQMouseEvent * e ) if ( d->pressedColumn == 0 ) r.setLeft( r.left() + itemMargin() + ( currentItem()->depth() + ( rootIsDecorated() ? 1 : 0 ) ) * treeStepSize() - 1 ); - if ( r.tqcontains( e->pos() ) && + if ( r.contains( e->pos() ) && !( e->state() & ( ShiftButton | ControlButton ) ) ) d->renameTimer->start( TQApplication::doubleClickInterval(), TRUE ); } @@ -5179,7 +5179,7 @@ void TQListView::keyPressEvent( TQKeyEvent * e ) } \endcode - This might be interesting if you use this function to tqfind out + This might be interesting if you use this function to find out where the user clicked and if you want to start a drag (which you do not want to do if the user clicked onto the root decoration of an item). @@ -5948,7 +5948,7 @@ TQListViewItem * TQListView::firstChild() const Returns the last item in the list view tree. Returns 0 if there are no items in the TQListView. - This function is slow because it traverses the entire tree to tqfind + This function is slow because it traverses the entire tree to find the last item. */ @@ -5990,7 +5990,7 @@ void TQListView::repaintItem( const TQListViewItem * item ) const d->dirtyItemTimer->start( 0, TRUE ); if ( !d->dirtyItems ) d->dirtyItems = new TQPtrDict<void>(); - d->dirtyItems->tqreplace( (void *)item, (void *)item ); + d->dirtyItems->replace( (void *)item, (void *)item ); } @@ -6426,7 +6426,7 @@ void TQCheckListItem::setCurrentState( ToggleState s ) void TQCheckListItem::setStoredState( ToggleState newState, void *key ) { if ( myType == CheckBox || myType == CheckBoxController ) - d->statesDict->tqreplace( key, new ToggleState(newState) ); + d->statesDict->replace( key, new ToggleState(newState) ); } /* @@ -6438,7 +6438,7 @@ TQCheckListItem::ToggleState TQCheckListItem::storedState( void *key ) const if ( !d->statesDict ) return Off; - ToggleState *foundState = d->statesDict->tqfind( key ); + ToggleState *foundState = d->statesDict->find( key ); if ( foundState ) return ToggleState( *foundState ); else @@ -6494,7 +6494,7 @@ void TQCheckListItem::activate() TQRect r( x, y, boxsize-3, boxsize-3 ); // columns might have been swapped r.moveBy( lv->header()->sectionPos( 0 ), 0 ); - if ( !r.tqcontains( pos ) ) + if ( !r.contains( pos ) ) return; } if ( ( myType == CheckBox ) || ( myType == CheckBoxController) ) { @@ -7444,7 +7444,7 @@ TQListViewItemIterator::TQListViewItemIterator() } /*! - Constructs an iterator for the TQListView that tqcontains the \a + Constructs an iterator for the TQListView that contains the \a item. The current iterator item is set to point to the \a item. */ @@ -7461,7 +7461,7 @@ TQListViewItemIterator::TQListViewItemIterator( TQListViewItem *item ) } /*! - Constructs an iterator for the TQListView that tqcontains the \a item + Constructs an iterator for the TQListView that contains the \a item using the flags \a iteratorFlags. The current iterator item is set to point to \a item or the next matching item if \a item doesn't match the flags. @@ -7772,7 +7772,7 @@ TQListViewItem *TQListViewItemIterator::current() const TQListViewItemIteratorPrivate* TQListViewItemIterator::d() const { return qt_iteratorprivate_dict ? - qt_iteratorprivate_dict->tqfind( (void *)this ) : 0; + qt_iteratorprivate_dict->find( (void *)this ) : 0; } void TQListViewItemIterator::init( int iteratorFlags ) @@ -8081,7 +8081,7 @@ bool TQListView::selectRange( TQListViewItem *newItem, TQListViewItem *oldItem, The default comparison mode is case-sensitive, exact match. */ -TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, +TQListViewItem *TQListView::findItem( const TQString& text, int column, TQt::ComparisonFlags compare ) const { if (text.isEmpty() && !(compare & TQt::ExactMatch)) @@ -8100,7 +8100,7 @@ TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, TQListViewItem *item; TQListViewItem *beginsWithItem = 0; TQListViewItem *endsWithItem = 0; - TQListViewItem *tqcontainsItem = 0; + TQListViewItem *containsItem = 0; for ( int pass = 0; pass < 2; pass++ ) { while ( (item = it.current()) != sentinel ) { @@ -8111,11 +8111,11 @@ TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, if ( compare & TQt::ExactMatch && itmtxt == comtxt ) return item; if ( compare & TQt::BeginsWith && !beginsWithItem && itmtxt.startsWith( comtxt ) ) - beginsWithItem = tqcontainsItem = item; + beginsWithItem = containsItem = item; if ( compare & TQt::EndsWith && !endsWithItem && itmtxt.endsWith( comtxt ) ) - endsWithItem = tqcontainsItem = item; - if ( compare & TQt::Contains && !tqcontainsItem && itmtxt.tqcontains( comtxt ) ) - tqcontainsItem = item; + endsWithItem = containsItem = item; + if ( compare & TQt::Contains && !containsItem && itmtxt.contains( comtxt ) ) + containsItem = item; ++it; } @@ -8128,8 +8128,8 @@ TQListViewItem *TQListView::tqfindItem( const TQString& text, int column, return beginsWithItem; else if ( endsWithItem ) return endsWithItem; - else if ( tqcontainsItem ) - return tqcontainsItem; + else if ( containsItem ) + return containsItem; return 0; } diff --git a/tqtinterface/qt4/src/widgets/tqlistview.h b/tqtinterface/qt4/src/widgets/tqlistview.h index 11d2110..3d6c997 100644 --- a/tqtinterface/qt4/src/widgets/tqlistview.h +++ b/tqtinterface/qt4/src/widgets/tqlistview.h @@ -353,7 +353,7 @@ public: virtual void setResizeMode( ResizeMode m ); ResizeMode resizeMode() const; - TQListViewItem * tqfindItem( const TQString& text, int column, TQt::ComparisonFlags compare = TQt::ExactMatch | TQt::CaseSensitive ) const; + TQListViewItem * findItem( const TQString& text, int column, TQt::ComparisonFlags compare = TQt::ExactMatch | TQt::CaseSensitive ) const; enum RenameAction { Accept, Reject }; virtual void setDefaultRenameAction( RenameAction a ); @@ -508,7 +508,7 @@ public: int width( const TQFontMetrics&, const TQListView*, int column) const; void setup(); - virtual void setOn( bool ); // ### should be tqreplaced by setChecked in ver4 + virtual void setOn( bool ); // ### should be replaced by setChecked in ver4 bool isOn() const { return on; } Type type() const { return myType; } TQString text() const { return TQListViewItem::text( 0 ); } diff --git a/tqtinterface/qt4/src/widgets/tqmainwindow.cpp b/tqtinterface/qt4/src/widgets/tqmainwindow.cpp index 1921297..6a649bc 100644 --- a/tqtinterface/qt4/src/widgets/tqmainwindow.cpp +++ b/tqtinterface/qt4/src/widgets/tqmainwindow.cpp @@ -1125,7 +1125,7 @@ TQToolTipGroup * TQMainWindow::toolTipGroup() const void TQMainWindow::setDockEnabled( TQt::Dock dock, bool enable ) { - d->docks.tqreplace( dock, enable ); + d->docks.replace( dock, enable ); } @@ -1180,7 +1180,7 @@ bool TQMainWindow::isDockEnabled( TQDockArea *area ) const void TQMainWindow::setDockEnabled( TQDockWindow *dw, TQt::Dock dock, bool enable ) { - if ( d->dockWindows.tqfind( dw ) == -1 ) { + if ( d->dockWindows.find( dw ) == -1 ) { d->dockWindows.append( dw ); connect( dw, TQT_SIGNAL( placeChanged(TQDockWindow::Place) ), this, TQT_SLOT( slotPlaceChanged() ) ); @@ -1189,7 +1189,7 @@ void TQMainWindow::setDockEnabled( TQDockWindow *dw, TQt::Dock dock, bool enable s.sprintf( "%p_%d", (void*)dw, (int)dock ); if ( enable ) d->disabledDocks.remove( s ); - else if ( d->disabledDocks.tqfind( s ) == d->disabledDocks.end() ) + else if ( d->disabledDocks.find( s ) == d->disabledDocks.end() ) d->disabledDocks << s; switch ( dock ) { case TQt::DockTop: @@ -1251,7 +1251,7 @@ bool TQMainWindow::isDockEnabled( TQDockWindow *tb, TQt::Dock dock ) const return FALSE; TQString s; s.sprintf( "%p_%d", (void*)tb, (int)dock ); - return d->disabledDocks.tqfind( s ) == d->disabledDocks.end(); + return d->disabledDocks.find( s ) == d->disabledDocks.end(); } @@ -1279,7 +1279,7 @@ void TQMainWindow::addDockWindow( TQDockWindow *dockWindow, #endif moveDockWindow( dockWindow, edge ); dockWindow->setNewLine( newLine ); - if ( d->dockWindows.tqfind( dockWindow ) == -1 ) { + if ( d->dockWindows.find( dockWindow ) == -1 ) { d->dockWindows.append( dockWindow ); connect( dockWindow, TQT_SIGNAL( placeChanged(TQDockWindow::Place) ), this, TQT_SLOT( slotPlaceChanged() ) ); @@ -1701,7 +1701,7 @@ void TQMainWindow::childEvent( TQChildEvent* e) d->sb = ::tqqt_cast<TQStatusBar*>(e->child()); if ( d->sb ) { if ( d->tll ) { - if ( !d->tll->tqfindWidget( d->sb ) ) + if ( !d->tll->findWidget( d->sb ) ) d->tll->addWidget( d->sb ); } else { triggerLayout(); @@ -2154,7 +2154,7 @@ void TQMainWindow::setDockMenuEnabled( bool b ) } /*! - Creates the dock window menu which tqcontains all toolbars (if \a + Creates the dock window menu which contains all toolbars (if \a dockWindows is \c OnlyToolBars ), all dock windows (if \a dockWindows is \c NoToolBars) or all toolbars and dock windows (if \a dockWindows is \c AllDockWindows - the default). @@ -2198,7 +2198,7 @@ TQPopupMenu *TQMainWindow::createDockWindowMenu( DockWindows dockWindows ) const TQPopupMenu *menu = new TQPopupMenu( (TQMainWindow*)this, "qt_customize_menu" ); menu->setCheckable( TRUE ); - d->dockWindowModes.tqreplace( menu, dockWindows ); + d->dockWindowModes.replace( menu, dockWindows ); connect( menu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( menuAboutToShow() ) ); return menu; } @@ -2218,7 +2218,7 @@ TQPopupMenu *TQMainWindow::createDockWindowMenu( DockWindows dockWindows ) const void TQMainWindow::menuAboutToShow() { TQPopupMenu *menu = (TQPopupMenu*)sender(); - TQMap<TQPopupMenu*, DockWindows>::Iterator it = d->dockWindowModes.tqfind( menu ); + TQMap<TQPopupMenu*, DockWindows>::Iterator it = d->dockWindowModes.find( menu ); if ( it == d->dockWindowModes.end() ) return; menu->clear(); @@ -2349,7 +2349,7 @@ TQDockArea *TQMainWindow::dockingArea( const TQPoint &p ) bool TQMainWindow::hasDockWindow( TQDockWindow *dw ) { - return d->dockWindows.tqfindRef( dw ) != -1; + return d->dockWindows.findRef( dw ) != -1; } /*! @@ -2451,7 +2451,7 @@ bool TQMainWindow::isCustomizable() const bool TQMainWindow::appropriate( TQDockWindow *dw ) const { - TQMap<TQDockWindow*, bool>::ConstIterator it = d->appropriate.tqfind( dw ); + TQMap<TQDockWindow*, bool>::ConstIterator it = d->appropriate.find( dw ); if ( it == d->appropriate.end() ) return TRUE; return *it; @@ -2474,7 +2474,7 @@ bool TQMainWindow::appropriate( TQDockWindow *dw ) const void TQMainWindow::setAppropriate( TQDockWindow *dw, bool a ) { - d->appropriate.tqreplace( dw, a ); + d->appropriate.replace( dw, a ); } #ifndef TQT_NO_TEXTSTREAM diff --git a/tqtinterface/qt4/src/widgets/tqmenubar.cpp b/tqtinterface/qt4/src/widgets/tqmenubar.cpp index 0a1feba..e932f18 100644 --- a/tqtinterface/qt4/src/widgets/tqmenubar.cpp +++ b/tqtinterface/qt4/src/widgets/tqmenubar.cpp @@ -695,7 +695,7 @@ void TQMenuBar::popupDestroyed( TQObject *o ) bool TQMenuBar::tryMouseEvent( TQPopupMenu *, TQMouseEvent *e ) { TQPoint pos = mapFromGlobal( e->globalPos() ); - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( pos ) ) // outside + if ( !TQT_TQRECT_OBJECT(rect()).contains( pos ) ) // outside return FALSE; int item = itemAtPos( pos ); if ( item == -1 && (e->type() == TQEvent::MouseButtonPress || @@ -965,8 +965,8 @@ int TQMenuBar::calculateRects( int max_width ) } else { w = fm.boundingRect( s ).width() + 2*motifItemHMargin; } - w -= s.tqcontains('&')*fm.width('&'); - w += s.tqcontains("&&")*fm.width('&'); + w -= s.contains('&')*fm.width('&'); + w += s.contains("&&")*fm.width('&'); w = TQMAX( w, TQApplication::globalStrut().width() ); if (gs == GtkStyle ) { h = TQMAX( fm.height() + gtkItemVMargin, TQApplication::globalStrut().height() ); @@ -1106,7 +1106,7 @@ int TQMenuBar::itemAtPos( const TQPoint &pos_ ) pos.setX( TQMAX( margin, TQMIN( width() - margin, pos.x()))); pos.setY( TQMAX( margin, TQMIN( height() - margin, pos.y()))); while ( i < (int)mitems->count() ) { - if ( !irects[i].isEmpty() && irects[i].tqcontains( pos ) ) { + if ( !irects[i].isEmpty() && irects[i].contains( pos ) ) { TQMenuItem *mi = mitems->at(i); return mi->isSeparator() ? -1 : i; } @@ -1219,7 +1219,7 @@ void TQMenuBar::mousePressEvent( TQMouseEvent *e ) #ifndef USE_QT4 TQFocusEvent::Reason oldReason = TQFocusEvent::reason(); #endif // USE_QT4 - TQMenuItem *mi = tqfindItem( idAt( item ) ); + TQMenuItem *mi = findItem( idAt( item ) ); // we know that a popup will open, so set the reason to avoid // itemviews to redraw their selections if ( mi && mi->popup() ) @@ -1377,7 +1377,7 @@ void TQMenuBar::keyPressEvent( TQKeyEvent *e ) ++it; TQString s = m->text(); if ( !s.isEmpty() ) { - int i = s.tqfind( '&' ); + int i = s.find( '&' ); if ( i >= 0 ) { if ( s[i+1].upper() == c ) { diff --git a/tqtinterface/qt4/src/widgets/tqmenudata.cpp b/tqtinterface/qt4/src/widgets/tqmenudata.cpp index 2f0fd80..2061254 100644 --- a/tqtinterface/qt4/src/widgets/tqmenudata.cpp +++ b/tqtinterface/qt4/src/widgets/tqmenudata.cpp @@ -96,7 +96,7 @@ TQMenuDataData::TQMenuDataData() respectively. By default, newly created menu items are visible. They can be hidden (and shown again) with setItemVisible(). - Menu items are stored in a list. Use tqfindItem() to tqfind an item by + Menu items are stored in a list. Use findItem() to find an item by its list position or by its menu identifier. (See also indexOf() and idAt().) @@ -278,7 +278,7 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap, mi->text_data = text?*text:TQString(); #else TQString newText( *text ); - newText.truncate( newText.tqfindRev( '\t' ) ); + newText.truncate( newText.findRev( '\t' ) ); mi->text_data = newText.isEmpty()?TQString():newText; #endif #ifndef TQT_NO_ACCEL @@ -308,10 +308,10 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap, /*! \internal - Internal function that tqfinds the menu item where \a popup is located, + Internal function that finds the menu item where \a popup is located, storing its index at \a index if \a index is not NULL. */ -TQMenuItem *TQMenuData::tqfindPopup( TQPopupMenu *popup, int *index ) +TQMenuItem *TQMenuData::findPopup( TQPopupMenu *popup, int *index ) { int i = 0; TQMenuItem *mi = mitems->first(); @@ -329,7 +329,7 @@ TQMenuItem *TQMenuData::tqfindPopup( TQPopupMenu *popup, int *index ) void TQMenuData::removePopup( TQPopupMenu *popup ) { int index = 0; - TQMenuItem *mi = tqfindPopup( popup, &index ); + TQMenuItem *mi = findPopup( popup, &index ); if ( mi ) { mi->popup_menu = 0; removeItemAt( index ); @@ -802,7 +802,7 @@ int TQMenuData::insertSeparator( int index ) void TQMenuData::removeItem( int id ) { TQMenuData *tqparent; - if ( tqfindItem( id, &tqparent ) ) + if ( findItem( id, &tqparent ) ) tqparent->removeItemAt(tqparent->indexOf(id)); } @@ -872,7 +872,7 @@ void TQMenuData::clear() TQKeySequence TQMenuData::accel( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( mi ) return mi->key(); return TQKeySequence(); @@ -883,7 +883,7 @@ TQKeySequence TQMenuData::accel( int id ) const An accelerator key consists of a key code and a combination of the modifiers \c SHIFT, \c CTRL, \c ALT or \c UNICODE_ACCEL (OR'ed or - added). The header file \c tqnamespace.h tqcontains a list of key + added). The header file \c tqnamespace.h contains a list of key codes. Defining an accelerator key produces a text that is added to the @@ -927,7 +927,7 @@ TQKeySequence TQMenuData::accel( int id ) const void TQMenuData::setAccel( const TQKeySequence& key, int id ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { mi->accel_key = key; tqparent->menuContentsChanged(); @@ -945,7 +945,7 @@ void TQMenuData::setAccel( const TQKeySequence& key, int id ) TQIconSet* TQMenuData::iconSet( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->iconSet() : 0; } @@ -958,7 +958,7 @@ TQIconSet* TQMenuData::iconSet( int id ) const TQString TQMenuData::text( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->text() : TQString::null; } @@ -971,7 +971,7 @@ TQString TQMenuData::text( int id ) const TQPixmap *TQMenuData::pixmap( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->pixmap() : 0; } @@ -1013,7 +1013,7 @@ TQPixmap *TQMenuData::pixmap( int id ) const void TQMenuData::changeItem( int id, const TQString &text ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { // item found if ( mi->text_data == text ) // same string return; @@ -1023,7 +1023,7 @@ void TQMenuData::changeItem( int id, const TQString &text ) } mi->text_data = text; #ifndef TQT_NO_ACCEL - if ( !mi->accel_key && text.tqfind( '\t' ) != -1 ) + if ( !mi->accel_key && text.find( '\t' ) != -1 ) mi->accel_key = TQt::Key_unknown; #endif tqparent->menuContentsChanged(); @@ -1042,7 +1042,7 @@ void TQMenuData::changeItem( int id, const TQString &text ) void TQMenuData::changeItem( int id, const TQPixmap &pixmap ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { // item found register TQPixmap *i = mi->pixmap_data; bool fast_refresh = i != 0 && @@ -1104,7 +1104,7 @@ void TQMenuData::changeItem( int id, const TQIconSet &icon, const TQPixmap &pixm void TQMenuData::changeItemIconSet( int id, const TQIconSet &icon ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { // item found register TQIconSet *i = mi->iconset_data; bool fast_refresh = i != 0; @@ -1130,7 +1130,7 @@ void TQMenuData::changeItemIconSet( int id, const TQIconSet &icon ) bool TQMenuData::isItemEnabled( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->isEnabled() : FALSE; } @@ -1144,7 +1144,7 @@ bool TQMenuData::isItemEnabled( int id ) const void TQMenuData::setItemEnabled( int id, bool enable ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi && (bool)mi->is_enabled != enable ) { mi->is_enabled = enable; #if !defined(TQT_NO_ACCEL) && !defined(TQT_NO_POPUPMENU) @@ -1176,7 +1176,7 @@ bool TQMenuData::isItemActive( int id ) const bool TQMenuData::isItemChecked( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->isChecked() : FALSE; } @@ -1191,7 +1191,7 @@ bool TQMenuData::isItemChecked( int id ) const void TQMenuData::setItemChecked( int id, bool check ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi && (bool)mi->is_checked != check ) { mi->is_checked = check; #ifndef TQT_NO_POPUPMENU @@ -1211,7 +1211,7 @@ void TQMenuData::setItemChecked( int id, bool check ) bool TQMenuData::isItemVisible( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi ? mi->isVisible() : FALSE; } @@ -1225,7 +1225,7 @@ bool TQMenuData::isItemVisible( int id ) const void TQMenuData::setItemVisible( int id, bool visible ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi && (bool)mi->is_visible != visible ) { mi->is_visible = visible; tqparent->menuContentsChanged(); @@ -1245,9 +1245,9 @@ void TQMenuData::setItemVisible( int id, bool visible ) \sa indexOf() */ -TQMenuItem *TQMenuData::tqfindItem( int id ) const +TQMenuItem *TQMenuData::findItem( int id ) const { - return tqfindItem( id, 0 ); + return findItem( id, 0 ); } @@ -1266,7 +1266,7 @@ TQMenuItem *TQMenuData::tqfindItem( int id ) const \sa indexOf() */ -TQMenuItem * TQMenuData::tqfindItem( int id, TQMenuData ** tqparent ) const +TQMenuItem * TQMenuData::findItem( int id, TQMenuData ** tqparent ) const { if ( tqparent ) *tqparent = (TQMenuData *)this; // ### @@ -1288,7 +1288,7 @@ TQMenuItem * TQMenuData::tqfindItem( int id, TQMenuData ** tqparent ) const TQPopupMenu *p = mi->popup_menu; if (!p->avoid_circularity) { p->avoid_circularity = 1; - mi = mi->popup_menu->tqfindItem( id, tqparent ); + mi = mi->popup_menu->findItem( id, tqparent ); p->avoid_circularity = 0; if ( mi ) // found item return mi; @@ -1303,7 +1303,7 @@ TQMenuItem * TQMenuData::tqfindItem( int id, TQMenuData ** tqparent ) const Returns the index of the menu item with identifier \a id, or -1 if there is no item with this identifier. - \sa idAt(), tqfindItem() + \sa idAt(), findItem() */ int TQMenuData::indexOf( int id ) const @@ -1359,7 +1359,7 @@ void TQMenuData::setId( int index, int id ) \sa connectItem(), disconnectItem(), itemParameter() */ bool TQMenuData::setItemParameter( int id, int param ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi ) // no such identifier return FALSE; if ( !mi->signal_data ) { // create new signal @@ -1381,7 +1381,7 @@ bool TQMenuData::setItemParameter( int id, int param ) { */ int TQMenuData::itemParameter( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi || !mi->signal_data ) return id; return mi->signal_data->value().toInt(); @@ -1401,7 +1401,7 @@ int TQMenuData::itemParameter( int id ) const bool TQMenuData::connectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, const char* member ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi ) // no such identifier return FALSE; if ( !mi->signal_data ) { // create new signal @@ -1426,7 +1426,7 @@ bool TQMenuData::connectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, bool TQMenuData::disconnectItem( int id, const TQT_BASE_OBJECT_NAME *receiver, const char* member ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( !mi || !mi->signal_data ) // no identifier or no signal return FALSE; return mi->signal_data->disconnect( receiver, member ); @@ -1442,7 +1442,7 @@ void TQMenuData::setWhatsThis( int id, const TQString& text ) { TQMenuData *tqparent; - TQMenuItem *mi = tqfindItem( id, &tqparent ); + TQMenuItem *mi = findItem( id, &tqparent ); if ( mi ) { mi->setWhatsThis( text ); tqparent->menuContentsChanged(); @@ -1458,7 +1458,7 @@ void TQMenuData::setWhatsThis( int id, const TQString& text ) TQString TQMenuData::whatsThis( int id ) const { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); return mi? mi->whatsThis() : TQString::null; } diff --git a/tqtinterface/qt4/src/widgets/tqmenudata.h b/tqtinterface/qt4/src/widgets/tqmenudata.h index 96128c0..70f7a43 100644 --- a/tqtinterface/qt4/src/widgets/tqmenudata.h +++ b/tqtinterface/qt4/src/widgets/tqmenudata.h @@ -245,9 +245,9 @@ public: bool setItemParameter( int id, int param ); int itemParameter( int id ) const; - TQMenuItem *tqfindItem( int id ) const; - TQMenuItem *tqfindItem( int id, TQMenuData ** tqparent ) const; - TQMenuItem * tqfindPopup( TQPopupMenu *, int *index = 0 ); + TQMenuItem *findItem( int id ) const; + TQMenuItem *findItem( int id, TQMenuData ** tqparent ) const; + TQMenuItem * findPopup( TQPopupMenu *, int *index = 0 ); virtual void activateItemAt( int index ); diff --git a/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp b/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp index 22066bc..1dba7ed 100644 --- a/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqmultilineedit.cpp @@ -262,7 +262,7 @@ void TQMultiLineEdit::pageUp( bool mark ) /*! Inserts \a txt at paragraph number \a line. If \a line is less than zero, or larger than the number of paragraphs, the new text is - put at the end. If \a txt tqcontains newline characters, several + put at the end. If \a txt contains newline characters, several paragraphs are inserted. The cursor position is not changed. @@ -452,7 +452,7 @@ void TQMultiLineEdit::cursorWordBackward( bool mark ) */ /*! Inserts string \a s at paragraph number \a line, after character - number \a col in the paragraph. If \a s tqcontains newline + number \a col in the paragraph. If \a s contains newline characters, new lines are inserted. If \a mark is TRUE the inserted string will be selected. diff --git a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp index 89f525a..a96b67d 100644 --- a/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp +++ b/tqtinterface/qt4/src/widgets/tqpopupmenu.cpp @@ -75,7 +75,7 @@ bool tqwidget_is_popup_menu(QWidget* w) { QWidget* tqwidget_parent_popup_menu(QWidget* w) { TQPopupMenu* tqpm = dynamic_cast<TQPopupMenu*>(w); if (tqpm) { - TQMenuData *top = tqpm; // tqfind top level + TQMenuData *top = tqpm; // find top level if ( top->parentMenu ) { if (top->parentMenu->isPopupMenu == FALSE) return 0; return (dynamic_cast<TQPopupMenu*>(top->parentMenu)); @@ -202,7 +202,7 @@ static TQMenuItem* whatsThisItem = 0; into a popup menu (for example, a color selector). A TQPopupMenu can also provide a tear-off menu. A tear-off menu is - a top-level window that tqcontains a copy of the menu. This makes it + a top-level window that contains a copy of the menu. This makes it possible for the user to "tear off" frequently used menus and position them in a convenient place on the screen. If you want that functionality for a certain menu, insert a tear-off handle @@ -210,7 +210,7 @@ static TQMenuItem* whatsThisItem = 0; mind that the concept isn't typically used on Microsoft Windows so users may not be familiar with it. Consider using a TQToolBar instead. Tear-off menus cannot contain custom widgets; if the - original menu tqcontains a custom widget item, this item is omitted. + original menu contains a custom widget item, this item is omitted. \link menu-example.html menu/menu.cpp\endlink is an example of TQMenuBar and TQPopupMenu use. @@ -752,7 +752,7 @@ static bool fromAccel = FALSE; #ifndef TQT_NO_ACCEL void TQPopupMenu::accelActivated( int id ) { - TQMenuItem *mi = tqfindItem( id ); + TQMenuItem *mi = findItem( id ); if ( mi && mi->isEnabledAndVisible() ) { TQGuardedPtr<TQSignal> signal = mi->signal(); fromAccel = TRUE; @@ -786,7 +786,7 @@ void TQPopupMenu::actSig( int id, bool inwhatsthis ) #ifndef TQT_NO_WHATSTHIS TQRect r( itemGeometry( indexOf( id ) ) ); TQPoint p( r.center().x(), r.bottom() ); - TQString whatsThis = tqfindItem( id )->whatsThis(); + TQString whatsThis = findItem( id )->whatsThis(); if ( whatsThis.isNull() ) whatsThis = TQWhatsThis::textFor( this, p ); TQWhatsThis::leaveWhatsThisMode( whatsThis, mapToGlobal( p ), this ); @@ -833,7 +833,7 @@ void TQPopupMenu::setFirstItemActive() void TQPopupMenu::hideAllPopups() { - register TQMenuData *top = this; // tqfind top level popup + register TQMenuData *top = this; // find top level popup if ( !preventAnimation ) TQTimer::singleShot( 10, this, TQT_SLOT(allowAnimation()) ); preventAnimation = TRUE; @@ -889,7 +889,7 @@ void TQPopupMenu::hidePopups() bool TQPopupMenu::tryMenuBar( TQMouseEvent *e ) { - register TQMenuData *top = this; // tqfind top level + register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; #ifndef TQT_NO_MENUBAR @@ -910,7 +910,7 @@ bool TQPopupMenu::tryMouseEvent( TQPopupMenu *p, TQMouseEvent * e) if ( p == this ) return FALSE; TQPoint pos = mapFromGlobal( e->globalPos() ); - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( pos ) ) // outside + if ( !TQT_TQRECT_OBJECT(rect()).contains( pos ) ) // outside return FALSE; TQMouseEvent ee( e->type(), pos, e->globalPos(), e->button(), e->state() ); event( &ee ); @@ -925,7 +925,7 @@ bool TQPopupMenu::tryMouseEvent( TQPopupMenu *p, TQMouseEvent * e) void TQPopupMenu::byeMenuBar() { #ifndef TQT_NO_MENUBAR - register TQMenuData *top = this; // tqfind top level + register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; #endif @@ -945,7 +945,7 @@ void TQPopupMenu::byeMenuBar() int TQPopupMenu::itemAtPos( const TQPoint &pos, bool ignoreSeparator ) const { - if ( !contentsRect().tqcontains(pos) ) + if ( !contentsRect().contains(pos) ) return -1; int row = 0; @@ -988,7 +988,7 @@ int TQPopupMenu::itemAtPos( const TQPoint &pos, bool ignoreSeparator ) const y = contentsRect().y(); x +=itemw; } - if ( TQRect( x, y, itemw, itemh ).tqcontains( pos ) ) + if ( TQRect( x, y, itemw, itemh ).contains( pos ) ) break; y += itemh; ++row; @@ -1146,17 +1146,17 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize) if (! mi->text().isNull()) { TQString s = mi->text(); int t; - if ( (t = s.tqfind('\t')) >= 0 ) { // string tqcontains tab + if ( (t = s.find('\t')) >= 0 ) { // string contains tab w += fm.width( s, t ); - w -= s.tqcontains('&') * fm.width('&'); - w += s.tqcontains("&&") * fm.width('&'); + w -= s.contains('&') * fm.width('&'); + w += s.contains("&&") * fm.width('&'); int tw = fm.width( s.mid(t + 1) ); if ( tw > tab) tab = tw; } else { w += fm.width( s ); - w -= s.tqcontains('&') * fm.width('&'); - w += s.tqcontains("&&") * fm.width('&'); + w -= s.contains('&') * fm.width('&'); + w += s.contains("&&") * fm.width('&'); } } else if (mi->pixmap()) w += mi->pixmap()->width(); @@ -1280,7 +1280,7 @@ void TQPopupMenu::updateAccel( TQWidget *tqparent ) delete autoaccel; autoaccel = 0; } else if ( !autoaccel ) { - // we have no tqparent. Rather than ignoring any accelerators we try to tqfind this popup's main window + // we have no tqparent. Rather than ignoring any accelerators we try to find this popup's main window if ( tornOff ) { tqparent = this; } else { @@ -1322,13 +1322,13 @@ void TQPopupMenu::updateAccel( TQWidget *tqparent ) } if ( !mi->text().isNull() || mi->custom() ) { TQString s = mi->text(); - int i = s.tqfind('\t'); + int i = s.find('\t'); // Note: Only looking at the first key in the sequence! if ( (int)k && (int)k != TQt::Key_unknown ) { TQString t = (TQString)mi->key(); if ( i >= 0 ) - s.tqreplace( i+1, s.length()-i, t ); + s.replace( i+1, s.length()-i, t ); else { s += '\t'; s += t; @@ -1557,7 +1557,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) if(d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp) { TQRect rect(x, y, contentsRect().width(), tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this)); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { TQStyle::SFlags flags = TQStyle::Style_Up; if (isEnabled()) flags |= TQStyle::Style_Enabled; @@ -1592,7 +1592,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) if ( ncols > 1 && y + itemh > contentsRect().bottom() ) { if ( y < contentsRect().bottom() ) { TQRect rect(x, y, itemw, contentsRect().bottom() - y); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { flags = TQStyle::Style_Default; if (isEnabled() && mi->isEnabledAndVisible()) flags |= TQStyle::Style_Enabled; @@ -1603,14 +1603,14 @@ void TQPopupMenu::drawContents( TQPainter* p ) y = contentsRect().y(); x +=itemw; } - if (!mi->widget() && (!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(TQRect(x, y, itemw, itemh)))) + if (!mi->widget() && (!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(TQRect(x, y, itemw, itemh)))) drawItem( p, tab, mi, row == actItem, x, y, itemw, itemh ); y += itemh; ++row; } if ( y < contentsRect().bottom() ) { TQRect rect(x, y, itemw, contentsRect().bottom() - y); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { flags = TQStyle::Style_Default; if ( isEnabled() ) flags |= TQStyle::Style_Enabled; @@ -1621,7 +1621,7 @@ void TQPopupMenu::drawContents( TQPainter* p ) if( d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown ) { int sh = tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this); TQRect rect(x, contentsRect().height() - sh, contentsRect().width(), sh); - if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).tqcontains(rect)) { + if(!p->hasClipping() || TQT_TQREGION_OBJECT(p->clipRegion()).contains(rect)) { TQStyle::SFlags flags = TQStyle::Style_Down; if (isEnabled()) flags |= TQStyle::Style_Enabled; @@ -1668,7 +1668,7 @@ void TQPopupMenu::closeEvent( TQCloseEvent * e) { void TQPopupMenu::mousePressEvent( TQMouseEvent *e ) { int sh = tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this); - if (TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) && + if (TQT_TQRECT_OBJECT(rect()).contains(e->pos()) && ((d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp && e->pos().y() <= sh) || //up (d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollDown && e->pos().y() >= contentsRect().height() - sh))) //down @@ -1677,7 +1677,7 @@ void TQPopupMenu::mousePressEvent( TQMouseEvent *e ) mouseBtDn = TRUE; // mouse button down int item = itemAtPos( e->pos() ); if ( item == -1 ) { - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) && !tryMenuBar(e) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) && !tryMenuBar(e) ) { byeMenuBar(); } return; @@ -1719,7 +1719,7 @@ void TQPopupMenu::mouseReleaseEvent( TQMouseEvent *e ) // to the menubar or our parent menu int sh = tqstyle().tqpixelMetric(TQStyle::PM_PopupMenuScrollerHeight, this); - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) && tryMenuBar(e) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) && tryMenuBar(e) ) { return; } else if((d->scroll.scrollable & TQPopupMenuPrivate::Scroll::ScrollUp && e->pos().y() <= sh) || //up @@ -1730,7 +1730,7 @@ void TQPopupMenu::mouseReleaseEvent( TQMouseEvent *e ) if ( actItem < 0 ) { // we do not have an active item // if the release is inside without motion (happens with // oversized popup menus on small screens), ignore it - if ( TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) && motion < 6 ) + if ( TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) && motion < 6 ) return; else byeMenuBar(); @@ -1794,9 +1794,9 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) TQPopupMenu* p = (TQPopupMenu*)parentMenu; int myIndex; - p->tqfindPopup( this, &myIndex ); + p->findPopup( this, &myIndex ); TQPoint pPos = p->mapFromParent( e->globalPos() ); - if ( p->actItem != myIndex && !TQT_TQRECT_OBJECT(p->rect()).tqcontains( pPos ) ) + if ( p->actItem != myIndex && !TQT_TQRECT_OBJECT(p->rect()).contains( pPos ) ) p->setActiveItem( myIndex ); if ( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SloppySubMenus, this )) { @@ -1838,7 +1838,7 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) if ( lastActItem >= 0 ) updateRow( lastActItem ); if ( lastActItem > 0 || - ( !TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) && !tryMenuBar( e ) ) ) { + ( !TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) && !tryMenuBar( e ) ) ) { popupSubMenuLater(tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay, this), this); } @@ -1863,7 +1863,7 @@ void TQPopupMenu::mouseMoveEvent( TQMouseEvent *e ) return; if ( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SloppySubMenus, this) && - d->mouseMoveBuffer.tqcontains( e->pos() ) ) { + d->mouseMoveBuffer.contains( e->pos() ) ) { actItem = item; popupSubMenuLater( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay, this) * 6, this ); @@ -2078,7 +2078,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) ++it; TQString s = m->text(); if ( !s.isEmpty() ) { - int i = s.tqfind( '&' ); + int i = s.find( '&' ); while ( i >= 0 && i < (int)s.length() - 1 ) { if ( s[i+1].upper() == c ) { ok_key = TRUE; @@ -2091,7 +2091,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) firstAfterCurrent = m; break; } else if ( s[i+1] == '&' ) { - i = s.tqfind( '&', i+2 ); + i = s.find( '&', i+2 ); } else { break; } @@ -2137,7 +2137,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e ) } #ifndef TQT_NO_MENUBAR if ( !ok_key ) { // send to menu bar - register TQMenuData *top = this; // tqfind top level + register TQMenuData *top = this; // find top level while ( top->parentMenu ) top = top->parentMenu; if ( top->isMenuBar ) { @@ -2430,7 +2430,7 @@ void TQPopupMenu::subMenuTimer() { if ( tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SloppySubMenus, this )) { TQPoint cur = TQCursor::pos(); - if ( r.tqcontains( mapFromGlobal( cur ) ) ) { + if ( r.contains( mapFromGlobal( cur ) ) ) { TQPoint pts[4]; pts[0] = TQPoint( cur.x(), cur.y() - 2 ); pts[3] = TQPoint( cur.x(), cur.y() + 2 ); @@ -2753,7 +2753,7 @@ public: Inserts a tear-off handle into the menu. A tear-off handle is a special menu item that creates a copy of the menu when the menu is selected. This "torn-off" copy lives in a separate window. It - tqcontains the same menu items as the original menu, with the + contains the same menu items as the original menu, with the exception of the tear-off handle. The handle item is assigned the identifier \a id or an diff --git a/tqtinterface/qt4/src/widgets/tqradiobutton.cpp b/tqtinterface/qt4/src/widgets/tqradiobutton.cpp index 69bdedb..13ca866 100644 --- a/tqtinterface/qt4/src/widgets/tqradiobutton.cpp +++ b/tqtinterface/qt4/src/widgets/tqradiobutton.cpp @@ -184,7 +184,7 @@ bool TQRadioButton::hitButton( const TQPoint &pos ) const } else { r.setLeft( 0 ); } - return r.tqcontains( pos ); + return r.contains( pos ); } @@ -223,7 +223,7 @@ printf("[WARNING] TQSharedDoubleBuffer double buffering has been disabled\n\r"); TQTextOStream os(&pmkey); os << "$qt_radio_" << tqstyle().className() << "_" << palette().serialNumber() << "_" << irect.width() << "x" << irect.height() << "_" << kf; - TQPixmap *pm = TQPixmapCache::tqfind( pmkey ); + TQPixmap *pm = TQPixmapCache::find( pmkey ); if ( pm ) { // pixmap exists drawButtonLabel( p ); p->drawPixmap( irect.topLeft(), *pm ); diff --git a/tqtinterface/qt4/src/widgets/tqscrollbar.cpp b/tqtinterface/qt4/src/widgets/tqscrollbar.cpp index 09d1575..de8c74c 100644 --- a/tqtinterface/qt4/src/widgets/tqscrollbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqscrollbar.cpp @@ -511,7 +511,7 @@ void TQScrollBar::wheelEvent( TQWheelEvent *e ) offset_owner = this; offset = 0; } - if ( e->orientation() != orient && !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) ) + if ( e->orientation() != orient && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) return; e->accept(); int step = TQMIN( TQApplication::wheelScrollLines()*lineStep(), @@ -765,7 +765,7 @@ void TQScrollBar::mouseMoveEvent( TQMouseEvent *e ) r.setRect( r.x() - m, r.y() - 2*m, r.width() + 2*m, r.height() + 4*m ); else r.setRect( r.x() - 2*m, r.y() - m, r.width() + 4*m, r.height() + 2*m ); - if (! r.tqcontains( e->pos())) + if (! r.contains( e->pos())) newSliderPos = sliderStartPos; else newSliderPos = (HORIZONTAL ? e->pos().x() : diff --git a/tqtinterface/qt4/src/widgets/tqscrollview.cpp b/tqtinterface/qt4/src/widgets/tqscrollview.cpp index 3ba7eec..dba2bc0 100644 --- a/tqtinterface/qt4/src/widgets/tqscrollview.cpp +++ b/tqtinterface/qt4/src/widgets/tqscrollview.cpp @@ -155,7 +155,7 @@ public: } ~TQScrollViewData(); - TQSVChildRec* rec(TQWidget* w) { return childDict.tqfind(w); } + TQSVChildRec* rec(TQWidget* w) { return childDict.find(w); } TQSVChildRec* ancestorRec(TQWidget* w); TQSVChildRec* addChildRec(TQWidget* w, int x, int y ) { @@ -1525,7 +1525,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e ) TQRect inside_margin( autoscroll_margin, autoscroll_margin, visibleWidth() - autoscroll_margin * 2, visibleHeight() - autoscroll_margin * 2 ); - if ( !inside_margin.tqcontains( vp ) ) { + if ( !inside_margin.contains( vp ) ) { startDragAutoScroll(); // Keep sending move events ( (TQDragMoveEvent*)e )->accept( TQRect(0,0,0,0) ); @@ -2550,7 +2550,7 @@ bool TQScrollView::focusNextPrevChild( bool next ) w = next ? f->next() : f->prev(); } - // if we could not tqfind one, maybe super or parentWidget() can? + // if we could not find one, maybe super or parentWidget() can? if ( !candidate ) return TQFrame::focusNextPrevChild( next ); diff --git a/tqtinterface/qt4/src/widgets/tqslider.cpp b/tqtinterface/qt4/src/widgets/tqslider.cpp index 9d3ece2..4ba2515 100644 --- a/tqtinterface/qt4/src/widgets/tqslider.cpp +++ b/tqtinterface/qt4/src/widgets/tqslider.cpp @@ -438,7 +438,7 @@ void TQSlider::mousePressEvent( TQMouseEvent *e ) if ( e->button() == Qt::RightButton ) return; - if ( r.tqcontains( e->pos() ) ) { + if ( r.contains( e->pos() ) ) { state = Dragging; clickOffset = (TQCOORD)( goodPart( e->pos() ) - sliderPos ); emit sliderPressed(); @@ -495,7 +495,7 @@ void TQSlider::mouseMoveEvent( TQMouseEvent *e ) else r.setRect( r.x() - 2*m/3, r.y() - m, r.width() + 3*m, r.height() + 2*m ); - if ( !r.tqcontains( e->pos() ) ) { + if ( !r.contains( e->pos() ) ) { moveSlider( positionFromValue(d->sliderStartVal) ); return; } @@ -511,7 +511,7 @@ void TQSlider::mouseMoveEvent( TQMouseEvent *e ) #ifndef TQT_NO_WHEELEVENT void TQSlider::wheelEvent( TQWheelEvent * e ) { - if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()) ) + if ( e->orientation() != orientation() && !TQT_TQRECT_OBJECT(rect()).contains(e->pos()) ) return; static float offset = 0; diff --git a/tqtinterface/qt4/src/widgets/tqspinbox.cpp b/tqtinterface/qt4/src/widgets/tqspinbox.cpp index 579d93b..8ea1775 100644 --- a/tqtinterface/qt4/src/widgets/tqspinbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqspinbox.cpp @@ -108,7 +108,7 @@ TQValidator::State TQSpinBoxValidator::validate( TQString& str, int& pos ) const int corePos = pos - pref.length(); state = TQIntValidator::validate( core, corePos ); pos = corePos + pref.length(); - str.tqreplace( pref.length(), str.length() - overhead, core ); + str.replace( pref.length(), str.length() - overhead, core ); } else { state = TQIntValidator::validate( str, pos ); if ( state == Invalid ) { diff --git a/tqtinterface/qt4/src/widgets/tqspinwidget.cpp b/tqtinterface/qt4/src/widgets/tqspinwidget.cpp index 1fc4407..f035c13 100644 --- a/tqtinterface/qt4/src/widgets/tqspinwidget.cpp +++ b/tqtinterface/qt4/src/widgets/tqspinwidget.cpp @@ -141,9 +141,9 @@ void TQSpinWidget::mousePressEvent( TQMouseEvent *e ) uint oldButtonDown = d->buttonDown; - if ( d->down.tqcontains( e->pos() ) && d->downEnabled ) + if ( d->down.contains( e->pos() ) && d->downEnabled ) d->buttonDown = 1; - else if ( d->up.tqcontains( e->pos() ) && d->upEnabled ) + else if ( d->up.contains( e->pos() ) && d->upEnabled ) d->buttonDown = 2; else d->buttonDown = 0; @@ -269,19 +269,19 @@ void TQSpinWidget::mouseMoveEvent( TQMouseEvent *e ) return; uint oldButtonDown = d->theButton; - if ( oldButtonDown & 1 && !d->down.tqcontains( e->pos() ) ) { + if ( oldButtonDown & 1 && !d->down.contains( e->pos() ) ) { d->stopTimer(); d->theButton = 0; tqrepaint( d->down, FALSE ); - } else if ( oldButtonDown & 2 && !d->up.tqcontains( e->pos() ) ) { + } else if ( oldButtonDown & 2 && !d->up.contains( e->pos() ) ) { d->stopTimer(); d->theButton = 0; tqrepaint( d->up, FALSE ); - } else if ( !oldButtonDown && d->up.tqcontains( e->pos() ) && d->buttonDown & 2 ) { + } else if ( !oldButtonDown && d->up.contains( e->pos() ) && d->buttonDown & 2 ) { d->startTimer( 500 ); d->theButton = 2; tqrepaint( d->up, FALSE ); - } else if ( !oldButtonDown && d->down.tqcontains( e->pos() ) && d->buttonDown & 1 ) { + } else if ( !oldButtonDown && d->down.contains( e->pos() ) && d->buttonDown & 1 ) { d->startTimer( 500 ); d->theButton = 1; tqrepaint( d->down, FALSE ); diff --git a/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/tqtinterface/qt4/src/widgets/tqsplitter.cpp index 50a4a13..b5a159b 100644 --- a/tqtinterface/qt4/src/widgets/tqsplitter.cpp +++ b/tqtinterface/qt4/src/widgets/tqsplitter.cpp @@ -329,7 +329,7 @@ bool TQSplitter::tqchildrenCollapsible() const void TQSplitter::setCollapsible( TQWidget *w, bool collapse ) { - tqfindWidget( w )->collapsible = collapse ? 1 : 0; + findWidget( w )->collapsible = collapse ? 1 : 0; } /*! @@ -340,7 +340,7 @@ void TQSplitter::resizeEvent( TQResizeEvent * ) doResize(); } -TQSplitterLayoutStruct *TQSplitter::tqfindWidget( TQWidget *w ) +TQSplitterLayoutStruct *TQSplitter::findWidget( TQWidget *w ) { processChildEvents(); TQSplitterLayoutStruct *s = d->list.first(); @@ -625,7 +625,7 @@ void TQSplitter::doMove( bool backwards, int pos, int id, int delta, bool upLeft } } -int TQSplitter::tqfindWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ) +int TQSplitter::findWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ) { id += delta; do { @@ -648,10 +648,10 @@ void TQSplitter::getRange( int id, int *farMin, int *min, int *max, int *farMax return; int collapsibleSizeBefore = 0; - int idJustBefore = tqfindWidgetJustBeforeOrJustAfter( id, -1, collapsibleSizeBefore ); + int idJustBefore = findWidgetJustBeforeOrJustAfter( id, -1, collapsibleSizeBefore ); int collapsibleSizeAfter = 0; - int idJustAfter = tqfindWidgetJustBeforeOrJustAfter( id, +1, collapsibleSizeAfter ); + int idJustAfter = findWidgetJustBeforeOrJustAfter( id, +1, collapsibleSizeAfter ); int minBefore = 0; int minAfter = 0; @@ -953,7 +953,7 @@ void TQSplitter::recalc( bool update ) void TQSplitter::setResizeMode( TQWidget *w, ResizeMode mode ) { - tqfindWidget( w )->resizeMode = mode; + findWidget( w )->resizeMode = mode; } @@ -1175,7 +1175,7 @@ TQValueList<int> TQSplitter::sizes() const values set the heights of each widget going from top to bottom. Extra values in the \a list are ignored. - If \a list tqcontains too few values, the result is undefined but + If \a list contains too few values, the result is undefined but the program will still be well-behaved. Note that the values in \a list should be the height/width that diff --git a/tqtinterface/qt4/src/widgets/tqsplitter.h b/tqtinterface/qt4/src/widgets/tqsplitter.h index 7dd9a3a..18d62f9 100644 --- a/tqtinterface/qt4/src/widgets/tqsplitter.h +++ b/tqtinterface/qt4/src/widgets/tqsplitter.h @@ -154,13 +154,13 @@ public: //private: int adjustPos( int, int, int *, int *, int *, int * ); bool collapsible( TQSplitterLayoutStruct * ); void processChildEvents(); - TQSplitterLayoutStruct *tqfindWidget( TQWidget * ); + TQSplitterLayoutStruct *findWidget( TQWidget * ); TQSplitterLayoutStruct *addWidget( TQWidget *, bool prepend = FALSE ); void recalcId(); void doMove( bool backwards, int pos, int id, int delta, bool upLeft, bool mayCollapse ); void setGeo( TQWidget *w, int pos, int size, bool splitterMoved ); - int tqfindWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ); + int findWidgetJustBeforeOrJustAfter( int id, int delta, int &collapsibleSize ); void updateHandles(); inline TQCOORD pick( const TQPoint &p ) const diff --git a/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp b/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp index aebaa6c..b948045 100644 --- a/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp +++ b/tqtinterface/qt4/src/widgets/tqsyntaxhighlighter.cpp @@ -127,7 +127,7 @@ TQSyntaxHighlighter::~TQSyntaxHighlighter() that this paragraph has ended in the middle of a paragraph spanning construct). - To tqfind out which paragraph is highlighted, call + To find out which paragraph is highlighted, call currentParagraph(). For example, if you're writing a simple C++ syntax highlighter, diff --git a/tqtinterface/qt4/src/widgets/tqtabbar.cpp b/tqtinterface/qt4/src/widgets/tqtabbar.cpp index dd31f44..fd02625 100644 --- a/tqtinterface/qt4/src/widgets/tqtabbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqtabbar.cpp @@ -261,7 +261,7 @@ public: void add( TQTab * tab, const TQString & tip ) { - tabTips.tqreplace( tab, tip ); + tabTips.replace( tab, tip ); } void remove( TQTab * tab ) @@ -272,7 +272,7 @@ public: TQString tipForTab( TQTab * tab ) const { TQMapConstIterator<TQTab *, TQString> it; - it = tabTips.tqfind( tab ); + it = tabTips.find( tab ); if ( it != tabTips.end() ) return it.data(); else @@ -293,14 +293,14 @@ protected: tb->d->leftB->width(), tb->d->leftB->height() ); rectR.setRect( tb->d->rightB->x(), tb->d->rightB->y(), tb->d->rightB->width(), tb->d->rightB->height() ); - if ( tb->d->scrolls && (rectL.tqcontains( p ) || rectR.tqcontains( p )) ) + if ( tb->d->scrolls && (rectL.contains( p ) || rectR.contains( p )) ) return; #ifndef TQT_NO_TOOLTIP - // tqfind and show the tool tip for the tab under the point p + // find and show the tool tip for the tab under the point p TQMapIterator<TQTab *, TQString> it; for ( it = tabTips.begin(); it != tabTips.end(); ++it ) { - if ( it.key()->rect().tqcontains( p ) ) + if ( it.key()->rect().contains( p ) ) tip( it.key()->rect(), it.data() ); } #endif @@ -387,7 +387,7 @@ TQTabBar::~TQTabBar() Adds the tab, \a newTab, to the tab control. Sets \a newTab's id to a new id and places the tab just to the - right of the existing tabs. If the tab's label tqcontains an + right of the existing tabs. If the tab's label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this @@ -408,7 +408,7 @@ int TQTabBar::addTab( TQTab * newTab ) If \a index is not specified, the tab is simply appended. Otherwise it's inserted at the specified position. - Sets \a newTab's id to a new id. If the tab's label tqcontains an + Sets \a newTab's id to a new id. If the tab's label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this @@ -515,7 +515,7 @@ void TQTabBar::setTabEnabled( int id, bool enabled ) } if ( t->enabled ) { r = r.unite( t->r ); - l->append( l->take( l->tqfindRef( t ) ) ); + l->append( l->take( l->findRef( t ) ) ); emit selected( t->id ); } } @@ -592,7 +592,7 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const else if(t == d->pressed) flags |= TQStyle::Style_Sunken; //selection flags - if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(), tqcolorGroup(), flags, TQStyleOption(t) ); @@ -608,8 +608,8 @@ void TQTabBar::paint( TQPainter * p, TQTab * t, bool selected ) const } TQFontMetrics fm = p->fontMetrics(); int fw = fm.width( t->label ); - fw -= t->label.tqcontains('&') * fm.width('&'); - fw += t->label.tqcontains("&&") * fm.width('&'); + fw -= t->label.contains('&') * fm.width('&'); + fw += t->label.contains("&&") * fm.width('&'); int w = iw + fw + 4; int h = TQMAX(fm.height() + 4, ih ); int offset = 3; @@ -662,7 +662,7 @@ void TQTabBar::paintLabel( TQPainter* p, const TQRect& br, flags |= TQStyle::Style_Selected; else if(t == d->pressed) flags |= TQStyle::Style_Sunken; - if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos()))) + if(t->rect().contains(mapFromGlobal(TQCursor::pos()))) flags |= TQStyle::Style_MouseOver; tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, r, t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(), @@ -721,8 +721,8 @@ void TQTabBar::paintEvent( TQPaintEvent * e ) /*! This virtual function is called by the mouse event handlers to determine which tab is pressed. The default implementation returns - a pointer to the tab whose bounding rectangle tqcontains \a p, if - exactly one tab's bounding rectangle tqcontains \a p. Otherwise it + a pointer to the tab whose bounding rectangle contains \a p, if + exactly one tab's bounding rectangle contains \a p. Otherwise it returns 0. \sa mousePressEvent() mouseReleaseEvent() @@ -738,7 +738,7 @@ TQTab * TQTabBar::selectTab( const TQPoint & p ) const TQTab * t = i.current(); ++i; - if ( t && t->r.tqcontains( p ) ) { + if ( t && t->r.contains( p ) ) { if ( selected ) moreThanOne = TRUE; else @@ -866,7 +866,7 @@ void TQTabBar::setCurrentTab( TQTab * tab ) return; TQRect r = l->last()->r; - if ( l->tqfindRef( tab ) >= 0 ) + if ( l->findRef( tab ) >= 0 ) l->append( l->take() ); d->focus = tab->id; @@ -896,7 +896,7 @@ void TQTabBar::setCurrentTab( TQTab * tab ) \property TQTabBar::keyboardFocusTab \brief the id of the tab that has the keyboard focus - This property tqcontains the id of the tab that has the keyboard + This property contains the id of the tab that has the keyboard focus or -1 if the tab bar does not have the keyboard focus. */ @@ -1095,8 +1095,8 @@ void TQTabBar::layoutTabs() int offset = (t && d->scrolls) ? t->r.x() : 0; while ( t ) { int lw = fm.width( t->label ); - lw -= t->label.tqcontains('&') * fm.width('&'); - lw += t->label.tqcontains("&&") * fm.width('&'); + lw -= t->label.contains('&') * fm.width('&'); + lw += t->label.contains("&&") * fm.width('&'); int iw = 0; int ih = 0; if ( t->iconset != 0 ) { diff --git a/tqtinterface/qt4/src/widgets/tqtabwidget.cpp b/tqtinterface/qt4/src/widgets/tqtabwidget.cpp index 5fab113..e1afe3d 100644 --- a/tqtinterface/qt4/src/widgets/tqtabwidget.cpp +++ b/tqtinterface/qt4/src/widgets/tqtabwidget.cpp @@ -96,7 +96,7 @@ The current page is available as an index position with currentPageIndex() or as a wiget pointer with currentPage(). You can retrieve a pointer to a page with a given index using page(), - and can tqfind the index position of a page with indexOf(). Use + and can find the index position of a page with indexOf(). Use setCurrentPage() to show a particular page by index, or showPage() to show a page by widget pointer. @@ -266,7 +266,7 @@ TQTabWidget::~TQTabWidget() the label is shown on-screen and may vary according to language and other factors. - If the tab's \a label tqcontains an ampersand, the letter following + If the tab's \a label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this tab. @@ -322,7 +322,7 @@ void TQTabWidget::addTab( TQWidget *child, TQTab* tab ) the label is shown on-screen and may vary according to language and other factors. - If the tab's \a label tqcontains an ampersand, the letter following + If the tab's \a label contains an ampersand, the letter following the ampersand is used as an accelerator for the tab, e.g. if the label is "Bro\&wse" then Alt+W becomes an accelerator which will move the focus to this tab. diff --git a/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp b/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp index af1b078..81cf7de 100644 --- a/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp +++ b/tqtinterface/qt4/src/widgets/tqtextbrowser.cpp @@ -234,7 +234,7 @@ void TQTextBrowser::setSource(const TQString& name) d->textOrSourceChanged = TRUE; TQString source = name; TQString mark; - int hash = name.tqfind('#'); + int hash = name.find('#'); if ( hash != -1) { source = name.left( hash ); mark = name.mid( hash+1 ); @@ -259,8 +259,8 @@ void TQTextBrowser::setSource(const TQString& name) } } if ( isVisible() ) { - TQString firstTag = txt.left( txt.tqfind( '>' ) + 1 ); - if ( firstTag.left( 3 ) == "<qt" && firstTag.tqcontains( "type" ) && firstTag.tqcontains( "detail" ) ) { + TQString firstTag = txt.left( txt.find( '>' ) + 1 ); + if ( firstTag.left( 3 ) == "<qt" && firstTag.contains( "type" ) && firstTag.contains( "detail" ) ) { popupDetail( txt, TQCursor::pos() ); #ifndef TQT_NO_CURSOR tqApp->restoreOverrideCursor(); @@ -471,7 +471,7 @@ void TQTextBrowser::popupDetail( const TQString& contents, const TQPoint& pos ) popup->resize( w + shadowWidth, h + shadowWidth ); - // okay, now to tqfind a suitable location + // okay, now to find a suitable location //###### we need a global fancy popup positioning somewhere popup->move(pos - popup->rect().center()); if (popup->tqgeometry().right() > TQApplication::desktop()->width()) diff --git a/tqtinterface/qt4/src/widgets/tqtextedit.cpp b/tqtinterface/qt4/src/widgets/tqtextedit.cpp index c2c3141..7900d3c 100644 --- a/tqtinterface/qt4/src/widgets/tqtextedit.cpp +++ b/tqtinterface/qt4/src/widgets/tqtextedit.cpp @@ -283,7 +283,7 @@ static bool block_set_tqalignment = FALSE; \i \e{current format} -- this is the format at the current cursor position, \e and it is the format of the selected text if any. - \i \e{current paragraph} -- the paragraph which tqcontains the + \i \e{current paragraph} -- the paragraph which contains the cursor. \endlist @@ -325,8 +325,8 @@ static bool block_set_tqalignment = FALSE; TQTextEdit can display a large HTML subset, including tables and images. - The text is set or tqreplaced using setText() which deletes any - existing text and tqreplaces it with the text passed in the + The text is set or replaced using setText() which deletes any + existing text and replaces it with the text passed in the setText() call. If you call setText() with legacy HTML (with setTextFormat(RichText) in force), and then call text(), the text that is returned may have different markup, but will render the @@ -384,8 +384,8 @@ static bool block_set_tqalignment = FALSE; length(). You can scroll to an anchor in the text, e.g. - \c{<a name="anchor">} with scrollToAnchor(). The tqfind() function - can be used to tqfind and select a given string within the text. + \c{<a name="anchor">} with scrollToAnchor(). The find() function + can be used to find and select a given string within the text. A read-only TQTextEdit provides the same functionality as the (obsolete) TQTextView. (TQTextView is still supplied for @@ -490,7 +490,7 @@ static bool block_set_tqalignment = FALSE; Use setSelection() to select text. The setSelectionAttributes() function is used to indicate how selected text should be - displayed. Use hasSelectedText() to tqfind out if any text is + displayed. Use hasSelectedText() to find out if any text is selected. The currently selected text's position is available using getSelection() and the selected text itself is returned by selectedText(). The selection can be copied to the clipboard with @@ -850,7 +850,7 @@ static bool block_set_tqalignment = FALSE; \fn void TQTextEdit::cursorPositionChanged( int para, int pos ) This signal is emitted if the position of the cursor has changed. - \a para tqcontains the paragraph index and \a pos tqcontains the + \a para contains the paragraph index and \a pos contains the character position within the paragraph. \sa setCursorPosition() @@ -910,7 +910,7 @@ TQTextEdit::TQTextEdit( TQWidget *tqparent, const char *name ) uses to resolve the locations of files and images. It is passed to the mimeSourceFactory() when quering data. - For example if the text tqcontains an image tag, + For example if the text contains an image tag, \c{<img src="image.png">}, and the context is "path/to/look/in", the TQMimeSourceFactory will try to load the image from "path/to/look/in/image.png". If the tag was @@ -2546,12 +2546,12 @@ void TQTextEdit::contentsMouseDoubleClickEvent( TQMouseEvent * e ) int startIdx = index, endIdx = index, i; if ( !str[ index ].isSpace() ) { i = startIdx; - // tqfind start of word + // find start of word while ( i >= 0 && !str[ i ].isSpace() ) { startIdx = i--; } i = endIdx; - // tqfind end of word.. + // find end of word.. while ( (uint) i < str.length() && !str[ i ].isSpace() ) { endIdx = ++i; } @@ -3053,9 +3053,9 @@ void TQTextEdit::insert( const TQString &text, bool indent, RedoIndentation is set, the paragraph is re-indented. If \c CheckNewLines is set, newline characters in \a text result in hard line breaks (i.e. new paragraphs). If \c checkNewLine is not set, - the behaviour of the editor is undefined if the \a text tqcontains + the behaviour of the editor is undefined if the \a text contains newlines. (It is not possible to change TQTextEdit's newline handling - behavior, but you can use TQString::tqreplace() to preprocess text + behavior, but you can use TQString::replace() to preprocess text before inserting it.) If \c RemoveSelected is set, any selected text (in selection 0) is removed before the text is inserted. @@ -4040,10 +4040,10 @@ void TQTextEdit::setText( const TQString &text, const TQString &context ) modify the cursor position. Using the \a para and \a index parameters will not work correctly - in case the document tqcontains tables. + in case the document contains tables. */ -bool TQTextEdit::tqfind( const TQString &expr, bool cs, bool wo, bool forward, +bool TQTextEdit::find( const TQString &expr, bool cs, bool wo, bool forward, int *para, int *index ) { #ifdef TQT_TEXTEDIT_OPTIMIZATION @@ -4054,29 +4054,29 @@ bool TQTextEdit::tqfind( const TQString &expr, bool cs, bool wo, bool forward, #ifndef TQT_NO_CURSOR viewport()->setCursor( isReadOnly() ? Qt::ArrowCursor : Qt::IBeamCursor ); #endif - TQTextCursor tqfindcur = *cursor; + TQTextCursor findcur = *cursor; if ( para && index ) { if ( doc->paragAt( *para ) ) - tqfindcur.gotoPosition( doc->paragAt(*para), *index ); + findcur.gotoPosition( doc->paragAt(*para), *index ); else - tqfindcur.gotoEnd(); + findcur.gotoEnd(); } else if ( doc->hasSelection( TQTextDocument::Standard ) ){ - // maks sure we do not tqfind the same selection again + // maks sure we do not find the same selection again if ( forward ) - tqfindcur.gotoNextLetter(); + findcur.gotoNextLetter(); else - tqfindcur.gotoPreviousLetter(); - } else if (!forward && tqfindcur.index() == 0 && tqfindcur.paragraph() == tqfindcur.topParagraph()) { - tqfindcur.gotoEnd(); + findcur.gotoPreviousLetter(); + } else if (!forward && findcur.index() == 0 && findcur.paragraph() == findcur.topParagraph()) { + findcur.gotoEnd(); } removeSelection( TQTextDocument::Standard ); - bool found = doc->tqfind( tqfindcur, expr, cs, wo, forward ); + bool found = doc->find( findcur, expr, cs, wo, forward ); if ( found ) { if ( para ) - *para = tqfindcur.paragraph()->paragId(); + *para = findcur.paragraph()->paragId(); if ( index ) - *index = tqfindcur.index(); - *cursor = tqfindcur; + *index = findcur.index(); + *cursor = findcur; repaintChanged(); ensureCursorVisible(); } @@ -4146,7 +4146,7 @@ void TQTextEdit::getCursorPosition( int *para, int *index ) const Any existing selections which have a different id (\a selNum) are left alone, but if an existing selection has the same id as \a - selNum it is removed and tqreplaced by this selection. + selNum it is removed and replaced by this selection. Uses the selection settings of selection \a selNum. If \a selNum is 0, this is the default selection. @@ -5003,7 +5003,7 @@ void TQTextEdit::scrollToAnchor( const TQString& name ) if( c->isAnchor() ) { TQString a = c->anchorName(); if ( a == name || - (a.tqcontains( '#' ) && TQStringList::split( '#', a ).tqcontains( name ) ) ) { + (a.contains( '#' ) && TQStringList::split( '#', a ).contains( name ) ) ) { setContentsPos( contentsX(), TQMIN( cursor.paragraph()->rect().top() + cursor.totalOffsetY(), contentsHeight() - visibleHeight() ) ); break; } @@ -5125,9 +5125,9 @@ void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m ) return; if ( st == "application/x-qrichtext" ) { int start; - if ( (start = t.tqfind( "<!--StartFragment-->" )) != -1 ) { + if ( (start = t.find( "<!--StartFragment-->" )) != -1 ) { start += 20; - int end = t.tqfind( "<!--EndFragment-->" ); + int end = t.find( "<!--EndFragment-->" ); TQTextCursor oldC = *cursor; // during the setRichTextInternal() call the cursors @@ -5200,10 +5200,10 @@ void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m ) } else { #if defined(TQ_OS_WIN32) // Need to convert CRLF to LF - t.tqreplace( "\r\n", "\n" ); + t.replace( "\r\n", "\n" ); #elif defined(TQ_OS_MAC) //need to convert CR to LF - t.tqreplace( '\r', '\n' ); + t.replace( '\r', '\n' ); #endif TQChar *uc = (TQChar *)t.tqunicode(); for ( int i=0; (uint) i<t.length(); i++ ) { @@ -5241,12 +5241,12 @@ TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPo int n = 0; TQDict<void> done; for (int i = 0; !( fmt = ms->format( i ) ).isNull(); i++) { - int semi = fmt.tqfind( ";" ); + int semi = fmt.find( ";" ); if ( semi >= 0 ) fmt = fmt.left( semi ); if ( fmt.left( 5 ) == "text/" ) { fmt = fmt.mid( 5 ); - if ( !done.tqfind( fmt ) ) { + if ( !done.find( fmt ) ) { done.insert( fmt,(void*)1 ); popup.insertItem( fmt, i ); n++; @@ -5261,7 +5261,7 @@ TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPo #else TQString fmt; for (int i = 0; !( fmt = ms->format( i ) ).isNull(); i++) { - int semi = fmt.tqfind( ";" ); + int semi = fmt.find( ";" ); if ( semi >= 0 ) fmt = fmt.left( semi ); if ( fmt.left( 5 ) == "text/" ) { @@ -6220,7 +6220,7 @@ TQString TQTextEdit::optimText() const } else { tmp = d->od->lines[ LOGOFFSET(i) ] + "\n"; // inject the tags for this line - if ( (it = d->od->tagIndex.tqfind( LOGOFFSET(i) )) != d->od->tagIndex.end() ) + if ( (it = d->od->tagIndex.find( LOGOFFSET(i) )) != d->od->tagIndex.end() ) ftag = it.data(); offset = 0; while ( ftag && ftag->line == i ) { @@ -6286,7 +6286,7 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimAppendTag( int index, const TQStr d->od->lastTag = t; tmp = d->od->tagIndex[ LOGOFFSET(t->line) ]; if ( !tmp || (tmp && tmp->index > t->index) ) { - d->od->tagIndex.tqreplace( LOGOFFSET(t->line), t ); + d->od->tagIndex.replace( LOGOFFSET(t->line), t ); } return t; } @@ -6311,9 +6311,9 @@ TQTextEditOptimPrivate::Tag *TQTextEdit::optimInsertTag(int line, int index, con t->next = 0; t->prev = 0; - // tqfind insertion pt. in tag struct. + // find insertion pt. in tag struct. TQMap<int,TQTextEditOptimPrivate::Tag *>::ConstIterator it; - if ((it = d->od->tagIndex.tqfind(LOGOFFSET(line))) != d->od->tagIndex.end()) { + if ((it = d->od->tagIndex.find(LOGOFFSET(line))) != d->od->tagIndex.end()) { tmp = *it; if (tmp->index >= index) { // the exisiting tag may be placed AFTER the one we want to insert tmp = tmp->prev; @@ -6338,7 +6338,7 @@ TQTextEditOptimPrivate::Tag *TQTextEdit::optimInsertTag(int line, int index, con tmp = d->od->tagIndex[LOGOFFSET(t->line)]; if (!tmp || (tmp && tmp->index >= t->index)) { - d->od->tagIndex.tqreplace(LOGOFFSET(t->line), t); + d->od->tagIndex.replace(LOGOFFSET(t->line), t); } return t; } @@ -6405,7 +6405,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) c = '>'; else if ( esc == "&" ) c = '&'; - line->tqreplace( escIndex, i - escIndex + 1, c ); + line->replace( escIndex, i - escIndex + 1, c ); len = line->length(); i -= i-escIndex; escIndex = -1; @@ -6518,7 +6518,7 @@ void TQTextEdit::optimParseTags( TQString * line, int lineNo, int indexOffset ) // calculate the width of a string in pixels inc. tabs static int qStrWidth(const TQString& str, int tabWidth, const TQFontMetrics& fm) { - int tabs = str.tqcontains('\t'); + int tabs = str.contains('\t'); if (!tabs) return fm.width(str); @@ -6528,7 +6528,7 @@ static int qStrWidth(const TQString& str, int tabWidth, const TQFontMetrics& fm) int strWidth = 0; int tn; for (tn = 1; tn <= tabs; ++tn) { - newIdx = str.tqfind('\t', newIdx); + newIdx = str.find('\t', newIdx); strWidth += fm.width(str.mid(lastIdx, newIdx - lastIdx)); if (strWidth >= tn * tabWidth) { int u = tn; @@ -6549,7 +6549,7 @@ bool TQTextEdit::optimHasBoldMetrics(int line) { TQTextEditOptimPrivate::Tag *t; TQMapConstIterator<int,TQTextEditOptimPrivate::Tag *> it; - if ((it = d->od->tagIndex.tqfind(line)) != d->od->tagIndex.end()) { + if ((it = d->od->tagIndex.find(line)) != d->od->tagIndex.end()) { t = *it; while (t && t->line == line) { if (t->bold) @@ -6564,7 +6564,7 @@ bool TQTextEdit::optimHasBoldMetrics(int line) /*! \internal - Append \a str to the current text buffer. Parses each line to tqfind + Append \a str to the current text buffer. Parses each line to find formatting tags. */ void TQTextEdit::optimAppend( const TQString &str ) @@ -6628,7 +6628,7 @@ static void qStripTags(TQString *line) c = '>'; else if ( esc == "&" ) c = '&'; - line->tqreplace( escIndex, i - escIndex + 1, c ); + line->replace( escIndex, i - escIndex + 1, c ); len = line->length(); i -= i-escIndex; escIndex = -1; @@ -6685,7 +6685,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) qStripTags( &stripped ); d->od->lines[LOGOFFSET(line)].insert(index, stripped); // move the tag indices following the insertion pt. - if ((ii = d->od->tagIndex.tqfind(LOGOFFSET(line))) != d->od->tagIndex.end()) { + if ((ii = d->od->tagIndex.find(LOGOFFSET(line))) != d->od->tagIndex.end()) { tag = *ii; while (tag && (LOGOFFSET(tag->line) == line && tag->index < index)) tag = tag->next; @@ -6710,7 +6710,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) // fix the tag index and the tag line/index numbers - this // might take a while.. for (x = line; x < d->od->numLines; x++) { - if ((ii = d->od->tagIndex.tqfind(LOGOFFSET(line))) != d->od->tagIndex.end()) { + if ((ii = d->od->tagIndex.find(LOGOFFSET(line))) != d->od->tagIndex.end()) { tag = ii.data(); if (LOGOFFSET(tag->line) == line) while (tag && (LOGOFFSET(tag->line) == line && tag->index < index)) @@ -6731,7 +6731,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) d->od->tagIndex.clear(); tag = d->od->tags; while (tag) { - if (!((ii = d->od->tagIndex.tqfind(LOGOFFSET(tag->line))) != d->od->tagIndex.end())) + if (!((ii = d->od->tagIndex.find(LOGOFFSET(tag->line))) != d->od->tagIndex.end())) d->od->tagIndex[LOGOFFSET(tag->line)] = tag; tag = tag->next; } @@ -6739,7 +6739,7 @@ void TQTextEdit::optimInsert(const TQString& text, int line, int index) // update the tag indices on the spliced line - needs to be done before new tags are added TQString stripped = strl[strl.count() - 1]; qStripTags(&stripped); - if ((ii = d->od->tagIndex.tqfind(LOGOFFSET(line + numNewLines))) != d->od->tagIndex.end()) { + if ((ii = d->od->tagIndex.find(LOGOFFSET(line + numNewLines))) != d->od->tagIndex.end()) { tag = *ii; while (tag && (LOGOFFSET(tag->line) == line + numNewLines)) { tag->index += stripped.length(); @@ -6794,7 +6794,7 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimPreviousLeftTag( int line ) { TQTextEditOptimPrivate::Tag * ftag = 0; TQMapConstIterator<int,TQTextEditOptimPrivate::Tag *> it; - if ( (it = d->od->tagIndex.tqfind( LOGOFFSET(line) )) != d->od->tagIndex.end() ) + if ( (it = d->od->tagIndex.find( LOGOFFSET(line) )) != d->od->tagIndex.end() ) ftag = it.data(); if ( !ftag ) { // start searching for an open tag @@ -6823,7 +6823,7 @@ TQTextEditOptimPrivate::Tag * TQTextEdit::optimPreviousLeftTag( int line ) /*! \internal Set the format for the string starting at index \a start and ending - at \a end according to \a tag. If \a tag is a Format tag, tqfind the + at \a end according to \a tag. If \a tag is a Format tag, find the first open color tag appearing before \a tag and use that tag to color the string. */ @@ -6854,7 +6854,7 @@ void TQTextEdit::optimSetTextFormat( TQTextDocument * td, TQTextCursor * cur, if ( tag ) { TQString col = tag->tag.simplifyWhiteSpace(); if ( col.left( 10 ) == "font color" ) { - int i = col.tqfind( '=', 10 ); + int i = col.find( '=', 10 ); col = TQT_TQSTRING(col.mid( i + 1 )).simplifyWhiteSpace(); if ( col[0] == '\"' ) col = col.mid( 1, col.length() - 2 ); @@ -6923,10 +6923,10 @@ void TQTextEdit::optimDrawContents( TQPainter * p, int clipx, int clipy, TQMapConstIterator<int,TQTextEditOptimPrivate::Tag *> it; TQTextEditOptimPrivate::Tag * tag = 0, * tmp = 0; TQTextCursor cur( td ); - // Step 1 - tqfind previous left-tag + // Step 1 - find previous left-tag tmp = optimPreviousLeftTag( i ); for ( ; i < startLine + nLines; i++ ) { - if ( (it = d->od->tagIndex.tqfind( LOGOFFSET(i) )) != d->od->tagIndex.end() ) + if ( (it = d->od->tagIndex.find( LOGOFFSET(i) )) != d->od->tagIndex.end() ) tag = it.data(); // Step 2 - iterate over tags on the current line int lastIndex = 0; @@ -7124,7 +7124,7 @@ void TQTextEdit::optimDoAutoScroll() int xx = contentsX() + pos.x(); int yy = contentsY() + pos.y(); - // tqfind out how much we have to scroll in either dir. + // find out how much we have to scroll in either dir. if ( pos.x() < 0 || pos.x() > viewport()->width() || pos.y() < 0 || pos.y() > viewport()->height() ) { int my = yy; @@ -7201,7 +7201,7 @@ int TQTextEdit::optimCharIndex( const TQString &str, int mx ) const int strWidth; mx = mx - 4; // ### get the real margin from somewhere - if (!str.tqcontains('\t') && mx > fm.width(str)) + if (!str.contains('\t') && mx > fm.width(str)) return str.length(); while (i < str.length()) { @@ -7296,8 +7296,8 @@ bool TQTextEdit::optimFind( const TQString & expr, bool cs, bool /*wo*/, return FALSE; for ( i = parag; fw ? i < d->od->numLines : i >= 0; fw ? i++ : i-- ) { - idx = fw ? d->od->lines[ LOGOFFSET(i) ].tqfind( expr, idx, cs ) : - d->od->lines[ LOGOFFSET(i) ].tqfindRev( expr, idx, cs ); + idx = fw ? d->od->lines[ LOGOFFSET(i) ].find( expr, idx, cs ) : + d->od->lines[ LOGOFFSET(i) ].findRev( expr, idx, cs ); if ( idx != -1 ) { found = TRUE; break; @@ -7413,11 +7413,11 @@ void TQTextEdit::optimCheckLimit( const TQString& str ) } // ...in the tag index as well TQMapIterator<int, TQTextEditOptimPrivate::Tag *> idx; - if ( (idx = d->od->tagIndex.tqfind( d->logOffset )) != d->od->tagIndex.end() ) + if ( (idx = d->od->tagIndex.find( d->logOffset )) != d->od->tagIndex.end() ) d->od->tagIndex.remove( idx ); TQMapIterator<int,TQString> it; - if ( (it = d->od->lines.tqfind( d->logOffset )) != d->od->lines.end() ) { + if ( (it = d->od->lines.find( d->logOffset )) != d->od->lines.end() ) { d->od->len -= (*it).length(); d->od->lines.remove( it ); d->od->numLines--; diff --git a/tqtinterface/qt4/src/widgets/tqtextedit.h b/tqtinterface/qt4/src/widgets/tqtextedit.h index ebca634..a69b434 100644 --- a/tqtinterface/qt4/src/widgets/tqtextedit.h +++ b/tqtinterface/qt4/src/widgets/tqtextedit.h @@ -235,7 +235,7 @@ public: void getSelection( int *paraFrom, int *indexFrom, int *paraTo, int *indexTo, int selNum = 0 ) const; - virtual bool tqfind( const TQString &expr, bool cs, bool wo, bool forward = TRUE, + virtual bool find( const TQString &expr, bool cs, bool wo, bool forward = TRUE, int *para = 0, int *index = 0 ); int paragraphs() const; diff --git a/tqtinterface/qt4/src/widgets/tqtitlebar.cpp b/tqtinterface/qt4/src/widgets/tqtitlebar.cpp index ed7cd51..84ec7b9 100644 --- a/tqtinterface/qt4/src/widgets/tqtitlebar.cpp +++ b/tqtinterface/qt4/src/widgets/tqtitlebar.cpp @@ -407,7 +407,7 @@ void TQTitleBar::mouseMoveEvent( TQMouseEvent * e) TQWorkspace *workspace = ::tqqt_cast<TQWorkspace*>(d->window->parentWidget()->parentWidget()); if(workspace) { p = workspace->mapFromGlobal( e->globalPos() ); - if ( !TQT_TQRECT_OBJECT(workspace->rect()).tqcontains(p) ) { + if ( !TQT_TQRECT_OBJECT(workspace->rect()).contains(p) ) { if ( p.x() < 0 ) p.rx() = 0; if ( p.y() < 0 ) diff --git a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp index 0701c6a..e7ff8f4 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbar.cpp +++ b/tqtinterface/qt4/src/widgets/tqtoolbar.cpp @@ -221,7 +221,7 @@ void TQToolBarSeparator::paintEvent( TQPaintEvent * ) \ingroup application \mainclass - A toolbar is a panel that tqcontains a set of controls, usually + 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 TQMainWindow the user can drag toolbars within and between the diff --git a/tqtinterface/qt4/src/widgets/tqtoolbox.cpp b/tqtinterface/qt4/src/widgets/tqtoolbox.cpp index 5950b1c..b082f56 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbox.cpp +++ b/tqtinterface/qt4/src/widgets/tqtoolbox.cpp @@ -508,7 +508,7 @@ TQWidget *TQToolBox::item( int index ) const int TQToolBox::indexOf( TQWidget *item ) const { TQToolBoxPrivate::Page *c = d->page(item); - return c ? d->pageList.tqfindIndex( *c ) : -1; + return c ? d->pageList.findIndex( *c ) : -1; } /*! diff --git a/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp b/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp index 2cfd962..8c84a59 100644 --- a/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp +++ b/tqtinterface/qt4/src/widgets/tqtoolbutton.cpp @@ -581,7 +581,7 @@ void TQToolButton::mousePressEvent( TQMouseEvent *e ) TQRect popupr = TQStyle::tqvisualRect( tqstyle().querySubControlMetrics(TQStyle::CC_ToolButton, this, TQStyle::SC_ToolButtonMenu), this ); - d->instantPopup = (popupr.isValid() && popupr.tqcontains(e->pos())); + d->instantPopup = (popupr.isValid() && popupr.contains(e->pos())); #ifndef TQT_NO_POPUPMENU if ( d->discardNextMouseEvent ) { @@ -702,8 +702,8 @@ TQIconSet TQToolButton::offIconSet( ) const \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. There is - now an \l TQToolButton::iconSet property that tqreplaces both \l + Since TQt 3.0, TQIconSet contains both the On and Off icons. There is + now an \l TQToolButton::iconSet property that replaces both \l TQToolButton::onIconSet and \l TQToolButton::offIconSet. For ease of porting, this property is a synonym for \l @@ -729,8 +729,8 @@ void TQToolButton::setOnIconSet( const TQIconSet& set ) \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. There is - now an \l TQToolButton::iconSet property that tqreplaces both \l + Since TQt 3.0, TQIconSet contains both the On and Off icons. There is + now an \l TQToolButton::iconSet property that replaces both \l TQToolButton::onIconSet and \l TQToolButton::offIconSet. For ease of porting, this property is a synonym for \l @@ -775,7 +775,7 @@ void TQToolButton::setIconSet( const TQIconSet & set ) /*! \overload \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. + Since TQt 3.0, TQIconSet contains both the On and Off icons. For ease of porting, this function ignores the \a on parameter and sets the \l iconSet property. If you relied on the \a on parameter, @@ -820,7 +820,7 @@ TQIconSet TQToolButton::iconSet() const /*! \overload \obsolete - Since TQt 3.0, TQIconSet tqcontains both the On and Off icons. + Since TQt 3.0, TQIconSet contains both the On and Off icons. For ease of porting, this function ignores the \a on parameter and returns the \l iconSet property. If you relied on the \a on diff --git a/tqtinterface/qt4/src/widgets/tqtooltip.cpp b/tqtinterface/qt4/src/widgets/tqtooltip.cpp index 1c82b0e..411487d 100644 --- a/tqtinterface/qt4/src/widgets/tqtooltip.cpp +++ b/tqtinterface/qt4/src/widgets/tqtooltip.cpp @@ -115,7 +115,7 @@ public: void hideTipAndSleep(); - TQString tqfind( TQWidget *, const TQPoint& ); + TQString find( TQWidget *, const TQPoint& ); void setWakeUpDelay(int); public Q_SLOTS: @@ -231,7 +231,7 @@ void TQTipManager::add( const TQRect &gm, TQWidget *w, tips->insert( w, t ); - if ( a && t->rect.tqcontains( pos ) && (!g || g->enabled()) ) { + if ( a && t->rect.contains( pos ) && (!g || g->enabled()) ) { removeTimer->stop(); showTip(); } @@ -426,7 +426,7 @@ bool TQTipManager::eventFilter( TQObject *obj, TQEvent *e ) TQMouseEvent * m = (TQMouseEvent *)e; TQPoint mousePos = w->mapFromGlobal( m->globalPos() ); - if ( currentTip && !currentTip->rect.tqcontains( mousePos ) ) { + if ( currentTip && !currentTip->rect.contains( mousePos ) ) { hideTip(); if ( m->state() == 0 ) return FALSE; @@ -484,7 +484,7 @@ void TQTipManager::showTip() return; TQTipManager::Tip *t = (*tips)[ widget ]; - while ( t && !t->rect.tqcontains( pos ) ) + while ( t && !t->rect.contains( pos ) ) t = t->next; if ( t == 0 ) return; @@ -637,10 +637,10 @@ void TQTipManager::allowAnimation() preventAnimation = FALSE; } -TQString TQTipManager::tqfind( TQWidget *w, const TQPoint& pos ) +TQString TQTipManager::find( TQWidget *w, const TQPoint& pos ) { Tip *t = (*tips)[ w ]; - while ( t && !t->rect.tqcontains( pos ) ) + while ( t && !t->rect.contains( pos ) ) t = t->next; return t ? t->text : TQString::null; @@ -938,7 +938,7 @@ void TQToolTip::remove( TQWidget * widget, const TQRect & rect ) TQString TQToolTip::textFor( TQWidget *widget, const TQPoint& pos ) { if ( tipManager ) - return tipManager->tqfind( widget, pos ); + return tipManager->find( widget, pos ); return TQString::null; } diff --git a/tqtinterface/qt4/src/widgets/tqvalidator.cpp b/tqtinterface/qt4/src/widgets/tqvalidator.cpp index e238ab0..423e837 100644 --- a/tqtinterface/qt4/src/widgets/tqvalidator.cpp +++ b/tqtinterface/qt4/src/widgets/tqvalidator.cpp @@ -184,7 +184,7 @@ void TQValidator::fixup( TQString & ) const /*! \class TQIntValidator \brief The TQIntValidator class provides a validator which ensures - that a string tqcontains a valid integer within a specified range. + that a string contains a valid integer within a specified range. \ingroup misc @@ -408,10 +408,10 @@ TQDoubleValidator::~TQDoubleValidator() /*! - Returns \c Acceptable if the string \a input tqcontains a double + Returns \c Acceptable if the string \a input contains a double that is within the valid range and is in the correct format. - Returns \c Intermediate if \a input tqcontains a double that is + Returns \c Intermediate if \a input contains a double that is outside the range or is in the wrong format, e.g. with too many digits after the decimal point or is empty. @@ -431,7 +431,7 @@ TQValidator::State TQDoubleValidator::validate( TQString & input, int & ) const return Intermediate; bool ok = TRUE; double entered = input.toDouble( &ok ); - int nume = input.tqcontains( 'e', FALSE ); + int nume = input.contains( 'e', FALSE ); if ( !ok ) { // explicit exponent regexp TQRegExp expexpexp( TQString::tqfromLatin1("[Ee][+-]?\\d*$") ); @@ -448,7 +448,7 @@ TQValidator::State TQDoubleValidator::validate( TQString & input, int & ) const } } - int i = input.tqfind( '.' ); + int i = input.find( '.' ); if ( i >= 0 && nume == 0 ) { // has decimal point (but no E), now count digits after that i++; @@ -524,7 +524,7 @@ void TQDoubleValidator::setDecimals( int decimals ) \ingroup misc - TQRegExpValidator tqcontains a regular expression, "regexp", used to + TQRegExpValidator contains a regular expression, "regexp", used to determine whether an input string is \c Acceptable, \c Intermediate or \c Invalid. diff --git a/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp b/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp index 80e984c..3ada619 100644 --- a/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp +++ b/tqtinterface/qt4/src/widgets/tqwhatsthis.cpp @@ -311,7 +311,7 @@ void TQWhatsThat::hide() void TQWhatsThat::mousePressEvent( TQMouseEvent* e ) { pressed = TRUE; - if ( e->button() == Qt::LeftButton && TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) ) { + if ( e->button() == Qt::LeftButton && TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) ) { #ifndef TQT_NO_RICHTEXT if ( doc ) anchor = doc->anchorAt( e->pos() - TQPoint( hMargin, vMargin) ); @@ -326,14 +326,14 @@ void TQWhatsThat::mouseReleaseEvent( TQMouseEvent* e ) if ( !pressed ) return; #ifndef TQT_NO_RICHTEXT - if ( e->button() == Qt::LeftButton && doc && TQT_TQRECT_OBJECT(rect()).tqcontains( e->pos() ) ) { + if ( e->button() == Qt::LeftButton && doc && TQT_TQRECT_OBJECT(rect()).contains( e->pos() ) ) { TQString a = doc->anchorAt( e->pos() - TQPoint( hMargin, vMargin ) ); TQString href; if ( anchor == a ) href = a; anchor = TQString::null; if ( widget && wt && wt->dict ) { - TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->tqfind( widget ); + TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->find( widget ); if ( i && i->whatsthis && !i->whatsthis->clicked( href ) ) return; } @@ -545,7 +545,7 @@ bool TQWhatsThisPrivate::eventFilter( TQObject * o, TQEvent * e ) TQMouseEvent* me = (TQMouseEvent*) e; TQPoint p = me->pos(); while( w && !i ) { - i = dict->tqfind( w ); + i = dict->find( w ); if ( !i ) { p += w->pos(); w = w->parentWidget( TRUE ); @@ -670,7 +670,7 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP "automatic what's this? widget" ); - // okay, now to tqfind a suitable location + // okay, now to find a suitable location int scr = ( widget ? TQApplication::desktop()->screenNumber( widget ) : @@ -735,13 +735,13 @@ void TQWhatsThisPrivate::say( TQWidget * widget, const TQString &text, const TQP TQWhatsThisPrivate::WhatsThisItem* TQWhatsThisPrivate::newItem( TQWidget * widget ) { - WhatsThisItem * i = dict->tqfind( (void *)widget ); + WhatsThisItem * i = dict->find( (void *)widget ); if ( i ) TQWhatsThis::remove( widget ); i = new WhatsThisItem; dict->insert( (void *)widget, i ); TQWidget * t = widget->tqtopLevelWidget(); - if ( !tlw->tqfind( (void *)t ) ) { + if ( !tlw->find( (void *)t ) ) { tlw->insert( (void *)t, t ); t->installEventFilter( this ); } @@ -764,7 +764,7 @@ void TQWhatsThisPrivate::add( TQWidget * widget, const TQString &text ) /*! Adds \a text as "What's this" help for \a widget. If the text is - rich text formatted (i.e. it tqcontains markup) it will be rendered + rich text formatted (i.e. it contains markup) it will be rendered with the default stylesheet TQStyleSheet::defaultSheet(). The text is destroyed if the widget is later destroyed, so it need @@ -790,7 +790,7 @@ void TQWhatsThis::add( TQWidget * widget, const TQString &text ) void TQWhatsThis::remove( TQWidget * widget ) { TQWhatsThisPrivate::setUpWhatsThis(); - TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->tqfind( (void *)widget ); + TQWhatsThisPrivate::WhatsThisItem * i = wt->dict->find( (void *)widget ); if ( !i ) return; @@ -804,7 +804,7 @@ void TQWhatsThis::remove( TQWidget * widget ) /*! Returns the what's this text for widget \a w or TQString::null if - there is no "What's this?" help for the widget. \a pos tqcontains + there is no "What's this?" help for the widget. \a pos contains the mouse position; this is useful, for example, if you've subclassed to make the text that is displayed position dependent. @@ -819,7 +819,7 @@ TQString TQWhatsThis::textFor( TQWidget * w, const TQPoint& pos, bool includePar TQWhatsThisPrivate::WhatsThisItem * i = 0; TQPoint p = pos; while( w && !i ) { - i = wt->dict->tqfind( w ); + i = wt->dict->find( w ); if ( !includeParents ) break; if ( !i ) { diff --git a/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp b/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp index d4aa8fc..9b4d106 100644 --- a/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp +++ b/tqtinterface/qt4/src/widgets/tqwidgetplugin.cpp @@ -714,7 +714,7 @@ TQWidgetList TQWidgetContainerPlugin::pages( const TQString &, TQWidget * ) cons return widget + "->addTab( " + page + ", \"" + pageName + "\" )"; \endcode - Warning: If the code returned by this function tqcontains invalid + Warning: If the code returned by this function contains invalid C++ syntax, the generated \c uic code will not compile. */ diff --git a/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp b/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp index b9b576a..d09353d 100644 --- a/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp +++ b/tqtinterface/qt4/src/widgets/tqwidgetresizehandler.cpp @@ -127,7 +127,7 @@ bool TQWidgetResizeHandler::eventFilter( TQObject *o, TQEvent *ee ) case TQEvent::MouseButtonPress: { if ( w->isMaximized() ) break; - if ( !TQT_TQRECT_OBJECT(widget->rect()).tqcontains( widget->mapFromGlobal( e->globalPos() ) ) ) + if ( !TQT_TQRECT_OBJECT(widget->rect()).contains( widget->mapFromGlobal( e->globalPos() ) ) ) return FALSE; if ( e->button() == Qt::LeftButton ) { emit activate(); @@ -214,7 +214,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e ) TQPoint globalPos = widget->parentWidget( TRUE ) ? widget->parentWidget( TRUE )->mapFromGlobal( e->globalPos() ) : e->globalPos(); - if ( widget->parentWidget( TRUE ) && !TQT_TQRECT_OBJECT(widget->parentWidget( TRUE )->rect()).tqcontains( globalPos ) ) { + if ( widget->parentWidget( TRUE ) && !TQT_TQRECT_OBJECT(widget->parentWidget( TRUE )->rect()).contains( globalPos ) ) { if ( globalPos.x() < 0 ) globalPos.rx() = 0; if ( globalPos.y() < 0 ) diff --git a/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp b/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp index 4bf824e..ff78a7b 100644 --- a/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp +++ b/tqtinterface/qt4/src/widgets/tqwidgetstack.cpp @@ -177,7 +177,7 @@ int TQWidgetStack::addWidget(TQWidget * w, int id) // prevent duplicates removeWidget(w); - if (id >= 0 && dict->tqfind(id)) + if (id >= 0 && dict->find(id)) id = -2; if (id < -1) id = d->nextNegativeID--; @@ -196,7 +196,7 @@ int TQWidgetStack::addWidget(TQWidget * w, int id) if (f) { if (!focusWidgets) focusWidgets = new TQPtrDict<TQWidget>(17); - focusWidgets->tqreplace(w, TQT_TQWIDGET(w->focusWidget())); + focusWidgets->replace(w, TQT_TQWIDGET(w->focusWidget())); } w->hide(); @@ -241,7 +241,7 @@ void TQWidgetStack::raiseWidget(int id) { if (id == -1) return; - TQWidget * w = dict->tqfind(id); + TQWidget * w = dict->find(id); if (w) raiseWidget(w); } @@ -415,7 +415,7 @@ void TQWidgetStack::setVisible(bool visible) TQWidget * TQWidgetStack::widget(int id) const { - return id != -1 ? dict->tqfind(id) : 0; + return id != -1 ? dict->find(id) : 0; } @@ -785,7 +785,7 @@ int TQWidgetStack::addWidget( TQWidget * w, int id ) // prevent duplicates removeWidget( w ); - if ( id >= 0 && dict->tqfind( id ) ) + if ( id >= 0 && dict->find( id ) ) id = -2; if ( id < -1 ) id = nseq_no--; @@ -804,7 +804,7 @@ int TQWidgetStack::addWidget( TQWidget * w, int id ) if ( f ) { if ( !tqfocusWidgets ) tqfocusWidgets = new TQPtrDict<TQWidget>( 17 ); - tqfocusWidgets->tqreplace( w, w->tqfocusWidget() ); + tqfocusWidgets->replace( w, w->tqfocusWidget() ); } w->hide(); @@ -850,7 +850,7 @@ void TQWidgetStack::raiseWidget( int id ) { if ( id == -1 ) return; - TQWidget * w = dict->tqfind( id ); + TQWidget * w = dict->find( id ); if ( w ) raiseWidget( w ); } @@ -913,9 +913,9 @@ void TQWidgetStack::raiseWidget( TQWidget *w ) if ( p == topWidget ) { // focus was on old page if ( !tqfocusWidgets ) tqfocusWidgets = new TQPtrDict<TQWidget>( 17 ); - tqfocusWidgets->tqreplace( topWidget, fw ); + tqfocusWidgets->replace( topWidget, fw ); fw->clearFocus(); - // look for the best focus widget we can tqfind + // look for the best focus widget we can find // best == what we had (which may be deleted) fw = tqfocusWidgets->take( w ); if ( isChildOf( fw, w ) ) { @@ -1036,7 +1036,7 @@ void TQWidgetStack::show() TQWidget * TQWidgetStack::widget( int id ) const { - return id != -1 ? dict->tqfind( id ) : 0; + return id != -1 ? dict->find( id ) : 0; } diff --git a/tqtinterface/qt4/src/workspace/tqworkspace.cpp b/tqtinterface/qt4/src/workspace/tqworkspace.cpp index 164a670..a4e2687 100644 --- a/tqtinterface/qt4/src/workspace/tqworkspace.cpp +++ b/tqtinterface/qt4/src/workspace/tqworkspace.cpp @@ -87,7 +87,7 @@ MDI (multiple document interface) applications typically have one main window with a menu bar and toolbar, and a central widget that - is a TQWorkspace. The workspace itself tqcontains zero, one or more + is a TQWorkspace. The workspace itself contains zero, one or more document windows, each of which is a widget. The workspace itself is an ordinary TQt widget. It has a standard @@ -127,7 +127,7 @@ larger than the actual workspace, set the scrollBarsEnabled property to TRUE. - If the top-level window tqcontains a menu bar and a document window + If the top-level window contains a menu bar and a document window is maximised, TQWorkspace moves the document window's minimize, restore and close buttons from the document window's frame to the workspace window's menu bar. It then inserts a window operations @@ -418,7 +418,7 @@ void TQWorkspace::childEvent( TQChildEvent * e) if (e->inserted() && e->child()->isWidgetType()) { TQWidget* w = static_cast<TQWidget*>(static_cast<QWidget*>(e->child())); if ( !w || !w->testWFlags( (WFlags)(TQt::WStyle_Title | TQt::WStyle_NormalBorder | TQt::WStyle_DialogBorder) ) || w->testWFlags(TQt::WType_Dialog) - || d->icons.tqcontains( w ) || w == d->vbar || w == d->hbar || w == d->corner ) + || d->icons.contains( w ) || w == d->vbar || w == d->hbar || w == d->corner ) return; // nothing to do bool wasMaximized = w->isMaximized(); @@ -469,7 +469,7 @@ void TQWorkspace::childEvent( TQChildEvent * e) updateWorkspace(); } else if (e->removed() ) { - if ( d->windows.tqcontains( (TQWorkspaceChild*)e->child() ) ) { + if ( d->windows.contains( (TQWorkspaceChild*)e->child() ) ) { d->windows.removeRef( (TQWorkspaceChild*)e->child() ); d->focus.removeRef( (TQWorkspaceChild*)e->child() ); if (d->maxWindow == e->child()) @@ -564,7 +564,7 @@ void TQWorkspace::activateWindow( TQWidget* w, bool change_focus ) } if ( change_focus ) { - if ( d->focus.tqfind( d->active ) >=0 ) { + if ( d->focus.find( d->active ) >=0 ) { d->focus.removeRef( d->active ); d->focus.append( d->active ); } @@ -729,7 +729,7 @@ void TQWorkspace::place( TQWidget* w) void TQWorkspace::insertIcon( TQWidget* w ) { - if ( !w || d->icons.tqcontains( w ) ) + if ( !w || d->icons.contains( w ) ) return; d->icons.append( w ); if (w->parentWidget() != this ) @@ -763,7 +763,7 @@ void TQWorkspace::insertIcon( TQWidget* w ) void TQWorkspace::removeIcon( TQWidget* w) { - if ( !d->icons.tqcontains( w ) ) + if ( !d->icons.contains( w ) ) return; d->icons.remove( w ); w->hide(); @@ -888,7 +888,7 @@ void TQWorkspace::handleUndock(TQDockWindow *w) if ( l != w && l->tqgeometry().intersects(TQRect(sc_pt, w->size()))) sc.o++; } - if(maxRect.tqcontains(TQRect(sc_pt, w->size())) && + if(maxRect.contains(TQRect(sc_pt, w->size())) && (!possible || (sc.o < score.o) || ((score.o || sc.o == score.o) && score.x < sc.x))) { wpos = sc_pt; @@ -924,7 +924,7 @@ void TQWorkspace::dockWindowsShow() TQPtrList<TQDockWindow> lst = d->newdocks; d->newdocks.clear(); for(TQPtrListIterator<TQDockWindow> dw_it(lst); (*dw_it); ++dw_it) { - if(d->dockwindows.tqfind((*dw_it)) != -1) + if(d->dockwindows.find((*dw_it)) != -1) continue; handleUndock((*dw_it)); d->dockwindows.append((*dw_it)); @@ -1016,7 +1016,7 @@ void TQWorkspace::showEvent( TQShowEvent *e ) } else if(::tqqt_cast<TQStatusBar*>(w)) { if(activeWindow()) { TQWorkspaceChild *c; - if ( ( c = tqfindChild(activeWindow()) ) ) + if ( ( c = findChild(activeWindow()) ) ) c->setqStatusBar((TQStatusBar*)w); } } else if(::tqqt_cast<TQWorkspaceChild*>(w)) { @@ -1086,7 +1086,7 @@ void TQWorkspace::hideEvent( TQHideEvent * ) void TQWorkspace::minimizeWindow( TQWidget* w) { - TQWorkspaceChild* c = tqfindChild( w ); + TQWorkspaceChild* c = findChild( w ); if ( !w || (w && (!w->testWFlags( TQt::WStyle_Minimize ) || w->testWFlags( TQt::WStyle_Tool) )) ) return; @@ -1135,7 +1135,7 @@ void TQWorkspace::minimizeWindow( TQWidget* w) void TQWorkspace::normalizeWindow( TQWidget* w) { - TQWorkspaceChild* c = tqfindChild( w ); + TQWorkspaceChild* c = findChild( w ); if ( !w ) return; if ( c ) { @@ -1183,14 +1183,14 @@ void TQWorkspace::normalizeWindow( TQWidget* w) void TQWorkspace::maximizeWindow( TQWidget* w) { - TQWorkspaceChild* c = tqfindChild( w ); + TQWorkspaceChild* c = findChild( w ); if ( !w || (w && (!w->testWFlags( TQt::WStyle_Maximize ) || w->testWFlags( TQt::WStyle_Tool) )) ) return; if ( c ) { setUpdatesEnabled( FALSE ); - if (c->iconw && d->icons.tqcontains( c->iconw->parentWidget() ) ) + if (c->iconw && d->icons.contains( c->iconw->parentWidget() ) ) normalizeWindow( w ); TQWorkspace *fake = (TQWorkspace*)w; @@ -1250,7 +1250,7 @@ void TQWorkspace::showWindow( TQWidget* w) } -TQWorkspaceChild* TQWorkspace::tqfindChild( TQWidget* w) +TQWorkspaceChild* TQWorkspace::findChild( TQWidget* w) { TQPtrListIterator<TQWorkspaceChild> it( d->windows ); while ( it.current () ) { @@ -1320,7 +1320,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) return FALSE; } TQDockWindow *w = (TQDockWindow*)ce->child(); - if(d->newdocks.tqfind(w) == -1 && d->dockwindows.tqfind(w) == -1) { + if(d->newdocks.find(w) == -1 && d->dockwindows.find(w) == -1) { if(::tqqt_cast<TQToolBar*>(w)) d->newdocks.prepend(w); else @@ -1372,7 +1372,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) if ( !o->isA( "TQWorkspaceChild" ) || !isVisible() || e->spontaneous() ) break; if ( TQT_BASE_OBJECT(d->active) == TQT_BASE_OBJECT(o) ) { - int a = d->focus.tqfind( d->active ); + int a = d->focus.find( d->active ); if (a < 0) { printf("[WARNING] In TQWorkspace TQEvent::HideToParent handler: Expected active window to be present in focus list but this was not the case! Avoiding infinite loop but the root cause of this problem should be repaired. d->focus.count(): %d\n\r", d->focus.count()); break; @@ -1382,7 +1382,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) a = d->focus.count()-1; TQWorkspaceChild* c = d->focus.at( a ); if ( !c || TQT_BASE_OBJECT(c) == TQT_BASE_OBJECT(o) ) { - if ( c && c->iconw && d->icons.tqcontains( c->iconw->parentWidget() ) ) + if ( c && c->iconw && d->icons.contains( c->iconw->parentWidget() ) ) break; activateWindow( 0 ); break; @@ -1421,7 +1421,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e) updateWorkspace(); break; case TQEvent::Show: - if ( o->isA("TQWorkspaceChild") && !d->focus.tqcontainsRef( (TQWorkspaceChild*)o ) ) { + if ( o->isA("TQWorkspaceChild") && !d->focus.containsRef( (TQWorkspaceChild*)o ) ) { d->focus.append( (TQWorkspaceChild*)o ); } updateWorkspace(); @@ -1791,7 +1791,7 @@ void TQWorkspace::activateNextWindow() return; } - int a = d->focus.tqfind( d->active ) + 1; + int a = d->focus.find( d->active ) + 1; a = a % d->focus.count(); @@ -1824,7 +1824,7 @@ void TQWorkspace::activatePrevWindow() return; } - int a = d->focus.tqfind( d->active ) - 1; + int a = d->focus.find( d->active ) - 1; if ( a < 0 ) a = d->focus.count()-1; @@ -2328,7 +2328,7 @@ bool TQWorkspaceChild::eventFilter( TQObject * o, TQEvent * e) switch ( e->type() ) { case TQEvent::Show: - if ( ((TQWorkspace*)parentWidget())->d->focus.tqfind( this ) < 0 ) + if ( ((TQWorkspace*)parentWidget())->d->focus.find( this ) < 0 ) ((TQWorkspace*)parentWidget())->d->focus.append( this ); if ( isVisibleTo( parentWidget() ) ) break; @@ -2463,7 +2463,7 @@ bool TQWorkspaceChild::focusNextPrevChild( bool next ) if ( candidate ) { TQObjectList *ol = queryList(); - bool ischild = ol->tqfindRef( TQT_TQOBJECT(candidate) ) != -1; + bool ischild = ol->findRef( TQT_TQOBJECT(candidate) ) != -1; delete ol; if ( !ischild ) { startingPoint = f->home(); @@ -2475,7 +2475,7 @@ bool TQWorkspaceChild::focusNextPrevChild( bool next ) if ( ( candidate->focusPolicy() & Qt::TabFocus ) == Qt::TabFocus && candidate->isEnabled() &&!candidate->focusProxy() && candidate->isVisible() ) lastValid = candidate; - if ( ol2->tqfindRef( TQT_TQOBJECT(nw) ) == -1 ) { + if ( ol2->findRef( TQT_TQOBJECT(nw) ) == -1 ) { candidate = lastValid; break; } @@ -2577,7 +2577,7 @@ void TQWorkspaceChild::setActive( bool b ) for ( o = ol->first(); o; o = ol->next() ) o->removeEventFilter( this ); if ( !hasFocus ) { - if ( lastfocusw && ol->tqcontains( TQT_TQOBJECT(lastfocusw) ) && + if ( lastfocusw && ol->contains( TQT_TQOBJECT(lastfocusw) ) && lastfocusw->focusPolicy() != Qt::NoFocus ) { // this is a bug if lastfocusw has been deleted, a new // widget has been created, and the new one is a child @@ -2587,7 +2587,7 @@ void TQWorkspaceChild::setActive( bool b ) } else if ( childWidget->focusPolicy() != Qt::NoFocus ) { childWidget->setFocus(); } else { - // tqfind something, anything, that accepts focus, and use that. + // find something, anything, that accepts focus, and use that. o = ol->first(); while( o && ((TQWidget*)o)->focusPolicy() == Qt::NoFocus ) o = ol->next(); diff --git a/tqtinterface/qt4/src/workspace/tqworkspace.h b/tqtinterface/qt4/src/workspace/tqworkspace.h index 2b128ec..b48f7fe 100644 --- a/tqtinterface/qt4/src/workspace/tqworkspace.h +++ b/tqtinterface/qt4/src/workspace/tqworkspace.h @@ -140,7 +140,7 @@ private: void removeIcon( TQWidget* w); void place( TQWidget* ); - TQWorkspaceChild* tqfindChild( TQWidget* w); + TQWorkspaceChild* findChild( TQWidget* w); void showMaximizeControls(); void hideMaximizeControls(); void activateWindow( TQWidget* w, bool change_focus = TRUE ); diff --git a/tqtinterface/qt4/src/xml/tqdom.cpp b/tqtinterface/qt4/src/xml/tqdom.cpp index ef453c3..4b85e22 100644 --- a/tqtinterface/qt4/src/xml/tqdom.cpp +++ b/tqtinterface/qt4/src/xml/tqdom.cpp @@ -82,7 +82,7 @@ */ static void qt_split_namespace( TQString& prefix, TQString& name, const TQString& qName, bool hasURI ) { - int i = qName.tqfind( ':' ); + int i = qName.find( ':' ); if ( i == -1 ) { if ( hasURI ) prefix = ""; @@ -134,7 +134,7 @@ public: virtual bool hasAttributes() { return FALSE; } virtual TQDomNodePrivate* insertBefore( TQDomNodePrivate* newChild, TQDomNodePrivate* refChild ); virtual TQDomNodePrivate* insertAfter( TQDomNodePrivate* newChild, TQDomNodePrivate* refChild ); - virtual TQDomNodePrivate* tqreplaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ); + virtual TQDomNodePrivate* replaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ); virtual TQDomNodePrivate* removeChild( TQDomNodePrivate* oldChild ); virtual TQDomNodePrivate* appendChild( TQDomNodePrivate* newChild ); @@ -219,8 +219,8 @@ public: TQDomNodePrivate* removeNamedItem( const TQString& name ); TQDomNodePrivate* item( int index ) const; uint length() const; - bool tqcontains( const TQString& name ) const; - bool tqcontainsNS( const TQString& nsURI, const TQString & localName ) const; + bool contains( const TQString& name ) const; + bool containsNS( const TQString& nsURI, const TQString & localName ) const; /** * Remove all tqchildren from the map. @@ -233,7 +233,7 @@ public: * If TRUE, then the node will redirect insert/remove calls * to its tqparent by calling TQDomNodePrivate::appendChild or removeChild. * In addition the map wont increase or decrease the reference count - * of the nodes it tqcontains. + * of the nodes it contains. * * By default this value is FALSE and the map will handle reference counting * by itself. @@ -265,7 +265,7 @@ public: TQDomNodePrivate* cloneNode( bool deep = TRUE ); TQDomNodePrivate* insertBefore( TQDomNodePrivate* newChild, TQDomNodePrivate* refChild ); TQDomNodePrivate* insertAfter( TQDomNodePrivate* newChild, TQDomNodePrivate* refChild ); - TQDomNodePrivate* tqreplaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ); + TQDomNodePrivate* replaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ); TQDomNodePrivate* removeChild( TQDomNodePrivate* oldChild ); TQDomNodePrivate* appendChild( TQDomNodePrivate* newChild ); @@ -307,7 +307,7 @@ public: void appendData( const TQString& arg ); void insertData( unsigned long offset, const TQString& arg ); void deleteData( unsigned long offset, unsigned long count ); - void tqreplaceData( unsigned long offset, unsigned long count, const TQString& arg ); + void replaceData( unsigned long offset, unsigned long count, const TQString& arg ); // Reimplemented from TQDomNodePrivate bool isCharacterData() { return TRUE; } @@ -1332,7 +1332,7 @@ TQDomNodePrivate* TQDomNodePrivate::insertAfter( TQDomNodePrivate* newChild, TQD return newChild; } -TQDomNodePrivate* TQDomNodePrivate::tqreplaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ) +TQDomNodePrivate* TQDomNodePrivate::replaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ) { if ( oldChild->tqparent() != this ) return 0; @@ -1541,7 +1541,7 @@ void TQDomNodePrivate::save( TQTextStream& s, int depth, int indent ) const Many functions in the DOM return a TQDomNode. - You can tqfind out the type of a node using isAttr(), + You can find out the type of a node using isAttr(), isCDATASection(), isDocumentFragment(), isDocument(), isDocumentType(), isElement(), isEntityReference(), isText(), isEntity(), isNotation(), isProcessingInstruction(), @@ -1561,15 +1561,15 @@ void TQDomNodePrivate::save( TQTextStream& s, int depth, int indent ) const independent (deep) copy of the node with cloneNode(). Nodes are inserted with insertBefore(), insertAfter() or - appendChild(). You can tqreplace one node with another using - tqreplaceChild() and remove a node with removeChild(). + appendChild(). You can replace one node with another using + replaceChild() and remove a node with removeChild(). To traverse nodes use firstChild() to get a node's first child (if any), and nextSibling() to traverse. TQDomNode also provides - lastChild(), previousSibling() and parentNode(). To tqfind the first + lastChild(), previousSibling() and parentNode(). To find the first child node with a particular node name use namedItem(). - To tqfind out if a node has tqchildren use hasChildNodes() and to get + To find out if a node has tqchildren use hasChildNodes() and to get a list of all of a node's tqchildren use childNodes(). The node's name and value (the meaning of which varies depending @@ -2086,7 +2086,7 @@ bool TQDomNode::hasAttributes() const Returns a new reference to \a newChild on success or a \link isNull() null node\endlink on failure. - \sa insertAfter() tqreplaceChild() removeChild() appendChild() + \sa insertAfter() replaceChild() removeChild() appendChild() */ TQDomNode TQDomNode::insertBefore( const TQDomNode& newChild, const TQDomNode& refChild ) { @@ -2116,7 +2116,7 @@ TQDomNode TQDomNode::insertBefore( const TQDomNode& newChild, const TQDomNode& r Returns a new reference to \a newChild on success or a \link isNull() null node\endlink on failure. - \sa insertBefore() tqreplaceChild() removeChild() appendChild() + \sa insertBefore() replaceChild() removeChild() appendChild() */ TQDomNode TQDomNode::insertAfter( const TQDomNode& newChild, const TQDomNode& refChild ) { @@ -2138,14 +2138,14 @@ TQDomNode TQDomNode::insertAfter( const TQDomNode& newChild, const TQDomNode& re position in the list of tqchildren is changed. If \a newChild is a TQDomDocumentFragment, then \a oldChild is - tqreplaced by all of the tqchildren of the fragment. + replaced by all of the tqchildren of the fragment. Returns a new reference to \a oldChild on success or a \link isNull() null node\endlink an failure. \sa insertBefore() insertAfter() removeChild() appendChild() */ -TQDomNode TQDomNode::tqreplaceChild( const TQDomNode& newChild, const TQDomNode& oldChild ) +TQDomNode TQDomNode::replaceChild( const TQDomNode& newChild, const TQDomNode& oldChild ) { if ( !impl ) { if (nodeType() == DocumentNode) @@ -2153,7 +2153,7 @@ TQDomNode TQDomNode::tqreplaceChild( const TQDomNode& newChild, const TQDomNode& else return TQDomNode(); } - return TQDomNode( IMPL->tqreplaceChild( newChild.impl, oldChild.impl ) ); + return TQDomNode( IMPL->replaceChild( newChild.impl, oldChild.impl ) ); } /*! @@ -2163,7 +2163,7 @@ TQDomNode TQDomNode::tqreplaceChild( const TQDomNode& newChild, const TQDomNode& Returns a new reference to \a oldChild on success or a \link isNull() null node\endlink on failure. - \sa insertBefore() insertAfter() tqreplaceChild() appendChild() + \sa insertBefore() insertAfter() replaceChild() appendChild() */ TQDomNode TQDomNode::removeChild( const TQDomNode& oldChild ) { @@ -2188,7 +2188,7 @@ TQDomNode TQDomNode::removeChild( const TQDomNode& oldChild ) Returns a new reference to \a newChild. - \sa insertBefore() insertAfter() tqreplaceChild() removeChild() + \sa insertBefore() insertAfter() replaceChild() removeChild() */ TQDomNode TQDomNode::appendChild( const TQDomNode& newChild ) { @@ -2621,12 +2621,12 @@ uint TQDomNamedNodeMapPrivate::length() const return map.count(); } -bool TQDomNamedNodeMapPrivate::tqcontains( const TQString& name ) const +bool TQDomNamedNodeMapPrivate::contains( const TQString& name ) const { return ( map[ name ] != 0 ); } -bool TQDomNamedNodeMapPrivate::tqcontainsNS( const TQString& nsURI, const TQString & localName ) const +bool TQDomNamedNodeMapPrivate::containsNS( const TQString& nsURI, const TQString & localName ) const { return ( namedItemNS( nsURI, localName ) != 0 ); } @@ -2642,7 +2642,7 @@ bool TQDomNamedNodeMapPrivate::tqcontainsNS( const TQString& nsURI, const TQStri /*! \class TQDomNamedNodeMap tqdom.h \reentrant - \brief The TQDomNamedNodeMap class tqcontains a collection of nodes + \brief The TQDomNamedNodeMap class contains a collection of nodes that can be accessed by name. \if defined(commercial) It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>. @@ -2672,7 +2672,7 @@ bool TQDomNamedNodeMapPrivate::tqcontainsNS( const TQString& nsURI, const TQStri returns. Nodes are retrieved using namedItem(), namedItemNS() or item(). New nodes are inserted with setNamedItem() or setNamedItemNS() and removed with removeNamedItem() or - removeNamedItemNS(). Use tqcontains() to see if an item with the + removeNamedItemNS(). Use contains() to see if an item with the given name is in the named node map. The number of items is returned by length(). @@ -2767,8 +2767,8 @@ TQDomNode TQDomNamedNodeMap::namedItem( const TQString& name ) const by the map is the node name of \a newNode as returned by TQDomNode::nodeName(). - If the new node tqreplaces an existing node, i.e. the map tqcontains a - node with the same name, the tqreplaced node is returned. + If the new node replaces an existing node, i.e. the map contains a + node with the same name, the replaced node is returned. \sa namedItem() removeNamedItem() setNamedItemNS() */ @@ -2829,8 +2829,8 @@ TQDomNode TQDomNamedNodeMap::namedItemNS( const TQString& nsURI, const TQString& /*! Inserts the node \a newNode in the map. If a node with the same namespace URI and the same local name already exists in the map, - it is tqreplaced by \a newNode. If the new node tqreplaces an existing - node, the tqreplaced node is returned. + it is replaced by \a newNode. If the new node replaces an existing + node, the replaced node is returned. \sa namedItemNS() removeNamedItemNS() setNamedItem() */ @@ -2883,14 +2883,14 @@ uint TQDomNamedNodeMap::length() const */ /*! - Returns TRUE if the map tqcontains a node called \a name; otherwise + Returns TRUE if the map contains a node called \a name; otherwise returns FALSE. */ -bool TQDomNamedNodeMap::tqcontains( const TQString& name ) const +bool TQDomNamedNodeMap::contains( const TQString& name ) const { if ( !impl ) return FALSE; - return IMPL->tqcontains( name ); + return IMPL->contains( name ); } #undef IMPL @@ -2977,10 +2977,10 @@ TQDomNodePrivate* TQDomDocumentTypePrivate::insertAfter( TQDomNodePrivate* newCh return p; } -TQDomNodePrivate* TQDomDocumentTypePrivate::tqreplaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ) +TQDomNodePrivate* TQDomDocumentTypePrivate::replaceChild( TQDomNodePrivate* newChild, TQDomNodePrivate* oldChild ) { // Call the origianl implementation - TQDomNodePrivate* p = TQDomNodePrivate::tqreplaceChild( newChild, oldChild ); + TQDomNodePrivate* p = TQDomNodePrivate::replaceChild( newChild, oldChild ); // Update the maps if ( p ) { if ( oldChild && oldChild->isEntity() ) @@ -3275,7 +3275,7 @@ TQDomNodePrivate* TQDomDocumentFragmentPrivate::cloneNode( bool deep) The most important feature of TQDomDocumentFragment is that it is treated in a special way by TQDomNode::insertAfter(), - TQDomNode::insertBefore(), TQDomNode::tqreplaceChild() and + TQDomNode::insertBefore(), TQDomNode::replaceChild() and TQDomNode::appendChild(): instead of inserting the fragment itself, all the fragment's tqchildren are inserted. */ @@ -3397,9 +3397,9 @@ void TQDomCharacterDataPrivate::deleteData( unsigned long offset, unsigned long value.remove( offset, n ); } -void TQDomCharacterDataPrivate::tqreplaceData( unsigned long offset, unsigned long n, const TQString& arg ) +void TQDomCharacterDataPrivate::replaceData( unsigned long offset, unsigned long n, const TQString& arg ) { - value.tqreplace( offset, n, arg ); + value.replace( offset, n, arg ); } void TQDomCharacterDataPrivate::appendData( const TQString& arg ) @@ -3434,7 +3434,7 @@ void TQDomCharacterDataPrivate::appendData( const TQString& arg ) You can retrieve a portion of the data string using substringData(). Extra data can be appended with appendData(), or inserted with insertData(). Portions of the data string can be - deleted with deleteData() or tqreplaced with tqreplaceData(). The + deleted with deleteData() or replaced with replaceData(). The length of the data string is returned by length(). The node type of the node containing this character data is @@ -3559,10 +3559,10 @@ void TQDomCharacterData::deleteData( unsigned long offset, unsigned long count ) Replaces the substring of length \a count starting at position \a offset with the string \a arg. */ -void TQDomCharacterData::tqreplaceData( unsigned long offset, unsigned long count, const TQString& arg ) +void TQDomCharacterData::replaceData( unsigned long offset, unsigned long count, const TQString& arg ) { if ( impl ) - IMPL->tqreplaceData( offset, count, arg ); + IMPL->replaceData( offset, count, arg ); } /*! @@ -3669,25 +3669,25 @@ static TQString encodeAttr( const TQString& str ) uint i = 0; while ( i < len ) { if ( tmp[(int)i] == '<' ) { - tmp.tqreplace( i, 1, "<" ); + tmp.replace( i, 1, "<" ); len += 3; i += 4; } else if ( tmp[(int)i] == '"' ) { - tmp.tqreplace( i, 1, """ ); + tmp.replace( i, 1, """ ); len += 5; i += 6; } else if ( tmp[(int)i] == '&' ) { - tmp.tqreplace( i, 1, "&" ); + tmp.replace( i, 1, "&" ); len += 4; i += 5; } else if ( tmp[(int)i] == '>' && i>=2 && tmp[(int)i-1]==']' && tmp[(int)i-2]==']' ) { - tmp.tqreplace( i, 1, ">" ); + tmp.replace( i, 1, ">" ); len += 3; i += 4; } else if (!isXmlChar(tmp[(int)i])) { TQString repl = "&#x" + TQString::number(tmp[(int)i].tqunicode(), 16) + ';'; qWarning("TQDom: saving invalid character %s, the document will not be well-formed", repl.latin1()); - tmp.tqreplace(i, 1, repl); + tmp.replace(i, 1, repl); len += repl.length() - 1; i += repl.length(); } else { @@ -4034,12 +4034,12 @@ TQDomAttrPrivate* TQDomElementPrivate::removeAttributeNode( TQDomAttrPrivate* ol bool TQDomElementPrivate::hasAttribute( const TQString& aname ) { - return m_attr->tqcontains( aname ); + return m_attr->contains( aname ); } bool TQDomElementPrivate::hasAttributeNS( const TQString& nsURI, const TQString& localName ) { - return m_attr->tqcontainsNS( nsURI, localName ); + return m_attr->containsNS( nsURI, localName ); } TQString TQDomElementPrivate::text() @@ -4146,8 +4146,8 @@ void TQDomElementPrivate::save( TQTextStream& s, int depth, int indent ) const //... TQString s = e.text() \endcode - The text() function operates recursively to tqfind the text (since - not all elements contain text). If you want to tqfind all the text + The text() function operates recursively to find the text (since + not all elements contain text). If you want to find all the text in all of a node's tqchildren, iterate over the tqchildren looking for TQDomText nodes, e.g. \code @@ -4271,7 +4271,7 @@ TQString TQDomElement::attribute( const TQString& name, const TQString& defValu /*! Adds an attribute called \a name with value \a value. If an - attribute with the same name exists, its value is tqreplaced by \a + attribute with the same name exists, its value is replaced by \a value. \sa attribute() setAttributeNode() setAttributeNS() @@ -4367,7 +4367,7 @@ TQDomAttr TQDomElement::attributeNode( const TQString& name) Adds the attribute \a newAttr to this element. If the element has another attribute that has the same name as \a - newAttr, this function tqreplaces that attribute and returns it; + newAttr, this function replaces that attribute and returns it; otherwise the function returns a \link TQDomNode::isNull() null attribute\endlink. @@ -4454,11 +4454,11 @@ TQString TQDomElement::attributeNS( const TQString nsURI, const TQString& localN Adds an attribute with the qualified name \a qName and the namespace URI \a nsURI with the value \a value. If an attribute with the same local name and namespace URI exists, its prefix is - tqreplaced by the prefix of \a qName and its value is repaced by \a + replaced by the prefix of \a qName and its value is repaced by \a value. Although \a qName is the qualified name, the local name is used to - decide if an existing attribute's value should be tqreplaced. + decide if an existing attribute's value should be replaced. \sa attributeNS() setAttributeNodeNS() setAttribute() */ @@ -4558,7 +4558,7 @@ TQDomAttr TQDomElement::attributeNodeNS( const TQString& nsURI, const TQString& Adds the attribute \a newAttr to this element. If the element has another attribute that has the same local name - and namespace URI as \a newAttr, this function tqreplaces that + and namespace URI as \a newAttr, this function replaces that attribute and returns it; otherwise the function returns a \link TQDomNode::isNull() null attribute\endlink. @@ -5261,20 +5261,20 @@ static TQCString encodeEntity( const TQCString& str ) const char* d = tmp.data(); while ( i < len ) { if ( d[i] == '%' ){ - tmp.tqreplace( i, 1, "<" ); + tmp.replace( i, 1, "<" ); d = tmp.data(); len += 4; i += 5; } else if ( d[i] == '"' ) { - tmp.tqreplace( i, 1, """ ); + tmp.replace( i, 1, """ ); d = tmp.data(); len += 4; i += 5; } else if ( d[i] == '&' && i + 1 < len && d[i+1] == '#' ) { // Dont encode < or " or &custom;. // Only encode character references - tmp.tqreplace( i, 1, "&" ); + tmp.replace( i, 1, "&" ); d = tmp.data(); len += 4; i += 5; @@ -5329,7 +5329,7 @@ void TQDomEntityPrivate::save( TQTextStream& s, int, int ) const DOM does not support editing entity nodes; if a user wants to make changes to the contents of an entity, every related - TQDomEntityReference node must be tqreplaced in the DOM tree by a + TQDomEntityReference node must be replaced in the DOM tree by a clone of the entity's contents, and then the desired changes must be made to each of the clones instead. All the descendents of an entity node are read-only. @@ -6060,7 +6060,7 @@ void TQDomDocumentPrivate::save( TQTextStream& s, int, int indent ) const Since elements, text nodes, comments, processing instructions, etc., cannot exist outside the context of a document, the document - class also tqcontains the factory functions needed to create these + class also contains the factory functions needed to create these objects. The node objects created have an ownerDocument() function which associates them with the document within whose context they were created. The DOM classes that will be used most often are @@ -6580,7 +6580,7 @@ TQDomEntityReference TQDomDocument::createEntityReference( const TQString& name } /*! - Returns a TQDomNodeList, that tqcontains all the elements in the + Returns a TQDomNodeList, that contains all the elements in the document with the name \a tagname. The order of the node list is the order they are encountered in a preorder traversal of the element tree. @@ -6655,7 +6655,7 @@ TQDomNodeList TQDomDocument::elementsByTagName( const TQString& tagname ) const \endtable \sa TQDomElement::setAttribute() TQDomNode::insertBefore() - TQDomNode::insertAfter() TQDomNode::tqreplaceChild() TQDomNode::removeChild() + TQDomNode::insertAfter() TQDomNode::replaceChild() TQDomNode::removeChild() TQDomNode::appendChild() */ TQDomNode TQDomDocument::importNode( const TQDomNode& importedNode, bool deep ) @@ -6698,7 +6698,7 @@ TQDomAttr TQDomDocument::createAttributeNS( const TQString& nsURI, const TQStrin } /*! - Returns a TQDomNodeList that tqcontains all the elements in the + Returns a TQDomNodeList that contains all the elements in the document with the local name \a localName and a namespace URI of \a nsURI. The order of the node list is the order they are encountered in a preorder traversal of the element tree. diff --git a/tqtinterface/qt4/src/xml/tqdom.h b/tqtinterface/qt4/src/xml/tqdom.h index f0cc43f..f73a823 100644 --- a/tqtinterface/qt4/src/xml/tqdom.h +++ b/tqtinterface/qt4/src/xml/tqdom.h @@ -153,7 +153,7 @@ public: // DOM functions virtual TQDomNode insertBefore( const TQDomNode& newChild, const TQDomNode& refChild ); virtual TQDomNode insertAfter( const TQDomNode& newChild, const TQDomNode& refChild ); - virtual TQDomNode tqreplaceChild( const TQDomNode& newChild, const TQDomNode& oldChild ); + virtual TQDomNode replaceChild( const TQDomNode& newChild, const TQDomNode& oldChild ); virtual TQDomNode removeChild( const TQDomNode& oldChild ); virtual TQDomNode appendChild( const TQDomNode& newChild ); virtual bool hasChildNodes() const; @@ -370,7 +370,7 @@ public: uint count() const { return length(); } // TQt API consitancy // TQt extension - bool tqcontains( const TQString& name ) const; + bool contains( const TQString& name ) const; private: TQDomNamedNodeMapPrivate* impl; @@ -413,7 +413,7 @@ public: virtual void appendData( const TQString& arg ); virtual void insertData( unsigned long offset, const TQString& arg ); virtual void deleteData( unsigned long offset, unsigned long count ); - virtual void tqreplaceData( unsigned long offset, unsigned long count, const TQString& arg ); + virtual void replaceData( unsigned long offset, unsigned long count, const TQString& arg ); // DOM read only attributes virtual uint length() const; diff --git a/tqtinterface/qt4/src/xml/tqsvgdevice.cpp b/tqtinterface/qt4/src/xml/tqsvgdevice.cpp index cda8c4f..3f3c863 100644 --- a/tqtinterface/qt4/src/xml/tqsvgdevice.cpp +++ b/tqtinterface/qt4/src/xml/tqsvgdevice.cpp @@ -193,7 +193,7 @@ bool TQSvgDevice::play( TQPainter *painter ) TQDomNode svg = doc.namedItem( "svg" ); if ( svg.isNull() || !svg.isElement() ) { - qWarning( "TQSvgDevice::play: Couldn't tqfind any svg element." ); + qWarning( "TQSvgDevice::play: Couldn't find any svg element." ); return FALSE; } @@ -206,9 +206,9 @@ bool TQSvgDevice::play( TQPainter *painter ) int y = lenToInt( attr, "y" ); brect.setX( x ); brect.setY( y ); - TQString wstr = attr.tqcontains( "width" ) + TQString wstr = attr.contains( "width" ) ? attr.namedItem( "width" ).nodeValue() : TQString( "100%" ); - TQString hstr = attr.tqcontains( "height" ) + TQString hstr = attr.contains( "height" ) ? attr.namedItem( "height" ).nodeValue() : TQString( "100%" ); double width = parseLen( wstr, 0, TRUE ); double height = parseLen( hstr, 0, FALSE ); @@ -217,7 +217,7 @@ bool TQSvgDevice::play( TQPainter *painter ) brect.setHeight( int(height) - y ); painter->setClipRect( brect, TQPainter::CoordPainter ); - if ( attr.tqcontains( "viewBox" ) ) { + if ( attr.contains( "viewBox" ) ) { TQRegExp re( TQString::tqfromLatin1("\\s*(\\S+)\\s*,?\\s*(\\S+)\\s*,?" "\\s*(\\S+)\\s*,?\\s*(\\S+)\\s*") ); if ( re.search( attr.namedItem( "viewBox" ).nodeValue() ) < 0 ) { @@ -809,10 +809,10 @@ bool TQSvgDevice::play( const TQDomNode &node ) pt->setPen( p ); } TQDomNamedNodeMap attr = node.attributes(); - if ( attr.tqcontains( "style" ) ) + if ( attr.contains( "style" ) ) setStyle( attr.namedItem( "style" ).nodeValue() ); // ### might have to exclude more elements from transform - if ( t != SvgElement && attr.tqcontains( "transform" ) ) + if ( t != SvgElement && attr.contains( "transform" ) ) setTransform( attr.namedItem( "transform" ).nodeValue() ); uint i = attr.length(); if ( i > 0 ) { @@ -842,8 +842,8 @@ bool TQSvgDevice::play( const TQDomNode &node ) h = lenToInt( attr, "height" ); if ( w == 0 || h == 0 ) // prevent div by zero below break; - x2 = (int)attr.tqcontains( "rx" ); // tiny abuse of x2 and y2 - y2 = (int)attr.tqcontains( "ry" ); + x2 = (int)attr.contains( "rx" ); // tiny abuse of x2 and y2 + y2 = (int)attr.contains( "ry" ); if ( x2 ) rx = lenToInt( attr, "rx" ); if ( y2 ) @@ -926,9 +926,9 @@ bool TQSvgDevice::play( const TQDomNode &node ) case TSpanElement: case TextElement: { - if ( attr.tqcontains( "x" ) ) + if ( attr.contains( "x" ) ) curr->textx = lenToInt( attr, "x" ); - if ( attr.tqcontains( "y" ) ) + if ( attr.contains( "y" ) ) curr->texty = lenToInt( attr, "y" ); if ( t == TSpanElement ) { curr->textx += lenToInt( attr, "dx" ); @@ -1081,11 +1081,11 @@ TQColor TQSvgDevice::parseColor( const TQString &col ) } // a keyword ? - if ( qSvgColMap->tqcontains ( col ) ) + if ( qSvgColMap->contains ( col ) ) return TQColor( (*qSvgColMap)[ col ] ); // in rgb(r,g,b) form ? TQString c = col; - c.tqreplace( TQRegExp( TQString::tqfromLatin1("\\s*") ), "" ); + c.replace( TQRegExp( TQString::tqfromLatin1("\\s*") ), "" ); TQRegExp reg( TQString::tqfromLatin1("^rgb\\((\\d+)(%?),(\\d+)(%?),(\\d+)(%?)\\)$") ); if ( reg.search( c ) >= 0 ) { int comp[3]; @@ -1161,7 +1161,7 @@ double TQSvgDevice::parseLen( const TQString &str, bool *ok, bool horiz ) const int TQSvgDevice::lenToInt( const TQDomNamedNodeMap &map, const TQString &attr, int def ) const { - if ( map.tqcontains( attr ) ) { + if ( map.contains( attr ) ) { bool ok; double dbl = parseLen( map.namedItem( attr ).nodeValue(), &ok ); if ( ok ) @@ -1173,7 +1173,7 @@ int TQSvgDevice::lenToInt( const TQDomNamedNodeMap &map, const TQString &attr, double TQSvgDevice::lenToDouble( const TQDomNamedNodeMap &map, const TQString &attr, int def ) const { - if ( map.tqcontains( attr ) ) { + if ( map.contains( attr ) ) { bool ok; double d = parseLen( map.namedItem( attr ).nodeValue(), &ok ); if ( ok ) @@ -1285,7 +1285,7 @@ void TQSvgDevice::setStyle( const TQString &s ) TQStringList::ConstIterator it = rules.begin(); for ( ; it != rules.end(); it++ ) { - int col = (*it).tqfind( ':' ); + int col = (*it).find( ':' ); if ( col > 0 ) { TQString prop = TQT_TQSTRING((*it).left( col )).simplifyWhiteSpace(); TQString val = (*it).right( (*it).length() - col - 1 ); @@ -1363,7 +1363,7 @@ void TQSvgDevice::drawPath( const TQString &data ) if ( ch.isSpace() ) continue; TQChar chUp = ch.upper(); - int cmd = commands.tqfind( chUp ); + int cmd = commands.find( chUp ); if ( cmd >= 0 ) { // switch to new command mode mode = cmd; diff --git a/tqtinterface/qt4/src/xml/tqxml.cpp b/tqtinterface/qt4/src/xml/tqxml.cpp index 9462b33..fa98822 100644 --- a/tqtinterface/qt4/src/xml/tqxml.cpp +++ b/tqtinterface/qt4/src/xml/tqxml.cpp @@ -173,7 +173,7 @@ static const signed char charLookupTable[256]={ /* This function strips the TextDecl [77] ("<?xml ...?>") from the string \a - str. The stripped version is stored in \a str. If this function tqfinds an + str. The stripped version is stored in \a str. If this function finds an invalid TextDecl, it returns FALSE, otherwise TRUE. This function is used for external entities since those can include an @@ -190,7 +190,7 @@ static bool stripTextDecl( TQString& str ) "(encoding\\s*=\\s*((['\"])[A-Za-z][-a-zA-Z0-9_.]*\\6))?" "\\s*\\?>" )); - TQString strTmp = str.tqreplace( textDecl, "" ); + TQString strTmp = str.replace( textDecl, "" ); if ( strTmp.length() != str.length() ) return FALSE; // external entity has wrong TextDecl str = strTmp; @@ -476,7 +476,7 @@ TQString TQXmlNamespaceSupport::uri( const TQString& prefix ) const void TQXmlNamespaceSupport::splitName( const TQString& qname, TQString& prefix, TQString& localname ) const { - int pos = qname.tqfind(':'); + int pos = qname.find(':'); if (pos == -1) pos = qname.length(); @@ -691,7 +691,7 @@ void TQXmlNamespaceSupport::reset() */ int TQXmlAttributes::index( const TQString& qName ) const { - return qnameList.tqfindIndex( qName ); + return qnameList.findIndex( qName ); } /*! @@ -908,10 +908,10 @@ void TQXmlAttributes::append( const TQString &qName, const TQString &uri, const class. This class recognizes the encoding of the data by reading the - encoding declaration in the XML file if it tqfinds one, and reading - the data using the corresponding encoding. If it does not tqfind an + encoding declaration in the XML file if it finds one, and reading + the data using the corresponding encoding. If it does not find an encoding declaration, then it assumes that the data is either in - UTF-8 or UTF-16, depending on whether it can tqfind a byte-order + UTF-8 or UTF-16, depending on whether it can find a byte-order mark. There are two ways to populate the input source with data: you can @@ -953,7 +953,7 @@ void TQXmlInputSource::init() } /*! - Constructs an input source which tqcontains no data. + Constructs an input source which contains no data. \sa setData() */ @@ -1048,7 +1048,7 @@ void TQXmlInputSource::reset() } /*! - Returns the data the input source tqcontains or TQString::null if the + Returns the data the input source contains or TQString::null if the input source does not contain any data. \sa setData() TQXmlInputSource() fetchData() @@ -1061,7 +1061,7 @@ TQString TQXmlInputSource::data() /*! Sets the data of the input source to \a dat. - If the input source already tqcontains data, this function deletes + If the input source already contains data, this function deletes that data first. \sa data() @@ -1091,7 +1091,7 @@ void TQXmlInputSource::setData( const TQByteArray& dat ) construction. If the input source already contained data, this function deletes that data first. - This object tqcontains no data after a call to this function if the + This object contains no data after a call to this function if the object was constructed without a tqdevice to read data from or if this function was not able to get more data from the tqdevice. @@ -1165,10 +1165,10 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning TQString input = encMapper->toUnicode( data.data(), data.size() ); // ### unexpected EOF? (for incremental parsing) // starts the document with an XML declaration? - if ( input.tqfind("<?xml") == 0 ) { - // try to tqfind out if there is an encoding - int endPos = input.tqfind( ">" ); - int pos = input.tqfind( "encoding" ); + if ( input.find("<?xml") == 0 ) { + // try to find out if there is an encoding + int endPos = input.find( ">" ); + int pos = input.find( "encoding" ); if ( pos < endPos && pos != -1 ) { TQString encoding; do { @@ -1302,7 +1302,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning The reader calls this function to signal the begin of a prefix-URI namespace mapping scope. This information is not necessary for normal namespace processing since the reader automatically - tqreplaces prefixes for element and attribute names. + replaces prefixes for element and attribute names. Note that startPrefixMapping() and endPrefixMapping() calls are not guaranteed to be properly nested relative to each other: all @@ -1350,8 +1350,8 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning cause a startElement() call to be immediately followed by an endElement() call. - The attribute list provided only tqcontains attributes with explicit - values. The attribute list tqcontains attributes used for namespace + The attribute list provided only contains attributes with explicit + values. The attribute list contains attributes used for namespace declaration (i.e. attributes starting with xmlns) only if the namespace-prefix property of the reader is TRUE. @@ -1575,7 +1575,7 @@ TQString TQXmlInputSource::fromRawData( const TQByteArray &data, bool beginning /*! \fn bool TQXmlDTDHandler::unparsedEntityDecl( const TQString& name, const TQString& publicId, const TQString& systemId, const TQString& notationName ) - The reader calls this function when it tqfinds an unparsed entity + The reader calls this function when it finds an unparsed entity declaration. The argument \a name is the unparsed entity's name, \a publicId is @@ -3537,7 +3537,7 @@ bool TQXmlSimpleReader::processElementEmptyTag() // call the handler for prefix mapping prefixesAfter = d->namespaceSupport.prefixes(); for ( TQStringList::Iterator it = prefixesBefore.begin(); it != prefixesBefore.end(); ++it ) { - if ( prefixesAfter.tqcontains(*it) == 0 ) { + if ( prefixesAfter.contains(*it) == 0 ) { if ( !contentHnd->endPrefixMapping( *it ) ) { reportParseError( contentHnd->errorString() ); return FALSE; @@ -3597,7 +3597,7 @@ bool TQXmlSimpleReader::processElementETagBegin2() prefixesAfter = d->namespaceSupport.d->ns; if (prefixesBefore.size() != prefixesAfter.size()) { for (NamespaceMap::const_iterator it = prefixesBefore.constBegin(); it != prefixesBefore.constEnd(); ++it) { - if (!it.key().isEmpty() && !prefixesAfter.tqcontains(it.key())) { + if (!it.key().isEmpty() && !prefixesAfter.contains(it.key())) { if (!contentHnd->endPrefixMapping(it.key())) { reportParseError(contentHnd->errorString()); return FALSE; @@ -4963,13 +4963,13 @@ bool TQXmlSimpleReader::parsePEReference() TQString xmlRefString; TQMap<TQString,TQString>::Iterator it; - it = d->parameterEntities.tqfind( ref() ); + it = d->parameterEntities.find( ref() ); if ( it != d->parameterEntities.end() ) { skipIt = FALSE; xmlRefString = it.data(); } else if ( entityRes ) { TQMap<TQString,TQXmlSimpleReaderPrivate::ExternParameterEntity>::Iterator it2; - it2 = d->externParameterEntities.tqfind( ref() ); + it2 = d->externParameterEntities.find( ref() ); TQXmlInputSource *ret = 0; if ( it2 != d->externParameterEntities.end() ) { if ( !entityRes->resolveEntity( it2.data().publicId, it2.data().systemId, ret ) ) { @@ -6666,8 +6666,8 @@ bool TQXmlSimpleReader::parseComment() of the attribute (i.e. all whitespaces are already parsed). The head stand on the next character after the end quotes. The - variable name tqcontains the name of the attribute and the variable - string tqcontains the value of the attribute. + variable name contains the name of the attribute and the variable + string contains the value of the attribute. */ bool TQXmlSimpleReader::parseAttribute() { @@ -6950,7 +6950,7 @@ bool TQXmlSimpleReader::parseNmtoken() parseReference_charDataRead is set to FALSE if the reference must be parsed. The charachter(s) which the reference mapped to are inserted at the reference - position. The head stands on the first character of the tqreplacement). + position. The head stands on the first character of the replacement). */ bool TQXmlSimpleReader::parseReference() { @@ -7115,7 +7115,7 @@ bool TQXmlSimpleReader::parseReference() whereby undefined entities in attribute values would be appended after the element that contained them. - The solution is not perfect - the undefined entity reference is tqreplaced by + The solution is not perfect - the undefined entity reference is replaced by an empty string. The propper fix will come in TQt4, when SAX will be extended so that attribute values can be made up of multiple tqchildren, rather than just a single string value. @@ -7178,7 +7178,7 @@ bool TQXmlSimpleReader::processReference() d->parseReference_charDataRead = TRUE; } else { TQMap<TQString,TQString>::Iterator it; - it = d->entities.tqfind( reference ); + it = d->entities.find( reference ); if ( it != d->entities.end() ) { // "Internal General" switch ( d->parseReference_context ) { @@ -7213,7 +7213,7 @@ bool TQXmlSimpleReader::processReference() } } else { TQMap<TQString,TQXmlSimpleReaderPrivate::ExternEntity>::Iterator itExtern; - itExtern = d->externEntities.tqfind( reference ); + itExtern = d->externEntities.find( reference ); if ( itExtern == d->externEntities.end() ) { // entity not declared // ### check this case for conformance @@ -7379,7 +7379,7 @@ bool TQXmlSimpleReader::insertXmlRef( const TQString &data, const TQString &name { if ( inLiteral ) { TQString tmp = data; - d->xmlRef.push( TQT_TQSTRING(tmp.tqreplace( "\"", """ )).tqreplace( "'", "'" ) ); + d->xmlRef.push( TQT_TQSTRING(tmp.replace( "\"", """ )).replace( "'", "'" ) ); } else { d->xmlRef.push( data ); } @@ -7509,10 +7509,10 @@ void TQXmlSimpleReader::initData() */ bool TQXmlSimpleReader::entityExist( const TQString& e ) const { - if ( d->parameterEntities.tqfind(e) == d->parameterEntities.end() && - d->externParameterEntities.tqfind(e) == d->externParameterEntities.end() && - d->externEntities.tqfind(e) == d->externEntities.end() && - d->entities.tqfind(e) == d->entities.end() ) { + if ( d->parameterEntities.find(e) == d->parameterEntities.end() && + d->externParameterEntities.find(e) == d->externParameterEntities.end() && + d->externEntities.find(e) == d->externEntities.end() && + d->entities.find(e) == d->entities.end() ) { return FALSE; } else { return TRUE; diff --git a/tqtinterface/qt4/tools/assistant/LICENSE.GPL b/tqtinterface/qt4/tools/assistant/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/assistant/LICENSE.GPL +++ b/tqtinterface/qt4/tools/assistant/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/assistant/assistant_de.ts b/tqtinterface/qt4/tools/assistant/assistant_de.ts index ed4c994..15b0b97 100644 --- a/tqtinterface/qt4/tools/assistant/assistant_de.ts +++ b/tqtinterface/qt4/tools/assistant/assistant_de.ts @@ -357,7 +357,7 @@ Der Assistent ist nicht einsatzbereit!</translation> <translation><b>Geben Sie Suchbegriffe ein.</b><p>Geben Sie hier die gesuchten Begriffe ein. Die Begriffe können Wildcards (*) enthalten. Eine Phrase muß in Anführungszeichen stehen.</p></translation> </message> <message> - <source><b>Found documents</b><p>This list tqcontains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></source> + <source><b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></source> <translation><b>Gefundene Dokumente</b><p>Diese Liste beinhaltet alle gefundenen Dokumente der letzten Suche. Die Dokumente sind nach der Häufigkeit der Treffer geordnet.</p></translation> </message> <message> @@ -777,11 +777,11 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.</translati </message> <message> <source>Find &Next</source> - <translation>&Nächste tqfinden</translation> + <translation>&Nächste finden</translation> </message> <message> <source>Find Next</source> - <translation>Nächste tqfinden</translation> + <translation>Nächste finden</translation> </message> <message> <source>F3</source> @@ -789,11 +789,11 @@ Bitte überprüfen Sie, das dieser an der angegeben Stelle existiert.</translati </message> <message> <source>Find &Previous</source> - <translation>&Vorigen tqfinden</translation> + <translation>&Vorigen finden</translation> </message> <message> <source>Find Previous</source> - <translation>Vorigen tqfinden</translation> + <translation>Vorigen finden</translation> </message> <message> <source>Shift+F3</source> diff --git a/tqtinterface/qt4/tools/assistant/book/assistant.leaf b/tqtinterface/qt4/tools/assistant/book/assistant.leaf index e978b03..57bab4c 100644 --- a/tqtinterface/qt4/tools/assistant/book/assistant.leaf +++ b/tqtinterface/qt4/tools/assistant/book/assistant.leaf @@ -56,8 +56,8 @@ in which it appears. \endlist -No matter where you tqfind yourself in the Qt documentation, you will -tqfind extensive cross-referencing. Even snippets of example code +No matter where you find yourself in the Qt documentation, you will +find extensive cross-referencing. Even snippets of example code contain clickable links, so that for example, if you come across a class declaration in a code example, the class name will be a clickable link to the class's documentation. @@ -99,10 +99,10 @@ To perform an index search, click the \Toolbutton Index tab on the Sidebar beneath the line edit. If the highlighted text matches what you're looking for, double click it, (or press \Key Enter) and the documentation window will display the relevant page. You rarely have -to type in the whole word before \QA tqfinds a match. Note that for some +to type in the whole word before \QA finds a match. Note that for some words there may be more than one possible page that is relevant. -\QA also provides full text searching for tqfinding specific words in +\QA also provides full text searching for finding specific words in the documentation. Documents with the highest occurrences of the word that you are looking for appear first, and every occurrence of the word within the documentation is highlighted. @@ -272,8 +272,8 @@ options and can be used to print the current page. \section2 The Find Text Dialog -This dialog is used to tqfind text in the current page. Enter the text -you want to tqfind in the Find line edit. If you check the 'Whole words +This dialog is used to find text in the current page. Enter the text +you want to find in the Find line edit. If you check the 'Whole words only' checkbox, the search will only consider whole words, i.e. if you search for 'spin' with this checkbox checked it will not match 'spinbox', but will match 'spin'. If you check the 'Case sensitive' @@ -311,12 +311,12 @@ Some pages contain links to external web pages. In order to display these links, you must specify a web browser. Type the name of your browser's executable in the Web Browser Application line edit. Alternatively, click the \Button {(ellipsis)} button to invoke the -\Widget {Set Web Browser} dialog and navigate until you tqfind the web +\Widget {Set Web Browser} dialog and navigate until you find the web browser you want to use. Click \Button {Save} to accept the selection. To change \QA's default home page, enter the file name in the Home Page line edit. Alternatively, click the \Button {(ellipsis)} button -to invoke the \Widget {Set Homepage} dialog. Navigate until you tqfind +to invoke the \Widget {Set Homepage} dialog. Navigate until you find the home page file you want to use and then click \Button {Save} to accept the selection. @@ -328,7 +328,7 @@ Some pages contain links to PDF documents. In order to display these links, you must specify a PDF viewer. Type in the name of your PDF viewer's executable in the line edit. Alternatively, click the \Button {(ellipsis)} button to invoke the \Widget {Set PDF Browser} dialog and navigate -until you tqfind the PDF viewer you want to use. Click \Button Save to +until you find the PDF viewer you want to use. Click \Button Save to accept the selection. \chapter Full Text Searching @@ -375,7 +375,7 @@ startup page, and application icon. When it is started without any options, \QA displays a default set of documentation. When Qt is installed, the default documentation set in -\QA tqcontains the Qt reference documentation as well as the tools that +\QA contains the Qt reference documentation as well as the tools that come with Qt, such as \QD and qmake. Documentation can be added or removed from \QA by @@ -473,7 +473,7 @@ location of the profile. The property name is \c applicationicon \i Start Page- This property specifies which page \QA should initially display when the profile is used. Usually, this is the HTML file which -tqcontains the documentation's table of contents. This property also +contains the documentation's table of contents. This property also describes the default location to go to when pressing the home button in \QA's main user interface. The start page is specified relative to the location of the profile. The property name is \c startpage @@ -551,7 +551,7 @@ on how to use \QA with profiles for your own applications. When distributing \QA with your application, you will also need to copy the icon files from the \c QTDIR/tools/assistant/images -directory so that \QA tqfinds its icons. +directory so that \QA finds its icons. \omit For small documentation sets, the sidebar may not be necessary. You diff --git a/tqtinterface/qt4/tools/assistant/config.cpp b/tqtinterface/qt4/tools/assistant/config.cpp index 56ac848..1cbccbc 100644 --- a/tqtinterface/qt4/tools/assistant/config.cpp +++ b/tqtinterface/qt4/tools/assistant/config.cpp @@ -285,13 +285,13 @@ TQStringList Config::mimePaths() // Mime source for .dcf file path TQFileInfo info( *it ); TQString dcfPath = info.dirPath(TRUE); - if (lst.tqcontains(dcfPath) == 0) + if (lst.contains(dcfPath) == 0) lst << dcfPath; // Image dir for .dcf TQString imgDir = TQDir::convertSeparators( dcfPath + TQDir::separator() + profil->imageDirs[it.key()] ); - if (lst.tqcontains(imgDir) == 0) + if (lst.contains(imgDir) == 0) lst << imgDir; } return lst; diff --git a/tqtinterface/qt4/tools/assistant/docuparser.cpp b/tqtinterface/qt4/tools/assistant/docuparser.cpp index f1c2f01..a64fb47 100644 --- a/tqtinterface/qt4/tools/assistant/docuparser.cpp +++ b/tqtinterface/qt4/tools/assistant/docuparser.cpp @@ -339,7 +339,7 @@ bool DocuParser320::endElement( const TQString &nameSpace, { static const TQStringList lst = TQStringList() << "startpage" << "abouturl" << "applicationicon" << "assistantdocs"; - if (lst.tqcontains(propertyName)) + if (lst.contains(propertyName)) propertyValue = absolutify( propertyValue ); } prof->addProperty( propertyName, propertyValue ); diff --git a/tqtinterface/qt4/tools/assistant/finddialog.ui b/tqtinterface/qt4/tools/assistant/finddialog.ui index 56fd582..c34ceae 100644 --- a/tqtinterface/qt4/tools/assistant/finddialog.ui +++ b/tqtinterface/qt4/tools/assistant/finddialog.ui @@ -274,7 +274,7 @@ <variables> <variable>TQStatusBar *sb;</variable> <variable>bool onceFound;</variable> - <variable>TQString tqfindExpr;</variable> + <variable>TQString findExpr;</variable> <variable>TQTextBrowser *lastBrowser;</variable> </variables> <Q_SLOTS> diff --git a/tqtinterface/qt4/tools/assistant/finddialog.ui.h b/tqtinterface/qt4/tools/assistant/finddialog.ui.h index dc10393..9204cd7 100644 --- a/tqtinterface/qt4/tools/assistant/finddialog.ui.h +++ b/tqtinterface/qt4/tools/assistant/finddialog.ui.h @@ -37,7 +37,7 @@ void FindDialog::init() { lastBrowser = 0; onceFound = FALSE; - tqfindExpr = ""; + findExpr = ""; sb = new TQStatusBar( this ); FindDialogLayout->addWidget( sb ); sb->message( tr( "Enter the text you are looking for." ) ); @@ -57,18 +57,18 @@ void FindDialog::doFind(bool forward) TQTextBrowser *browser = (TQTextBrowser*) mainWindow()->browsers()->currentBrowser(); sb->clear(); - if (comboFind->currentText() != tqfindExpr || lastBrowser != browser) + if (comboFind->currentText() != findExpr || lastBrowser != browser) onceFound = false; - tqfindExpr = comboFind->currentText(); + findExpr = comboFind->currentText(); bool found; if (browser->hasSelectedText()) { // Search either forward or backward from cursor. - found = browser->tqfind(tqfindExpr, checkCase->isChecked(), checkWords->isChecked(), + found = browser->find(findExpr, checkCase->isChecked(), checkWords->isChecked(), forward); } else { int para = forward ? 0 : INT_MAX; int index = forward ? 0 : INT_MAX; - found = browser->tqfind(tqfindExpr, checkCase->isChecked(), checkWords->isChecked(), + found = browser->find(findExpr, checkCase->isChecked(), checkWords->isChecked(), forward, ¶, &index); } @@ -95,7 +95,7 @@ MainWindow* FindDialog::mainWindow() bool FindDialog::hasFindExpression() { - return !tqfindExpr.isEmpty(); + return !findExpr.isEmpty(); } void FindDialog::statusMessage(const TQString &message) diff --git a/tqtinterface/qt4/tools/assistant/helpdialog.ui b/tqtinterface/qt4/tools/assistant/helpdialog.ui index 3f61572..e81008f 100644 --- a/tqtinterface/qt4/tools/assistant/helpdialog.ui +++ b/tqtinterface/qt4/tools/assistant/helpdialog.ui @@ -317,7 +317,7 @@ <cstring>resultBox</cstring> </property> <property name="whatsThis" stdset="0"> - <string><b>Found documents</b><p>This list tqcontains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></string> + <string><b>Found documents</b><p>This list contains all found documents from the last search. The documents are ordered, i.e. the first document has the most matches.</p></string> </property> </widget> <widget class="TQLabel" row="4" column="0"> diff --git a/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp b/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp index b608d51..8c2e0df 100644 --- a/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp +++ b/tqtinterface/qt4/tools/assistant/helpdialogimpl.cpp @@ -71,7 +71,7 @@ static TQString stripAmpersand( const TQString &str ) { TQString s( str ); - s = s.tqreplace( '&', "" ); + s = s.replace( '&', "" ); return s; } @@ -138,7 +138,7 @@ HelpNavigationListItem::HelpNavigationListItem( TQListBox *ls, const TQString &t void HelpNavigationListItem::addLink( const TQString &link ) { - int hash = link.tqfind( '#' ); + int hash = link.find( '#' ); if ( hash == -1 ) { linkList << link; return; @@ -364,10 +364,10 @@ void HelpDialog::loadIndexFile() lastKeyword = (*it).keyword; TQString lnk = (*it).link; - int i = lnk.tqfindRev('#'); + int i = lnk.findRev('#'); if ( i > -1 ) lnk = lnk.left( i ); - if (!keywordDocuments.tqcontains(lnk)) + if (!keywordDocuments.contains(lnk)) keywordDocuments.append(lnk); } framePrepare->hide(); @@ -569,13 +569,13 @@ void HelpDialog::buildContentDict() void HelpDialog::currentTabChanged( const TQString &s ) { - if ( stripAmpersand( s ).tqcontains( tr( "Index" ) ) ) + if ( stripAmpersand( s ).contains( tr( "Index" ) ) ) TQTimer::singleShot( 0, this, TQT_SLOT( loadIndexFile() ) ); - else if ( stripAmpersand( s ).tqcontains( tr( "Bookmarks" ) ) ) + else if ( stripAmpersand( s ).contains( tr( "Bookmarks" ) ) ) insertBookmarks(); - else if ( stripAmpersand( s ).tqcontains( tr( "Contents" ) ) ) + else if ( stripAmpersand( s ).contains( tr( "Contents" ) ) ) TQTimer::singleShot( 0, this, TQT_SLOT( insertContents() ) ); - else if ( stripAmpersand( s ).tqcontains( tr( "Search" ) ) ) + else if ( stripAmpersand( s ).contains( tr( "Search" ) ) ) TQTimer::singleShot( 0, this, TQT_SLOT( setupFullTextIndex() ) ); } @@ -614,11 +614,11 @@ void HelpDialog::showTopic( TQListViewItem *item ) void HelpDialog::showTopic() { - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Index" ) ) ) + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Index" ) ) ) showIndexTopic(); - else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Bookmarks" ) ) ) + else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Bookmarks" ) ) ) showBookmarkTopic(); - else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Contents" ) ) ) + else if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Contents" ) ) ) showContentsTopic(); } @@ -671,7 +671,7 @@ void HelpDialog::searchInIndex( const TQString &s ) TQString HelpDialog::titleOfLink( const TQString &link ) { TQString s( link ); - s.remove( s.tqfind( '#' ), s.length() ); + s.remove( s.find( '#' ), s.length() ); s = titleMap[ s ]; if ( s.isEmpty() ) return link; @@ -944,16 +944,16 @@ void HelpDialog::setupFullTextIndex() TQString documentName; for ( ; it != titleMap.end(); ++it ) { documentName = it.key(); - int i = documentName.tqfindRev('#'); + int i = documentName.findRev('#'); if ( i > -1 ) documentName = documentName.left( i ); - if (!documentList.tqcontains(documentName)) + if (!documentList.contains(documentName)) documentList << documentName; } loadIndexFile(); for (TQStringList::Iterator it2 = keywordDocuments.begin(); it2 != keywordDocuments.end(); ++it2) { - if (!documentList.tqcontains(*it2)) + if (!documentList.contains(*it2)) documentList << *it2; } fullTextIndex->setDocList( documentList ); @@ -996,11 +996,11 @@ void HelpDialog::setIndexingProgress( int prog ) void HelpDialog::startSearch() { TQString str = termsEdit->text(); - str = str.tqreplace( "\'", "\"" ); - str = str.tqreplace( "`", "\"" ); + str = str.replace( "\'", "\"" ); + str = str.replace( "`", "\"" ); TQString buf = str; - str = str.tqreplace( "-", " " ); - str = str.tqreplace( TQRegExp( "\\s[\\S]?\\s" ), " " ); + str = str.replace( "-", " " ); + str = str.replace( TQRegExp( "\\s[\\S]?\\s" ), " " ); terms = TQStringList::split( " ", str ); TQStringList termSeq; TQStringList seqWords; @@ -1008,28 +1008,28 @@ void HelpDialog::startSearch() for ( ; it != terms.end(); ++it ) { (*it) = (*it).simplifyWhiteSpace(); (*it) = (*it).lower(); - (*it) = (*it).tqreplace( "\"", "" ); + (*it) = (*it).replace( "\"", "" ); } - if ( str.tqcontains( '\"' ) ) { - if ( (str.tqcontains( '\"' ))%2 == 0 ) { + if ( str.contains( '\"' ) ) { + if ( (str.contains( '\"' ))%2 == 0 ) { int beg = 0; int end = 0; TQString s; - beg = str.tqfind( '\"', beg ); + beg = str.find( '\"', beg ); while ( beg != -1 ) { beg++; - end = str.tqfind( '\"', beg ); + end = str.find( '\"', beg ); s = str.mid( beg, end - beg ); s = s.lower(); s = s.simplifyWhiteSpace(); - if ( s.tqcontains( '*' ) ) { + if ( s.contains( '*' ) ) { TQMessageBox::warning( this, tr( "Full Text Search" ), tr( "Using a wildcard within phrases is not allowed." ) ); return; } seqWords += TQStringList::split( ' ', s ); termSeq << s; - beg = str.tqfind( '\"', end + 1); + beg = str.find( '\"', end + 1); } } else { TQMessageBox::warning( this, tr( "Full Text Search" ), @@ -1095,14 +1095,14 @@ void HelpDialog::showItemMenu( TQListBoxItem *item, const TQPoint &pos ) return; int id = itemPopup->exec( pos ); if ( id == 0 ) { - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Index" ) ) ) + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Index" ) ) ) showTopic(); else { showResultPage( item ); } } else if ( id > 0 ) { HelpWindow *hw = help->browsers()->currentBrowser(); - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Index" ) ) ) { + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Index" ) ) ) { editIndex->blockSignals( TRUE ); editIndex->setText( item->text() ); editIndex->blockSignals( FALSE ); @@ -1147,7 +1147,7 @@ void HelpDialog::showItemMenu( TQListViewItem *item, const TQPoint &pos ) return; int id = itemPopup->exec( pos ); if ( id == 0 ) { - if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).tqcontains( tr( "Contents" ) ) ) + if ( stripAmpersand( tabWidget->tabLabel( tabWidget->currentPage() ) ).contains( tr( "Contents" ) ) ) showContentsTopic(); else showBookmarkTopic(); diff --git a/tqtinterface/qt4/tools/assistant/helpwindow.cpp b/tqtinterface/qt4/tools/assistant/helpwindow.cpp index 7a57028..25d774d 100644 --- a/tqtinterface/qt4/tools/assistant/helpwindow.cpp +++ b/tqtinterface/qt4/tools/assistant/helpwindow.cpp @@ -202,7 +202,7 @@ TQPopupMenu *HelpWindow::createPopupMenu( const TQPoint& pos ) if ( !lastAnchor.isEmpty() ) { if ( lastAnchor.at( 0 ) == '#' ) { TQString src = source(); - int hsh = src.tqfind( '#' ); + int hsh = src.find( '#' ); lastAnchor = ( hsh>=0 ? src.left( hsh ) : src ) + lastAnchor; } m->insertItem( tr("Open Link in New Window\tShift+LMB"), @@ -257,11 +257,11 @@ void HelpWindow::copy() TQt::TextFormat oldTf = textFormat(); setTextFormat(TQt::PlainText); TQString selectText = selectedText(); - selectText.tqreplace("<br>", "\n"); - selectText.tqreplace("\xa0", " "); - selectText.tqreplace(">", ">"); - selectText.tqreplace("<", "<"); - selectText.tqreplace("&", "&"); + selectText.replace("<br>", "\n"); + selectText.replace("\xa0", " "); + selectText.replace(">", ">"); + selectText.replace("<", "<"); + selectText.replace("&", "&"); TQClipboard *cb = TQApplication::tqclipboard(); if (cb->supportsSelection()) diff --git a/tqtinterface/qt4/tools/assistant/index.cpp b/tqtinterface/qt4/tools/assistant/index.cpp index 41e582f..7ed1a4f 100644 --- a/tqtinterface/qt4/tools/assistant/index.cpp +++ b/tqtinterface/qt4/tools/assistant/index.cpp @@ -266,7 +266,7 @@ TQStringList Index::query( const TQStringList &terms, const TQStringList &termSe TQStringList::ConstIterator it = terms.begin(); for ( it = terms.begin(); it != terms.end(); ++it ) { Entry *e = 0; - if ( (*it).tqcontains( '*' ) ) { + if ( (*it).contains( '*' ) ) { TQValueList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) ); termList.append( new Term( "dummy", wcts.count(), wcts ) ); } else if ( dict[ *it ] ) { @@ -333,8 +333,8 @@ TQString Index::getDocumentTitle( const TQString &fileName ) TQTextStream s( &file ); TQString text = s.read(); - int start = text.tqfind( "<title>", 0, FALSE ) + 7; - int end = text.tqfind( "</title>", 0, FALSE ); + int start = text.find( "<title>", 0, FALSE ) + 7; + int end = text.find( "</title>", 0, FALSE ); TQString title = ( end - start <= 0 ? tr("Untitled") : text.mid( start, end - start ) ); return title; @@ -360,9 +360,9 @@ TQStringList Index::getWildcardTerms( const TQString &term ) found = FALSE; break; } - index = text.tqfind( *iter, index ); + index = text.find( *iter, index ); if ( *iter == terms.last() && index != (int)text.length()-1 ) { - index = text.tqfindRev( *iter ); + index = text.findRev( *iter ); if ( index != (int)text.length() - (int)(*iter).length() ) { found = FALSE; break; @@ -388,7 +388,7 @@ TQStringList Index::split( const TQString &str ) { TQStringList lst; int j = 0; - int i = str.tqfind( '*', j ); + int i = str.find( '*', j ); while ( i != -1 ) { if ( i > j && i <= (int)str.length() ) { @@ -396,7 +396,7 @@ TQStringList Index::split( const TQString &str ) lst << "*"; } j = i + 1; - i = str.tqfind( '*', j ); + i = str.find( '*', j ); } int l = str.length() - 1; @@ -431,7 +431,7 @@ TQValueList<Document> Index::setupDummyTerm( const TQStringList &terms ) while ( t ) { TQValueList<Document> docs = t->documents; for ( docIt = docs.begin(); docIt != docs.end(); ++docIt ) { - if ( maxList.tqfindIndex( *docIt ) == -1 ) + if ( maxList.findIndex( *docIt ) == -1 ) maxList.append( *docIt ); } t = termList.next(); @@ -511,7 +511,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & b = miniDict[ wordLst[j] ]->positions; aIt = a.begin(); while ( aIt != a.end() ) { - if ( b.tqfind( *aIt + 1 ) != b.end() ) { + if ( b.find( *aIt + 1 ) != b.end() ) { (*aIt)++; ++aIt; } else { diff --git a/tqtinterface/qt4/tools/assistant/main.cpp b/tqtinterface/qt4/tools/assistant/main.cpp index 42b5819..8b60a9e 100644 --- a/tqtinterface/qt4/tools/assistant/main.cpp +++ b/tqtinterface/qt4/tools/assistant/main.cpp @@ -107,8 +107,8 @@ void AssistantSocket::readClient() while ( canReadLine() ) link = readLine(); if ( !link.isNull() ) { - link = link.tqreplace( "\n", "" ); - link = link.tqreplace( "\r", "" ); + link = link.replace( "\n", "" ); + link = link.replace( "\r", "" ); emit showLinkRequest( link ); } } diff --git a/tqtinterface/qt4/tools/assistant/mainwindow.ui b/tqtinterface/qt4/tools/assistant/mainwindow.ui index d3dbdab..3074838 100644 --- a/tqtinterface/qt4/tools/assistant/mainwindow.ui +++ b/tqtinterface/qt4/tools/assistant/mainwindow.ui @@ -512,19 +512,19 @@ <sender>actionEditFind</sender> <signal>activated()</signal> <receiver>MainWindow</receiver> - <slot>tqfind()</slot> + <slot>find()</slot> </connection> <connection> <sender>actionEditFindAgain</sender> <signal>activated()</signal> <receiver>MainWindow</receiver> - <slot>tqfindAgain()</slot> + <slot>findAgain()</slot> </connection> <connection> <sender>actionEditFindAgainPrev</sender> <signal>activated()</signal> <receiver>MainWindow</receiver> - <slot>tqfindAgainPrev()</slot> + <slot>findAgainPrev()</slot> </connection> <connection> <sender>actionFilePrint</sender> @@ -618,7 +618,7 @@ <variable>TQMap<int, TQString> bookmarks;</variable> <variable>HelpDialog *helpDock;</variable> <variable>TQDockWindow *dw;</variable> - <variable>TQGuardedPtr<FindDialog> tqfindDialog;</variable> + <variable>TQGuardedPtr<FindDialog> findDialog;</variable> <variable>static TQPtrList<MainWindow> *windows;</variable> <variable>TQMap<TQAction*,TQString> *goActionDocFiles;</variable> <variable>TQStringList pendingLinks;</variable> @@ -630,9 +630,9 @@ <slot>destroy()</slot> <slot>about()</slot> <slot>aboutApplication()</slot> - <slot>tqfind()</slot> - <slot>tqfindAgain()</slot> - <slot>tqfindAgainPrev()</slot> + <slot>find()</slot> + <slot>findAgain()</slot> + <slot>findAgainPrev()</slot> <slot>goHome()</slot> <slot>print()</slot> <slot>updateBookmarkMenu()</slot> diff --git a/tqtinterface/qt4/tools/assistant/mainwindow.ui.h b/tqtinterface/qt4/tools/assistant/mainwindow.ui.h index cb079aa..68fcb95 100644 --- a/tqtinterface/qt4/tools/assistant/mainwindow.ui.h +++ b/tqtinterface/qt4/tools/assistant/mainwindow.ui.h @@ -293,32 +293,32 @@ void MainWindow::aboutApplication() box.exec(); } -void MainWindow::tqfind() +void MainWindow::find() { - if ( !tqfindDialog ) - tqfindDialog = new FindDialog( this ); - tqfindDialog->comboFind->setFocus(); - tqfindDialog->comboFind->lineEdit()->setSelection( - 0, tqfindDialog->comboFind->lineEdit()->text().length() ); - tqfindDialog->show(); + if ( !findDialog ) + findDialog = new FindDialog( this ); + findDialog->comboFind->setFocus(); + findDialog->comboFind->lineEdit()->setSelection( + 0, findDialog->comboFind->lineEdit()->text().length() ); + findDialog->show(); } -void MainWindow::tqfindAgain() +void MainWindow::findAgain() { - if (!tqfindDialog || !tqfindDialog->hasFindExpression()) { - tqfind(); + if (!findDialog || !findDialog->hasFindExpression()) { + find(); return; } - tqfindDialog->doFind(TRUE); + findDialog->doFind(TRUE); } -void MainWindow::tqfindAgainPrev() +void MainWindow::findAgainPrev() { - if (!tqfindDialog || !tqfindDialog->hasFindExpression()) { - tqfind(); + if (!findDialog || !findDialog->hasFindExpression()) { + find(); return; } - tqfindDialog->doFind(FALSE); + findDialog->doFind(FALSE); } void MainWindow::goHome() @@ -397,8 +397,8 @@ void MainWindow::setupBookmarkMenu() void MainWindow::showBookmark( int id ) { - if ( bookmarks.tqfind( id ) != bookmarks.end() ) - showLink( *bookmarks.tqfind( id ) ); + if ( bookmarks.find( id ) != bookmarks.end() ) + showLink( *bookmarks.find( id ) ); } void MainWindow::showLinkFromClient( const TQString &link ) @@ -415,14 +415,14 @@ void MainWindow::showLink( const TQString &link ) qWarning( "The link is empty!" ); } - int tqfind = link.tqfind( '#' ); - TQString name = tqfind >= 0 ? link.left( tqfind ) : link; + int find = link.find( '#' ); + TQString name = find >= 0 ? link.left( find ) : link; TQString absLink = link; TQFileInfo fi( name ); if ( fi.isRelative() ) { - if ( tqfind >= 0 ) - absLink = fi.absFilePath() + link.right( link.length() - tqfind ); + if ( find >= 0 ) + absLink = fi.absFilePath() + link.right( link.length() - find ); else absLink = fi.absFilePath(); } @@ -626,14 +626,14 @@ void MainWindow::showSearchLink( const TQString &link, const TQStringList &terms for ( ; it != terms.end(); ++it ) { int para = 0; int index = 0; - bool found = hw->tqfind( *it, FALSE, TRUE, TRUE, ¶, &index ); + bool found = hw->find( *it, FALSE, TRUE, TRUE, ¶, &index ); while ( found ) { if ( para < minPar ) { minPar = para; minIndex = index; } hw->setColor( Qt::red ); - found = hw->tqfind( *it, FALSE, TRUE, TRUE ); + found = hw->find( *it, FALSE, TRUE, TRUE ); } } hw->blockScrolling( FALSE ); @@ -651,7 +651,7 @@ void MainWindow::showGoActionLink() return; TQAction *action = (TQAction*) origin; - TQString docfile = *( goActionDocFiles->tqfind( action ) ); + TQString docfile = *( goActionDocFiles->find( action ) ); showLink( docfile ); } diff --git a/tqtinterface/qt4/tools/assistant/profile.h b/tqtinterface/qt4/tools/assistant/profile.h index f8482c7..91b0904 100644 --- a/tqtinterface/qt4/tools/assistant/profile.h +++ b/tqtinterface/qt4/tools/assistant/profile.h @@ -88,13 +88,13 @@ inline void Profile::addDCFTitle(const TQString &dcf, const TQString &title) { TQString absdcf = TQFileInfo(dcf).absFilePath(); dcfTitles[title] = absdcf; - if (docs.tqcontains(absdcf) == 0) + if (docs.contains(absdcf) == 0) docs << absdcf; } inline void Profile::addDCF( const TQString &docfile ) { - if( !docs.tqcontains( docfile ) == 0 ) + if( !docs.contains( docfile ) == 0 ) docs << docfile; } @@ -124,7 +124,7 @@ inline void Profile::addProperty( const TQString &name, inline bool Profile::hasDocFile( const TQString &name ) { - return docs.tqcontains( name ) > 0; + return docs.contains( name ) > 0; } #endif diff --git a/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp b/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp index 4cad976..daeedc5 100644 --- a/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp +++ b/tqtinterface/qt4/tools/assistant/topicchooserimpl.cpp @@ -54,7 +54,7 @@ TQString TopicChooser::link() const TQString s = listbox->currentText(); if ( s.isEmpty() ) return s; - int i = linkNames.tqfindIndex( s ); + int i = linkNames.findIndex( s ); return links[ i ]; } diff --git a/tqtinterface/qt4/tools/designer/LICENSE.GPL b/tqtinterface/qt4/tools/designer/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/designer/LICENSE.GPL +++ b/tqtinterface/qt4/tools/designer/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp index d52fad4..605a264 100644 --- a/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp +++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.cpp @@ -244,7 +244,7 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw ) indicator->hide(); installEventFilter( this ); widgetInserting = FALSE; - tqfindFormWindow(); + findFormWindow(); mw->setDockEnabled( TQt::DockTornOff, FALSE ); } @@ -259,11 +259,11 @@ TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, TQt::Dock dock ) MetaDataBase::addEntry( this ); installEventFilter( this ); widgetInserting = FALSE; - tqfindFormWindow(); + findFormWindow(); mw->setDockEnabled( TQt::DockTornOff, FALSE ); } -void TQDesignerToolBar::tqfindFormWindow() +void TQDesignerToolBar::findFormWindow() { TQWidget *w = this; while ( w ) { @@ -395,7 +395,7 @@ void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w ) { if ( widgetInserting ) doInsertWidget( mapFromGlobal( e->globalPos() ) ); - else if ( w->isWidgetType() && formWindow->widgets()->tqfind( w ) ) { + else if ( w->isWidgetType() && formWindow->widgets()->find( w ) ) { formWindow->clearSelection( FALSE ); formWindow->selectWidget( w ); } @@ -409,7 +409,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject const int ID_DELETE = 1; const int ID_SEP = 2; const int ID_DELTOOLBAR = 3; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it != actionMap.end() && ::tqqt_cast<TQSeparatorAction*>(*it) ) menu.insertItem( tr( "Delete Separator" ), ID_DELETE ); else @@ -419,11 +419,11 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject menu.insertItem( tr( "Delete Toolbar" ), ID_DELTOOLBAR ); int res = menu.exec( e->globalPos() ); if ( res == ID_DELETE ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -433,7 +433,7 @@ void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject } else if ( res == ID_SEP ) { calcIndicatorPos( mapFromGlobal( e->globalPos() ) ); TQAction *a = new TQSeparatorAction( 0 ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -474,11 +474,11 @@ void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) void TQDesignerToolBar::removeWidget( TQWidget *w ) { - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( w ); if ( it == actionMap.end() ) return; TQAction *a = *it; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -495,13 +495,13 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; - TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o ); + TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o ); if ( it == actionMap.end() ) return; TQAction *a = *it; if ( !a ) return; - int index = actionList.tqfind( a ); + int index = actionList.find( a ); RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand( tr( "Delete Action '%1' from Toolbar '%2'" ). arg( a->name() ).arg( caption() ), @@ -516,7 +516,7 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) TQStoredDrag *drag = new ActionDrag( type, a, this ); drag->setPixmap( a->iconSet().pixmap() ); if ( ::tqqt_cast<TQDesignerAction*>(a) ) { - if ( formWindow->widgets()->tqfind( ( (TQDesignerAction*)a )->widget() ) ) + if ( formWindow->widgets()->find( ( (TQDesignerAction*)a )->widget() ) ) formWindow->selectWidget( ( (TQDesignerAction*)a )->widget(), FALSE ); } if ( !drag->drag() ) { @@ -564,7 +564,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) indicator->hide(); TQAction *a = 0; - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) @@ -579,7 +579,7 @@ void TQDesignerToolBar::dropEvent( TQDropEvent *e ) a = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action()); } - if ( actionList.tqfindRef( a ) != -1 ) { + if ( actionList.findRef( a ) != -1 ) { TQMessageBox::warning( MainWindow::self, tr( "Insert/Move Action" ), tr( "Action '%1' has already been added to this toolbar.\n" "An Action may only occur once in a given toolbar." ). @@ -708,7 +708,7 @@ void TQDesignerToolBar::doInsertWidget( const TQPoint &p ) installEventFilters( w ); MainWindow::self->formWindow()->insertWidget( w, TRUE ); TQDesignerAction *a = new TQDesignerAction( w, tqparent() ); - int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) ); + int index = actionList.findRef( *actionMap.find( insertAnchor ) ); if ( index != -1 && afterAnchor ) ++index; if ( !insertAnchor ) diff --git a/tqtinterface/qt4/tools/designer/designer/actiondnd.h b/tqtinterface/qt4/tools/designer/designer/actiondnd.h index adde1b4..e6ec528 100644 --- a/tqtinterface/qt4/tools/designer/designer/actiondnd.h +++ b/tqtinterface/qt4/tools/designer/designer/actiondnd.h @@ -85,7 +85,7 @@ public: void init(); TQWidget *widget() const { return wid; } - TQWidget *widget( TQAction *a ) const { return *widgets.tqfind( a ); } + TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); } int index() const { return idx; } protected: @@ -230,7 +230,7 @@ private: void buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ); void buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *o ); void doInsertWidget( const TQPoint &p ); - void tqfindFormWindow(); + void findFormWindow(); private: TQPoint lastIndicatorPos; diff --git a/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp b/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp index c135716..9c91def 100644 --- a/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp +++ b/tqtinterface/qt4/tools/designer/designer/asciivalidator.cpp @@ -92,7 +92,7 @@ TQValidator::State AsciiValidator::validate( TQString &s, int & ) const } } - if ( allowedChars.tqfind( s[ i ] ) != -1 ) + if ( allowedChars.find( s[ i ] ) != -1 ) continue; s[i] = '_'; diff --git a/tqtinterface/qt4/tools/designer/designer/command.cpp b/tqtinterface/qt4/tools/designer/designer/command.cpp index 2f34892..10bf291 100644 --- a/tqtinterface/qt4/tools/designer/designer/command.cpp +++ b/tqtinterface/qt4/tools/designer/designer/command.cpp @@ -376,7 +376,7 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw, for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { TQObjectList *tqchildren = w->queryList( "TQWidget" ); for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) { - if ( copyOfWidgets.tqfind( c ) == -1 && formWindow()->widgets()->tqfind( c ) ) { + if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) { widgets.insert(widgets.at() + 1, c); widgets.prev(); copyOfWidgets.append(c); @@ -422,7 +422,7 @@ void DeleteCommand::unexecute() w->setName( s ); formWindow()->widgets()->insert( w, w ); formWindow()->selectWidget( w ); - TQValueList<MetaDataBase::Connection> conns = *connections.tqfind( w ); + TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { MetaDataBase::addConnection( formWindow(), (*it).sender, @@ -493,7 +493,7 @@ bool SetPropertyCommand::canMerge( Command *c ) if ( !widget ) return FALSE; const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "toolTip" || propName == "whatsThis" ) return TRUE; @@ -566,16 +566,16 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ if ( select ) editor->propertyList()->setCurrentProperty( propName ); const TQMetaProperty *p = - widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { if ( propName == "hAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignHorizontal_Mask ); align |= p->keyToValue( currentItemText ); widget->setProperty( "tqalignment", TQVariant( align ) ); } else if ( propName == "vAlign" ) { - p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + p = widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); int align = widget->property( "tqalignment" ).toInt(); align &= ~( AlignVertical_Mask ); align |= p->keyToValue( currentItemText ); @@ -1723,7 +1723,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *columnFields.tqfind( col.text ); + col.field = *columnFields.find( col.text ); oldColumns.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -2058,7 +2058,7 @@ void AddActionToPopupCommand::execute() void AddActionToPopupCommand::unexecute() { item->hideMenu(); - int i = menu->tqfind( item->action() ); + int i = menu->find( item->action() ); menu->remove( i ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); } @@ -2127,7 +2127,7 @@ RenameActionCommand::RenameActionCommand( const TQString &n, void RenameActionCommand::execute() { TQString actionText = newName; - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = newName; action->setText( actionText ); action->setMenuText( menuText ); @@ -2206,7 +2206,7 @@ void AddMenuCommand::execute() popup->setName( "PopupMenuEditor" ); formWindow()->insertWidget( popup, TRUE ); mb->insertItem( name, popup, index ); - index = mb->tqfindItem( popup ); + index = mb->findItem( popup ); item = mb->item( index ); } else { PopupMenuEditor *popup = item->menu(); @@ -2224,7 +2224,7 @@ void AddMenuCommand::unexecute() return; } item->menu()->hide(); - int i = mb->tqfindItem( item ); + int i = mb->findItem( item ); formWindow()->removeWidget( item->menu() ); mb->removeItemAt( i ); formWindow()->mainWindow()->objectHierarchy()->rebuild(); diff --git a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h index 4eb046b..2778f8b 100644 --- a/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/configtoolboxdialog.ui.h @@ -58,7 +58,7 @@ void ConfigToolboxDialog::init() a; a = MainWindow::self->toolActions.prev() ) { TQString grp = ( (WidgetAction*)a )->group(); - TQListViewItem *tqparent = groups.tqfind( grp ); + TQListViewItem *tqparent = groups.find( grp ); if ( !tqparent ) { tqparent = new TQListViewItem( listViewTools ); tqparent->setText( 0, grp ); @@ -102,7 +102,7 @@ void ConfigToolboxDialog::addTool() listViewCommon->ensureItemVisible( i ); } else if ( !addKids ) { // Children processing not set, so set it - // Also tqfind the item were we shall quit + // Also find the item were we shall quit // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h index 0113b95..da8fd8c 100644 --- a/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/connectiondialog.ui.h @@ -194,15 +194,15 @@ void ConnectionDialog::okClicked() for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) { MetaDataBase::Connection conn; - // tqfind sender widget + // find sender widget conn.sender = MainWindow::self->formWindow()->child( c->senderItem()->currentText() ); - if ( !conn.sender ) // if no sender widget, tqfind sender action - conn.sender = MainWindow::self->formWindow()->tqfindAction( c->senderItem()->currentText() ); + if ( !conn.sender ) // if no sender widget, find sender action + conn.sender = MainWindow::self->formWindow()->findAction( c->senderItem()->currentText() ); - // tqfind receiver widget + // find receiver widget conn.receiver = MainWindow::self->formWindow()->child( c->receiverItem()->currentText() ); - if ( !conn.receiver ) // if no receiver widget, tqfind receiver action - conn.receiver = MainWindow::self->formWindow()->tqfindAction( c->receiverItem()->currentText() ); + if ( !conn.receiver ) // if no receiver widget, find receiver action + conn.receiver = MainWindow::self->formWindow()->findAction( c->receiverItem()->currentText() ); conn.signal = c->signalItem()->currentText(); conn.slot = c->slotItem()->currentText(); diff --git a/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp b/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp index b6ab06a..1627ef8 100644 --- a/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp +++ b/tqtinterface/qt4/tools/designer/designer/connectionitems.cpp @@ -227,7 +227,7 @@ SenderItem::SenderItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -267,7 +267,7 @@ void SenderItem::senderChanged( const TQString &sender ) { TQObject *o = formWindow->child( sender, "TQObject" ); if ( !o ) - o = formWindow->tqfindAction( sender ); + o = formWindow->findAction( sender ); if ( !o ) return; emit currentSenderChanged( o ); @@ -284,7 +284,7 @@ ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw ) TQPtrDictIterator<TQWidget> it( *formWindow->widgets() ); while ( it.current() ) { - if ( lst.tqfind( it.current()->name() ) != lst.end() ) { + if ( lst.find( it.current()->name() ) != lst.end() ) { ++it; continue; } @@ -324,7 +324,7 @@ void ReceiverItem::receiverChanged( const TQString &receiver ) { TQObject *o = formWindow->child( receiver, "TQObject" ); if ( !o ) - o = formWindow->tqfindAction( receiver ); + o = formWindow->findAction( receiver ); if ( !o ) return; emit currentReceiverChanged( o ); @@ -460,7 +460,7 @@ void SlotItem::updateSlotList() TQMetaData::Protected) ) && !ignoreSlot( md->name() ) && checkConnectArgs( signal.latin1(), lastReceiver, md->name() ) ) - if ( lst.tqfind( md->name() ) == lst.end() ) + if ( lst.find( md->name() ) == lst.end() ) lst << MetaDataBase::normalizeFunction( md->name() ); } @@ -477,7 +477,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } @@ -494,7 +494,7 @@ void SlotItem::updateSlotList() continue; s = MetaDataBase::normalizeFunction( s ); if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) { - if ( lst.tqfind( (*it).function ) == lst.end() ) + if ( lst.find( (*it).function ) == lst.end() ) lst << s; } } diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui index f5d5a01..4565fb8 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditor.ui @@ -185,7 +185,7 @@ <string>Loads widget description file</string> </property> <property name="whatsThis" stdset="0"> - <string><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> + <string><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> <p>Since it is a lot of work to type in all the information for custom widgets, you should consider using the createcw tool which is in $QTDIR/tools/designer/tools/createcw. Using createcw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the createcw directory</p></string> </property> </widget> diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp index 91531c3..7d364c5 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.cpp @@ -112,7 +112,7 @@ void CustomWidgetEditor::setupSignals() { editSignal->setEnabled( FALSE ); buttonRemoveSignal->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listSignals->clear(); @@ -130,7 +130,7 @@ void CustomWidgetEditor::setupSlots() comboAccess->setEnabled( FALSE ); buttonRemoveSlot->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listSlots->clear(); @@ -149,7 +149,7 @@ void CustomWidgetEditor::setupProperties() comboType->setEnabled( FALSE ); buttonRemoveProperty->setEnabled( FALSE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w ) return; listProperties->clear(); @@ -167,7 +167,7 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i ) checkTimer->stop(); checkWidgetName(); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) { buttonChooseHeader->setEnabled( FALSE ); editClass->setEnabled( FALSE ); @@ -239,7 +239,7 @@ void CustomWidgetEditor::addWidgetClicked() void CustomWidgetEditor::classNameChanged( const TQString &s ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -269,7 +269,7 @@ void CustomWidgetEditor::deleteWidgetClicked() checkWidgetName(); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( mainWindow->isCustomWidgetUsed( w ) ) { TQMessageBox::information( mainWindow, tr( "Removing Custom Widget" ), @@ -299,7 +299,7 @@ void CustomWidgetEditor::deleteWidgetClicked() void CustomWidgetEditor::headerFileChanged( const TQString &s ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -309,7 +309,7 @@ void CustomWidgetEditor::headerFileChanged( const TQString &s ) void CustomWidgetEditor::heightChanged( int h ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -320,7 +320,7 @@ void CustomWidgetEditor::heightChanged( int h ) void CustomWidgetEditor::includePolicyChanged( int p ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -330,7 +330,7 @@ void CustomWidgetEditor::includePolicyChanged( int p ) void CustomWidgetEditor::pixmapChoosen() { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -353,7 +353,7 @@ void CustomWidgetEditor::pixmapChoosen() void CustomWidgetEditor::widthChanged( int wid ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -361,12 +361,12 @@ void CustomWidgetEditor::widthChanged( int wid ) updateCustomWidgetSizes(); } -MetaDataBase::CustomWidget *CustomWidgetEditor::tqfindWidget( TQListBoxItem *i ) +MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( TQListBoxItem *i ) { if ( !i ) return 0; - TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.tqfind( i ); + TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.find( i ); if ( it == customWidgets.end() ) return 0; return *it; @@ -375,7 +375,7 @@ MetaDataBase::CustomWidget *CustomWidgetEditor::tqfindWidget( TQListBoxItem *i ) void CustomWidgetEditor::chooseHeader() { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -389,7 +389,7 @@ void CustomWidgetEditor::chooseHeader() void CustomWidgetEditor::checkWidgetName() { TQListBoxItem *i = oldItem ? oldItem : boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); oldItem = 0; if ( !i || !w ) return; @@ -442,7 +442,7 @@ void CustomWidgetEditor::addSignal() TQListBoxItem *i = new TQListBoxText( listSignals, "signal()" ); listSignals->setCurrentItem( i ); listSignals->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.append( i->text().latin1() ); } @@ -453,18 +453,18 @@ void CustomWidgetEditor::removeSignal() delete listSignals->item( listSignals->currentItem() ); if ( listSignals->currentItem() != -1 ) listSignals->setSelected( listSignals->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) w->lstSignals.remove( s.latin1() ); } void CustomWidgetEditor::signalNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || listSignals->currentItem() == -1 ) return; - TQValueList<TQCString>::Iterator it = w->lstSignals.tqfind( listSignals->currentText().latin1() ); + TQValueList<TQCString>::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() ); if ( it != w->lstSignals.end() ) w->lstSignals.remove( it ); listSignals->blockSignals( TRUE ); @@ -475,14 +475,14 @@ void CustomWidgetEditor::signalNameChanged( const TQString &s ) void CustomWidgetEditor::slotAccessChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) return; MetaDataBase::Function slot; slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 1, s ); @@ -493,7 +493,7 @@ void CustomWidgetEditor::slotAccessChanged( const TQString &s ) void CustomWidgetEditor::slotNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listSlots->currentItem() ) return; @@ -501,7 +501,7 @@ void CustomWidgetEditor::slotNameChanged( const TQString &s ) slot.function = listSlots->currentItem()->text( 0 ); slot.access = listSlots->currentItem()->text( 1 ); slot.type = "slot"; - TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot ); + TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot ); if ( it != w->lstSlots.end() ) w->lstSlots.remove( it ); listSlots->currentItem()->setText( 0, s ); @@ -515,7 +515,7 @@ void CustomWidgetEditor::addSlot() TQListViewItem *i = new TQListViewItem( listSlots, "slot()", "public" ); listSlots->setCurrentItem( i ); listSlots->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Function slot; slot.function = "slot()"; @@ -536,7 +536,7 @@ void CustomWidgetEditor::removeSlot() delete listSlots->currentItem(); if ( listSlots->currentItem() ) listSlots->setSelected( listSlots->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && slot.function != "1 2 3" ) w->lstSlots.remove( slot ); } @@ -570,14 +570,14 @@ void CustomWidgetEditor::currentSlotChanged( TQListViewItem *i ) void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) return; MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 1, s ); @@ -588,14 +588,14 @@ void CustomWidgetEditor::propertyTypeChanged( const TQString &s ) void CustomWidgetEditor::propertyNameChanged( const TQString &s ) { - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( !w || !listProperties->currentItem() ) return; MetaDataBase::Property property; property.property = listProperties->currentItem()->text( 0 ); property.type = listProperties->currentItem()->text( 1 ); - TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property ); + TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property ); if ( it != w->lstProperties.end() ) w->lstProperties.remove( it ); listProperties->currentItem()->setText( 0, s ); @@ -609,7 +609,7 @@ void CustomWidgetEditor::addProperty() TQListViewItem *i = new TQListViewItem( listProperties, "property", "String" ); listProperties->setCurrentItem( i ); listProperties->setSelected( i, TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w ) { MetaDataBase::Property prop; prop.property = "property"; @@ -629,7 +629,7 @@ void CustomWidgetEditor::removeProperty() delete listProperties->currentItem(); if ( listProperties->currentItem() ) listProperties->setSelected( listProperties->currentItem(), TRUE ); - MetaDataBase::CustomWidget *w = tqfindWidget( boxWidgets->item( boxWidgets->currentItem() ) ); + MetaDataBase::CustomWidget *w = findWidget( boxWidgets->item( boxWidgets->currentItem() ) ); if ( w && property.property != "1 2 3" ) w->lstProperties.remove( property ); } @@ -674,11 +674,11 @@ static TQString makeIndent2( int indent ) static TQString entitize2( const TQString &s ) { TQString s2 = s; - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); + s2 = s2.replace( "'", "'" ); return s2; } @@ -793,7 +793,7 @@ void CustomWidgetEditor::horDataChanged( int a ) { TQSizePolicy::SizeType st = int_to_size_type( a ); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -814,7 +814,7 @@ void CustomWidgetEditor::verDataChanged( int a ) { TQSizePolicy::SizeType st = int_to_size_type( a ); TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; @@ -834,7 +834,7 @@ void CustomWidgetEditor::verDataChanged( int a ) void CustomWidgetEditor::widgetIsContainer( bool b ) { TQListBoxItem *i = boxWidgets->item( boxWidgets->currentItem() ); - MetaDataBase::CustomWidget *w = tqfindWidget( i ); + MetaDataBase::CustomWidget *w = findWidget( i ); if ( !i || !w ) return; diff --git a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h index 719b1c2..ed0caf9 100644 --- a/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h +++ b/tqtinterface/qt4/tools/designer/designer/customwidgeteditorimpl.h @@ -86,7 +86,7 @@ protected Q_SLOTS: void widgetIsContainer( bool ); private: - MetaDataBase::CustomWidget *tqfindWidget( TQListBoxItem *i ); + MetaDataBase::CustomWidget *findWidget( TQListBoxItem *i ); void setupDefinition(); void setupSignals(); void setupSlots(); diff --git a/tqtinterface/qt4/tools/designer/designer/designer.pro b/tqtinterface/qt4/tools/designer/designer/designer.pro index 4d98c51..7d147bc 100644 --- a/tqtinterface/qt4/tools/designer/designer/designer.pro +++ b/tqtinterface/qt4/tools/designer/designer/designer.pro @@ -2,7 +2,7 @@ TEMPLATE = lib CONFIG += qt warn_on staticlib qmake_cache CONFIG -= dll -!force_static:!win32:tqcontains(QT_PRODUCT,qt-internal) { +!force_static:!win32:contains(QT_PRODUCT,qt-internal) { CONFIG -= staticlib CONFIG += dll } diff --git a/tqtinterface/qt4/tools/designer/designer/designer_de.ts b/tqtinterface/qt4/tools/designer/designer/designer_de.ts index 4fd54de..ec81ece 100644 --- a/tqtinterface/qt4/tools/designer/designer/designer_de.ts +++ b/tqtinterface/qt4/tools/designer/designer/designer_de.ts @@ -423,8 +423,8 @@ so it is not possible to rename it to this name.</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> -<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can tqfind in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> + <source><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> +<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -1278,7 +1278,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a form with the + <source>The project contains already a form with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> @@ -2265,7 +2265,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source>Couldn't tqfind the Qt documentation property index file! + <source>Couldn't find the Qt documentation property index file! Define the correct documentation path in the preferences dialog.</source> <translation type="unfinished"></translation> </message> @@ -4690,7 +4690,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a sourcefile with the + <source>The project contains already a sourcefile with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> diff --git a/tqtinterface/qt4/tools/designer/designer/designer_fr.ts b/tqtinterface/qt4/tools/designer/designer/designer_fr.ts index 4fd54de..ec81ece 100644 --- a/tqtinterface/qt4/tools/designer/designer/designer_fr.ts +++ b/tqtinterface/qt4/tools/designer/designer/designer_fr.ts @@ -423,8 +423,8 @@ so it is not possible to rename it to this name.</source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> - <source><b>Load Descriptions</b><p>Loads a file which tqcontains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> -<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can tqfind in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> + <source><b>Load Descriptions</b><p>Loads a file which contains descriptions of custom widgets, so that these custom widgets can be used in the Qt Designer.</p> +<p>As it is a lot of work to type in all the information for custom widgets, you should check the tool createcw which you can find in $QTDIR/tools/designer/tools/createcw. Using that tool you can create custom widget description files for your custom widgets without the need of typing in all that information. For more information about that see the README file in that directory</p></source> <translation type="unfinished"></translation> </message> <message encoding="UTF-8"> @@ -1278,7 +1278,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a form with the + <source>The project contains already a form with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> @@ -2265,7 +2265,7 @@ but they are not known to the designer:</source> <translation type="unfinished"></translation> </message> <message> - <source>Couldn't tqfind the Qt documentation property index file! + <source>Couldn't find the Qt documentation property index file! Define the correct documentation path in the preferences dialog.</source> <translation type="unfinished"></translation> </message> @@ -4690,7 +4690,7 @@ Do you want to reload it?</source> <translation type="unfinished"></translation> </message> <message> - <source>The project tqcontains already a sourcefile with the + <source>The project contains already a sourcefile with the filename '%1'. Please choose a new filename.</source> <translation type="unfinished"></translation> </message> diff --git a/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp b/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp index 5acbf58..a959d42 100644 --- a/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp +++ b/tqtinterface/qt4/tools/designer/designer/designerappiface.cpp @@ -348,12 +348,12 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps TQString DesignerProjectImpl::breakPointCondition( TQObject *o, int line ) const { - return MetaDataBase::breakPointCondition( MainWindow::self->tqfindRealObject( o ), line ); + return MetaDataBase::breakPointCondition( MainWindow::self->findRealObject( o ), line ); } void DesignerProjectImpl::setBreakPointCondition( TQObject *o, int line, const TQString &condition ) { - MetaDataBase::setBreakPointCondition( MainWindow::self->tqfindRealObject( o ), line, condition ); + MetaDataBase::setBreakPointCondition( MainWindow::self->findRealObject( o ), line, condition ); } void DesignerProjectImpl::clearAllBreakpoints() const @@ -739,7 +739,7 @@ TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIc void DesignerFormWindowImpl::addAction( TQAction *a ) { - if ( formWindow->actionList().tqfindRef( a ) != -1 ) + if ( formWindow->actionList().findRef( a ) != -1 ) return; formWindow->actionList().append( a ); MetaDataBase::addEntry( a ); @@ -777,7 +777,7 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value ) { - int id = o->tqmetaObject()->tqfindProperty( property, TRUE ); + int id = o->tqmetaObject()->findProperty( property, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) o->setProperty( property, value ); @@ -787,7 +787,7 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const { - int id = o->tqmetaObject()->tqfindProperty( prop, TRUE ); + int id = o->tqmetaObject()->findProperty( prop, TRUE ); const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE ); if ( p && p->isValid() ) return o->property( prop ); diff --git a/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp b/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp index 062a79c..a8ee282 100644 --- a/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/editfunctionsimpl.cpp @@ -177,10 +177,10 @@ void EditFunctions::okClicked() TQString s = function.function; s = s.simplifyWhiteSpace(); bool startNum = s[ 0 ] >= '0' && s[ 0 ] <= '9'; - bool noParens = s.tqcontains( '(' ) != 1 || s.tqcontains( ')' ) != 1; - bool illegalSpace = s.tqfind( ' ' ) != -1 && s.tqfind( ' ' ) < s.tqfind( '(' ); + bool noParens = s.contains( '(' ) != 1 || s.contains( ')' ) != 1; + bool illegalSpace = s.find( ' ' ) != -1 && s.find( ' ' ) < s.find( '(' ); - if ( startNum || noParens || illegalSpace || lst.tqfind( function.function ) != -1 ) { + if ( startNum || noParens || illegalSpace || lst.find( function.function ) != -1 ) { invalidFunctions = TRUE; invalidItems.append( (*it) ); continue; @@ -456,7 +456,7 @@ void EditFunctions::currentTypeChanged( const TQString &type ) void EditFunctions::changeItem( TQListViewItem *item, Attribute a, const TQString &nV ) { int itemId; - TQMap<TQListViewItem*, int>::Iterator fit = functionIds.tqfind( item ); + TQMap<TQListViewItem*, int>::Iterator fit = functionIds.find( item ); if ( fit != functionIds.end() ) itemId = *fit; else diff --git a/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h b/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h index 4eba205..b4ff3e3 100644 --- a/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/finddialog.ui.h @@ -48,7 +48,7 @@ void FindDialog::doFind() if ( !editor ) return; - if ( !editor->tqfind( comboFind->currentText(), checkCase->isChecked(), + if ( !editor->find( comboFind->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked() ) ) checkBegin->setChecked( TRUE ); else diff --git a/tqtinterface/qt4/tools/designer/designer/formfile.cpp b/tqtinterface/qt4/tools/designer/designer/formfile.cpp index 3701d02..6b706a9 100644 --- a/tqtinterface/qt4/tools/designer/designer/formfile.cpp +++ b/tqtinterface/qt4/tools/designer/designer/formfile.cpp @@ -53,17 +53,17 @@ static TQString make_func_pretty( const TQString &s ) { TQString res = s; - if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 ) + if ( res.find( ")" ) - res.find( "(" ) == 1 ) return res; - res.tqreplace( "(", "( " ); - res.tqreplace( ")", " )" ); - res.tqreplace( "&", " &" ); - res.tqreplace( "*", " *" ); - res.tqreplace( ",", ", " ); - res.tqreplace( ":", " : " ); + res.replace( "(", "( " ); + res.replace( ")", " )" ); + res.replace( "&", " &" ); + res.replace( "*", " *" ); + res.replace( ",", ", " ); + res.replace( ":", " : " ); res = res.simplifyWhiteSpace(); - res.tqreplace( " : : ", "::" ); - res.tqreplace( ">>", "> >" ); + res.replace( " : : ", "::" ); + res.replace( ">>", "> >" ); return res; } @@ -113,7 +113,7 @@ void FormFile::setFileName( const TQString &fn ) return; if ( fn.isEmpty() ) { fileNameTemp = TRUE; - if ( filename.tqfind( "unnamed" ) != 0 ) + if ( filename.find( "unnamed" ) != 0 ) filename = createUnnamedFileName(); return; } else { @@ -267,7 +267,7 @@ bool FormFile::saveAs( bool ignoreModified ) TQString f = pro->makeAbsolute( fileName() ); if ( fileNameTemp && formWindow() ) { f = TQString( formWindow()->name() ).lower(); - f.tqreplace( "::", "_" ); + f.replace( "::", "_" ); f = pro->makeAbsolute( f + ".ui" ); } bool saved = FALSE; @@ -767,7 +767,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) int line = 0; int start = 0; while ( line < (*fit).start - 1 ) { - start = sourceCode.tqfind( '\n', start ); + start = sourceCode.find( '\n', start ); if ( start == -1 ) return; start++; @@ -777,7 +777,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function ) return; int end = start; while ( line < (*fit).end + 1 ) { - end = sourceCode.tqfind( '\n', end ); + end = sourceCode.find( '\n', end ); if ( end == -1 ) { if ( line <= (*fit).end ) end = sourceCode.length() - 1; @@ -799,7 +799,7 @@ void FormFile::functionNameChanged( const TQString &oldName, const TQString &new { if ( !cod.isEmpty() ) { TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" ); - int i = cod.tqfind( funcStart + oldName ); + int i = cod.find( funcStart + oldName ); if ( i != -1 ) { cod.remove( i + funcStart.length(), oldName.length() ); cod.insert( i + funcStart.length(), newName ); @@ -813,7 +813,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName; TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName; - int i = cod.tqfind( oldFunct ); + int i = cod.find( oldFunct ); if ( i != -1 ) { cod.remove( i, oldFunct.length() ); cod.insert( i, newFunct ); @@ -838,7 +838,7 @@ TQString FormFile::formName() const while ( !ts.eof() ) { line = ts.readLine(); if ( !className.isEmpty() ) { - int end = line.tqfind( "</class>" ); + int end = line.find( "</class>" ); if ( end == -1 ) { className += line; } else { @@ -848,8 +848,8 @@ TQString FormFile::formName() const continue; } int start; - if ( ( start = line.tqfind( "<class>" ) ) != -1 ) { - int end = line.tqfind( "</class>" ); + if ( ( start = line.find( "<class>" ) ) != -1 ) { + int end = line.find( "</class>" ); if ( end == -1 ) { className = line.mid( start + 7 ); } else { @@ -872,10 +872,10 @@ void FormFile::formWindowChangedSomehow() bool FormFile::checkFileName( bool allowBreak ) { - FormFile *ff = pro->tqfindFormFile( filename, this ); + FormFile *ff = pro->findFormFile( filename, this ); if ( ff ) TQMessageBox::warning( MainWindow::self, tr( "Invalid Filename" ), - tr( "The project already tqcontains a form with a\n" + tr( "The project already contains a form with a\n" "filename of '%1'. Please choose a new filename." ).arg( filename ) ); if (!formWindow()) // We are starting up return FALSE; @@ -892,7 +892,7 @@ bool FormFile::checkFileName( bool allowBreak ) return FALSE; } filename = pro->makeRelative( fn ); - ff = pro->tqfindFormFile( filename, this ); + ff = pro->findFormFile( filename, this ); } return TRUE; } diff --git a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp index 0b102e9..f3155ee 100644 --- a/tqtinterface/qt4/tools/designer/designer/formwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/formwindow.cpp @@ -97,7 +97,7 @@ static void setCursorToAll( const TQCursor &c, TQWidget *start ) static void restoreCursors( TQWidget *start, FormWindow *fw ) { - if ( fw->widgets()->tqfind( start ) ) + if ( fw->widgets()->find( start ) ) start->setCursor( MetaDataBase::cursor( start ) ); else start->setCursor( TQt::ArrowCursor ); @@ -256,7 +256,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e ) TQPixmap grid; TQString grid_name; grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y()); - if( !TQPixmapCache::tqfind( grid_name, grid ) ) { + if( !TQPixmapCache::find( grid_name, grid ) ) { grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) ); grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) ); TQBitmap tqmask( grid.width(), grid.height() ); @@ -432,10 +432,10 @@ void FormWindow::insertWidget() ++it; if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) && o != TQT_TQOBJECT(w) ) { + insertedWidgets.find( (TQWidget*)o ) && o != TQT_TQOBJECT(w) ) { TQRect r2( ( (TQWidget*)o )->pos(), ( (TQWidget*)o )->size() ); - if ( r.tqcontains( r2 ) ) + if ( r.contains( r2 ) ) lst.append( (TQWidget*)o ); } } @@ -535,11 +535,11 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w ) if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget raiseChildSelections( w ); // raise selections and select widget selectWidget( w ); - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one while ( w->parentWidget() && ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || - !insertedWidgets.tqfind(w) ) ) + !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) { e->accept(); @@ -596,7 +596,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) for ( TQObject *o = l->first(); o; o = l->next() ) { if ( !o->isWidgetType() ) continue; - if ( insertedWidgets.tqfind( (TQWidget*)o ) ) + if ( insertedWidgets.find( (TQWidget*)o ) ) selectWidget( (TQWidget*)o, FALSE ); } setPropertyShowingBlocked( FALSE ); @@ -614,9 +614,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) raiseChildSelections( w ); // raise selections and select widget selectWidget( w ); - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) ) + ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) ) w = w->parentWidget(); if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving @@ -674,7 +674,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) orderedWidgets.removeRef( w ); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -690,7 +690,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w ) default: // any insert widget tool if ( e->button() == Qt::LeftButton ) { insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow - if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can tqfind another tqparent + if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another tqparent TQWidget *wid = w; for (;;) { int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) ); @@ -720,7 +720,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w ) orderedWidgets.clear(); orderedWidgets.append( w ); for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) { - int i = stackedWidgets.tqfindRef( wid ); + int i = stackedWidgets.findRef( wid ); if ( i != -1 ) { stackedWidgets.removeRef( wid ); stackedWidgets.insert( 0, wid ); @@ -752,9 +752,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) case POINTER_TOOL: if ( widgetPressed && allowMove( w ) ) { // we are prepated for a move - // if widget is laid out, tqfind the first non-laid out super-widget + // if widget is laid out, find the first non-laid out super-widget while ( w->parentWidget() && - ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) ) + ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.find(w ) ) ) w = w->parentWidget(); // calc correct position @@ -860,13 +860,13 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) wid = tqApp->widgetAt( e->globalPos(), TRUE ); if ( wid ) wid = designerWidget( wid ); - if ( wid && ( isMainContainer( wid ) || insertedWidgets.tqfind( wid ) ) && wid->isVisibleTo( this ) ) + if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) ) newendWidget = wid; if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) ) newendWidget = (TQWidget*)endWidget; drawRecRect = newendWidget != endWidget; if ( newendWidget && - ( isMainContainer( newendWidget ) || insertedWidgets.tqfind( newendWidget ) ) && !isCentralWidget( newendWidget ) ) + ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; mainWindow()->statusBar()->message( tr( "Connect '%1' to '%2'" ).arg( startWidget->name() ). arg( endWidget->name() ) ); @@ -893,7 +893,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w ) drawRecRect = newendWidget != endWidget; if ( !newendWidget ) endWidget = newendWidget; - else if ( insertedWidgets.tqfind( newendWidget ) && !isCentralWidget( newendWidget ) ) + else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( newendWidget ) ) endWidget = newendWidget; if ( endWidget ) mainWindow()->statusBar()->message( tr( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ). @@ -927,7 +927,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w ) if ( widgetPressed && allowMove( w ) ) { // we moved the widget sizePreviewLabel->hide(); - if ( moving.isEmpty() || w->pos() == *moving.tqfind(w) ) + if ( moving.isEmpty() || w->pos() == *moving.find(w) ) break; // restore targetContainer @@ -1160,7 +1160,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w ) TQObjectList *l = queryList( "TQWidget" ); if ( !l ) return; - if ( l->tqfind( TQT_TQOBJECT(w) ) != -1 ) + if ( l->find( TQT_TQOBJECT(w) ) != -1 ) e->accept(); delete l; } @@ -1210,7 +1210,7 @@ void FormWindow::selectWidget( TQT_BASE_OBJECT_NAME *o, bool select ) repaintSelection( (TQWidget*)opw ); if ( !isPropertyShowingBlocked() ) emitShowProperties( propertyWidget ); - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) { s->show(); return; @@ -1230,7 +1230,7 @@ void FormWindow::selectWidget( TQT_BASE_OBJECT_NAME *o, bool select ) s->setWidget( w ); emitSelectionChanged(); } else { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->setWidget( 0 ); TQObject *opw = propertyWidget; @@ -1255,7 +1255,7 @@ TQPoint FormWindow::grid() const void FormWindow::updateSelection( QWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( !w->isVisibleTo( this ) ) selectWidget( w, FALSE ); else if ( s ) @@ -1264,14 +1264,14 @@ void FormWindow::updateSelection( QWidget *w ) void FormWindow::raiseSelection( QWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->show(); } void FormWindow::repaintSelection( TQWidget *w ) { - WidgetSelection *s = usedSelections.tqfind( w ); + WidgetSelection *s = usedSelections.find( w ); if ( s ) s->update(); } @@ -1370,7 +1370,7 @@ void FormWindow::selectWidgets() TQPoint p = ( (TQWidget*)o )->mapToGlobal( TQPoint(0,0) ); p = mapFromGlobal( p ); TQRect r( p, ( (TQWidget*)o )->size() ); - if ( r.intersects( currRect ) && !r.tqcontains( currRect ) ) + if ( r.intersects( currRect ) && !r.contains( currRect ) ) selectWidget( (TQWidget*)o ); } } @@ -1382,7 +1382,7 @@ void FormWindow::selectWidgets() bool FormWindow::isWidgetSelected( TQT_BASE_OBJECT_NAME *w ) { if ( w->isWidgetType() ) - return usedSelections.tqfind( (TQWidget*)w ) != 0; + return usedSelections.find( (TQWidget*)w ) != 0; return FALSE; // #### do stuff for TQObjects } @@ -1425,7 +1425,7 @@ void FormWindow::raiseChildSelections( TQWidget *w ) TQPtrDictIterator<WidgetSelection> it( usedSelections ); for ( ; it.current(); ++it ) { - if ( l->tqfindRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) + if ( l->findRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 ) it.current()->show(); } delete l; @@ -1437,7 +1437,7 @@ void FormWindow::updateChildSelections( TQWidget *w ) if ( l ) { for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) updateSelection( (TQWidget*)o ); } delete l; @@ -1457,7 +1457,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w ) if ( it.current()->widget() == mainContainer() ) continue; ++it; - if ( l->tqfind( TQT_TQOBJECT(sel->widget()) ) == -1 ) { + if ( l->find( TQT_TQOBJECT(sel->widget()) ) == -1 ) { if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) sel->setWidget( 0 ); } else { @@ -1566,7 +1566,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry( TQRect &r ) { - if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( r ) ) { + if ( !TQT_TQRECT_OBJECT(rect()).contains( r ) ) { if ( r.left() < rect().left() ) r.moveTopLeft( TQPoint( 0, r.top() ) ); if ( r.right() > rect().right() ) @@ -1778,7 +1778,7 @@ void FormWindow::showOrderIndicators() w->focusPolicy() != Qt::NoFocus ) { OrderIndicator* ind = new OrderIndicator( order++, w, this ); orderIndicators.append( ind ); - if ( stackedWidgets.tqfindRef( w ) == -1 ) + if ( stackedWidgets.findRef( w ) == -1 ) stackedWidgets.append( w ); } } @@ -1875,16 +1875,16 @@ void FormWindow::lowerWidgets() commandHistory()->addCommand( cmd ); } -void tqfind_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ) +void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ) { - int i = txt.tqfind( "&" ); + int i = txt.find( "&" ); if ( i == -1 ) return; TQChar c = txt[ i + 1 ]; if ( c.isNull() || c == '&' ) return; c = c.lower(); - TQMap<TQChar, TQWidgetList >::Iterator it = accels.tqfind( c ); + TQMap<TQChar, TQWidgetList >::Iterator it = accels.find( c ); if ( it == accels.end() ) { TQWidgetList wl; wl.append( w ); @@ -1906,17 +1906,17 @@ void FormWindow::checkAccels() insertedWidgets[ (void*)o ] ) { TQWidget *w = (TQWidget*)o; const TQMetaProperty* text = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); const TQMetaProperty* title = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); const TQMetaProperty* pageTitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( text ) - tqfind_accel( w->property( "text" ).toString(), accels, w ); + find_accel( w->property( "text" ).toString(), accels, w ); if ( title ) - tqfind_accel( w->property( "title" ).toString(), accels, w ); + find_accel( w->property( "title" ).toString(), accels, w ); if ( pageTitle ) - tqfind_accel( w->property( "pageTitle" ).toString(), accels, w ); + find_accel( w->property( "pageTitle" ).toString(), accels, w ); } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) { ((MenuBarEditor *)o)->checkAccels( accels ); } @@ -2055,7 +2055,7 @@ void FormWindow::layoutHorizontalContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( tr( "Lay out tqchildren horizontally" ), @@ -2075,7 +2075,7 @@ void FormWindow::layoutVerticalContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutVerticalCommand *cmd = new LayoutVerticalCommand( tr( "Lay out tqchildren vertically" ), @@ -2098,7 +2098,7 @@ void FormWindow::layoutGridContainer( TQWidget *w ) for ( TQObject *o = WidgetFactory::containerOfWidget(w)->childrenListObject().first(); o; o = WidgetFactory::containerOfWidget(w)->childrenListObject().next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } LayoutGridCommand *cmd = new LayoutGridCommand( tr( "Lay out tqchildren in a grid" ), @@ -2149,7 +2149,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w ) if ( o->isWidgetType() && !mainWindow()->isAToolBarChild( (TQWidget*)o ) && ( (TQWidget*)o )->isVisibleTo( this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) + insertedWidgets.find( (TQWidget*)o ) ) widgets.append( (TQWidget*)o ); } return new BreakLayoutCommand( tr( "Break Layout" ), this, WidgetFactory::widgetOfContainer( w ), widgets ); @@ -2182,7 +2182,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const for ( TQObject *o = l->first(); o; o = l->next() ) { if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) && - insertedWidgets.tqfind( (TQWidget*)o ) ) { + insertedWidgets.find( (TQWidget*)o ) ) { delete l; return TRUE; } @@ -2196,7 +2196,7 @@ bool FormWindow::allowMove( TQWidget *w ) { w = w->parentWidget(); while ( w ) { - if ( ( isMainContainer( w ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) + if ( ( isMainContainer( w ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) return TRUE; w = w->parentWidget(); } @@ -2272,7 +2272,7 @@ void FormWindow::restoreConnectionLine() w = h = 64; r = r.normalize(); - while ( r.tqcontains( p ) ) { + while ( r.contains( p ) ) { unclippedPainter->drawPixmap( p, *buffer, TQRect( p, TQSize( w, h ) ) ); unclippedPainter->setPen( Qt::red ); p.setX( p.x() + dx ); @@ -2443,7 +2443,7 @@ bool FormWindow::isDatabaseWidgetUsed() const TQPtrDictIterator<TQWidget> it( insertedWidgets ); for ( ; it.current(); ++it ) { TQString c( it.current()->className() ); - if ( dbClasses.tqcontains( c ) > 0 ) { + if ( dbClasses.contains( c ) > 0 ) { return TRUE; } } @@ -2517,7 +2517,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if ( TQT_TQRECT_OBJECT(rect()).tqcontains( mapFromGlobal( pos ) ) ) { + if ( TQT_TQRECT_OBJECT(rect()).contains( mapFromGlobal( pos ) ) ) { container = mainContainer(); depth = widgetDepth( container ); } @@ -2528,7 +2528,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) continue; if ( !it.current()->isVisibleTo( this ) ) continue; - if ( selected.tqfind( it.current() ) != -1 ) + if ( selected.find( it.current() ) != -1 ) continue; if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( it.current() ) ) ) && it.current() != mainContainer() ) @@ -2537,7 +2537,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while ( w && !w->isTopLevel() ) { - if ( !TQT_TQRECT_OBJECT(w->rect()).tqcontains( ( w->mapFromGlobal( pos ) ) ) ) + if ( !TQT_TQRECT_OBJECT(w->rect()).contains( ( w->mapFromGlobal( pos ) ) ) ) break; w = w->parentWidget(); } @@ -2545,8 +2545,8 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf ) int wd = widgetDepth( it.current() ); if ( wd == depth && container ) { - if ( ( it.current()->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) > - ( container->parentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) ) + if ( ( it.current()->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(it.current()) ) > + ( container->parentWidget()->childrenListObject() ).find( TQT_TQOBJECT(container) ) ) wd++; } if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) { @@ -2650,7 +2650,7 @@ Project *FormWindow::project() const return proj; } -TQAction *FormWindow::tqfindAction( const TQString &name ) +TQAction *FormWindow::findAction( const TQString &name ) { for ( TQAction *a = actionList().first(); a; a = actionList().next() ) { if ( TQString( a->name() ) == name ) diff --git a/tqtinterface/qt4/tools/designer/designer/formwindow.h b/tqtinterface/qt4/tools/designer/designer/formwindow.h index bacc45f..a4dd567 100644 --- a/tqtinterface/qt4/tools/designer/designer/formwindow.h +++ b/tqtinterface/qt4/tools/designer/designer/formwindow.h @@ -190,7 +190,7 @@ public: void setActiveObject( TQT_BASE_OBJECT_NAME *o ); TQPtrList<TQAction> &actionList() { return actions; } - TQAction *tqfindAction( const TQString &name ); + TQAction *findAction( const TQString &name ); void setProject( Project *pro ); Project *project() const; diff --git a/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp b/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp index d583bdc..11f6523 100644 --- a/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp +++ b/tqtinterface/qt4/tools/designer/designer/hierarchyview.cpp @@ -244,7 +244,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) if ( !i ) return 0; - TQObject *o = tqfindObject( i ); + TQObject *o = findObject( i ); if ( !o ) return 0; if ( TQT_BASE_OBJECT(formWindow) == TQT_BASE_OBJECT(o) ) { @@ -255,7 +255,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } if ( o->isWidgetType() ) { TQWidget *w = (TQWidget*)o; - if ( !formWindow->widgets()->tqfind( w ) ) { + if ( !formWindow->widgets()->find( w ) ) { if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) { if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) { ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w ); @@ -274,7 +274,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i ) } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) { formWindow->setActiveObject( w ); } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) { - return 0; // ### we could try to tqfind our menu bar and change the currentMenu to our index + return 0; // ### we could try to find our menu bar and change the currentMenu to our index } else { return 0; } @@ -316,12 +316,12 @@ void HierarchyList::objectClicked( TQListViewItem *i ) } } -TQObject *HierarchyList::tqfindObject( TQListViewItem *i ) +TQObject *HierarchyList::findObject( TQListViewItem *i ) { return ( (HierarchyItem*)i )->object(); } -TQListViewItem *HierarchyList::tqfindItem( TQT_BASE_OBJECT_NAME *o ) +TQListViewItem *HierarchyList::findItem( TQT_BASE_OBJECT_NAME *o ) { TQListViewItemIterator it( this ); while ( it.current() ) { @@ -341,7 +341,7 @@ TQObject *HierarchyList::current() const void HierarchyList::changeNameOf( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { - TQListViewItem *item = tqfindItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 0, name ); @@ -353,7 +353,7 @@ void HierarchyList::changeDatabaseOf( TQT_BASE_OBJECT_NAME *o, const TQString &i #ifndef TQT_NO_SQL if ( !formWindow->isDatabaseAware() ) return; - TQListViewItem *item = tqfindItem( o ); + TQListViewItem *item = findItem( o ); if ( !item ) return; item->setText( 2, info ); @@ -474,7 +474,7 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq if ( !it.current()->isWidgetType() || ( (TQWidget*)it.current() )->isHidden() ) continue; - if ( !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) { + if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) { if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) || ::tqqt_cast<TQWidgetStack*>(it.current()) ) { TQObject *obj = it.current(); @@ -485,7 +485,7 @@ void HierarchyList::insertObject( TQT_BASE_OBJECT_NAME *tqbo, TQListViewItem *tq stack = (TQWidgetStack*)obj; else stack = (TQWidgetStack*)obj->tqparent(); - if ( widgetStacks->tqfindRef( stack ) != -1 ) + if ( widgetStacks->findRef( stack ) != -1 ) continue; widgetStacks->append( stack ); TQObjectList *l2 = stack->queryList( "TQWidget", 0, TRUE, FALSE ); @@ -590,12 +590,12 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) if ( !i ) return; - TQObject *o = tqfindObject( i ); + TQObject *o = findObject( i ); if ( !o ) return; if ( !o->isWidgetType() || - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->tqfind( (TQWidget*)o ) ) ) + ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->find( (TQWidget*)o ) ) ) return; TQWidget *w = (TQWidget*)o; diff --git a/tqtinterface/qt4/tools/designer/designer/hierarchyview.h b/tqtinterface/qt4/tools/designer/designer/hierarchyview.h index 9b04c0d..a9f2fae 100644 --- a/tqtinterface/qt4/tools/designer/designer/hierarchyview.h +++ b/tqtinterface/qt4/tools/designer/designer/hierarchyview.h @@ -138,8 +138,8 @@ public Q_SLOTS: private: void insertObject( TQT_BASE_OBJECT_NAME *o, TQListViewItem *tqparent ); - TQObject *tqfindObject( TQListViewItem *i ); - TQListViewItem *tqfindItem( TQT_BASE_OBJECT_NAME *o ); + TQObject *findObject( TQListViewItem *i ); + TQListViewItem *findItem( TQT_BASE_OBJECT_NAME *o ); TQObject *current() const; TQObject *handleObjectClick( TQListViewItem *i ); diff --git a/tqtinterface/qt4/tools/designer/designer/layout.cpp b/tqtinterface/qt4/tools/designer/designer/layout.cpp index acb6766..e6e34e1 100644 --- a/tqtinterface/qt4/tools/designer/designer/layout.cpp +++ b/tqtinterface/qt4/tools/designer/designer/layout.cpp @@ -118,7 +118,7 @@ void Layout::setup() lastList->append( w ); } - // So, now tqfind the list with the most entries + // So, now find the list with the most entries lastList = 0; TQValueList<TQWidgetList>::Iterator it = lists.begin(); for ( ; it != lists.end(); ++it ) { @@ -204,7 +204,7 @@ void Layout::finishLayout( bool needMove, TQLayout *tqlayout ) formWindow->insertWidget( layoutBase ); formWindow->selectWidget( layoutBase ); TQString n = layoutBase->name(); - if ( n.tqfind( "qt_dead_widget_" ) != -1 ) { + if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); layoutBase->setName( n ); } @@ -257,7 +257,7 @@ void Layout::breakLayout() w->reparent( layoutBase->parentWidget(), 0, layoutBase->pos() + w->pos(), TRUE ); if ( needResize ) { - TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w ); + TQMap<TQWidget*, TQRect>::Iterator it = rects.find( w ); if ( it != rects.end() ) w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) ); } @@ -842,7 +842,7 @@ void GridLayout::buildGrid() delete grid; grid = new Grid( (int)(y.size()-1), (int)(x.size()-1) ); - // Mark the cells in the grid that tqcontains a widget + // Mark the cells in the grid that contains a widget for ( w = widgets.first(); w; w = widgets.next() ) { TQRect c(0,0,0,0), widgetPos = w->tqgeometry(); // From left til right (not including) diff --git a/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp b/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp index 191ea34..83f02b5 100644 --- a/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp +++ b/tqtinterface/qt4/tools/designer/designer/listboxdnd.cpp @@ -256,7 +256,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListB int count = 0; stream >> count; - TQ_UINT8 recievePtr = 0; // data tqcontains just item pointers; no data + TQ_UINT8 recievePtr = 0; // data contains just item pointers; no data stream >> recievePtr; TQListBoxItem * item = 0; diff --git a/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp b/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp index f283dd7..6de0765 100644 --- a/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp +++ b/tqtinterface/qt4/tools/designer/designer/listviewdnd.cpp @@ -153,7 +153,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list ) list.append( *it ); } else if ( !addKids ) { // Children processing not set, so set it - // Also tqfind the item were we shall quit + // Also find the item were we shall quit // processing tqchildren...if any such item addKids = TRUE; nextSibling = (*it)->nextSibling(); diff --git a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp index 5e28663..9d86a9f 100644 --- a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.cpp @@ -146,7 +146,7 @@ void ListViewEditor::okClicked() void ListViewEditor::columnClickable( bool b ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; c->clickable = b; @@ -171,7 +171,7 @@ void ListViewEditor::columnDownClicked() void ListViewEditor::columnPixmapChosen() { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -198,7 +198,7 @@ void ListViewEditor::columnPixmapChosen() void ListViewEditor::columnPixmapDeleted() { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -216,7 +216,7 @@ void ListViewEditor::columnPixmapDeleted() void ListViewEditor::columnResizable( bool b ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; c->resizable = b; @@ -224,7 +224,7 @@ void ListViewEditor::columnResizable( bool b ) void ListViewEditor::columnTextChanged( const TQString &txt ) { - Column *c = tqfindColumn( colPreview->item( colPreview->currentItem() ) ); + Column *c = findColumn( colPreview->item( colPreview->currentItem() ) ); if ( !c ) return; @@ -256,7 +256,7 @@ void ListViewEditor::columnUpClicked() void ListViewEditor::currentColumnChanged( TQListBoxItem *i ) { - Column *c = tqfindColumn( i ); + Column *c = findColumn( i ); if ( !i || !c ) { colText->setEnabled( FALSE ); colPixmap->setEnabled( FALSE ); @@ -601,7 +601,7 @@ void ListViewEditor::setupItems() int i = 0; TQHeader *header = itemsPreview->header(); for ( TQListBoxItem *item = colPreview->firstItem(); item; item = item->next() ) { - Column *col = tqfindColumn( item ); + Column *col = findColumn( item ); if ( !col ) continue; if ( i >= itemsPreview->columns() ) @@ -617,7 +617,7 @@ void ListViewEditor::setupItems() itemColumn->setValue( TQMIN( numColumns - 1, itemColumn->value() ) ); } -ListViewEditor::Column *ListViewEditor::tqfindColumn( TQListBoxItem *i ) +ListViewEditor::Column *ListViewEditor::findColumn( TQListBoxItem *i ) { if ( !i ) return 0; diff --git a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h index 8f2135b..24367cd 100644 --- a/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h +++ b/tqtinterface/qt4/tools/designer/designer/listvieweditorimpl.h @@ -94,7 +94,7 @@ private: private: void setupColumns(); void setupItems(); - Column *tqfindColumn( TQListBoxItem *i ); + Column *findColumn( TQListBoxItem *i ); void transferItems( TQListView *from, TQListView *to ); void displayItem( TQListViewItem *i, int col ); diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp index def15eb..c5c7485 100644 --- a/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/mainwindow.cpp @@ -143,7 +143,7 @@ static TQString textNoAccel( const TQString& text) { TQString t = text; int i; - while ( (i = t.tqfind('&') )>= 0 ) { + while ( (i = t.find('&') )>= 0 ) { t.remove(i,1); } return t; @@ -752,10 +752,10 @@ void MainWindow::helpContents() TQTextStream ts( &f ); while ( !ts.eof() ) { TQString s = ts.readLine(); - int from = s.tqfind( "\"" ); + int from = s.find( "\"" ); if ( from == -1 ) continue; - int to = s.tqfindRev( "\"" ); + int to = s.findRev( "\"" ); if ( to == -1 ) continue; propertyDocumentation[ s.mid( from + 1, to - from - 1 ) ] = s.mid( to + 2 ) + "-prop"; @@ -781,7 +781,7 @@ void MainWindow::helpContents() else source = propertyDocumentation[ "TQObject/name" ]; } else { - while ( mo && !propertyDocumentation.tqcontains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) + while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) ) mo = TQT_TQMETAOBJECT(const_cast<QMetaObject*>(mo->superClass())); if ( mo ) source = "p:" + propertyDocumentation[s]; @@ -939,12 +939,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e ) TQPoint pos = ((TQMouseEvent*)e)->pos(); MenuBarEditor *m = ::tqqt_cast<MenuBarEditor*>(o); showProperties( o ); - if ( m->tqfindItem( pos ) >= m->count() ) + if ( m->findItem( pos ) >= m->count() ) m->setFocus(); } else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<PopupMenuEditor*>(o) ) { PopupMenuEditor *m = ::tqqt_cast<PopupMenuEditor*>(o); PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() ); - if ( m->tqfind( i->action() ) != -1 && !i->isSeparator() ) + if ( m->find( i->action() ) != -1 && !i->isSeparator() ) showProperties( i->action() ); } return TQMainWindow::eventFilter( o, e ); @@ -1261,7 +1261,7 @@ FormWindow *MainWindow::formWindow() if ( ::tqqt_cast<FormWindow*>(qworkspace->activeWindow()) ) fw = (FormWindow*)qworkspace->activeWindow(); else if ( lastActiveFormWindow && - qworkspace->windowList().tqfind( lastActiveFormWindow ) != -1) + qworkspace->windowList().find( lastActiveFormWindow ) != -1) fw = lastActiveFormWindow; return fw; } @@ -1555,18 +1555,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w ) { - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); if ( text && qstrcmp( text->type(), "TQString") != 0 ) text = 0; - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( title && qstrcmp( title->type(), "TQString") != 0 ) title = 0; const TQMetaProperty* pagetitle = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE ); if ( pagetitle && qstrcmp( pagetitle->type(), "TQString") != 0 ) pagetitle = 0; const TQMetaProperty* pixmap = - w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pixmap", TRUE ), TRUE ); + w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE ); if ( pixmap && qstrcmp( pixmap->type(), "TQPixmap") != 0 ) pixmap = 0; @@ -2137,7 +2137,7 @@ void MainWindow::selectionChanged() static TQString fixArgs( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ',', ';' ); + return s.replace( ',', ';' ); } void MainWindow::writeConfig() @@ -2247,7 +2247,7 @@ void MainWindow::writeConfig() static TQString fixArgs2( const TQString &s2 ) { TQString s = s2; - return s.tqreplace( ';', ',' ); + return s.replace( ';', ',' ); } void MainWindow::readConfig() @@ -2295,14 +2295,14 @@ void MainWindow::readConfig() } // We know that the oldSettingsKey() will return 3.1 if ( keybase == DesignerApplication::oldSettingsKey() ) { - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyFiles = config.readListEntry( keybase + "RecentlyOpenedFiles", ',' ); else recentlyFiles = config.readListEntry(keybase + "RecentlyOpenedFiles"); if ( recentlyFiles.count() == 1 && recentlyFiles[0].isNull() ) recentlyFiles.clear(); - if (keybase.tqcontains("3.1")) + if (keybase.contains("3.1")) recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects", ',' ); else recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects"); @@ -2579,7 +2579,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) TQString fullSignal; for ( int i = 0; i < (int)sigs.count(); ++i ) { TQString sig = sigs.at( i ); - if ( sig.left( sig.tqfind( '(' ) ) == defSignal ) { + if ( sig.left( sig.find( '(' ) ) == defSignal ) { fullSignal = sig; break; } @@ -2587,14 +2587,14 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) if ( !fullSignal.isEmpty() ) { TQString signl = fullSignal; - fullSignal = fullSignal.mid( fullSignal.tqfind( '(' ) + 1 ); + fullSignal = fullSignal.mid( fullSignal.find( '(' ) + 1 ); fullSignal.remove( (int)fullSignal.length() - 1, 1 ); fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() ); s += "(" + fullSignal + ")"; if ( !MetaDataBase::hasFunction( f, s.latin1() ) ) MetaDataBase::addFunction( f, s.latin1(), "", "public", "slot", f->project()->language(), "void" ); - s = s.left( s.tqfind( '(' ) ).latin1(); + s = s.left( s.find( '(' ) ).latin1(); if ( !MetaDataBase::hasConnection( f, w, defSignal.latin1(), f->mainContainer(), s.latin1() ) ) { MetaDataBase::Connection conn; conn.sender = TQT_TQOBJECT(w); @@ -2622,8 +2622,8 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f ) return TRUE; } - const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE ); - const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE ); + const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE ); + const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE ); if ( text && text->designable(w) ) { bool ok = FALSE; bool oldDoWrap = FALSE; @@ -2809,7 +2809,7 @@ void MainWindow::projectSelected( TQAction *a ) a->setOn( TRUE ); if ( currentProject ) currentProject->setActive( FALSE ); - Project *p = *projects.tqfind( a ); + Project *p = *projects.find( a ); p->setActive( TRUE ); if ( currentProject == p ) return; @@ -2886,9 +2886,9 @@ void MainWindow::showDialogHelp() else if ( ::tqqt_cast<ProjectSettingsBase*>(w) ) link += "dialog-project-settings"; else if ( ::tqqt_cast<FindDialog*>(w) ) - link += "dialog-tqfind-text"; + link += "dialog-find-text"; else if ( ::tqqt_cast<ReplaceDialog*>(w) ) - link += "dialog-tqreplace-text"; + link += "dialog-replace-text"; else if ( ::tqqt_cast<GotoLineDialog*>(w) ) link += "dialog-go-to-line"; // else if ( ::tqqt_cast<ConnectionEditorBase*>(w) ) @@ -3037,7 +3037,7 @@ TQStringList MainWindow::projectFileNames() const return res; } -Project *MainWindow::tqfindProject( const TQString &projectName ) const +Project *MainWindow::findProject( const TQString &projectName ) const { for ( TQMap<TQAction*, Project* >::ConstIterator it = projects.begin(); it != projects.end(); ++it ) { if ( (*it)->projectName() == projectName ) @@ -3104,7 +3104,7 @@ void MainWindow::addRecentlyOpened( const TQString &fn, TQStringList &lst ) TQFileInfo fi( fn ); fi.convertToAbs(); TQString f = fi.filePath(); - if ( lst.tqfind( f ) != lst.end() ) + if ( lst.find( f ) != lst.end() ) lst.remove( f ); if ( lst.count() >= 10 ) lst.pop_back(); @@ -3215,7 +3215,7 @@ void MainWindow::setModified( bool b, TQWidget *window ) void MainWindow::editorClosed( SourceEditor *e ) { - sourceEditors.take( sourceEditors.tqfindRef( e ) ); + sourceEditors.take( sourceEditors.findRef( e ) ); } void MainWindow::functionsChanged() @@ -3427,7 +3427,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) mblockNewForms = TRUE; if ( !fw ) - openFormWindow( currentProject->makeAbsolute( *qwf_forms->tqfind( (TQWidget*)o ) ) ); + openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) ); else fw->formFile()->showEditor( FALSE ); tqApp->processEvents(); // give all views the chance to get the formwindow @@ -3449,7 +3449,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) } -TQObject *MainWindow::tqfindRealObject( TQObject *o ) +TQObject *MainWindow::findRealObject( TQObject *o ) { TQWidgetList windows = qWorkspace()->windowList(); for ( TQWidget *w = windows.first(); w; w = windows.next() ) { @@ -3625,13 +3625,13 @@ TQString MainWindow::whatsThisFrom( const TQString &key ) } } - int i = menuHelpFile.tqfind( key ); + int i = menuHelpFile.find( key ); if ( i == -1 ) return TQString(); int start = i; int end = i; - start = menuHelpFile.tqfindRev( "<li>", i ) + 4; - end = menuHelpFile.tqfind( '\n', i ) - 1; + start = menuHelpFile.findRev( "<li>", i ) + 4; + end = menuHelpFile.find( '\n', i ) - 1; return menuHelpFile.mid( start, end - start + 1 ); } diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindow.h b/tqtinterface/qt4/tools/designer/designer/mainwindow.h index 30f04df..901f6e0 100644 --- a/tqtinterface/qt4/tools/designer/designer/mainwindow.h +++ b/tqtinterface/qt4/tools/designer/designer/mainwindow.h @@ -147,7 +147,7 @@ public: TQPtrList<DesignerProject> projectList() const; TQStringList projectNames() const; TQStringList projectFileNames() const; - Project *tqfindProject( const TQString &projectName ) const; + Project *findProject( const TQString &projectName ) const; void setCurrentProject( Project *pro ); void setCurrentProjectByFilename( const TQString& proFilename ); OutputWindow *outputWindow() const { return oWindow; } @@ -172,7 +172,7 @@ public: void createNewProject( const TQString &lang ); void popupProjectMenu( const TQPoint &pos ); - TQObject *tqfindRealObject( TQObject *o ); + TQObject *findRealObject( TQObject *o ); void setSingleProject( Project *pro ); bool singleProjectMode() const { return singleProject; } @@ -452,8 +452,8 @@ private: bool autoSaveEnabled; int autoSaveInterval; TQLineEdit *incrementalSearch; - TQGuardedPtr<FindDialog> tqfindDialog; - TQGuardedPtr<ReplaceDialog> tqreplaceDialog; + TQGuardedPtr<FindDialog> findDialog; + TQGuardedPtr<ReplaceDialog> replaceDialog; TQGuardedPtr<GotoLineDialog> gotoLineDialog; Project *eProject; bool inDebugMode; diff --git a/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp b/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp index 281efdc..04fe15e 100644 --- a/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp +++ b/tqtinterface/qt4/tools/designer/designer/mainwindowactions.cpp @@ -1042,7 +1042,7 @@ void MainWindow::fileNewDialog() { static int forms = 0; TQString n = "Dialog" + TQString::number( ++forms ); - while ( currentProject->tqfindFormFile( n + ".ui" ) ) + while ( currentProject->findFormFile( n + ".ui" ) ) n = "Dialog" + TQString::number( ++forms ); FormWindow *fw = 0; FormFile *ff = new FormFile( n + ".ui", FALSE, currentProject ); @@ -1240,24 +1240,24 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co if ( !filename.isEmpty() ) { TQFileInfo fi( filename ); - if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.tqfind( ";pro" ) != -1 ) ) { + if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) { addRecentlyOpened( filename, recentlyProjects ); openProject( filename ); - } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.tqfind( ";ui" ) != -1 ) ) { + } else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) { if ( !inProject ) setCurrentProject( eProject ); openFormWindow( filename ); addRecentlyOpened( filename, recentlyFiles ); - } else if ( !extension.isEmpty() && extension.tqfind( ";" + fi.extension( FALSE ) ) != -1 || - additionalSources.tqfind( fi.extension( FALSE ) ) != additionalSources.end() ) { - SourceFile *sf = project->tqfindSourceFile( project->makeRelative( filename ) ); + } else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 || + additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) { + SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) ); if ( !sf ) sf = new SourceFile( project->makeRelative( filename ), FALSE, project ); editSource( sf ); } else if ( extension.isEmpty() ) { TQString filter; for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) { - if ( (*it2).tqcontains( "." + fi.extension( FALSE ), FALSE ) ) { + if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) { filter = *it2; break; } @@ -1314,7 +1314,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile } statusBar()->message( tr( "Reading file '%1'...").arg( filename ) ); - FormFile *ff2 = currentProject->tqfindFormFile( currentProject->makeRelative(filename) ); + FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) ); if ( ff2 && ff2->formWindow() ) { ff2->formWindow()->setFocus(); return ff2->formWindow(); @@ -1560,7 +1560,7 @@ void MainWindow::editPaste() formWindow()->commandHistory()->setModified( TRUE ); } else { TQMessageBox::information( this, tr( "Paste error" ), - tr( "Can't paste widgets. Designer couldn't tqfind a container\n" + tr( "Can't paste widgets. Designer couldn't find a container\n" "to paste into which does not contain a layout. Break the tqlayout\n" "of the container you want to paste into and select this container\n" "and then paste again." ) ); @@ -1958,14 +1958,14 @@ void MainWindow::searchFind() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - if ( !tqfindDialog ) - tqfindDialog = new FindDialog( this, 0, FALSE ); - tqfindDialog->show(); - tqfindDialog->raise(); - tqfindDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), + if ( !findDialog ) + findDialog = new FindDialog( this, 0, FALSE ); + findDialog->show(); + findDialog->raise(); + findDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), ( (SourceEditor*)qWorkspace()->activeWindow() )->object() ); - tqfindDialog->comboFind->setFocus(); - tqfindDialog->comboFind->lineEdit()->selectAll(); + findDialog->comboFind->setFocus(); + findDialog->comboFind->lineEdit()->selectAll(); } void MainWindow::searchIncremetalFindMenu() @@ -1980,7 +1980,7 @@ void MainWindow::searchIncremetalFind() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, FALSE ); } @@ -1990,7 +1990,7 @@ void MainWindow::searchIncremetalFindNext() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(), + ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(), FALSE, FALSE, TRUE, TRUE ); } @@ -2000,14 +2000,14 @@ void MainWindow::searchReplace() !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) return; - if ( !tqreplaceDialog ) - tqreplaceDialog = new ReplaceDialog( this, 0, FALSE ); - tqreplaceDialog->show(); - tqreplaceDialog->raise(); - tqreplaceDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), + if ( !replaceDialog ) + replaceDialog = new ReplaceDialog( this, 0, FALSE ); + replaceDialog->show(); + replaceDialog->raise(); + replaceDialog->setEditor( ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface(), ( (SourceEditor*)qWorkspace()->activeWindow() )->object() ); - tqreplaceDialog->comboFind->setFocus(); - tqreplaceDialog->comboFind->lineEdit()->selectAll(); + replaceDialog->comboFind->setFocus(); + replaceDialog->comboFind->lineEdit()->selectAll(); } void MainWindow::searchGotoLine() diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp index 1bfc825..429dfb8 100644 --- a/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.cpp @@ -44,7 +44,7 @@ #include "menubareditor.h" #include "popupmenueditor.h" -extern void tqfind_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ); +extern void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w ); // Drag Object Declaration ------------------------------------------- @@ -276,12 +276,12 @@ void MenuBarEditor::removeItem( MenuBarEditorItem * item ) } } -int MenuBarEditor::tqfindItem( MenuBarEditorItem * item ) +int MenuBarEditor::findItem( MenuBarEditorItem * item ) { - return itemList.tqfindRef( item ); + return itemList.findRef( item ); } -int MenuBarEditor::tqfindItem( PopupMenuEditor * menu ) +int MenuBarEditor::findItem( PopupMenuEditor * menu ) { MenuBarEditorItem * i = itemList.first(); @@ -294,7 +294,7 @@ int MenuBarEditor::tqfindItem( PopupMenuEditor * menu ) return -1; } -int MenuBarEditor::tqfindItem( TQPoint & pos ) +int MenuBarEditor::findItem( TQPoint & pos ) { int x = borderSize(); int dx = 0; @@ -319,7 +319,7 @@ int MenuBarEditor::tqfindItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.at(); addItemSizeToCoords( i, x, y, w ); @@ -339,7 +339,7 @@ int MenuBarEditor::tqfindItem( TQPoint & pos ) r = TQRect( x, y, s.width(), s.height() ); - if ( r.tqcontains( pos ) ) + if ( r.contains( pos ) ) return itemList.count(); return itemList.count() + 1; @@ -420,8 +420,8 @@ void MenuBarEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void MenuBarEditor::showLineEdit( int index ) @@ -549,7 +549,7 @@ void MenuBarEditor::checkAccels( TQMap<TQChar, TQWidgetList > &accels ) MenuBarEditorItem * i = itemList.first(); while ( i ) { t = i->menuText(); - tqfind_accel( t, accels, this ); + find_accel( t, accels, this ); // do not check the accelerators in the popup menus i = itemList.next(); } @@ -600,7 +600,7 @@ void MenuBarEditor::mousePressEvent( TQMouseEvent * e ) mousePressPos = e->pos(); hideItem(); lineEdit->hide(); - currentIndex = tqfindItem( mousePressPos ); + currentIndex = findItem( mousePressPos ); showItem(); update(); e->accept(); @@ -609,7 +609,7 @@ void MenuBarEditor::mousePressEvent( TQMouseEvent * e ) void MenuBarEditor::mouseDoubleClickEvent( TQMouseEvent * e ) { mousePressPos = e->pos(); - currentIndex = tqfindItem( mousePressPos ); + currentIndex = findItem( mousePressPos ); lineEdit->hide(); if ( currentIndex > (int)itemList.count() ) { insertSeparator(); @@ -625,7 +625,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) if ( ( e->pos() - mousePressPos ).manhattanLength() > 3 ) { bool itemCreated = FALSE; bool isSeparator = FALSE; - draggedItem = item( tqfindItem( mousePressPos ) ); + draggedItem = item( findItem( mousePressPos ) ); if ( draggedItem == &addItem ) { draggedItem = createItem(); itemCreated = TRUE; @@ -651,7 +651,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. - itemList.tqfind( draggedItem ); + itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); dropConfirmed = FALSE; d->dragCopy(); // dragevents and stuff happens @@ -697,7 +697,7 @@ void MenuBarEditor::dragMoveEvent( TQDragMoveEvent * e ) TQPoint pos = e->pos(); dropLine->move( snapToItem( pos ) ); - int idx = tqfindItem( pos ); + int idx = findItem( pos ); if ( currentIndex != idx ) { hideItem(); currentIndex = idx; @@ -1009,7 +1009,7 @@ void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos ) hideItem(); Command * cmd = 0; - int iidx = itemList.tqfindRef( i ); + int iidx = itemList.findRef( i ); if ( iidx != -1 ) { // internal dnd cmd = new MoveMenuCommand( "Item Dragged", formWnd, this, iidx, idx ); item( iidx )->tqsetVisible( TRUE ); diff --git a/tqtinterface/qt4/tools/designer/designer/menubareditor.h b/tqtinterface/qt4/tools/designer/designer/menubareditor.h index 913f0a8..7ce2c35 100644 --- a/tqtinterface/qt4/tools/designer/designer/menubareditor.h +++ b/tqtinterface/qt4/tools/designer/designer/menubareditor.h @@ -107,9 +107,9 @@ public: void removeItemAt( int index ); void removeItem( MenuBarEditorItem * item ); - int tqfindItem( MenuBarEditorItem * item ); - int tqfindItem( PopupMenuEditor * menu ); - int tqfindItem( TQPoint & pos ); + int findItem( MenuBarEditorItem * item ); + int findItem( PopupMenuEditor * menu ); + int findItem( TQPoint & pos ); MenuBarEditorItem * item( int index = -1 ); diff --git a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp index 501e6cc..f428e98 100644 --- a/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp +++ b/tqtinterface/qt4/tools/designer/designer/metadatabase.cpp @@ -127,7 +127,7 @@ void MetaDataBase::addEntry( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - if ( db->tqfind( o ) ) + if ( db->find( o ) ) return; MetaDataBaseRecord *r = new MetaDataBaseRecord; r->object = TQT_TQOBJECT(o); @@ -150,7 +150,7 @@ void MetaDataBase::setPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString & ( (PropertyObject*)o )->mdPropertyChanged( property, changed ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -158,10 +158,10 @@ void MetaDataBase::setPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString & } if ( changed ) { - if ( r->changedProperties.tqfindIndex( property ) == -1 ) + if ( r->changedProperties.findIndex( property ) == -1 ) r->changedProperties.append( property ); } else { - if ( r->changedProperties.tqfindIndex( property ) != -1 ) + if ( r->changedProperties.findIndex( property ) != -1 ) r->changedProperties.remove( property ); } @@ -189,20 +189,20 @@ bool MetaDataBase::isPropertyChanged( TQT_BASE_OBJECT_NAME *o, const TQString &p setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdIsPropertyChanged( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return FALSE; } - return r->changedProperties.tqfindIndex( property ) != -1; + return r->changedProperties.findIndex( property ) != -1; } TQStringList MetaDataBase::changedProperties( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -220,7 +220,7 @@ void MetaDataBase::setPropertyComment( TQT_BASE_OBJECT_NAME *o, const TQString & ( (PropertyObject*)o )->mdSetPropertyComment( property, comment ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -235,14 +235,14 @@ TQString MetaDataBase::propertyComment( TQT_BASE_OBJECT_NAME *o, const TQString setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPropertyComment( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - return *r->propertyComments.tqfind( property ); + return *r->propertyComments.find( property ); } void MetaDataBase::setFakeProperty( TQT_BASE_OBJECT_NAME *o, const TQString &property, const TQVariant& value ) @@ -252,7 +252,7 @@ void MetaDataBase::setFakeProperty( TQT_BASE_OBJECT_NAME *o, const TQString &pro ( (PropertyObject*)o )->mdSetFakeProperty( property, value ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -266,13 +266,13 @@ TQVariant MetaDataBase::fakeProperty( TQT_BASE_OBJECT_NAME * o, const TQString & setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdFakeProperty( property ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQVariant(); } - TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.tqfind( property ); + TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property ); if ( it != r->fakeProperties.end() ) return r->fakeProperties[property]; return WidgetFactory::defaultValue( o, property ); @@ -282,7 +282,7 @@ TQVariant MetaDataBase::fakeProperty( TQT_BASE_OBJECT_NAME * o, const TQString & TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQT_BASE_OBJECT_NAME* o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -296,7 +296,7 @@ void MetaDataBase::setSpacing( TQT_BASE_OBJECT_NAME *o, int spacing ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -324,7 +324,7 @@ int MetaDataBase::spacing( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -339,7 +339,7 @@ void MetaDataBase::setMargin( TQT_BASE_OBJECT_NAME *o, int margin ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -381,7 +381,7 @@ int MetaDataBase::margin( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -395,7 +395,7 @@ void MetaDataBase::setResizeMode( TQT_BASE_OBJECT_NAME *o, const TQString &mode if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -412,7 +412,7 @@ TQString MetaDataBase::resizeMode( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( ::tqqt_cast<TQMainWindow*>(o) ) o = ( (TQMainWindow*)o )->centralWidget(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -425,7 +425,7 @@ void MetaDataBase::addConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQT_BASE_OBJECT_NAME *receiver, const TQCString &slot, bool addCode ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -459,7 +459,7 @@ void MetaDataBase::removeConnection( TQT_BASE_OBJECT_NAME *o, TQObject *sender, TQObject *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -488,7 +488,7 @@ void MetaDataBase::removeConnection( TQT_BASE_OBJECT_NAME *o, TQObject *sender, void MetaDataBase::setupConnections( TQT_BASE_OBJECT_NAME *o, const TQValueList<LanguageInterface::Connection> &conns ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -506,8 +506,8 @@ void MetaDataBase::setupConnections( TQT_BASE_OBJECT_NAME *o, const TQValueList< cit != conns.end(); ++cit ) { // #### get the correct sender object out of Bla.Blub.sender TQString senderName = (*cit).sender; - if ( senderName.tqfind( '.' ) != -1 ) - senderName = senderName.mid( senderName.tqfindRev( '.' ) + 1 ); + if ( senderName.find( '.' ) != -1 ) + senderName = senderName.mid( senderName.findRev( '.' ) + 1 ); TQObject *sender = 0; if ( formfile->formWindow() ) sender = formfile->formWindow()->child( senderName ); @@ -536,7 +536,7 @@ bool MetaDataBase::hasConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQT_BASE_OBJECT_NAME *receiver, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -558,7 +558,7 @@ bool MetaDataBase::hasConnection( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -571,7 +571,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT TQT_BASE_OBJECT_NAME *receiver ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -593,7 +593,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT_NAME *o, TQT_BASE_OBJECT_NAME *object ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -614,7 +614,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQT_BASE_OBJECT void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -657,8 +657,8 @@ void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) continue; TQObject::connect( sender, s, receiver, s2 ); @@ -668,7 +668,7 @@ void MetaDataBase::doConnections( TQT_BASE_OBJECT_NAME *o ) bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -677,13 +677,13 @@ bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool if ( !onlyCustom ) { TQStrList slotList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = ( (FormWindow*)o )->mainContainer(); slotList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( slot ) != -1 ) + if ( slotList.find( slot ) != -1 ) return TRUE; } @@ -712,7 +712,7 @@ bool MetaDataBase::hasSlot( TQT_BASE_OBJECT_NAME *o, const TQCString &slot, bool bool MetaDataBase::isSlotUsed( TQT_BASE_OBJECT_NAME *o, const TQCString &slot ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -733,7 +733,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -747,7 +747,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi f.type = type; f.language = language; f.returnType = returnType; - TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.tqfind( f ); + TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.find( f ); if ( it != r->functionList.end() ) r->functionList.remove( it ); r->functionList.append( f ); @@ -757,7 +757,7 @@ void MetaDataBase::addFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi void MetaDataBase::setFunctionList( TQT_BASE_OBJECT_NAME *o, const TQValueList<Function> &functionList ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -771,7 +771,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &fun const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -795,7 +795,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &fun void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -813,7 +813,7 @@ void MetaDataBase::removeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &func TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQT_BASE_OBJECT_NAME *o, bool onlyFunctions ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -832,7 +832,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQT_BASE_OBJECT_ TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -850,7 +850,7 @@ void MetaDataBase::changeFunction( TQT_BASE_OBJECT_NAME *o, const TQString &func const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -874,7 +874,7 @@ void MetaDataBase::changeFunctionAttributes( TQT_BASE_OBJECT_NAME *o, const TQSt const TQString &returnType ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -898,7 +898,7 @@ void MetaDataBase::changeFunctionAttributes( TQT_BASE_OBJECT_NAME *o, const TQSt bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &function, bool onlyCustom ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -907,13 +907,13 @@ bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi if ( !onlyCustom ) { TQStrList functionList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; if ( ::tqqt_cast<FormWindow*>(o) ) { o = ( (FormWindow*)o )->mainContainer(); functionList = TQT_TQOBJECT(o)->tqmetaObject()->slotNames( TRUE ); - if ( functionList.tqfind( function ) != -1 ) + if ( functionList.find( function ) != -1 ) return TRUE; } @@ -942,7 +942,7 @@ bool MetaDataBase::hasFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &functi TQString MetaDataBase::languageOfFunction( TQT_BASE_OBJECT_NAME *o, const TQCString &function ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1036,7 +1036,7 @@ bool MetaDataBase::hasCustomWidget( const TQString &className ) void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1049,7 +1049,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*) w ); + MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1062,7 +1062,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) void MetaDataBase::setIncludes( TQT_BASE_OBJECT_NAME *o, const TQValueList<Include> &incs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1075,7 +1075,7 @@ void MetaDataBase::setIncludes( TQT_BASE_OBJECT_NAME *o, const TQValueList<Inclu TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1088,7 +1088,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQT_BASE_OBJECT_NAME void MetaDataBase::setForwards( TQT_BASE_OBJECT_NAME *o, const TQStringList &fwds ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1101,7 +1101,7 @@ void MetaDataBase::setForwards( TQT_BASE_OBJECT_NAME *o, const TQStringList &fwd TQStringList MetaDataBase::forwards( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1114,7 +1114,7 @@ TQStringList MetaDataBase::forwards( TQT_BASE_OBJECT_NAME *o ) void MetaDataBase::setVariables( TQT_BASE_OBJECT_NAME *o, const TQValueList<Variable> &vars ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1127,7 +1127,7 @@ void MetaDataBase::setVariables( TQT_BASE_OBJECT_NAME *o, const TQValueList<Vari void MetaDataBase::addVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name, const TQString &access ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1142,7 +1142,7 @@ void MetaDataBase::addVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name, c void MetaDataBase::removeVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1160,7 +1160,7 @@ void MetaDataBase::removeVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1173,7 +1173,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQT_BASE_OBJECT_NAM bool MetaDataBase::hasVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1190,7 +1190,7 @@ bool MetaDataBase::hasVariable( TQT_BASE_OBJECT_NAME *o, const TQString &name ) TQString MetaDataBase::extractVariableName( const TQString &name ) { - TQString n = name.right( name.length() - name.tqfindRev( ' ' ) - 1 ); + TQString n = name.right( name.length() - name.findRev( ' ' ) - 1 ); if ( n[ 0 ] == '*' || n[ 0 ] == '&' ) n[ 0 ] = ' '; if ( n[ (int)n.length() - 1 ] == ';' ) @@ -1201,7 +1201,7 @@ TQString MetaDataBase::extractVariableName( const TQString &name ) void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &sigs ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1215,10 +1215,10 @@ void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &s bool hasSemicolon = s.endsWith( ";" ); if ( hasSemicolon ) s = s.left( s.length() - 1 ); - int p = s.tqfind( '(' ); + int p = s.find( '(' ); if ( p < 0 ) p = s.length(); - int sp = s.tqfind( ' ' ); + int sp = s.find( ' ' ); if ( sp >= 0 && sp < p ) { s = s.mid( sp+1 ); p -= sp + 1; @@ -1234,7 +1234,7 @@ void MetaDataBase::setSignalList( TQT_BASE_OBJECT_NAME *o, const TQStringList &s TQStringList MetaDataBase::signalList( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1247,7 +1247,7 @@ TQStringList MetaDataBase::signalList( TQT_BASE_OBJECT_NAME *o ) void MetaDataBase::setMetaInfo( TQT_BASE_OBJECT_NAME *o, MetaInfo mi ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1260,7 +1260,7 @@ void MetaDataBase::setMetaInfo( TQT_BASE_OBJECT_NAME *o, MetaInfo mi ) MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQT_BASE_OBJECT_NAME *o ) { setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1306,7 +1306,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) ( (PropertyObject*)w )->mdSetCursor( c ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); @@ -1321,7 +1321,7 @@ TQCursor MetaDataBase::cursor( TQWidget *w ) setupDataBase(); if ( w->isA( "PropertyObject" ) ) return ( (PropertyObject*)w )->mdCursor(); - MetaDataBaseRecord *r = db->tqfind( (void*)w ); + MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { w->unsetCursor(); return w->cursor(); @@ -1357,7 +1357,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const { TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE ); - if ( sigList.tqfind( signal ) != -1 ) + if ( sigList.find( signal ) != -1 ) return TRUE; for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) { if ( normalizeFunction( *it ) == normalizeFunction( signal ) ) @@ -1369,7 +1369,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const { TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE ); - if ( slotList.tqfind( normalizeFunction( slot ) ) != -1 ) + if ( slotList.find( normalizeFunction( slot ) ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Function>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) { @@ -1382,7 +1382,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const { TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE ); - if ( propList.tqfind( prop ) != -1 ) + if ( propList.find( prop ) != -1 ) return TRUE; for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) { @@ -1397,7 +1397,7 @@ void MetaDataBase::setPixmapArgument( TQT_BASE_OBJECT_NAME *o, int pixmap, const if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1413,14 +1413,14 @@ TQString MetaDataBase::pixmapArgument( TQT_BASE_OBJECT_NAME *o, int pixmap ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - return *r->pixmapArguments.tqfind( pixmap ); + return *r->pixmapArguments.find( pixmap ); } void MetaDataBase::clearPixmapArguments( TQT_BASE_OBJECT_NAME *o ) @@ -1428,7 +1428,7 @@ void MetaDataBase::clearPixmapArguments( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1448,7 +1448,7 @@ void MetaDataBase::setPixmapKey( TQT_BASE_OBJECT_NAME *o, int pixmap, const TQSt ( (PropertyObject*)o )->mdSetPixmapKey( pixmap, arg ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1466,21 +1466,21 @@ TQString MetaDataBase::pixmapKey( TQT_BASE_OBJECT_NAME *o, int pixmap ) setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdPixmapKey( pixmap ); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - TQString s = *r->pixmapKeys.tqfind( pixmap ); + TQString s = *r->pixmapKeys.find( pixmap ); if ( !s.isNull() ) return s; if ( !o->isWidgetType() ) return s; TQWidget *w = (TQWidget*)o; if ( w->icon() ) - return *r->pixmapKeys.tqfind( w->icon()->serialNumber() ); + return *r->pixmapKeys.find( w->icon()->serialNumber() ); return s; } @@ -1489,7 +1489,7 @@ void MetaDataBase::clearPixmapKeys( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1506,7 +1506,7 @@ void MetaDataBase::setColumnFields( TQT_BASE_OBJECT_NAME *o, const TQMap<TQStrin if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1521,7 +1521,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return TQMap<TQString, TQString>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1538,7 +1538,7 @@ void MetaDataBase::setEditor( const TQStringList &langs ) bool MetaDataBase::hasEditor( const TQString &lang ) { - return editorLangList.tqfind( lang ) != editorLangList.end(); + return editorLangList.find( lang ) != editorLangList.end(); } void MetaDataBase::setupInterfaceManagers( const TQString &plugDir ) @@ -1587,7 +1587,7 @@ void MetaDataBase::setBreakPoints( TQT_BASE_OBJECT_NAME *o, const TQValueList<ui if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1600,8 +1600,8 @@ void MetaDataBase::setBreakPoints( TQT_BASE_OBJECT_NAME *o, const TQValueList<ui while ( it != r->breakPointConditions.end() ) { int line = it.key(); ++it; - if ( r->breakPoints.tqfind( line ) == r->breakPoints.end() ) - r->breakPointConditions.remove( r->breakPointConditions.tqfind( line ) ); + if ( r->breakPoints.find( line ) == r->breakPoints.end() ) + r->breakPointConditions.remove( r->breakPointConditions.find( line ) ); } } @@ -1610,7 +1610,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQT_BASE_OBJECT_NAME *o ) if ( !o ) return TQValueList<uint>(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1625,13 +1625,13 @@ void MetaDataBase::setBreakPointCondition( TQT_BASE_OBJECT_NAME *o, int line, co if ( !o ) return; setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return; } - r->breakPointConditions.tqreplace( line, condition ); + r->breakPointConditions.replace( line, condition ); } TQString MetaDataBase::breakPointCondition( TQT_BASE_OBJECT_NAME *o, int line ) @@ -1639,13 +1639,13 @@ TQString MetaDataBase::breakPointCondition( TQT_BASE_OBJECT_NAME *o, int line ) if ( !o ) return TQString(); setupDataBase(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); return TQString(); } - TQMap<int, TQString>::Iterator it = r->breakPointConditions.tqfind( line ); + TQMap<int, TQString>::Iterator it = r->breakPointConditions.find( line ); if ( it == r->breakPointConditions.end() ) return TQString(); return *it; @@ -1660,7 +1660,7 @@ void MetaDataBase::setExportMacro( TQT_BASE_OBJECT_NAME *o, const TQString ¯ ( (PropertyObject*)o )->mdSetExportMacro( macro ); return; } - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1677,7 +1677,7 @@ TQString MetaDataBase::exportMacro( TQT_BASE_OBJECT_NAME *o ) setupDataBase(); if ( TQT_TQOBJECT(o)->isA( "PropertyObject" ) ) return ( (PropertyObject*)o )->mdExportMacro(); - MetaDataBaseRecord *r = db->tqfind( (void*)o ); + MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { qWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, TQT_TQOBJECT(o)->name(), TQT_TQOBJECT(o)->className() ); @@ -1689,5 +1689,5 @@ TQString MetaDataBase::exportMacro( TQT_BASE_OBJECT_NAME *o ) bool MetaDataBase::hasObject( TQT_BASE_OBJECT_NAME *o ) { - return !!db->tqfind( o ); + return !!db->find( o ); } diff --git a/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp index d8a1ff2..819712b 100644 --- a/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/multilineeditorimpl.cpp @@ -234,7 +234,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget mlined->setReadOnly( TRUE ); const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property( - mlined->tqmetaObject()->tqfindProperty( "wordWrap", TRUE ), TRUE ); + mlined->tqmetaObject()->findProperty( "wordWrap", TRUE ), TRUE ); oldWrapMode = 0; oldWrapString = "NoWrap"; if ( wordWrap ) { @@ -323,7 +323,7 @@ void MultiLineEditor::insertTags( const TQString &tag ) { int pfrom, pto, ifrom, ito; TQString tagend( tag.simplifyWhiteSpace() ); - tagend.remove( tagend.tqfind( ' ', 0 ), tagend.length() ); + tagend.remove( tagend.find( ' ', 0 ), tagend.length() ); if ( textEdit->hasSelectedText() ) { textEdit->getSelection( &pfrom, &ifrom, &pto, &ito ); TQString buf = textEdit->selectedText(); diff --git a/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp b/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp index 1192529..92a9b87 100644 --- a/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/newformimpl.cpp @@ -141,12 +141,12 @@ static void unifyFormName( FormWindow *fw, TQWorkspace *qworkspace ) lst << w->name(); } - if ( lst.tqfindIndex( fw->name() ) == -1 ) + if ( lst.findIndex( fw->name() ) == -1 ) return; TQString origName = fw->name(); TQString n = origName; int i = 1; - while ( lst.tqfindIndex( n ) != -1 ) { + while ( lst.findIndex( n ) != -1 ) { n = origName + TQString::number( i++ ); } fw->setName( n ); @@ -310,7 +310,7 @@ void NewForm::insertTemplates( TQIconView *tView, if ( !fi->isFile() || fi->extension() != "ui" ) continue; TQString name = fi->baseName(); - name = name.tqreplace( '_', ' ' ); + name = name.replace( '_', ' ' ); CustomFormItem *ci = new CustomFormItem( tView, name ); allItems.append( ci ); ci->setDragEnabled( FALSE ); @@ -386,7 +386,7 @@ void NewForm::accept() { if ( !templateView->currentItem() ) return; - Project *pro = MainWindow::self->tqfindProject( projectCombo->currentText() ); + Project *pro = MainWindow::self->findProject( projectCombo->currentText() ); if ( !pro ) return; MainWindow::self->setCurrentProject( pro ); @@ -396,7 +396,7 @@ void NewForm::accept() void NewForm::projectChanged( const TQString &project ) { - Project *pro = MainWindow::self->tqfindProject( project ); + Project *pro = MainWindow::self->findProject( project ); if ( !pro ) return; TQIconViewItem *i; diff --git a/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp b/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp index ef3a943..8bc6ac3 100644 --- a/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp +++ b/tqtinterface/qt4/tools/designer/designer/outputwindow.cpp @@ -187,7 +187,7 @@ ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQStrin setMultiLinesEnabled( TRUE ); TQString m( message ); type = m.startsWith( "Warning: " ) ? Warning : Error; - m = m.mid( m.tqfind( ':' ) + 1 ); + m = m.mid( m.find( ':' ) + 1 ); setText( 0, type == Error ? "Error" : "Warning" ); setText( 1, m ); setText( 2, TQString::number( line ) ); diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp b/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp index 32b1231..8d0f41e 100644 --- a/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp +++ b/tqtinterface/qt4/tools/designer/designer/pixmapchooser.cpp @@ -198,7 +198,7 @@ ImageIconProvider::~ImageIconProvider() const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi ) { TQString ext = fi.extension().upper(); - if ( fmts.tqcontains( ext ) ) { + if ( fmts.contains( ext ) ) { return &imagepm; } else { return TQFileIconProvider::pixmap( fi ); diff --git a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h index 2dfe556..84c6bcf 100644 --- a/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/pixmapcollectioneditor.ui.h @@ -67,7 +67,7 @@ void PixmapCollectionEditor::addPixmap() } updateView(); - TQIconViewItem *item = viewPixmaps->tqfindItem( lastName ); + TQIconViewItem *item = viewPixmaps->findItem( lastName ); if ( item ) { viewPixmaps->setCurrentItem( item ); viewPixmaps->ensureItemVisible( item ); @@ -130,7 +130,7 @@ void PixmapCollectionEditor::setChooserMode( bool c ) void PixmapCollectionEditor::setCurrentItem( const TQString & name ) { - TQIconViewItem *i = viewPixmaps->tqfindItem( name ); + TQIconViewItem *i = viewPixmaps->findItem( name ); if ( i ) { viewPixmaps->setCurrentItem( i ); currentChanged( i ); diff --git a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp index d9d6a17..ee2eadc 100644 --- a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.cpp @@ -232,7 +232,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) TQChildEvent * ce = ( TQChildEvent * ) event; TQObject * c = TQT_TQOBJECT(ce->child()); TQAction * action = ::tqqt_cast<TQAction*>( c ); - if ( s->tqfind( action ) != -1 ) // avoid duplicates + if ( s->find( action ) != -1 ) // avoid duplicates return FALSE; TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c ); if ( actionGroup ) @@ -246,7 +246,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event ) void PopupMenuEditorItem::selfDestruct() { hideMenu(); - int i = m->tqfind( s ); + int i = m->find( s ); if ( i != -1 && i < m->count() ) m->remove( i ); // remove this item a = 0; // the selfDestruct call was caused by the deletion of the action @@ -379,7 +379,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index ) delete l; } -int PopupMenuEditor::tqfind( const TQAction * action ) +int PopupMenuEditor::find( const TQAction * action ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -390,7 +390,7 @@ int PopupMenuEditor::tqfind( const TQAction * action ) return -1; } -int PopupMenuEditor::tqfind( PopupMenuEditor * menu ) +int PopupMenuEditor::find( PopupMenuEditor * menu ) { PopupMenuEditorItem * i = itemList.first(); while ( i ) { @@ -419,8 +419,8 @@ void PopupMenuEditor::exchange( int a, int b ) ia == &addItem || ia == &addSeparator || ib == &addItem || ib == &addSeparator ) return; // do nothing - itemList.tqreplace( b, ia ); - itemList.tqreplace( a, ib ); + itemList.replace( b, ia ); + itemList.replace( a, ib ); } void PopupMenuEditor::cut( int index ) @@ -785,7 +785,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e ) // If the item is dropped in the same list, // we will have two instances of the same pointer // in the list. We use node instead. - int idx = itemList.tqfind( draggedItem ); + int idx = itemList.find( draggedItem ); TQLNode * node = itemList.currentNode(); d->dragCopy(); // dragevents and stuff happens @@ -1228,7 +1228,7 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y ) idx++; n = itemList.next(); } - int same = itemList.tqfindRef( i ); + int same = itemList.findRef( i ); AddActionToPopupCommand * cmd = new AddActionToPopupCommand( "Drop Item", formWnd, this, i, idx ); formWnd->commandHistory()->addCommand( cmd ); cmd->execute(); @@ -1409,7 +1409,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e ) // new item was created TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx(); TQString actionText = lineEdit->text(); - actionText.tqreplace("&&", "&"); + actionText.replace("&&", "&"); TQString menuText = lineEdit->text(); a->setText( actionText ); a->setMenuText( menuText ); @@ -1450,18 +1450,18 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item ) TQWidget *e = parentEditor(); PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e); if ( p ) { - int idx = p->tqfind( item->m ); + int idx = p->find( item->m ); PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 ); s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) ); } else { MenuBarEditor *b = ::tqqt_cast<MenuBarEditor*>(e); if ( b ) { - int idx = b->tqfindItem( item->m ); + int idx = b->findItem( item->m ); MenuBarEditorItem * i = ( idx > -1 ? b->item( idx ) : 0 ); s = ( i ? i->menuText().lower() : TQString( "" ) ); } } - // tqreplace illegal characters + // replace illegal characters return ( RenameMenuCommand::makeLegal( s ) + RenameMenuCommand::makeLegal( name ) + "Action" ); diff --git a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h index df070d9..1015b09 100644 --- a/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h +++ b/tqtinterface/qt4/tools/designer/designer/popupmenueditor.h @@ -124,8 +124,8 @@ public: void insert( PopupMenuEditorItem * item, int index = -1 ); void insert( TQAction * action, int index = -1 ); void insert( TQActionGroup * actionGroup, int index = -1 ); - int tqfind( const TQAction * action ); - int tqfind( PopupMenuEditor * menu ); + int find( const TQAction * action ); + int find( PopupMenuEditor * menu ); int count(); PopupMenuEditorItem * at( int index ); PopupMenuEditorItem * at( TQPoint pos ) { return itemAt( pos.y() ); } @@ -160,7 +160,7 @@ public Q_SLOTS: void paste() { paste( currentIndex ); } void remove( int index ); - void remove( TQAction * a ) { remove( tqfind( a ) ); } + void remove( TQAction * a ) { remove( find( a ) ); } void resizeToContents(); void showSubMenu(); diff --git a/tqtinterface/qt4/tools/designer/designer/project.cpp b/tqtinterface/qt4/tools/designer/designer/project.cpp index fa14e25..5e0ec53 100644 --- a/tqtinterface/qt4/tools/designer/designer/project.cpp +++ b/tqtinterface/qt4/tools/designer/designer/project.cpp @@ -113,12 +113,12 @@ bool DatabaseConnection::open( bool suppressDialog ) #ifndef TQT_NO_SQL // register our name, if nec if ( nm == "(default)" ) { - if ( !TQSqlDatabase::tqcontains() ) // default doesn't exists? + if ( !TQSqlDatabase::contains() ) // default doesn't exists? conn = TQSqlDatabase::addDatabase( drv ); else conn = TQSqlDatabase::database(); } else { - if ( !TQSqlDatabase::tqcontains( nm ) ) + if ( !TQSqlDatabase::contains( nm ) ) conn = TQSqlDatabase::addDatabase( drv, nm ); else conn = TQSqlDatabase::database( nm ); @@ -290,8 +290,8 @@ void Project::setFileName( const TQString &fn, bool doClear ) } - if ( proName.tqcontains( '.' ) ) - proName = proName.left( proName.tqfind( '.' ) ); + if ( proName.contains( '.' ) ) + proName = proName.left( proName.find( '.' ) ); if ( !doClear ) return; @@ -450,7 +450,7 @@ void Project::parse() TQStringList::ConstIterator it; - int i = contents.tqfind( "LANGUAGE" ); + int i = contents.find( "LANGUAGE" ); if ( i != -1 ) { lang = ""; is_cpp = FALSE; @@ -459,7 +459,7 @@ void Project::parse() is_cpp = lang == "C++"; } - i = contents.tqfind( "DBFILE" ); + i = contents.find( "DBFILE" ); if ( i != -1 ) { dbFile = ""; TQString part = contents.mid( i + TQString( "DBFILE" ).length() ); @@ -475,7 +475,7 @@ void Project::parse() } - i = contents.tqfind( "TEMPLATE" ); + i = contents.find( "TEMPLATE" ); if ( i != -1 ) { templ = ""; TQString part = contents.mid( i + TQString( "TEMPLATE" ).length() ); @@ -503,12 +503,12 @@ void Project::parse() updateCustomSettings(); for ( it = csList.begin(); it != csList.end(); ++it ) { - i = contents.tqfind( *it ); + i = contents.find( *it ); if ( i != -1 ) { TQString val = ""; TQString part = contents.mid( i + TQString( *it ).length() ); val = parse_part( part ); - customSettings.tqreplace( *it, val ); + customSettings.replace( *it, val ); } } @@ -537,7 +537,7 @@ void Project::clear() bool Project::removeSourceFile( SourceFile *sf ) { - if ( !sourcefiles.tqcontainsRef( sf ) ) + if ( !sourcefiles.containsRef( sf ) ) return FALSE; if ( !sf->close() ) return FALSE; @@ -601,10 +601,10 @@ TQString Project::makeRelative( const TQString &f ) static void remove_contents( TQString &contents, const TQString &s ) { - int i = contents.tqfind( s ); + int i = contents.find( s ); if ( i != -1 ) { int start = i; - int end = contents.tqfind( '\n', i ); + int end = contents.find( '\n', i ); if ( end == -1 ) end = contents.length() - 1; contents.remove( start, end - start + 1 ); @@ -613,9 +613,9 @@ static void remove_contents( TQString &contents, const TQString &s ) static void remove_multiline_contents( TQString &contents, const TQString &s, int *strt = 0 ) { - int i = contents.tqfind( s ); - int startBrace = contents.tqfindRev("{", i); - int endBrace = contents.tqfindRev("}", i); + int i = contents.find( s ); + int startBrace = contents.findRev("{", i); + int endBrace = contents.findRev("}", i); // We found a startBrace before i, but no endBrace after the startBrace before i if (startBrace != -1 && endBrace < startBrace) return; @@ -745,7 +745,7 @@ void Project::save( bool onlyProjectFile ) TQString key = iface->projectKeyForExtension( TQFileInfo( f->fileName() ).extension() ); TQStringList lst = sourceToKey[ key ]; lst << makeRelative( f->fileName() ); - sourceToKey.tqreplace( key, lst ); + sourceToKey.replace( key, lst ); } for ( TQMap<TQString, TQStringList>::Iterator skit = sourceToKey.begin(); @@ -791,7 +791,7 @@ void Project::save( bool onlyProjectFile ) // custom settings for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) { - TQString val = *customSettings.tqfind( *it ); + TQString val = *customSettings.find( *it ); if ( !val.isEmpty() ) contents += *it + "\t= " + val + "\n"; } @@ -1145,7 +1145,7 @@ void Project::setCustomSetting( const TQString &key, const TQString &value ) TQString Project::customSetting( const TQString &key ) const { - return *customSettings.tqfind( key ); + return *customSettings.find( key ); } void Project::updateCustomSettings() @@ -1184,7 +1184,7 @@ void Project::addSourceFile( SourceFile *sf ) } -SourceFile* Project::tqfindSourceFile( const TQString& filename, SourceFile *ignore ) const +SourceFile* Project::findSourceFile( const TQString& filename, SourceFile *ignore ) const { TQPtrListIterator<SourceFile> it(sourcefiles); while ( it.current() ) { @@ -1195,7 +1195,7 @@ SourceFile* Project::tqfindSourceFile( const TQString& filename, SourceFile *ign return 0; } -FormFile* Project::tqfindFormFile( const TQString& filename, FormFile *ignore ) const +FormFile* Project::findFormFile( const TQString& filename, FormFile *ignore ) const { TQPtrListIterator<FormFile> it(formfiles); while ( it.current() ) { @@ -1210,23 +1210,23 @@ void Project::setIncludePath( const TQString &platform, const TQString &path ) { if ( inclPath[platform] == path ) return; - inclPath.tqreplace( platform, path ); + inclPath.replace( platform, path ); modified = TRUE; } void Project::setLibs( const TQString &platform, const TQString &path ) { - lbs.tqreplace( platform, path ); + lbs.replace( platform, path ); } void Project::setDefines( const TQString &platform, const TQString &path ) { - defs.tqreplace( platform, path ); + defs.replace( platform, path ); } void Project::setConfig( const TQString &platform, const TQString &config ) { - cfg.tqreplace( platform, config ); + cfg.replace( platform, config ); } TQString Project::config( const TQString &platform ) const @@ -1273,7 +1273,7 @@ void Project::readPlatformSettings( const TQString &contents, TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - res.tqreplace( key, s ); + res.replace( key, s ); } } @@ -1305,7 +1305,7 @@ void Project::writePlatformSettings( TQString &contents, const TQString &setting TQString key = platforms[ i ]; if ( key.isEmpty() ) key = "(all)"; - TQMap<TQString, TQString>::ConstIterator it = input.tqfind( key ); + TQMap<TQString, TQString>::ConstIterator it = input.find( key ); if ( it == input.end() || (*it).isEmpty() ) continue; contents += p + setting + "\t+= " + *it + "\n\n"; @@ -1321,7 +1321,7 @@ void Project::addFormFile( FormFile *ff ) bool Project::removeFormFile( FormFile *ff ) { - if ( !formfiles.tqcontainsRef( ff ) ) + if ( !formfiles.containsRef( ff ) ) return FALSE; if ( !ff->close() ) return FALSE; @@ -1392,7 +1392,7 @@ TQObjectList Project::objects() const FormFile *Project::fakeFormFileFor( TQObject *o ) const { - return fakeFormFiles.tqfind( (void*)o ); + return fakeFormFiles.find( (void*)o ); } TQObject *Project::objectForFakeForm( FormWindow *fw ) const @@ -1451,14 +1451,14 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func return; iface->functions( f->text(), &funcs ); TQString func = function; - int i = func.tqfind( '(' ); + int i = func.find( '(' ); if ( i != -1 ) func = func.left( i ); bool found = FALSE; for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin(); it != funcs.end(); ++it ) { - if ( (*it).name.left( (*it).name.tqfind( '(' ) ) == func ) { + if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) { found = TRUE; break; } @@ -1503,7 +1503,7 @@ TQString Project::qualifiedName( TQObject *o ) TQObject *p = o->tqparent(); while ( p ) { name.prepend( TQString( p->name() ) + "." ); - if ( objs.tqfindRef( p ) != -1 ) + if ( objs.findRef( p ) != -1 ) break; p = p->tqparent(); } @@ -1587,7 +1587,7 @@ TQString Project::locationOfObject( TQObject *o ) return TQString(); } - TQString s = makeRelative( *qwf_forms->tqfind( (TQWidget*)o ) ); + TQString s = makeRelative( *qwf_forms->find( (TQWidget*)o ) ); s += " [Source]"; return s; } diff --git a/tqtinterface/qt4/tools/designer/designer/project.h b/tqtinterface/qt4/tools/designer/designer/project.h index bb4b8bb..ff39f5e 100644 --- a/tqtinterface/qt4/tools/designer/designer/project.h +++ b/tqtinterface/qt4/tools/designer/designer/project.h @@ -181,12 +181,12 @@ public: TQPtrListIterator<SourceFile> sourceFiles() const { return TQPtrListIterator<SourceFile>(sourcefiles); } void addSourceFile( SourceFile *sf ); bool removeSourceFile( SourceFile *sf ); - SourceFile* tqfindSourceFile( const TQString& filename, SourceFile *ignore = 0 ) const; + SourceFile* findSourceFile( const TQString& filename, SourceFile *ignore = 0 ) const; TQPtrListIterator<FormFile> formFiles() const { return TQPtrListIterator<FormFile>(formfiles); } void addFormFile( FormFile *ff ); bool removeFormFile( FormFile *ff ); - FormFile* tqfindFormFile( const TQString& filename, FormFile *ignore = 0 ) const; + FormFile* findFormFile( const TQString& filename, FormFile *ignore = 0 ) const; void setIncludePath( const TQString &platform, const TQString &path ); void setLibs( const TQString &platform, const TQString &path ); diff --git a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp index c74d2a3..c93201d 100644 --- a/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp +++ b/tqtinterface/qt4/tools/designer/designer/propertyeditor.cpp @@ -562,7 +562,7 @@ void PropertyItem::setText( int col, const TQString &t ) { TQString txt( t ); if ( col == 1 ) - txt = txt.tqreplace( "\n", " " ); + txt = txt.replace( "\n", " " ); TQListViewItem::setText( col, txt ); } @@ -2737,7 +2737,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e ) arrowRect.setHeight( TQMAX( height() - (2 * arrowRect.y()), arrowRect.height() ) ); - if ( arrowRect.tqcontains( e->pos() ) ) { + if ( arrowRect.contains( e->pos() ) ) { arrowDown = TRUE; tqrepaint( FALSE ); } @@ -2836,7 +2836,7 @@ void PropertyEnumItem::setValue() enumString += "|" + (*it).key; } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); @@ -2859,7 +2859,7 @@ void PropertyEnumItem::setCurrentValues( TQStrList lst ) } } if ( !enumString.isEmpty() ) - enumString.tqreplace( 0, 1, "" ); + enumString.replace( 0, 1, "" ); box->setText( enumString ); setText( 1, enumString ); } @@ -3041,10 +3041,10 @@ void PropertyList::setupProperties() for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( it.current(), allProperties), allProperties ); + property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties ); if ( !p ) continue; - if ( unique.tqcontains( TQString::tqfromLatin1( it.current() ) ) ) + if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) ) continue; if ( ::tqqt_cast<TQDesignerToolBar*>(editor->widget()) || ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) { @@ -3215,7 +3215,7 @@ void PropertyList::setupProperties() } } if ( item && !p->isSetType() ) { - if ( valueSet.tqfindIndex( item->name() ) == -1 ) { + if ( valueSet.findIndex( item->name() ) == -1 ) { setPropertyValue( item ); valueSet << item->name(); } @@ -3328,7 +3328,7 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw, for ( TQValueList<MetaDataBase::Property>::Iterator it = cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) { - if ( unique.tqcontains( TQString( (*it).property ) ) ) + if ( unique.contains( TQString( (*it).property ) ) ) continue; unique.insert( TQString( (*it).property ), TRUE ); addPropertyItem( item, (*it).property, (QVariant::Type)(int)type_to_variant( (*it).type ) ); @@ -3348,7 +3348,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, l << ""; while ( it.current() ) { if ( editor->formWindow()->canBeBuddy( it.current() ) ) { - if ( l.tqfind( it.current()->name() ) == l.end() ) + if ( l.find( it.current()->name() ) == l.end() ) l << it.current()->name(); } ++it; @@ -3668,9 +3668,9 @@ static void clearAlignList( TQStrList &l ) { if ( l.count() == 1 ) return; - if ( l.tqfind( "AlignAuto" ) != -1 ) + if ( l.find( "AlignAuto" ) != -1 ) l.remove( "AlignAuto" ); - if ( l.tqfind( "WordBreak" ) != -1 ) + if ( l.find( "WordBreak" ) != -1 ) l.remove( "WordBreak" ); } @@ -3682,12 +3682,12 @@ void PropertyList::setPropertyValue( PropertyItem *i ) { const TQMetaProperty *p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( i->name(), TRUE), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE ); if ( !p ) { if ( i->name() == "hAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~Qt::AlignVertical_Mask; TQStrList l = p->valueToKeys( align ); clearAlignList( l ); @@ -3695,7 +3695,7 @@ void PropertyList::setPropertyValue( PropertyItem *i ) } else if ( i->name() == "vAlign" ) { int align = editor->widget()->property( "tqalignment" ).toInt(); p = editor->widget()->tqmetaObject()-> - property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE ); + property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE ); align &= ~Qt::AlignHorizontal_Mask; ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() ); } else if ( i->name() == "wordwrap" ) { @@ -3859,7 +3859,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i ) TQString s; s = TQString( mo->className() ) + "::" + prop; TQMap<TQString, TQString>::Iterator it; - if ( ( it = propertyDocs.tqfind( s ) ) != propertyDocs.end() ) { + if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) { return *it; } mo = mo->tqsuperClass(); @@ -3918,15 +3918,15 @@ EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e ) TQString clean_arguments( const TQString &s ) { TQString slot = s; - TQString arg = slot.mid( slot.tqfind( '(' ) + 1 ); - arg = arg.left( arg.tqfindRev( ')' ) ); + TQString arg = slot.mid( slot.find( '(' ) + 1 ); + arg = arg.left( arg.findRev( ')' ) ); TQStringList args = TQStringList::split( ',', arg ); - slot = slot.left( slot.tqfind( '(' ) + 1 ); + slot = slot.left( slot.find( '(' ) + 1 ); int num = 0; for ( TQStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) { TQString a = *it; int i; - if ( ( i =a.tqfind( ':' ) ) == -1 ) + if ( ( i =a.find( ':' ) ) == -1 ) slot += a.simplifyWhiteSpace(); else slot += a.mid( i + 1 ).simplifyWhiteSpace(); @@ -3982,7 +3982,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = i->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4018,7 +4018,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) TQString s; if ( !formWindow->project()->isCpp() ) { TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 ); - int pt = s1.tqfind( "(" ); + int pt = s1.find( "(" ); if ( pt != -1 ) s1 = s1.left( pt ); s = TQString( editor->widget()->name() ) + "_" + s1; @@ -4073,9 +4073,9 @@ void EventList::renamed( TQListViewItem *i ) // #### we should look if the specified slot already // exists and if we can connect to this one TQString funcname = i->text( 0 ).latin1(); - if ( funcname.tqfind( '(' ) == -1 ) { // try to create a signature + if ( funcname.find( '(' ) == -1 ) { // try to create a signature TQString sig = i->tqparent()->text( 0 ); - sig = sig.mid( sig.tqfind( '(' ) + 1 ); + sig = sig.mid( sig.find( '(' ) + 1 ); sig.remove( (int)sig.length() - 1, 1 ); LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); if ( iface ) @@ -4085,7 +4085,7 @@ void EventList::renamed( TQListViewItem *i ) MetaDataBase::addFunction( formWindow, funcname.latin1(), "virtual", "public", "slot", formWindow->project()->language(), "void" ); editor->formWindow()->mainWindow()-> - editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ), TRUE ); + editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), TRUE ); cmd->execute(); editor->formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView(); editor->formWindow()->formFile()->setModified( TRUE ); @@ -4108,7 +4108,7 @@ void EventList::save( TQListViewItem *p ) \class PropertyEditor propertyeditor.h \brief PropertyEdior toplevel window - This is the toplevel window of the property editor which tqcontains a + This is the toplevel window of the property editor which contains a listview for editing properties. */ @@ -4252,7 +4252,7 @@ TQString PropertyEditor::classOfCurrentProperty() const TQMetaObject *mo = o->tqmetaObject(); while ( mo ) { TQStrList props = mo->propertyNames( FALSE ); - if ( props.tqfind( curr.latin1() ) != -1 ) + if ( props.find( curr.latin1() ) != -1 ) return mo->className(); mo = mo->tqsuperClass(); } diff --git a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp index 6c19964..0439dcb 100644 --- a/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp +++ b/tqtinterface/qt4/tools/designer/designer/qcompletionedit.cpp @@ -187,7 +187,7 @@ bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) void TQCompletionEdit::addCompletionEntry( const TQString &entry ) { - if ( compList.tqfind( entry ) == compList.end() ) { + if ( compList.find( entry ) == compList.end() ) { compList << entry; compList.sort(); } @@ -195,7 +195,7 @@ void TQCompletionEdit::addCompletionEntry( const TQString &entry ) void TQCompletionEdit::removeCompletionEntry( const TQString &entry ) { - TQStringList::Iterator it = compList.tqfind( entry ); + TQStringList::Iterator it = compList.find( entry ); if ( it != compList.end() ) compList.remove( it ); } diff --git a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h index 74fa7cb..08a86fc 100644 --- a/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h +++ b/tqtinterface/qt4/tools/designer/designer/replacedialog.ui.h @@ -51,7 +51,7 @@ void ReplaceDialog::doReplace() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), FALSE ) ) checkBegin->setChecked( TRUE ); else @@ -63,7 +63,7 @@ void ReplaceDialog::doReplaceAll() if ( !editor ) return; - if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), + if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), TRUE ) ) checkBegin->setChecked( TRUE ); else diff --git a/tqtinterface/qt4/tools/designer/designer/resource.cpp b/tqtinterface/qt4/tools/designer/designer/resource.cpp index 053c155..8ceca37 100644 --- a/tqtinterface/qt4/tools/designer/designer/resource.cpp +++ b/tqtinterface/qt4/tools/designer/designer/resource.cpp @@ -98,12 +98,12 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s, bool attribute = FALSE ) { TQString s2 = s; - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); if ( attribute ) { - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "'", "'" ); } return s2; } @@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks) } ++i; } - // If we can't tqfind the actual translatable keyname, + // If we can't find the actual translatable keyname, // fall back on the tqunicode representation of it... // Or else characters like Key_aring may not get displayed // ( Really depends on you locale ) @@ -743,7 +743,7 @@ TQString Resource::copy() TQWidget *p = w->parentWidget(); bool save = TRUE; while ( p ) { - if ( tmp.tqfindRef( p ) != -1 ) { + if ( tmp.findRef( p ) != -1 ) { save = FALSE; break; } @@ -848,7 +848,7 @@ void Resource::saveObject( TQT_BASE_OBJECT_NAME *bobj, TQDesignerGridLayout* gri includeHints << WidgetDatabase::includeFile( classID ); } - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->tqfind( (TQWidget*)obj ) ) + if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; @@ -1238,7 +1238,7 @@ void Resource::saveItems( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &ts, int inde if ( isDataTable && !columnFields.isEmpty() ) { ts << makeIndent( indent ) << "<property name=\"field\">" << endl; indent++; - ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.tqfind( l[ 0 ] ) ) << "</string>" << endl; + ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</property>" << endl; } @@ -1424,9 +1424,9 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t changed = MetaDataBase::changedProperties( w ); if ( w->isWidgetType() ) { if ( ::tqqt_cast<Spacer*>(w) ) { - if ( !changed.tqcontains( "tqsizeHint" ) ) + if ( !changed.contains( "tqsizeHint" ) ) changed << "tqsizeHint"; - if ( !changed.tqcontains( "geometry" ) ) + if ( !changed.contains( "geometry" ) ) changed << "geometry"; } else { TQToolButton *tb = ::tqqt_cast<TQToolButton*>(w); @@ -1445,9 +1445,9 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t } if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { - if ( changed.tqfindIndex( "geometry" ) == -1 ) + if ( changed.findIndex( "geometry" ) == -1 ) changed << "geometry"; - if ( changed.tqfindIndex( "caption" ) == -1 ) + if ( changed.findIndex( "caption" ) == -1 ) changed << "caption"; } @@ -1459,13 +1459,13 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) ); for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { - if ( changed.tqfind( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) + if ( changed.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() ) continue; - if ( saved.tqfind( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) + if ( saved.find( TQString::tqfromLatin1( it.current() ) ) != saved.end() ) continue; saved << TQString::tqfromLatin1( it.current() ); const TQMetaProperty* p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( it.current(), TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( it.current(), TRUE ), TRUE ); if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) ) continue; if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 && @@ -1522,7 +1522,7 @@ void Resource::saveObjectProperties( TQT_BASE_OBJECT_NAME *bobj, TQTextStream &t void Resource::saveSetProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { TQObject* w = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); TQStrList l( p->valueToKeys( w->property( name ).toInt() ) ); TQString v; for ( uint i = 0; i < l.count(); ++i ) { @@ -1536,7 +1536,7 @@ void Resource::saveSetProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name void Resource::saveEnumProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent ) { TQObject* w = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE ); + const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( name, TRUE ), TRUE ); int value = w->property( name ).toInt(); const char* key = p->valueToKey( value ); if (key) @@ -1553,7 +1553,7 @@ void Resource::saveProperty( TQT_BASE_OBJECT_NAME *bobj, const TQString &name, c uint unum; double dob; TQString comment; - if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) || formwindow->actionList().tqfind( (TQAction*)w ) ) + if ( w && formwindow->widgets()->find( (TQWidget*)w ) || formwindow->actionList().find( (TQAction*)w ) ) comment = MetaDataBase::propertyComment( w, name ); switch ( t ) { case TQVariant::String: @@ -2182,7 +2182,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQL void Resource::setObjectProperty( TQT_BASE_OBJECT_NAME* bobj, const TQString &prop, const TQDomElement &e ) { TQObject* obj = TQT_TQOBJECT(bobj); - const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, TRUE ), TRUE ); + const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->findProperty( prop, TRUE ), TRUE ); if ( !::tqqt_cast<TQLayout*>(obj) ) {// no layouts in metadatabase... (RS) if ( obj->inherits( "CustomWidget" ) ) { @@ -2443,7 +2443,7 @@ static TQImage loadImageData( TQDomElement &n2 ) ba[2] = ( len & 0x0000ff00 ) >> 8; ba[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress( ba, baSize ); - img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')) ); + img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format ); } @@ -2490,9 +2490,9 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; - if ( ( knownNames.tqfindIndex( TQString( conn.sender->name() ) ) == -1 && + if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 && qstrcmp( conn.sender->name(), "this" ) != 0 ) || - ( knownNames.tqfindIndex( TQString( conn.receiver->name() ) ) == -1 && + ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; if ( formwindow->isMainContainer( (TQWidget*)(*it).receiver ) && @@ -2551,7 +2551,7 @@ void Resource::loadConnections( const TQDomElement &e ) l = 0; } if ( !conn.sender ) - conn.sender = formwindow->tqfindAction( name ); + conn.sender = formwindow->findAction( name ); } } else if ( n2.tagName() == "signal" ) { conn.signal = n2.firstChild().toText().data(); @@ -2569,7 +2569,7 @@ void Resource::loadConnections( const TQDomElement &e ) l = 0; } if ( !conn.receiver ) - conn.receiver = formwindow->tqfindAction( name ); + conn.receiver = formwindow->findAction( name ); } } else if ( n2.tagName() == "slot" ) { conn.slot = n2.firstChild().toText().data(); @@ -2620,7 +2620,7 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent ) TQPtrList<MetaDataBase::CustomWidget> *lst = MetaDataBase::customWidgets(); for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) { - if ( usedCustomWidgets.tqfindIndex( w->className ) == -1 ) + if ( usedCustomWidgets.findIndex( w->className ) == -1 ) continue; ts << makeIndent( indent ) << "<customwidget>" << endl; indent++; @@ -2755,7 +2755,7 @@ void Resource::saveTabOrder( TQTextStream &ts, int indent ) indent++; for ( TQWidget *w = l.first(); w; w = l.next() ) { - if ( w->testWState( TQt::WState_ForceHide ) || knownNames.tqfindIndex( w->name() ) == -1 ) + if ( w->testWState( TQt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 ) continue; ts << makeIndent( indent ) << "<tabstop>" << w->name() << "</tabstop>" << endl; } @@ -3215,7 +3215,7 @@ void Resource::loadToolBars( const TQDomElement &e ) TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { - TQAction *a = formwindow->tqfindAction( n2.attribute( "name" ) ); + TQAction *a = formwindow->findAction( n2.attribute( "name" ) ); if ( a ) { a->addTo( tb ); tb->addAction( a ); @@ -3269,12 +3269,12 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e ) TQAction *a = 0; while ( !n.isNull() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup") { - a = formwindow->tqfindAction( n.attribute( "name" ) ); + a = formwindow->findAction( n.attribute( "name" ) ); if ( a ) p->insert( a ); } if ( n.tagName() == "item" ) { - PopupMenuEditorItem *i = p->at( p->tqfind( a ) ); + PopupMenuEditorItem *i = p->at( p->find( a ) ); if ( i ) { TQString name = n.attribute( "name" ); formwindow->unify( i, name, TRUE ); diff --git a/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp b/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp index 747822f..79a7353 100644 --- a/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp +++ b/tqtinterface/qt4/tools/designer/designer/sourcefile.cpp @@ -191,10 +191,10 @@ TQString SourceFile::createUnnamedFileName( const TQString &extension ) extensionCounter = new TQMap<TQString, int>; int count = -1; TQMap<TQString, int>::Iterator it; - if ( ( it = extensionCounter->tqfind( extension ) ) != extensionCounter->end() ) { + if ( ( it = extensionCounter->find( extension ) ) != extensionCounter->end() ) { count = *it; ++count; - extensionCounter->tqreplace( extension, count ); + extensionCounter->replace( extension, count ); } else { count = 1; extensionCounter->insert( extension, count ); @@ -279,10 +279,10 @@ void SourceFile::checkTimeStamp() bool SourceFile::checkFileName( bool allowBreak ) { - SourceFile *sf = pro->tqfindSourceFile( filename, this ); + SourceFile *sf = pro->findSourceFile( filename, this ); if ( sf ) TQMessageBox::warning( MainWindow::self, tr( "Invalid Filename" ), - tr( "The project already tqcontains a source file with \n" + tr( "The project already contains a source file with \n" "filename '%1'. Please choose a new filename." ).arg( filename ) ); while ( sf ) { LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() ); @@ -296,7 +296,7 @@ bool SourceFile::checkFileName( bool allowBreak ) return FALSE; } filename = pro->makeRelative( fn ); - sf = pro->tqfindSourceFile( filename, this ); + sf = pro->findSourceFile( filename, this ); } return TRUE; } diff --git a/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp b/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp index 8d342f4..f736f78 100644 --- a/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/startdialogimpl.cpp @@ -59,7 +59,7 @@ void StartDialog::accept() if( !tabindex ) { if ( !templateView->currentItem() ) return; - Project *pro = MainWindow::self->tqfindProject( tr( "<No Project>" ) ); + Project *pro = MainWindow::self->findProject( tr( "<No Project>" ) ); if ( !pro ) return; MainWindow::self->setCurrentProject( pro ); diff --git a/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp b/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp index 1247f5e..af20d20 100644 --- a/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/tableeditorimpl.cpp @@ -165,11 +165,11 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i ) #ifndef TQT_NO_SQL if ( ::tqqt_cast<TQDataTable*>(editTable) ) { - TQString s = *fieldMap.tqfind( listColumns->index( i ) ); + TQString s = *fieldMap.find( listColumns->index( i ) ); if ( s.isEmpty() ) comboFields->setCurrentItem( 0 ); - else if ( comboFields->listBox()->tqfindItem( s ) ) - comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->tqfindItem( s ) ) ); + else if ( comboFields->listBox()->findItem( s ) ) + comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->findItem( s ) ) ); else comboFields->lineEdit()->setText( s ); } @@ -241,7 +241,7 @@ void TableEditor::newColumnClicked() m.insert( table->horizontalHeader()->label( i ), TRUE ); int n = table->numCols() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->horizontalHeader()->setLabel( table->numCols() - 1, t ); listColumns->insertItem( t ); @@ -269,7 +269,7 @@ void TableEditor::newRowClicked() m.insert( table->verticalHeader()->label( i ), TRUE ); int n = table->numRows() - 1; TQString t = TQString::number( n ); - while ( m.tqfind( t ) != m.end() ) + while ( m.find( t ) != m.end() ) t = TQString::number( ++n ); table->verticalHeader()->setLabel( table->numRows() - 1, t ); listRows->insertItem( t ); @@ -340,7 +340,7 @@ void TableEditor::applyClicked() col.text = table->horizontalHeader()->label( i ); if ( table->horizontalHeader()->iconSet( i ) ) col.pix = table->horizontalHeader()->iconSet( i )->pixmap(); - col.field = *fieldMap.tqfind( i ); + col.field = *fieldMap.find( i ); cols.append( col ); } for ( i = 0; i < table->verticalHeader()->count(); ++i ) { @@ -430,7 +430,7 @@ void TableEditor::readFromTable() table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) ); listColumns->insertItem( editTable->horizontalHeader()->label( i ) ); } - TQString cf = *columnFields.tqfind( editTable->horizontalHeader()->label( i ) ); + TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) ); fieldMap.insert( i, cf ); } diff --git a/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp b/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp index e84a332..312fcb7 100644 --- a/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp +++ b/tqtinterface/qt4/tools/designer/designer/variabledialogimpl.cpp @@ -69,7 +69,7 @@ VariableDialog::~VariableDialog() void VariableDialog::setCurrentItem( TQString text ) { - TQListViewItem *i = varView->tqfindItem( text, 0 ); + TQListViewItem *i = varView->findItem( text, 0 ); if ( i ) varView->setCurrentItem( i ); } diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp index 84ccb85..edd455f 100644 --- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp +++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.cpp @@ -103,7 +103,7 @@ #include <globaldefs.h> #include <tqobject.h> -FormWindow *tqfind_formwindow( TQWidget *w ) +FormWindow *find_formwindow( TQWidget *w ) { if ( !w ) return 0; @@ -219,7 +219,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int index = 0; TQRect rect; for ( ; index < tabBar()->count(); index++ ) { - if ( tabBar()->tabAt( index )->rect().tqcontains( de->pos() ) ) { + if ( tabBar()->tabAt( index )->rect().contains( de->pos() ) ) { rect = tabBar()->tabAt( index )->rect(); break; } @@ -228,7 +228,7 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) if ( index == tabBar()->count() -1 ) { TQRect rect2 = rect; rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) index++; } @@ -256,24 +256,24 @@ bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) int newIndex = 0; for ( ; newIndex < tabBar()->count(); newIndex++ ) { - if ( tabBar()->tabAt( newIndex )->rect().tqcontains( de->pos() ) ) + if ( tabBar()->tabAt( newIndex )->rect().contains( de->pos() ) ) break; } if ( newIndex == tabBar()->count() -1 ) { TQRect rect2 = tabBar()->tabAt( newIndex )->rect(); rect2.setLeft( rect2.left() + rect2.width() / 2 ); - if ( rect2.tqcontains( de->pos() ) ) + if ( rect2.contains( de->pos() ) ) newIndex++; } int oldIndex = 0; for ( ; oldIndex < tabBar()->count(); oldIndex++ ) { - if ( tabBar()->tabAt( oldIndex )->rect().tqcontains( pressPoint ) ) + if ( tabBar()->tabAt( oldIndex )->rect().contains( pressPoint ) ) break; } - FormWindow *fw = tqfind_formwindow( this ); + FormWindow *fw = find_formwindow( this ); MoveTabPageCommand *cmd = new MoveTabPageCommand( tr( "Move Tab Page" ), fw, this, dragPage, dragLabel, newIndex, oldIndex ); @@ -330,7 +330,7 @@ void TQDesignerWidgetStack::nextPage() int TQDesignerWidgetStack::currentPage() const { TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this; - return that->pages.tqfind( visibleWidget() ); + return that->pages.find( visibleWidget() ); } void TQDesignerWidgetStack::setCurrentPage( int i ) @@ -385,12 +385,12 @@ int TQDesignerWidgetStack::insertPage( TQWidget *p, int i ) raiseWidget( p ); TQApplication::sendPostedEvents(); updateButtons(); - return pages.tqfind( p ); + return pages.find( p ); } int TQDesignerWidgetStack::removePage( TQWidget *p ) { - int i = pages.tqfind( p ); + int i = pages.find( p ); pages.remove( p ); removeWidget( p ); setCurrentPage( 0 ); @@ -465,7 +465,7 @@ int TQDesignerWizard::pageNum( TQWidget *p ) void TQDesignerWizard::addPage( TQWidget *p, const TQString &t ) { TQWizard::addPage( p, t ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -478,7 +478,7 @@ void TQDesignerWizard::removePage( TQWidget *p ) void TQDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index ) { TQWizard::insertPage( p, t, index ); - if ( removedPages.tqfind( p ) ) + if ( removedPages.find( p ) ) removedPages.remove( p ); } @@ -490,7 +490,7 @@ TQMap< int, TQStringList > *changedProperties = 0; \brief Set of static functions for creating widgets, layouts and do other stuff The widget factory offers functions to create widgets, create and - delete layouts tqfind out other details - all based on the + delete layouts find out other details - all based on the WidgetDatabase's data. So the functions that use ids use the same ids as in the WidgetDatabase. */ @@ -507,9 +507,9 @@ void WidgetFactory::saveDefaultProperties( TQT_BASE_OBJECT_NAME *tqbo, int id ) var = TQVariant( TQPixmap() ); else if ( !var.isValid() && qstrcmp( "iconSet", lst.at( i ) ) == 0 ) var = TQVariant( TQIconSet() ); - propMap.tqreplace( lst.at( i ), var ); + propMap.replace( lst.at( i ), var ); } - defaultProperties->tqreplace( id, propMap ); + defaultProperties->replace( id, propMap ); } void WidgetFactory::saveChangedProperties( TQT_BASE_OBJECT_NAME *w, int id ) @@ -547,9 +547,9 @@ TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, b return 0; MetaDataBase::addEntry( w ); - if ( !defaultProperties->tqcontains( id ) ) + if ( !defaultProperties->contains( id ) ) saveDefaultProperties( w, id ); - if ( !changedProperties->tqcontains( id ) ) + if ( !changedProperties->contains( id ) ) saveChangedProperties( w, id ); return w; @@ -696,7 +696,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else { b = new TQDesignerPushButton( tqparent, name ); } - TQWidget *w = tqfind_formwindow( b ); + TQWidget *w = find_formwindow( b ); b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) ); return b; } else if ( className == "TQToolButton" ) { @@ -811,7 +811,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa else if ( className == "TQTabWidget" ) { TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name ); if ( init ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" ); tw->addTab( w, MainWindow::tr("Tab 1") ); MetaDataBase::addEntry( w ); @@ -824,7 +824,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa } else if ( className == "TQWidgetStack" ) { TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name ); if ( init ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" ); ws->insertPage( w ); MetaDataBase::addEntry( w ); @@ -841,7 +841,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa ::tqqt_cast<TQWidgetStack*>(tqparent) || ::tqqt_cast<TQToolBox*>(tqparent) || ::tqqt_cast<TQMainWindow*>(tqparent) ) ) { - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); if ( fw ) { TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name ); MetaDataBase::addEntry( dw ); @@ -956,7 +956,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa if ( !init ) return new TQDesignerToolBox( tqparent, name ); TQToolBox *tb = new TQDesignerToolBox( tqparent, name ); - FormWindow *fw = tqfind_formwindow( tqparent ); + FormWindow *fw = find_formwindow( tqparent ); TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) : new TQWidget( tb, "page1" ); tb->addItem( w, MainWindow::tr("Page 1") ); @@ -1128,7 +1128,7 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w ) /*! Returns the actual designer widget of the container \a w. This is normally \a w itself, but might be a tqparent or grand tqparent of \a w (e.g. when working with a tabwidget and \a w is the container which - tqcontains and layouts childs, but the actual widget known to the + contains and layouts childs, but the actual widget known to the designer is the tabwidget which is the tqparent of \a w. So this function returns the tabwidget then.) */ @@ -1378,13 +1378,13 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) + if ( className.contains( "ListBox" ) ) return TRUE; - if ( className.tqcontains( "ComboBox" ) ) + if ( className.contains( "ComboBox" ) ) return TRUE; - if ( className.tqcontains( "ListView" ) ) + if ( className.contains( "ListView" ) ) return TRUE; - if ( className.tqcontains( "IconView" ) ) + if ( className.contains( "IconView" ) ) return TRUE; if ( className == "TQTextEdit" || className == "TQMultiLineEdit" ) return TRUE; @@ -1398,8 +1398,8 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget ) { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) || className.tqcontains( "ListView" ) || - className.tqcontains( "IconView" ) || className.tqcontains( "ComboBox" ) || + if ( className.contains( "ListBox" ) || className.contains( "ListView" ) || + className.contains( "IconView" ) || className.contains( "ComboBox" ) || ::tqqt_cast<TQTable*>(editorWidget) != 0 ) return TRUE; @@ -1410,7 +1410,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget { TQString className = WidgetDatabase::className( id ); - if ( className.tqcontains( "ListBox" ) ) { + if ( className.contains( "ListBox" ) ) { if ( !::tqqt_cast<TQListBox*>(editWidget) ) return; ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw ); @@ -1419,7 +1419,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ComboBox" ) ) { + if ( className.contains( "ComboBox" ) ) { if ( !::tqqt_cast<TQComboBox*>(editWidget) ) return; TQComboBox *cb = (TQComboBox*)editWidget; @@ -1435,7 +1435,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "ListView" ) ) { + if ( className.contains( "ListView" ) ) { if ( !::tqqt_cast<TQListView*>(editWidget) ) return; TQListView *lv = (TQListView*)editWidget; @@ -1445,7 +1445,7 @@ void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget return; } - if ( className.tqcontains( "IconView" ) ) { + if ( className.contains( "IconView" ) ) { if ( !::tqqt_cast<TQIconView*>(editWidget) ) return; IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw ); @@ -1474,15 +1474,15 @@ bool WidgetFactory::canResetProperty( TQT_BASE_OBJECT_NAME *w, const TQString &p { if ( propName == "name" || propName == "geometry" ) return FALSE; - TQStringList l = *changedProperties->tqfind( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); - return l.tqfindIndex( propName ) == -1; + TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ); + return l.findIndex( propName ) == -1; } bool WidgetFactory::resetProperty( TQT_BASE_OBJECT_NAME *tqbo, const TQString &propName ) { TQObject *w = TQT_TQOBJECT(tqbo); const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()-> - tqfindProperty( propName, TRUE ), TRUE ); + findProperty( propName, TRUE ), TRUE ); if (!p ) return FALSE; return p->reset( w ); @@ -1503,14 +1503,14 @@ TQVariant WidgetFactory::defaultValue( TQT_BASE_OBJECT_NAME *w, const TQString & return TQVariant( -1 ); } - return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName ); + return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName ); } TQString WidgetFactory::defaultCurrentItem( TQT_BASE_OBJECT_NAME *tqbo, const TQString &propName ) { TQObject *w = TQT_TQOBJECT(tqbo); const TQMetaProperty *p = w->tqmetaObject()-> - property( w->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE ); + property( w->tqmetaObject()->findProperty( propName, TRUE ), TRUE ); if ( !p ) { int v = defaultValue( w, "tqalignment" ).toInt(); if ( propName == "hAlign" ) { @@ -1550,7 +1550,7 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *nam TQVariant WidgetFactory::property( TQT_BASE_OBJECT_NAME *tqbo, const char *name ) { TQObject *w = TQT_TQOBJECT(tqbo); - int id = w->tqmetaObject()->tqfindProperty( name, TRUE ); + int id = w->tqmetaObject()->findProperty( name, TRUE ); const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE ); if ( !p || !p->isValid() ) return MetaDataBase::fakeProperty( w, name ); diff --git a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h index 77c0574..9a672da 100644 --- a/tqtinterface/qt4/tools/designer/designer/widgetfactory.h +++ b/tqtinterface/qt4/tools/designer/designer/widgetfactory.h @@ -223,7 +223,7 @@ public: void addPage( TQWidget *p, const TQString & ); void removePage( TQWidget *p ); void insertPage( TQWidget *p, const TQString &t, int index ); - bool isPageRemoved( TQWidget *p ) { return (removedPages.tqfind( p ) != 0); } + bool isPageRemoved( TQWidget *p ) { return (removedPages.find( p ) != 0); } bool isModal() const { return modal; } void setModal(bool b) { modal = b; } diff --git a/tqtinterface/qt4/tools/designer/designer/workspace.cpp b/tqtinterface/qt4/tools/designer/designer/workspace.cpp index 0694112..d22a086 100644 --- a/tqtinterface/qt4/tools/designer/designer/workspace.cpp +++ b/tqtinterface/qt4/tools/designer/designer/workspace.cpp @@ -381,7 +381,7 @@ void Workspace::sourceFileAdded( SourceFile* sf ) void Workspace::sourceFileRemoved( SourceFile* sf ) { - delete tqfindItem( sf ); + delete findItem( sf ); updateColors(); } @@ -395,7 +395,7 @@ void Workspace::formFileAdded( FormFile* ff ) void Workspace::formFileRemoved( FormFile* ff ) { - delete tqfindItem( ff ); + delete findItem( ff ); updateColors(); } @@ -407,7 +407,7 @@ void Workspace::objectAdded( TQObject *o ) void Workspace::objectRemoved( TQObject *o ) { - delete tqfindItem( o ); + delete findItem( o ); updateColors(); } @@ -419,7 +419,7 @@ void Workspace::update() void Workspace::update( FormFile* ff ) { - TQListViewItem* i = tqfindItem( ff ); + TQListViewItem* i = findItem( ff ); if ( i ) { i->tqrepaint(); if ( (i = i->firstChild()) ) @@ -430,7 +430,7 @@ void Workspace::update( FormFile* ff ) void Workspace::activeFormChanged( FormWindow *fw ) { - WorkspaceItem *i = tqfindItem( fw->formFile() ); + WorkspaceItem *i = findItem( fw->formFile() ); if ( i ) { setCurrentItem( i ); setSelected( i, TRUE ); @@ -448,7 +448,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) return; if ( se->formWindow() ) { - WorkspaceItem *i = tqfindItem( se->formWindow()->formFile() ); + WorkspaceItem *i = findItem( se->formWindow()->formFile() ); if ( i && i->firstChild() ) { if ( !i->isOpen() ) i->setAutoOpen( TRUE ); @@ -456,7 +456,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) setSelected( i->firstChild(), TRUE ); } } else { - WorkspaceItem *i = tqfindItem( se->sourceFile() ); + WorkspaceItem *i = findItem( se->sourceFile() ); if ( i ) { setCurrentItem( i ); setSelected( i, TRUE ); @@ -466,7 +466,7 @@ void Workspace::activeEditorChanged( SourceEditor *se ) closeAutoOpenItems(); } -WorkspaceItem *Workspace::tqfindItem( FormFile* ff) +WorkspaceItem *Workspace::findItem( FormFile* ff) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -476,7 +476,7 @@ WorkspaceItem *Workspace::tqfindItem( FormFile* ff) return 0; } -WorkspaceItem *Workspace::tqfindItem( SourceFile *sf ) +WorkspaceItem *Workspace::findItem( SourceFile *sf ) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -486,7 +486,7 @@ WorkspaceItem *Workspace::tqfindItem( SourceFile *sf ) return 0; } -WorkspaceItem *Workspace::tqfindItem( TQObject *o ) +WorkspaceItem *Workspace::findItem( TQObject *o ) { TQListViewItemIterator it( this ); for ( ; it.current(); ++it ) { @@ -683,7 +683,7 @@ void Workspace::bufferChosen( const TQString &buffer ) if ( bufferEdit ) bufferEdit->setText( "" ); - if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) { + if ( MainWindow::self->projectFileNames().contains( buffer ) ) { MainWindow::self->setCurrentProjectByFilename( buffer ); return; } diff --git a/tqtinterface/qt4/tools/designer/designer/workspace.h b/tqtinterface/qt4/tools/designer/designer/workspace.h index b889d3f..de96e96 100644 --- a/tqtinterface/qt4/tools/designer/designer/workspace.h +++ b/tqtinterface/qt4/tools/designer/designer/workspace.h @@ -138,9 +138,9 @@ private Q_SLOTS: void objectRemoved( TQObject * ); private: - WorkspaceItem *tqfindItem( FormFile *ff ); - WorkspaceItem *tqfindItem( SourceFile *sf ); - WorkspaceItem *tqfindItem( TQObject *o ); + WorkspaceItem *findItem( FormFile *ff ); + WorkspaceItem *findItem( SourceFile *sf ); + WorkspaceItem *findItem( TQObject *o ); void closeAutoOpenItems(); diff --git a/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp b/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp index 7f9269a..34e1ff6 100644 --- a/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp +++ b/tqtinterface/qt4/tools/designer/editor/arghintwidget.cpp @@ -191,7 +191,7 @@ ArgHintWidget::ArgHintWidget( TQWidget *tqparent, const char*name ) void ArgHintWidget::setFunctionText( int func, const TQString &text ) { - funcs.tqreplace( func, text ); + funcs.replace( func, text ); if ( func == curFunc ) { funcLabel->clear(); funcLabel->setText( text ); diff --git a/tqtinterface/qt4/tools/designer/editor/browser.cpp b/tqtinterface/qt4/tools/designer/editor/browser.cpp index 67c0e12..129d463 100644 --- a/tqtinterface/qt4/tools/designer/editor/browser.cpp +++ b/tqtinterface/qt4/tools/designer/editor/browser.cpp @@ -73,7 +73,7 @@ bool EditorBrowser::eventFilter( TQObject *o, TQEvent *e ) oldHighlightedParag->format(); oldHighlightedParag = 0; } - if ( tqfindCursor( c, from, to ) && from.paragraph() == to.paragraph() ) { + if ( findCursor( c, from, to ) && from.paragraph() == to.paragraph() ) { // avoid collision with other selections for ( int i = 0; i < curEditor->document()->numSelections(); ++i ) curEditor->document()->removeSelection( i ); @@ -132,7 +132,7 @@ void EditorBrowser::addEditor( Editor *e ) e->installEventFilter( this ); } -bool EditorBrowser::tqfindCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ) +bool EditorBrowser::findCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ) { from = c; while ( from.paragraph()->at( from.index() )->c != ' ' && from.paragraph()->at( from.index() )->c != '\t' && from.index() > 0 ) diff --git a/tqtinterface/qt4/tools/designer/editor/browser.h b/tqtinterface/qt4/tools/designer/editor/browser.h index 6d57299..f8d53c2 100644 --- a/tqtinterface/qt4/tools/designer/editor/browser.h +++ b/tqtinterface/qt4/tools/designer/editor/browser.h @@ -52,7 +52,7 @@ public: bool eventFilter( TQObject *o, TQEvent *e ); virtual void setCurrentEdior( Editor *e ); virtual void addEditor( Editor *e ); - virtual bool tqfindCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ); + virtual bool findCursor( const TQTextCursor &c, TQTextCursor &from, TQTextCursor &to ); virtual void showHelp( const TQString & ) {} protected: diff --git a/tqtinterface/qt4/tools/designer/editor/cindent.cpp b/tqtinterface/qt4/tools/designer/editor/cindent.cpp index 4c8c425..ef4f748 100644 --- a/tqtinterface/qt4/tools/designer/editor/cindent.cpp +++ b/tqtinterface/qt4/tools/designer/editor/cindent.cpp @@ -90,7 +90,7 @@ void CIndent::tabify( TQString &s ) break; } } - i = s.tqfind( '\n', i ); + i = s.find( '\n', i ); if ( i == -1 ) break; ++i; diff --git a/tqtinterface/qt4/tools/designer/editor/completion.cpp b/tqtinterface/qt4/tools/designer/editor/completion.cpp index 1b42cb0..d3a92b2 100644 --- a/tqtinterface/qt4/tools/designer/editor/completion.cpp +++ b/tqtinterface/qt4/tools/designer/editor/completion.cpp @@ -166,7 +166,7 @@ EditorCompletion::~EditorCompletion() void EditorCompletion::addCompletionEntry( const TQString &s, TQTextDocument *, bool strict ) { TQChar key( s[ 0 ] ); - TQMap<TQChar, TQStringList>::Iterator it = completionMap.tqfind( key ); + TQMap<TQChar, TQStringList>::Iterator it = completionMap.find( key ); if ( it == completionMap.end() ) { completionMap.insert( key, TQStringList( s ) ); } else { @@ -194,7 +194,7 @@ TQValueList<CompletionEntry> EditorCompletion::completionList( const TQString &s ( (EditorCompletion*)this )->updateCompletionMap( doc ); TQChar key( s[ 0 ] ); - TQMap<TQChar, TQStringList>::ConstIterator it = completionMap.tqfind( key ); + TQMap<TQChar, TQStringList>::ConstIterator it = completionMap.find( key ); if ( it == completionMap.end() ) return TQValueList<CompletionEntry>(); TQStringList::ConstIterator it2 = (*it).begin(); @@ -207,7 +207,7 @@ TQValueList<CompletionEntry> EditorCompletion::completionList( const TQString &s c.postfix = ""; c.prefix = ""; c.postfix2 = ""; - if ( (int)(*it2).length() > len && (*it2).left( len ) == s && lst.tqfind( c ) == lst.end() ) + if ( (int)(*it2).length() > len && (*it2).left( len ) == s && lst.find( c ) == lst.end() ) lst << c; } @@ -448,7 +448,7 @@ void EditorCompletion::completeCompletion() curEditor->insert( s, (uint) ( TQTextEdit::RedoIndentation | TQTextEdit::CheckNewLines | TQTextEdit::RemoveSelected ) ); - int i = s.tqfind( '(' ); + int i = s.find( '(' ); completionPopup->close(); curEditor->setFocus(); if ( i != -1 && i < (int)s.length() ) { @@ -499,7 +499,7 @@ bool EditorCompletion::doObjectCompletion( const TQString & ) static void strip( TQString &txt ) { - int i = txt.tqfind( "(" ); + int i = txt.find( "(" ); if ( i == -1 ) return; txt = txt.left( i ); @@ -517,7 +517,7 @@ bool EditorCompletion::continueComplete() return TRUE; } - TQListBoxItem *i = completionListBox->tqfindItem( searchString ); + TQListBoxItem *i = completionListBox->findItem( searchString ); if ( !i ) return FALSE; @@ -623,9 +623,9 @@ bool EditorCompletion::doArgumentHint( bool useIndex ) TQString func = function; int pnt = -1; - pnt = func.tqfindRev( '.' ); + pnt = func.findRev( '.' ); if ( pnt == -1 ) - func.tqfindRev( '>' ); + func.findRev( '>' ); if ( pnt != -1 ) func = func.mid( pnt + 1 ); diff --git a/tqtinterface/qt4/tools/designer/editor/preferences.ui.h b/tqtinterface/qt4/tools/designer/editor/preferences.ui.h index cf29fb8..7e1cdb3 100644 --- a/tqtinterface/qt4/tools/designer/editor/preferences.ui.h +++ b/tqtinterface/qt4/tools/designer/editor/preferences.ui.h @@ -114,7 +114,7 @@ void PreferencesBase::elementChanged( const TQString &element ) styles.insert( currentElement, currentStyle ); currentElement = ""; } - TQMap<TQString, ConfigStyle>::Iterator it = styles.tqfind( element ); + TQMap<TQString, ConfigStyle>::Iterator it = styles.find( element ); if ( it == styles.end() ) return; ConfigStyle s = *it; diff --git a/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp b/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp index 6c98f01..b0b0186 100644 --- a/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp +++ b/tqtinterface/qt4/tools/designer/editor/viewmanager.cpp @@ -208,7 +208,7 @@ void ViewManager::setBreakPoints( const TQValueList<uint> &l ) TQTextParagraph *p = ( (Editor*)curView )->document()->firstParagraph(); int i = 0; while ( p ) { - if ( l.tqfind( i ) != l.end() ) { + if ( l.find( i ) != l.end() ) { if ( !p->extraData() ) { ParagData *data = new ParagData; p->setExtraData( data ); diff --git a/tqtinterface/qt4/tools/designer/editor/yyindent.cpp b/tqtinterface/qt4/tools/designer/editor/yyindent.cpp index 61bd4d6..1942ce8 100644 --- a/tqtinterface/qt4/tools/designer/editor/yyindent.cpp +++ b/tqtinterface/qt4/tools/designer/editor/yyindent.cpp @@ -171,7 +171,7 @@ int columnForIndex( const TQString& t, int index ) */ int indentOfLine( const TQString& t ) { - return columnForIndex( t, t.tqfind(firstNonWhiteSpace(t)) ); + return columnForIndex( t, t.find(firstNonWhiteSpace(t)) ); } /* @@ -198,12 +198,12 @@ static TQString trimmedCodeLine( const TQString& t ) /* Replace character and string literals by X's, since they may contain confusing characters (such as '{' and ';'). "Hello!" is - tqreplaced by XXXXXXXX. The literals are rigourously of the same + replaced by XXXXXXXX. The literals are rigourously of the same length before and after; otherwise, we would break tqalignment of continuation lines. */ k = 0; - while ( (k = trimmed.tqfind(*literal, k)) != -1 ) { + while ( (k = trimmed.find(*literal, k)) != -1 ) { for ( int i = 0; i < literal->matchedLength(); i++ ) eraseChar( trimmed, k + i, 'X' ); k += literal->matchedLength(); @@ -214,7 +214,7 @@ static TQString trimmedCodeLine( const TQString& t ) handled elsewhere. */ k = 0; - while ( (k = trimmed.tqfind(*inlineCComment, k)) != -1 ) { + while ( (k = trimmed.find(*inlineCComment, k)) != -1 ) { for ( int i = 0; i < inlineCComment->matchedLength(); i++ ) eraseChar( trimmed, k + i, ' ' ); k += inlineCComment->matchedLength(); @@ -227,7 +227,7 @@ static TQString trimmedCodeLine( const TQString& t ) foo1: bar1; bar2; */ - while ( trimmed.tqfindRev(':') != -1 && trimmed.tqfind(*label) != -1 ) { + while ( trimmed.findRev(':') != -1 && trimmed.find(*label) != -1 ) { TQString cap1 = label->cap( 1 ); int pos1 = label->pos( 1 ); int stop = cap1.length(); @@ -249,7 +249,7 @@ static TQString trimmedCodeLine( const TQString& t ) /* Remove C++-style comments. */ - k = trimmed.tqfind( "//" ); + k = trimmed.find( "//" ); if ( k != -1 ) trimmed.truncate( k ); @@ -352,7 +352,7 @@ static bool readLine() if ( yyLinizerState->inCComment ) { TQString slashAster( "/*" ); - k = yyLinizerState->line.tqfind( slashAster ); + k = yyLinizerState->line.find( slashAster ); if ( k == -1 ) { yyLinizerState->line = TQString(); } else { @@ -364,7 +364,7 @@ static bool readLine() if ( !yyLinizerState->inCComment ) { TQString asterSlash( "*/" ); - k = yyLinizerState->line.tqfind( asterSlash ); + k = yyLinizerState->line.find( asterSlash ); if ( k != -1 ) { for ( int i = 0; i < k + 2; i++ ) eraseChar( yyLinizerState->line, i, ' ' ); @@ -399,8 +399,8 @@ static bool readLine() the other way around, as we are parsing backwards. */ yyLinizerState->braceDepth += - yyLinizerState->line.tqcontains( '}' ) - - yyLinizerState->line.tqcontains( '{' ); + yyLinizerState->line.contains( '}' ) - + yyLinizerState->line.contains( '{' ); /* We use a dirty trick for @@ -416,7 +416,7 @@ static bool readLine() if ( yyLinizerState->pendingRightBrace ) yyLinizerState->braceDepth++; yyLinizerState->pendingRightBrace = - ( yyLinizerState->line.tqfind(*braceX) == 0 ); + ( yyLinizerState->line.find(*braceX) == 0 ); if ( yyLinizerState->pendingRightBrace ) yyLinizerState->braceDepth--; } while ( yyLinizerState->line.isEmpty() ); @@ -466,12 +466,12 @@ static bool bottomLineStartsInCComment() return FALSE; --p; - if ( (*p).tqfind(slashAster) != -1 || (*p).tqfind(asterSlash) != -1 ) { + if ( (*p).find(slashAster) != -1 || (*p).find(asterSlash) != -1 ) { TQString trimmed = trimmedCodeLine( *p ); - if ( trimmed.tqfind(slashAster) != -1 ) { + if ( trimmed.find(slashAster) != -1 ) { return TRUE; - } else if ( trimmed.tqfind(asterSlash) != -1 ) { + } else if ( trimmed.find(asterSlash) != -1 ) { return FALSE; } } @@ -489,7 +489,7 @@ static bool bottomLineStartsInCComment() */ static int indentWhenBottomLineStartsInCComment() { - int k = yyLine->tqfindRev( "/*" ); + int k = yyLine->findRev( "/*" ); if ( k == -1 ) { /* We found a normal text line in a comment. Align the @@ -554,7 +554,7 @@ static bool matchBracelessControlStatement() case '(': delimDepth--; if ( delimDepth == 0 ) { - if ( yyLine->tqfind(*iflikeKeyword) != -1 ) { + if ( yyLine->find(*iflikeKeyword) != -1 ) { /* We have @@ -626,12 +626,12 @@ static bool isUnfinishedLine() return FALSE; TQChar lastCh = (*yyLine)[(int) yyLine->length() - 1]; - if ( TQString("{};").tqfind(lastCh) == -1 && !yyLine->endsWith("...") ) { + if ( TQString("{};").find(lastCh) == -1 && !yyLine->endsWith("...") ) { /* It doesn't end with ';' or similar. If it's neither "TQ_OBJECT" nor "if ( x )", it must be an unfinished line. */ - unf = ( yyLine->tqcontains("TQ_OBJECT") == 0 && + unf = ( yyLine->contains("TQ_OBJECT") == 0 && !matchBracelessControlStatement() ); } else if ( lastCh == TQChar(';') ) { if ( lastParen(*yyLine) == TQChar('(') ) { @@ -755,12 +755,12 @@ static int indentForContinuationLine() end of the unfinished lines or by unbalanced parentheses. */ - if ( TQString("!=<>").tqfind((*yyLine)[j - 1]) == -1 && + if ( TQString("!=<>").find((*yyLine)[j - 1]) == -1 && (*yyLine)[j + 1] != '=' ) { if ( braceDepth == 0 && delimDepth == 0 && j < (int) yyLine->length() - 1 && !yyLine->endsWith(",") && - (yyLine->tqcontains('(') == yyLine->tqcontains(')')) ) + (yyLine->contains('(') == yyLine->contains(')')) ) hook = j; } } @@ -932,7 +932,7 @@ static int indentForStandaloneLine() YY_RESTORE(); } - if ( yyLine->endsWith(";") || yyLine->tqcontains('{') > 0 ) { + if ( yyLine->endsWith(";") || yyLine->contains('{') > 0 ) { /* The situation is possibly this, and we want to indent "z;": diff --git a/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h b/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h index bd3c218..208c628 100644 --- a/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/addressbook/addressbook.ui.h @@ -129,7 +129,7 @@ void AddressBook::searchAddress( const TQString &expr ) TQListViewItemIterator it( addressView ); while ( it.current() ) { for ( int i = 0; i < 7; ++i ) { - if ( it.current()->text( i ).tqfind( expr ) != -1 ) + if ( it.current()->text( i ).find( expr ) != -1 ) addressView->setSelected( it.current(), TRUE ); } ++it; diff --git a/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h b/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h index 12e6eb6..45876fe 100644 --- a/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/book/book8/editbook.ui.h @@ -38,7 +38,7 @@ void EditBookForm::primeUpdateBook( TQSqlRecord * buffer ) int id = buffer->value( "authorid" ).toInt(); for ( int i = 0; i < ComboBoxAuthor->count(); i++ ) { TQString author = ComboBoxAuthor->text( i ); - if ( authorMap.tqcontains( author ) && authorMap[author] == id ) { + if ( authorMap.contains( author ) && authorMap[author] == id ) { ComboBoxAuthor->setCurrentItem( i ) ; break; } diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h b/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h index 8c50277..70d7f62 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/colortool/colornameform.ui.h @@ -20,7 +20,7 @@ void ColorNameForm::validate() { TQString name = colorLineEdit->text(); if ( ! name.isEmpty() && - ( m_colors.isEmpty() || ! m_colors.tqcontains( name ) ) ) + ( m_colors.isEmpty() || ! m_colors.contains( name ) ) ) accept(); else colorLineEdit->selectAll(); diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui index 2863f02..6cec9a7 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui +++ b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui @@ -35,12 +35,12 @@ <string>&Look for</string> </property> <property name="buddy" stdset="0"> - <cstring>tqfindLineEdit</cstring> + <cstring>findLineEdit</cstring> </property> </widget> <widget class="TQLineEdit"> <property name="name"> - <cstring>tqfindLineEdit</cstring> + <cstring>findLineEdit</cstring> </property> </widget> </hbox> @@ -89,7 +89,7 @@ </spacer> <widget class="TQPushButton"> <property name="name"> - <cstring>tqfindPushButton</cstring> + <cstring>findPushButton</cstring> </property> <property name="text"> <string>&Find</string> @@ -118,10 +118,10 @@ <slot>accept()</slot> </connection> <connection> - <sender>tqfindPushButton</sender> + <sender>findPushButton</sender> <signal>clicked()</signal> <receiver>FindForm</receiver> - <slot>tqfind()</slot> + <slot>find()</slot> </connection> </connections> <includes> @@ -131,7 +131,7 @@ <signal>lookfor(const QString&)</signal> </Q_SIGNALS> <Q_SLOTS> - <slot>tqfind()</slot> + <slot>find()</slot> </Q_SLOTS> <functions> <function>notfound()</function> diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h index 1f6e6b9..1f3e993 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/colortool/findform.ui.h @@ -7,12 +7,12 @@ *****************************************************************************/ -void FindForm::tqfind() +void FindForm::find() { - emit lookfor( tqfindLineEdit->text() ); + emit lookfor( findLineEdit->text() ); } void FindForm::notfound() { - tqfindLineEdit->selectAll(); + findLineEdit->selectAll(); } diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui index 448a88e..cf978bf 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui +++ b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui @@ -526,7 +526,7 @@ </connection> </connections> <includes> - <include location="local" impldecl="in declaration">tqfindform.h</include> + <include location="local" impldecl="in declaration">findform.h</include> <include location="local" impldecl="in implementation">qsettings.h</include> <include location="local" impldecl="in implementation">qradiobutton.h</include> <include location="local" impldecl="in implementation">qcheckbox.h</include> @@ -560,7 +560,7 @@ <variable>int m_clip_as;</variable> <variable>bool m_show_web;</variable> <variable>QClipboard *clipboard;</variable> - <variable>FindForm *tqfindForm;</variable> + <variable>FindForm *findForm;</variable> <variable>QMap<QString,QColor> m_colors;</variable> </variables> <Q_SLOTS> diff --git a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h index 0026d8a..62c0729 100644 --- a/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/colortool/mainform.ui.h @@ -22,7 +22,7 @@ void MainForm::init() if ( clipboard->supportsSelection() ) clipboard->setSelectionMode( TRUE ); - tqfindForm = 0; + findForm = 0; loadSettings(); m_filename = ""; m_changed = FALSE; @@ -354,12 +354,12 @@ void MainForm::editCopy() void MainForm::editFind() { - if ( ! tqfindForm ) { - tqfindForm = new FindForm( this ); - connect( tqfindForm, TQT_SIGNAL( lookfor(const TQString&) ), + if ( ! findForm ) { + findForm = new FindForm( this ); + connect( findForm, TQT_SIGNAL( lookfor(const TQString&) ), this, TQT_SLOT( lookfor(const TQString&) ) ); } - tqfindForm->show(); + findForm->show(); } void MainForm::lookfor( const TQString& text ) @@ -373,7 +373,7 @@ void MainForm::lookfor( const TQString& text ) if ( visible == tablePage && colorTable->numRows() ) { int row = colorTable->currentRow(); for ( int i = row + 1; i < colorTable->numRows(); ++i ) - if ( colorTable->text( i, 0 ).lower().tqcontains( ltext ) ) { + if ( colorTable->text( i, 0 ).lower().contains( ltext ) ) { colorTable->setCurrentCell( i, 0 ); colorTable->clearSelection(); colorTable->selectRow( i ); @@ -387,7 +387,7 @@ void MainForm::lookfor( const TQString& text ) else if ( visible == iconsPage ) { TQIconViewItem *start = colorIconView->currentItem(); for ( TQIconViewItem *item = start->nextItem(); item; item = item->nextItem() ) - if ( item->text().lower().tqcontains( ltext ) ) { + if ( item->text().lower().contains( ltext ) ) { colorIconView->setCurrentItem( item ); colorIconView->ensureItemVisible( item ); found = TRUE; @@ -397,9 +397,9 @@ void MainForm::lookfor( const TQString& text ) colorIconView->setCurrentItem( start ); } if ( ! found ) { - statusBar()->message( TQString( "Could not tqfind '%1' after here" ). + statusBar()->message( TQString( "Could not find '%1' after here" ). arg( text ) ); - tqfindForm->notfound(); + findForm->notfound(); } } diff --git a/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h b/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h index 087d8d0..e99a3ab 100644 --- a/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h +++ b/tqtinterface/qt4/tools/designer/examples/richedit/richedit.ui.h @@ -99,7 +99,7 @@ int EditorForm::saveAndContinue(const TQString & action) if ( textEdit->isModified() ) { switch( TQMessageBox::information( this, "Rich Edit", - "The document tqcontains unsaved changes.\n" + "The document contains unsaved changes.\n" "Do you want to save the changes?", "&Save", "&Don't Save", "&Cancel " + action, 0, // Enter == button 0 diff --git a/tqtinterface/qt4/tools/designer/integration/designer.el b/tqtinterface/qt4/tools/designer/integration/designer.el index 4449205..bea54dc 100644 --- a/tqtinterface/qt4/tools/designer/integration/designer.el +++ b/tqtinterface/qt4/tools/designer/integration/designer.el @@ -8,7 +8,7 @@ (defun designer-create-ui-file (&optional arg) (interactive "FNew UI-File: ") - (tqfind-file arg) + (find-file arg) (insert "<UI></UI>") (save-buffer) (designer-open-ui-file) diff --git a/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h b/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h index 4a80a12..9e273cb 100644 --- a/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h +++ b/tqtinterface/qt4/tools/designer/interfaces/editorinterface.h @@ -82,8 +82,8 @@ struct EditorInterface : public TQUnknownInterface virtual void copy() = 0; virtual void paste() = 0; virtual void selectAll() = 0; - virtual bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; - virtual bool tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, bool forward, bool startAtCursor, bool tqreplaceAll ) = 0; + virtual bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) = 0; + virtual bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ) = 0; virtual void gotoLine( int line ) = 0; virtual void indent() = 0; virtual void scrollTo( const TQString &txt, const TQString &first ) = 0; diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp index 00dca68..82b1447 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppbrowser.cpp @@ -59,12 +59,12 @@ void CppEditorBrowser::showHelp( const TQString &w ) return; } - if ( word.tqfind( '(' ) != -1 ) { - TQString txt = "::" + word.left( word.tqfind( '(' ) ); + if ( word.find( '(' ) != -1 ) { + TQString txt = "::" + word.left( word.find( '(' ) ); TQTextDocument *doc = curEditor->document(); TQTextParagraph *p = doc->firstParagraph(); while ( p ) { - if ( p->string()->toString().tqfind( txt ) != -1 ) { + if ( p->string()->toString().find( txt ) != -1 ) { curEditor->setCursorPosition( p->paragId(), 0 ); return; } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp index 46cd56e..f49e2d8 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/cppcompletion.cpp @@ -49,9 +49,9 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) return FALSE; TQString object( objName ); int i = -1; - if ( ( i = object.tqfindRev( "->" ) ) != -1 ) + if ( ( i = object.findRev( "->" ) ) != -1 ) object = object.mid( i + 2 ); - if ( ( i = object.tqfindRev( "." ) ) != -1 ) + if ( ( i = object.findRev( "." ) ) != -1 ) object = object.mid( i + 1 ); object = object.simplifyWhiteSpace(); TQObject *obj = 0; @@ -69,7 +69,7 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) if ( !obj->childrenListObject().isEmpty() ) { for ( TQObjectListIt cit( obj->childrenListObject() ); cit.current(); ++cit ) { TQString s( cit.current()->name() ); - if ( s.tqfind( " " ) == -1 && s.tqfind( "qt_" ) == -1 && s.tqfind( "unnamed" ) == -1 ) { + if ( s.find( " " ) == -1 && s.find( "qt_" ) == -1 && s.find( "unnamed" ) == -1 ) { CompletionEntry c; c.type = "variable"; c.text = s; @@ -92,19 +92,19 @@ bool CppEditorCompletion::doObjectCompletion( const TQString &objName ) ce.text = f; ce.postfix = "()"; - if ( lst.tqfind( ce ) == lst.end() ) + if ( lst.find( ce ) == lst.end() ) lst << ce; } TQStrList slts = obj->tqmetaObject()->slotNames( TRUE ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); - f = f.left( f.tqfind( "(" ) ); + f = f.left( f.find( "(" ) ); CompletionEntry c; c.type = "slot"; c.text = f; c.postfix = "()"; - if ( lst.tqfind( c ) == lst.end() ) + if ( lst.find( c ) == lst.end() ) lst << c; } @@ -127,16 +127,16 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin TQString objName; int i = -1; - i = expr.tqfindRev( "->" ); + i = expr.findRev( "->" ); if ( i == -1 ) - i = expr.tqfindRev( "." ); + i = expr.findRev( "." ); else ++i; if ( i == -1 ) { - i = expr.tqfindRev( " " ); + i = expr.findRev( " " ); if ( i == -1 ) - i = expr.tqfindRev( "\t" ); + i = expr.findRev( "\t" ); else objName = ths->name(); @@ -155,16 +155,16 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin if ( ex[ (int)ex.length() - 1 ] == '-' ) ex.remove( ex.length() - 1, 1 ); int j = -1; - j = ex.tqfindRev( "->" ); + j = ex.findRev( "->" ); if ( j == -1 ) - j = ex.tqfindRev( "." ); + j = ex.findRev( "." ); else ++j; if ( j == -1 ) { - j = ex.tqfindRev( " " ); + j = ex.findRev( " " ); if ( j == -1 ) - j = ex.tqfindRev( "\t" ); + j = ex.findRev( "\t" ); else objName = ths->name(); @@ -188,11 +188,11 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin TQStrList slts = obj->tqmetaObject()->slotNames( TRUE ); for ( TQPtrListIterator<char> sit( slts ); sit.current(); ++sit ) { TQString f( sit.current() ); - f = f.left( f.tqfind( "(" ) ); + f = f.left( f.find( "(" ) ); if ( f == func ) { f = TQString( sit.current() ); - f.remove( (uint)0, f.tqfind( "(" ) + 1 ); - f = f.left( f.tqfind( ")" ) ); + f.remove( (uint)0, f.find( "(" ) + 1 ); + f = f.left( f.find( ")" ) ); TQStringList lst = TQStringList::split( ',', f ); if ( !lst.isEmpty() ) { TQValueList<TQStringList> l; @@ -204,7 +204,7 @@ TQValueList<TQStringList> CppEditorCompletion::functionParameters( const TQStrin const TQMetaProperty *prop = obj->tqmetaObject()-> - property( obj->tqmetaObject()->tqfindProperty( func[ 3 ].lower() + func.mid( 4 ), TRUE ), TRUE ); + property( obj->tqmetaObject()->findProperty( func[ 3 ].lower() + func.mid( 4 ), TRUE ), TRUE ); if ( prop ) { TQValueList<TQStringList> l; l << TQStringList( prop->type() ); diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index 736b082..9d34421 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -165,40 +165,40 @@ void EditorInterfaceImpl::selectAll() ( (CppEditor*)viewManager->currentView() )->selectAll(); } -bool EditorInterfaceImpl::tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) +bool EditorInterfaceImpl::find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ) { if ( !viewManager || !viewManager->currentView() ) return FALSE; CppEditor *e = (CppEditor*)viewManager->currentView(); if ( startAtCursor ) - return e->tqfind( expr, cs, wo, forward ); + return e->find( expr, cs, wo, forward ); int dummy = 0; - return e->tqfind( expr, cs, wo, forward, &dummy, &dummy ); + return e->find( expr, cs, wo, forward, &dummy, &dummy ); } -bool EditorInterfaceImpl::tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, - bool forward, bool startAtCursor, bool tqreplaceAll ) +bool EditorInterfaceImpl::replace( const TQString &find, const TQString &replace, bool cs, bool wo, + bool forward, bool startAtCursor, bool replaceAll ) { if ( !viewManager || !viewManager->currentView() ) return FALSE; CppEditor *e = (CppEditor*)viewManager->currentView(); bool ok = FALSE; if ( startAtCursor ) { - ok = e->tqfind( tqfind, cs, wo, forward ); + ok = e->find( find, cs, wo, forward ); } else { int dummy = 0; - ok = e->tqfind( tqfind, cs, wo, forward, &dummy, &dummy ); + ok = e->find( find, cs, wo, forward, &dummy, &dummy ); } if ( ok ) { e->removeSelectedText(); - e->insert( tqreplace, FALSE, FALSE ); + e->insert( replace, FALSE, FALSE ); } - if ( !tqreplaceAll || !ok ) { + if ( !replaceAll || !ok ) { if ( ok ) e->setSelection( e->textCursor()->paragraph()->paragId(), - e->textCursor()->index() - tqreplace.length(), + e->textCursor()->index() - replace.length(), e->textCursor()->paragraph()->paragId(), e->textCursor()->index() ); return ok; @@ -206,10 +206,10 @@ bool EditorInterfaceImpl::tqreplace( const TQString &tqfind, const TQString &tqr bool ok2 = TRUE; while ( ok2 ) { - ok2 = e->tqfind( tqfind, cs, wo, forward ); + ok2 = e->find( find, cs, wo, forward ); if ( ok2 ) { e->removeSelectedText(); - e->insert( tqreplace, FALSE, FALSE ); + e->insert( replace, FALSE, FALSE ); } } @@ -249,7 +249,7 @@ void EditorInterfaceImpl::scrollTo( const TQString &txt, const TQString & ) TQTextDocument *doc = ( (CppEditor*)viewManager->currentView() )->document(); TQTextParagraph *p = doc->firstParagraph(); while ( p ) { - if ( p->string()->toString().tqfind( txt ) != -1 ) { + if ( p->string()->toString().find( txt ) != -1 ) { ( (CppEditor*)viewManager->currentView() )->setCursorPosition( p->paragId() + 2, 0 ); break; } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h index 997a99b..5bae764 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/editorinterfaceimpl.h @@ -66,8 +66,8 @@ public: void copy(); void paste(); void selectAll(); - bool tqfind( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ); - bool tqreplace( const TQString &tqfind, const TQString &tqreplace, bool cs, bool wo, bool forward, bool startAtCursor, bool tqreplaceAll ); + bool find( const TQString &expr, bool cs, bool wo, bool forward, bool startAtCursor ); + bool replace( const TQString &find, const TQString &replace, bool cs, bool wo, bool forward, bool startAtCursor, bool replaceAll ); void gotoLine( int line ); void indent(); void scrollTo( const TQString &txt, const TQString &first ); diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp index 14489c5..da857b5 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/languageinterfaceimpl.cpp @@ -93,9 +93,9 @@ void LanguageInterfaceImpl::functions( const TQString &code, TQValueList<Functio Function func; func.name = (*it).prototype(); func.name.remove( 0, (*it).returnType().length() ); - if ( func.name.tqfind( "::" ) == -1 ) + if ( func.name.find( "::" ) == -1 ) continue; - func.name.remove( (uint)0, func.name.tqfind( "::" ) + 2 ); + func.name.remove( (uint)0, func.name.find( "::" ) + 2 ); func.body = (*it).body(); func.returnType = (*it).returnType(); func.start = (*it).functionStartLineNum(); @@ -194,7 +194,7 @@ TQString LanguageInterfaceImpl::projectKeyForExtension( const TQString &extensio { // also handle something like foo.ut.cpp TQString ext = extension; - int i = ext.tqfindRev('.'); + int i = ext.findRev('.'); if ( i > -1 && i < (int)(ext.length()-1) ) ext = ext.mid( i + 1 ); if ( ext[ 0 ] == 'c' || ext[ 0 ] == 'C' ) diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h index 72aea91..9902c17 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/projectsettings.ui.h @@ -36,10 +36,10 @@ void CppProjectSettings::reInit( TQUnknownInterface *iface ) const TQString platforms[] = { "(all)", "win32", "unix", "mac", TQString() }; for ( int i = 0; platforms[ i ] != TQString(); ++i ) { - config.tqreplace( platforms[ i ], project->config( platforms[ i ] ) ); - libs.tqreplace( platforms[ i ], project->libs( platforms[ i ] ) ); - defines.tqreplace( platforms[ i ], project->defines( platforms[ i ] ) ); - includes.tqreplace( platforms[ i ], project->includePath( platforms[ i ] ) ); + config.replace( platforms[ i ], project->config( platforms[ i ] ) ); + libs.replace( platforms[ i ], project->libs( platforms[ i ] ) ); + defines.replace( platforms[ i ], project->defines( platforms[ i ] ) ); + includes.replace( platforms[ i ], project->includePath( platforms[ i ] ) ); } editConfig->setText( config[ "(all)" ] ); editLibs->setText( libs[ "(all)" ] ); @@ -67,22 +67,22 @@ void CppProjectSettings::save( TQUnknownInterface *iface ) void CppProjectSettings::configChanged( const TQString &str ) { - config.tqreplace( comboConfig->currentText(), str ); + config.replace( comboConfig->currentText(), str ); } void CppProjectSettings::libsChanged( const TQString &str ) { - libs.tqreplace( comboLibs->currentText(), str ); + libs.replace( comboLibs->currentText(), str ); } void CppProjectSettings::definesChanged( const TQString &str ) { - defines.tqreplace( comboDefines->currentText(), str ); + defines.replace( comboDefines->currentText(), str ); } void CppProjectSettings::includesChanged( const TQString &str ) { - includes.tqreplace( comboInclude->currentText(), str ); + includes.replace( comboInclude->currentText(), str ); } void CppProjectSettings::configPlatformChanged( const TQString &plat ) diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp index fe84703..5d3c96f 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/sourcetemplateinterfaceimpl.cpp @@ -100,7 +100,7 @@ SourceTemplateInterface::Source SourceTemplateInterfaceImpl::create( const TQStr formFileName( dia.listForms->text( dia.listForms->currentItem() ) ); include.remove( include.length() - 2, 2 ); include += "h"; - int slashFind = include.tqfindRev('/'); + int slashFind = include.findRev('/'); if (slashFind != -1) include = include.mid(slashFind+1); src.code = generateMainCppCode( dia.listForms->text( dia.listForms->currentItem() ), diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp index 251e2b5..0217682 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.cpp @@ -153,7 +153,7 @@ SyntaxHighlighter_CPP::SyntaxHighlighter_CPP() int len; for ( int i = 0; keywords[ i ]; ++i ) { len = (int)strlen( keywords[ i ] ); - if ( !wordMap->tqcontains( len ) ) + if ( !wordMap->contains( len ) ) wordMap->insert( len, TQMap<TQString, int >() ); TQMap<TQString, int> &map = wordMap->operator[]( len ); map[ keywords[ i ] ] = Keyword; @@ -330,11 +330,11 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin break; case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': case '0': - if ( alphabeth.tqfind( lastChar ) != -1 && - ( mathChars.tqfind( lastChar ) == -1 || numbers.tqfind( string->at( i - 1 )->c ) == -1 ) ) { + if ( alphabeth.find( lastChar ) != -1 && + ( mathChars.find( lastChar ) == -1 || numbers.find( string->at( i - 1 )->c ) == -1 ) ) { input = InputAlpha; } else { - if ( input == InputAlpha && numbers.tqfind( lastChar ) != -1 ) + if ( input == InputAlpha && numbers.find( lastChar ) != -1 ) input = InputAlpha; else input = InputNumber; @@ -381,9 +381,9 @@ void SyntaxHighlighter_CPP::process( TQTextDocument *doc, TQTextParagraph *strin if ( buffer[ 0 ] == 'Q' ) { string->setFormat( i - buffer.length(), buffer.length(), formatType, FALSE ); } else { - TQMap<int, TQMap<TQString, int > >::Iterator it = wordMap->tqfind( len ); + TQMap<int, TQMap<TQString, int > >::Iterator it = wordMap->find( len ); if ( it != wordMap->end() ) { - TQMap<TQString, int >::Iterator it2 = ( *it ).tqfind( buffer ); + TQMap<TQString, int >::Iterator it2 = ( *it ).find( buffer ); if ( it2 != ( *it ).end() ) string->setFormat( i - buffer.length(), buffer.length(), format( ( *it2 ) ), FALSE ); } diff --git a/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp b/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp index ab69cce..e1b41b5 100644 --- a/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/cppeditor/yyreg.cpp @@ -180,10 +180,10 @@ static int getToken() qDebug()'s here and there. */ if ( yyCurPos >= 0 ) { - int lineStart = yyIn->tqfindRev( TQChar('\n'), yyCurPos ) + 1; + int lineStart = yyIn->findRev( TQChar('\n'), yyCurPos ) + 1; TQString line = yyIn->mid( lineStart, yyCurPos - lineStart + 2 ); - int commentStart = line.tqfind( TQString("//") ); + int commentStart = line.find( TQString("//") ); if ( commentStart != -1 ) { yyCurPos = lineStart + commentStart - 1; yyPos = yyCurPos + 2; @@ -392,7 +392,7 @@ TQString CppFunction::prototype() const /* The parser follows. We are not really parsing C++, just trying to - tqfind the start and end of function definitions. + find the start and end of function definitions. One important pitfall is that the parsed code needs not be valid. Parsing from right to left helps cope with that, as explained in @@ -654,7 +654,7 @@ static CppFunction matchFunctionPrototype( bool stripParamNames ) functions and one that relates to the following function. One good heuristic is to assume that a comment immediately followed by a function with no blank line in between relates to the - function, but there's no easy way to tqfind that out with a + function, but there's no easy way to find that out with a tokenizer. */ #if 0 @@ -689,7 +689,7 @@ static CppFunction matchFunctionPrototype( bool stripParamNames ) printf( " world!\n" ); } - The parser first tqfinds bar(). Then it tqfinds "void foo() {" and + The parser first finds bar(). Then it finds "void foo() {" and naively expects the body to extend up to "void bar()". This function's job is to count braces and make sure "int n;" is not counted as part of the body. @@ -733,8 +733,8 @@ static void setBody( CppFunction *func, const TQString& somewhatBody ) } The parser looks for left braces and tries to parse a function - prototype backwards. First it tqfinds "void bar() {". Then it works - up and tqfinds "void foo() {". + prototype backwards. First it finds "void bar() {". Then it works + up and finds "void foo() {". */ static void matchTranslationUnit( TQValueList<CppFunction> *flist ) { @@ -763,11 +763,11 @@ static void matchTranslationUnit( TQValueList<CppFunction> *flist ) Compute important line numbers. */ int functionStartLineNo = 1 + TQConstString( yyIn->tqunicode(), yyPos ) - .string().tqcontains( TQChar('\n') ); + .string().contains( TQChar('\n') ); int startLineNo = functionStartLineNo + TQConstString( yyIn->tqunicode() + yyPos, startBody - yyPos ) - .string().tqcontains( TQChar('\n') ); - int endLineNo = startLineNo + body.tqcontains( TQChar('\n') ); + .string().contains( TQChar('\n') ); + int endLineNo = startLineNo + body.contains( TQChar('\n') ); func.setLineNums( functionStartLineNo, startLineNo, endLineNo ); flist->prepend( func ); diff --git a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp index cb71661..6f45017 100644 --- a/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/dlg/dlg2ui.cpp @@ -254,17 +254,17 @@ static AttributeMap attribute( const TQString& name, const TQString& val ) static TQString entitize( const TQString& str ) { TQString t = str; - t.tqreplace( '&', TQString("&") ); - t.tqreplace( '>', TQString(">") ); - t.tqreplace( '<', TQString("<") ); - t.tqreplace( '"', TQString(""") ); - t.tqreplace( '\'', TQString("'") ); + t.replace( '&', TQString("&") ); + t.replace( '>', TQString(">") ); + t.replace( '<', TQString("<") ); + t.replace( '"', TQString(""") ); + t.replace( '\'', TQString("'") ); return t; } TQString Dlg2Ui::alias( const TQString& name ) const { - if ( yyAliasMap.tqcontains(name) ) + if ( yyAliasMap.contains(name) ) return yyAliasMap[name]; else return name; @@ -318,8 +318,8 @@ TQString Dlg2Ui::getTextValue( const TQDomNode& node ) return TQString(); } TQString t = child.data().stripWhiteSpace(); - t.tqreplace( "\\\\", "\\" ); - t.tqreplace( "\\n", "\n" ); + t.replace( "\\\\", "\\" ); + t.replace( "\\n", "\n" ); return t; } @@ -549,7 +549,7 @@ void Dlg2Ui::emitClosingLayout( bool needsWidget, const TQString& layoutKind ) bool Dlg2Ui::isWidgetType( const TQDomElement& e ) { - return yyWidgetTypeSet.tqcontains( e.tagName() ); + return yyWidgetTypeSet.contains( e.tagName() ); } void Dlg2Ui::emitSpacer( int spacing, int stretch ) @@ -583,7 +583,7 @@ TQString Dlg2Ui::filteredFlags( const TQString& flags, const TQRegExp& filter ) TQRegExp evil( TQString("[^0-9A-Z_a-z|]") ); TQString f = flags; - f.tqreplace( evil, TQString() ); + f.replace( evil, TQString() ); TQStringList splitted = TQStringList::split( TQChar('|'), f ); return splitted.grep( filter ).join( TQChar('|') ); } @@ -679,7 +679,7 @@ void Dlg2Ui::emitWidgetBody( const TQDomElement& e, bool layouted ) } else { TQString tagName = n.toElement().tagName(); - TQMap<TQString, int>::ConstIterator p = pp.tqfind( tagName ); + TQMap<TQString, int>::ConstIterator p = pp.find( tagName ); if ( p == pp.end() ) { /* These properties are not in the propertyDefs table, @@ -1245,7 +1245,7 @@ void Dlg2Ui::matchLayoutWidget( const TQDomElement& layoutWidget ) } if ( !widget.isEmpty() ) { - TQMap<TQString, TQDomElement>::Iterator w = yyWidgetMap.tqfind( widget ); + TQMap<TQString, TQDomElement>::Iterator w = yyWidgetMap.find( widget ); if ( w == yyWidgetMap.end() ) { syntaxError(); } else { @@ -1412,7 +1412,7 @@ void Dlg2Ui::matchWidget( const TQDomElement& widget ) if ( name.isEmpty() ) name = TQString( "Widget%1" ).arg( uniqueWidget++ ); - if ( yyWidgetMap.tqcontains(name) ) + if ( yyWidgetMap.contains(name) ) syntaxError(); yyWidgetMap.insert( name, widget ); } diff --git a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp index 4571cf5..88375b0 100644 --- a/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/glade/glade2ui.cpp @@ -236,11 +236,11 @@ static AttributeMap attribute( const TQString& name, const TQString& val ) static TQString entitize( const TQString& str ) { TQString t = str; - t.tqreplace( '&', TQString("&") ); - t.tqreplace( '>', TQString(">") ); - t.tqreplace( '<', TQString("<") ); - t.tqreplace( '"', TQString(""") ); - t.tqreplace( '\'', TQString("'") ); + t.replace( '&', TQString("&") ); + t.replace( '>', TQString(">") ); + t.replace( '<', TQString("<") ); + t.replace( '"', TQString(""") ); + t.replace( '\'', TQString("'") ); return t; } @@ -446,9 +446,9 @@ void Glade2Ui::emitAttribute( const TQString& prop, const TQVariant& val, static TQString accelerate( const TQString& gtkLabel ) { TQString qtLabel = gtkLabel; - qtLabel.tqreplace( '&', TQString("&&") ); + qtLabel.replace( '&', TQString("&&") ); // close but not quite right - qtLabel.tqreplace( TQChar('_'), TQChar('&') ); + qtLabel.replace( TQChar('_'), TQChar('&') ); return qtLabel; } @@ -456,7 +456,7 @@ static TQString decelerate( const TQString& gtkLabel ) { TQString qtLabel = gtkLabel; // ditto - qtLabel.tqreplace( '_', TQString() ); + qtLabel.replace( '_', TQString() ); return qtLabel; } @@ -591,17 +591,17 @@ int Glade2Ui::matchAccelOnActivate( const TQDomElement& accel ) if ( key.length() == 5 ) { flags = key[4].upper().latin1(); - } else if ( yyKeyMap.tqcontains(key.mid(4)) ) { + } else if ( yyKeyMap.contains(key.mid(4)) ) { flags = yyKeyMap[key.mid(4)]; } else { return 0; } - if ( modifiers.tqcontains(TQString("_CONTROL_")) ) + if ( modifiers.contains(TQString("_CONTROL_")) ) flags |= TQt::CTRL; - if ( modifiers.tqcontains(TQString("_SHIFT_")) ) + if ( modifiers.contains(TQString("_SHIFT_")) ) flags |= TQt::SHIFT; - if ( modifiers.tqcontains(TQString("_MOD1_")) ) + if ( modifiers.contains(TQString("_MOD1_")) ) flags |= TQt::ALT; return flags; } @@ -838,9 +838,9 @@ void Glade2Ui::emitPushButton( const TQString& text, const TQString& name ) attribute(TQString("class"), TQString("TQPushButton")) ); emitProperty( TQString("name"), name.latin1() ); emitProperty( TQString("text"), text ); - if ( name.tqcontains(TQString("ok")) > 0 ) { + if ( name.contains(TQString("ok")) > 0 ) { emitProperty( TQString("default"), TQVariant(TRUE, 0) ); - } else if ( name.tqcontains(TQString("help")) > 0 ) { + } else if ( name.contains(TQString("help")) > 0 ) { emitProperty( TQString("accel"), (int) TQt::Key_F1 ); } emitClosing( TQString("widget") ); @@ -1662,7 +1662,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, button label. */ label = getTextValue( n ); - int k = label.tqfindRev( TQChar('_') ); + int k = label.findRev( TQChar('_') ); if ( k != -1 ) label = label.mid( k + 1 ); if ( !label.isEmpty() && label != TQString("OK") ) @@ -1880,7 +1880,7 @@ TQString Glade2Ui::emitWidget( const TQDomElement& widget, bool layouted, gtk2qtSelectionMode(selectionMode), TQString("enum") ); if ( !shadowType.endsWith(TQString("_NONE")) ) { - TQString tqshape = shadowType.tqcontains( TQString("_ETCHED_") ) > 0 ? + TQString tqshape = shadowType.contains( TQString("_ETCHED_") ) > 0 ? TQString( "Box" ) : TQString( "WinPanel" ); TQString shadow = shadowType.endsWith( TQString("_IN") ) ? TQString( "Sunken" ) : TQString( "Raised" ); @@ -2106,7 +2106,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) char *data = new char[maxLength]; TQString dir = yyFileName; - dir.truncate( dir.tqfindRev(TQChar('/')) + 1 ); + dir.truncate( dir.findRev(TQChar('/')) + 1 ); dir += yyPixmapDirectory; emitOpening( TQString("images") ); @@ -2173,7 +2173,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) emitFooter(); TQString outFileName = fileName; - int k = outFileName.tqfindRev( "." ); + int k = outFileName.findRev( "." ); if ( k != -1 ) outFileName.truncate( k ); if ( widgetNo != 0 ) diff --git a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp index 0030ab8..3c03e6d 100644 --- a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp @@ -181,20 +181,20 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) TQString shadow = "NoFrame"; TQString tqshape = "StyledPanel"; int width = 2; - if ( styles.tqcontains( "WS_EX_STATICEDGE" ) ) { + if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_CLIENTEDGE" ) ) { + if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_DLGMODALFRAME" ) ) { + if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; defineFrame = TRUE; } - if ( !styles.tqcontains( "WS_BORDER" ) ) { + if ( !styles.contains( "WS_BORDER" ) ) { tqshape = "NoFrame"; defineFrame = TRUE; } @@ -206,13 +206,13 @@ void KDEVDLG2UI::writeStyles( const TQStringList styles, bool isFrame ) } } - if ( styles.tqcontains("WS_DISABLED") ) + if ( styles.contains("WS_DISABLED") ) writeBool("enabled", FALSE ); - if ( styles.tqcontains("WS_EX_ACCEPTFILES") ) + if ( styles.contains("WS_EX_ACCEPTFILES") ) writeBool("acceptDrops", TRUE ); - if ( styles.tqcontains("WS_EX_TRANSPARENT") ) + if ( styles.contains("WS_EX_TRANSPARENT") ) writeBool("autoMask", TRUE ); - if ( !styles.tqcontains("WS_TABSTOP") ) + if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -283,11 +283,11 @@ bool KDEVDLG2UI::parse( TQStringList& get ) void KDEVDLG2UI::cleanString( TQString * text ) { if ( !text ) return; - text->tqreplace( "\\n", "\n" ); - text->tqreplace( "\\t", "\t" ); - text->tqreplace( "&", "&" ); - text->tqreplace( "<", "<" ); - text->tqreplace( ">", ">" ); + text->replace( "\\n", "\n" ); + text->replace( "\\t", "\t" ); + text->replace( "&", "&" ); + text->replace( "<", "<" ); + text->replace( ">", ">" ); } /*! diff --git a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp index 9ecac6e..fd2df40 100644 --- a/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/kdevdlg/main.cpp @@ -93,7 +93,7 @@ TQStringList KDevDlgFilter::import( const TQString &, const TQString& filename ) TQTextStream in; in.setDevice( &file ); - TQString name = filename.right( filename.length() - filename.tqfindRev( TQDir::separator() ) - 1 ).section( ".", 0, 0 ); + TQString name = filename.right( filename.length() - filename.findRev( TQDir::separator() ) - 1 ).section( ".", 0, 0 ); KDEVDLG2UI c( &in, name ); TQStringList files; c.parse(); diff --git a/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp b/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp index a9e87b0..7f7d3f3 100644 --- a/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/rc/rc2ui.cpp @@ -63,8 +63,8 @@ TQStringList RC2UI::splitStyles( const TQString& styles, char sep ) TQString s = styles; TQString style; TQStringList l; - while ( s.tqfind( sep ) > -1 ) { - style = s.left( s.tqfind( sep ) ); + while ( s.find( sep ) > -1 ) { + style = s.left( s.find( sep ) ); l << style.stripWhiteSpace(); s = s.right( s.length() - style.length() -1 ); } @@ -75,7 +75,7 @@ TQStringList RC2UI::splitStyles( const TQString& styles, char sep ) TQString RC2UI::parseNext( TQString& arg, char sep ) { - TQString next = arg.left( arg.tqfind(sep) ); + TQString next = arg.left( arg.find(sep) ); arg = arg.right( arg.length() - next.length() - 1 ); return next; } @@ -164,20 +164,20 @@ void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) TQString shadow = "NoFrame"; TQString tqshape = "StyledPanel"; int width = 2; - if ( styles.tqcontains( "WS_EX_STATICEDGE" ) ) { + if ( styles.contains( "WS_EX_STATICEDGE" ) ) { shadow = "Plain"; width = 1; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_CLIENTEDGE" ) ) { + if ( styles.contains( "WS_EX_CLIENTEDGE" ) ) { shadow = "Sunken"; defineFrame = TRUE; } - if ( styles.tqcontains( "WS_EX_DLGMODALFRAME" ) ) { + if ( styles.contains( "WS_EX_DLGMODALFRAME" ) ) { shadow = "Raised"; defineFrame = TRUE; } - if ( !styles.tqcontains( "WS_BORDER" ) ) { + if ( !styles.contains( "WS_BORDER" ) ) { tqshape = "NoFrame"; defineFrame = TRUE; } @@ -189,13 +189,13 @@ void RC2UI::writeStyles( const TQStringList styles, bool isFrame ) } } - if ( styles.tqcontains("WS_DISABLED") ) + if ( styles.contains("WS_DISABLED") ) writeBool("enabled", FALSE ); - if ( styles.tqcontains("WS_EX_ACCEPTFILES") ) + if ( styles.contains("WS_EX_ACCEPTFILES") ) writeBool("acceptDrops", TRUE ); - if ( styles.tqcontains("WS_EX_TRANSPARENT") ) + if ( styles.contains("WS_EX_TRANSPARENT") ) writeBool("autoMask", TRUE ); - if ( !styles.tqcontains("WS_TABSTOP") ) + if ( !styles.contains("WS_TABSTOP") ) writeEnum("focusPolicy", "NoFocus"); } @@ -297,7 +297,7 @@ TQString RC2UI::useName( const TQString& start ) TQString name = start; int id = 1; - while ( usedNames.tqcontains( name ) ) { + while ( usedNames.contains( name ) ) { name = start + TQString( "%1" ).arg( id ); id++; } @@ -359,19 +359,19 @@ bool RC2UI::makeDialog() } while ( line[(int)line.length()-1] == '|' || line[(int)line.length()-1] == ',' ); count = sscanf( line, "%s", property ); - line = line.right( line.length() - line.tqfind(" ") -1 ); + line = line.right( line.length() - line.find(" ") -1 ); if ( TQString(property) == "STYLE" ) { styles = splitStyles(line); - if ( styles.tqcontains( "WS_CAPTION" ) ) + if ( styles.contains( "WS_CAPTION" ) ) baseClass = "TQDialog"; else baseClass = "TQWidget"; } else if ( TQString(property) == "CAPTION" ) { caption = stripQM( line ); } else if ( TQString(property) == "FONT" ) { - TQString pt = line.left( line.tqfind(",") ); + TQString pt = line.left( line.find(",") ); pointsize = pt.toInt(); - fontname = stripQM(line.right( line.length() - line.tqfind(",") - 2 )); + fontname = stripQM(line.right( line.length() - line.find(",") - 2 )); } } while ( line != "BEGIN" ); @@ -462,10 +462,10 @@ bool RC2UI::makeDialog() if ( controlType == "Static" ) { ID = IDLabel; } else if ( controlType == "Button" ) { - if ( styles.tqcontains("BS_AUTOCHECKBOX") || - styles.tqcontains("BS_3STATE") ) + if ( styles.contains("BS_AUTOCHECKBOX") || + styles.contains("BS_3STATE") ) ID = IDCheckBox; - else if ( styles.tqcontains("BS_AUTORADIOBUTTON") ) + else if ( styles.contains("BS_AUTORADIOBUTTON") ) ID = IDRadioButton; } else if ( controlType == "msctls_updown32" ) { ID = IDSpinBox; @@ -514,7 +514,7 @@ bool RC2UI::makeDialog() extendedStyles = splitStyles(parseNext( arguments )); for ( uint i = 0; i < extendedStyles.count(); i++ ) styles << (*extendedStyles.at(i)); - } while ( arguments.tqfind(',') > -1 ); + } while ( arguments.find(',') > -1 ); switch ( ID ) { case IDWidget: @@ -537,7 +537,7 @@ bool RC2UI::makeDialog() writeRect( "geometry", x,y,w,h ); writeString( "text", widgetText ); TQString align; - if ( !styles.tqcontains("SS_CENTERIMAGE") ) + if ( !styles.contains("SS_CENTERIMAGE") ) align += "|AlignTop"; else align += "|AlignVCenter"; @@ -557,7 +557,7 @@ bool RC2UI::makeDialog() writeCString("name", useName("CheckBox_"+widgetID) ); writeRect("geometry", x,y,w,h); writeString("text", widgetText ); - if ( styles.tqcontains( "BS_3STATE" ) ) + if ( styles.contains( "BS_3STATE" ) ) writeBool( "tristate", TRUE ); } break; @@ -576,13 +576,13 @@ bool RC2UI::makeDialog() writeCString( "name", useName("GroupBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); writeString( "title", widgetText ); - if ( !styles.tqcontains( "WS_BORDER" ) ) + if ( !styles.contains( "WS_BORDER" ) ) styles.append( "WS_BORDER" ); } break; case IDLineEdit: { - if ( !styles.tqcontains("ES_MULTILINE") ) { + if ( !styles.contains("ES_MULTILINE") ) { writeClass("TQLineEdit"); writeCString( "name", useName("LineEdit_"+widgetID) ); } else { @@ -591,9 +591,9 @@ bool RC2UI::makeDialog() } writeRect( "geometry", x,y,w,h ); TQString align = "AlignTop"; - if ( styles.tqcontains("ES_CENTER") ) + if ( styles.contains("ES_CENTER") ) align+="|AlignHCenter"; - else if ( styles.tqcontains("ES_RIGHT") ) + else if ( styles.contains("ES_RIGHT") ) align+="|AlignRight"; else align+="|AlignLeft"; @@ -613,9 +613,9 @@ bool RC2UI::makeDialog() writeClass("TQIconView"); writeCString("name", useName("IconView_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( !styles.tqcontains( "LVS_SINGLESEL" ) ) + if ( !styles.contains( "LVS_SINGLESEL" ) ) writeEnum( "selectionMode", "Extended" ); - if ( styles.tqcontains( "LVS_NOLABELWRAP" ) ) + if ( styles.contains( "LVS_NOLABELWRAP" ) ) writeBool("wordWrapIconText", FALSE ); } break; @@ -625,9 +625,9 @@ bool RC2UI::makeDialog() writeClass("TQListView"); writeCString("name", useName("ListView_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains( "TVS_LINESATROOT" ) ) + if ( styles.contains( "TVS_LINESATROOT" ) ) writeBool( "rootIsDecorated", TRUE ); - if ( styles.tqcontains( "TVS_FULLROWSELECT" ) ) + if ( styles.contains( "TVS_FULLROWSELECT" ) ) writeBool( "allColumnsShowFocus", TRUE ); } break; @@ -637,7 +637,7 @@ bool RC2UI::makeDialog() writeClass("TQProgressBar"); writeCString("name", useName("ProgressBar_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("TBS_VERT") ) + if ( styles.contains("TBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); @@ -670,11 +670,11 @@ bool RC2UI::makeDialog() writeClass("TQSlider"); writeCString("name", useName("Slider_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("TBS_VERT") ) + if ( styles.contains("TBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); - if ( !styles.tqcontains("TBS_NOTICKS") ) + if ( !styles.contains("TBS_NOTICKS") ) writeEnum("tickmarks", "Left" ); } break; @@ -694,23 +694,23 @@ bool RC2UI::makeDialog() writeClass("TQListBox"); writeCString("name", useName("ListBox_"+widgetID) ); writeRect( "geometry", x,y,w,h ); - if ( styles.tqcontains("WS_HSCROLL") ) + if ( styles.contains("WS_HSCROLL") ) writeEnum("hScrollBarMode", "Auto"); else writeEnum("hScrollBarMode", "AlwaysOff"); - if ( styles.tqcontains("WS_VSCROLL") ) + if ( styles.contains("WS_VSCROLL") ) writeEnum("vScrollBarMode", "Auto"); else writeEnum("vScrollBarMode", "AlwaysOff"); - if ( styles.tqcontains("LBS_EXTENDEDSEL") ) + if ( styles.contains("LBS_EXTENDEDSEL") ) writeEnum("selectionMode", "Extended"); - else if ( styles.tqcontains("LBS_MULTIPLESEL") ) + else if ( styles.contains("LBS_MULTIPLESEL") ) writeEnum("selectionMode", "Multi"); - else if ( styles.tqcontains("LBS_NOSEL") ) + else if ( styles.contains("LBS_NOSEL") ) writeEnum("selectionMode", "NoSelection"); else writeEnum("selectionMode", "Single"); - if ( !styles.tqcontains( "NO WS_BORDER" ) ) + if ( !styles.contains( "NO WS_BORDER" ) ) styles.append( "WS_BORDER" ); } break; @@ -719,7 +719,7 @@ bool RC2UI::makeDialog() writeClass("TQScrollBar"); writeCString("name", useName("ScrollBar_"+widgetID) ); writeRect("geometry", x,y,w,h ); - if ( styles.tqcontains("SBS_VERT") ) + if ( styles.contains("SBS_VERT") ) writeEnum("orientation", "Vertical"); else writeEnum("orientation", "Horizontal"); diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h index 3865d12..5c3a29c 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/mainwindowwizard.ui.h @@ -156,7 +156,7 @@ void MainWindowWizardBase::accept() getPixmap( "editpaste", pix ); TQAction *editPasteAction = dfw->createAction( tr( "Paste" ), pix, tr( "&Paste" ), CTRL + Key_V, 0, "editPasteAction" ); actions.insert( tr( "Paste" ), editPasteAction ); - getPixmap( "searchtqfind", pix ); + getPixmap( "searchfind", pix ); TQAction *editFindAction = dfw->createAction( tr( "Find" ), pix, tr( "&Find..." ), CTRL + Key_F, 0, "editFindAction" ); actions.insert( tr( "Find" ), editFindAction ); @@ -236,19 +236,19 @@ void MainWindowWizardBase::accept() dfw->addToolBarSeparator( "toolBar" ); continue; } - TQAction *a = actions.tqfind( listToolbar->text( i ) ); + TQAction *a = actions.find( listToolbar->text( i ) ); if ( !a ) continue; dfw->addToolBarAction( "toolBar", a ); dfw->addAction( a ); - if ( usedActions.tqfindRef( a ) == -1 ) + if ( usedActions.findRef( a ) == -1 ) usedActions.append( a ); } } for ( TQAction *ac = usedActions.first(); ac; ac = usedActions.next() ) { - if ( TQString( ac->name() ).tqfind( "file" ) != -1 && checkCreateConnectionsFile->isChecked() || - TQString( ac->name() ).tqfind( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() || - TQString( ac->name() ).tqfind( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) { + if ( TQString( ac->name() ).find( "file" ) != -1 && checkCreateConnectionsFile->isChecked() || + TQString( ac->name() ).find( "edit" ) != -1 && checkCreateConnectionsEdit->isChecked() || + TQString( ac->name() ).find( "help" ) != -1 && checkCreateConnectionsHelp->isChecked() ) { TQString slot = ac->name(); slot.remove( slot.length() - 6, 6 ); slot += "()"; diff --git a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index e4d1d61..f8f2dd3 100644 --- a/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tqtinterface/qt4/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -150,7 +150,7 @@ void SqlFormWizard::autoPopulate( bool populate ) if ( d->name() == listBoxConnection->currentText() || ( ( d->name() == "(default)" || d->name().isEmpty() ) && listBoxConnection->currentText() == "(default)" ) ) { - TQStringList lst = *d->fields().tqfind( listBoxTable->currentText() ); + TQStringList lst = *d->fields().find( listBoxTable->currentText() ); // remove primary index fields, if any listBoxSortField->insertStringList( lst ); d->open( FALSE ); diff --git a/tqtinterface/qt4/tools/designer/shared/parser.cpp b/tqtinterface/qt4/tools/designer/shared/parser.cpp index d9f01ed..90ecc68 100644 --- a/tqtinterface/qt4/tools/designer/shared/parser.cpp +++ b/tqtinterface/qt4/tools/designer/shared/parser.cpp @@ -45,9 +45,9 @@ public: TQString Parser::cleanArgs( const TQString &func ) { TQString slot( func ); - int begin = slot.tqfind( "(" ) + 1; + int begin = slot.find( "(" ) + 1; TQString args = slot.mid( begin ); - args = args.left( args.tqfind( ")" ) ); + args = args.left( args.find( ")" ) ); TQStringList lst = TQStringList::split( ',', args ); TQString res = slot.left( begin ); for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { @@ -55,13 +55,13 @@ TQString Parser::cleanArgs( const TQString &func ) res += ","; TQString arg = *it; int pos = 0; - if ( ( pos = arg.tqfind( "&" ) ) != -1 ) { + if ( ( pos = arg.find( "&" ) ) != -1 ) { arg = arg.left( pos + 1 ); - } else if ( ( pos = arg.tqfind( "*" ) ) != -1 ) { + } else if ( ( pos = arg.find( "*" ) ) != -1 ) { arg = arg.left( pos + 1 ); } else { arg = arg.simplifyWhiteSpace(); - if ( ( pos = arg.tqfind( ':' ) ) != -1 ) + if ( ( pos = arg.find( ':' ) ) != -1 ) arg = arg.left( pos ).simplifyWhiteSpace() + ":" + arg.mid( pos + 1 ).simplifyWhiteSpace(); TQStringList l = TQStringList::split( ' ', arg ); if ( l.count() == 2 ) { diff --git a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp index bf6335d..082e2b0 100644 --- a/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp +++ b/tqtinterface/qt4/tools/designer/shared/ui2uib.cpp @@ -171,7 +171,7 @@ public: int insert() { return next++; } void setName( int no, const TQString& name ); - int tqfind( const TQString& name, int deflt = -1 ) const; + int find( const TQString& name, int deflt = -1 ) const; int count() const { return next; } private: @@ -188,10 +188,10 @@ void UibIndexMap::setName( int no, const TQString& name ) } } -int UibIndexMap::tqfind( const TQString& name, int deflt ) const +int UibIndexMap::find( const TQString& name, int deflt ) const { - TQMap<TQString, int>::ConstIterator no = nameMap.tqfind( name ); - if ( no == nameMap.end() || conflicts.tqcontains(name) ) { + TQMap<TQString, int>::ConstIterator no = nameMap.find( name ); + if ( no == nameMap.end() || conflicts.contains(name) ) { return deflt; } else { return *no; @@ -239,7 +239,7 @@ static void packString( UibStrTable& strings, TQDataStream& out, static void packStringSplit( UibStrTable& strings, TQDataStream& out, const TQString& str, TQChar sep ) { - int pos = str.tqfind( sep ); + int pos = str.find( sep ); if ( pos == -1 ) pos = str.length(); packString( strings, out, str.left(pos) ); @@ -523,7 +523,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies, if ( tag == "action" ) { if ( elem.tagName() == "item" || elem.tagName() == "toolbar" ) { TQString actionName = f.attribute( "name" ); - int no = objects.tqfind( actionName ); + int no = objects.find( actionName ); if ( no != -1 ) { out << (TQ_UINT8) Object_ActionRef; packUInt16( out, no ); @@ -763,7 +763,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( !f.isNull() ) { if ( f.tagName() == "tabstop" ) { TQString widgetName = f.firstChild().toText().data(); - int no = objects.tqfind( widgetName ); + int no = objects.find( widgetName ); if ( no != -1 ) packUInt16( out2, no ); } @@ -798,7 +798,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) while ( a != buddies.end() ) { TQStringList::ConstIterator b = (*a).begin(); while ( b != (*a).end() ) { - int no = objects.tqfind( *b ); + int no = objects.find( *b ); if ( no != -1 ) { packUInt16( out2, a.key() ); packUInt16( out2, no ); @@ -829,8 +829,8 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out ) } TQString language = f.attribute( "language", "C++" ); - int senderNo = objects.tqfind( argMap["sender"], widgetNo ); - int receiverNo = objects.tqfind( argMap["receiver"], widgetNo ); + int senderNo = objects.find( argMap["sender"], widgetNo ); + int receiverNo = objects.find( argMap["receiver"], widgetNo ); TQString signal = UibHack::normalize( argMap["signal"] ); TQString slot = UibHack::normalize( argMap["slot"] ); diff --git a/tqtinterface/qt4/tools/designer/shared/uib.h b/tqtinterface/qt4/tools/designer/shared/uib.h index 08a69de..1016102 100644 --- a/tqtinterface/qt4/tools/designer/shared/uib.h +++ b/tqtinterface/qt4/tools/designer/shared/uib.h @@ -115,7 +115,7 @@ inline int UibStrTable::insertCString( const char *cstr ) inline int UibStrTable::insertString( const TQString& str ) { - if ( str.tqcontains('\0') || str[0] == TQChar(0x7f) ) { + if ( str.contains('\0') || str[0] == TQChar(0x7f) ) { int nextPos = table.size(); out << (TQ_UINT8) 0x7f; out << str; diff --git a/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp b/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp index a35fd61..d383e9d 100644 --- a/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp +++ b/tqtinterface/qt4/tools/designer/shared/widgetdatabase.cpp @@ -764,7 +764,7 @@ TQString WidgetDatabase::createWidgetName( int id ) n = "Layout"; if ( n[ 0 ] == 'Q' && n[ 1 ].lower() != n[ 1 ] ) n = n.mid( 1 ); - int colonColon = n.tqfindRev( "::" ); + int colonColon = n.findRev( "::" ); if ( colonColon != -1 ) n = n.mid( colonColon + 2 ); @@ -783,14 +783,14 @@ int WidgetDatabase::idFromClassName( const TQString &name ) setupDataBase( -1 ); if ( name.isEmpty() ) return 0; - int *i = className2Id->tqfind( name ); + int *i = className2Id->find( name ); if ( i ) return *i; if ( name == "FormWindow" ) return idFromClassName( "TQLayoutWidget" ); #ifdef UIC setupDataBase( -2 ); - i = className2Id->tqfind( name ); + i = className2Id->find( name ); if ( i ) return *i; #endif @@ -799,7 +799,7 @@ int WidgetDatabase::idFromClassName( const TQString &name ) bool WidgetDatabase::hasWidget( const TQString &name ) { - return className2Id->tqfind( name ) != 0; + return className2Id->find( name ) != 0; } WidgetDatabaseRecord *WidgetDatabase::at( int index ) @@ -832,7 +832,7 @@ void WidgetDatabase::append( WidgetDatabaseRecord *r ) TQString WidgetDatabase::widgetGroup( const TQString &g ) { - if ( wGroups->tqfind( g ) == -1 ) + if ( wGroups->find( g ) == -1 ) wGroups->append( g ); return g; } @@ -866,7 +866,7 @@ int WidgetDatabase::numWidgetGroups() bool WidgetDatabase::isGroupVisible( const TQString &g ) { setupDataBase( -1 ); - return invisibleGroups->tqfind( g ) == -1; + return invisibleGroups->find( g ) == -1; } int WidgetDatabase::addCustomWidget( WidgetDatabaseRecord *r ) diff --git a/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp b/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp index 678c7f0..f336082 100644 --- a/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp +++ b/tqtinterface/qt4/tools/designer/tools/conv2ui/main.cpp @@ -81,7 +81,7 @@ bool Conv2ui::convert( const TQString & filename, const TQDir & dest ) } if ( !TQFile::exists( absName( filename ) ) ) { - qWarning( "Conv2ui: can not tqfind file %s", filename.latin1() ); + qWarning( "Conv2ui: can not find file %s", filename.latin1() ); return FALSE; } @@ -95,7 +95,7 @@ bool Conv2ui::convert( const TQString & filename, const TQDir & dest ) if ( !interface ) continue; - if ( (*it).tqcontains( tag, FALSE ) ) { + if ( (*it).contains( tag, FALSE ) ) { // Make sure we output the files in the destination dir TQString absfile = absName( filename ); TQString current = TQDir::currentDirPath(); diff --git a/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp b/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp index 4a5b8ae..af98319 100644 --- a/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp +++ b/tqtinterface/qt4/tools/designer/tools/createcw/main.cpp @@ -65,11 +65,11 @@ static TQString makeIndent( int indent ) static TQString entitize( const TQString &s ) { TQString s2 = s; - s2 = s2.tqreplace( "\"", """ ); - s2 = s2.tqreplace( "&", "&" ); - s2 = s2.tqreplace( ">", ">" ); - s2 = s2.tqreplace( "<", "<" ); - s2 = s2.tqreplace( "'", "'" ); + s2 = s2.replace( "\"", """ ); + s2 = s2.replace( "&", "&" ); + s2 = s2.replace( ">", ">" ); + s2 = s2.replace( "<", "<" ); + s2 = s2.replace( "'", "'" ); return s2; } @@ -130,7 +130,7 @@ static void createDescription( const TQValueList<Widget> &l, TQTextStream &ts ) for ( int i = 0; i < (int)props.count(); ++i ) { const TQMetaProperty *p = w.w->tqmetaObject()-> property( w.w->tqmetaObject()-> - tqfindProperty( props.at( i ), TRUE ), TRUE ); + findProperty( props.at( i ), TRUE ), TRUE ); if ( !p ) continue; if ( !p->writable() || !p->designable( w.w ) ) diff --git a/tqtinterface/qt4/tools/designer/uic/embed.cpp b/tqtinterface/qt4/tools/designer/uic/embed.cpp index f6b2f02..2ef80b5 100644 --- a/tqtinterface/qt4/tools/designer/uic/embed.cpp +++ b/tqtinterface/qt4/tools/designer/uic/embed.cpp @@ -230,7 +230,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima #endif out << "\n" - "static TQImage uic_tqfindImage( const TQString& name )\n" + "static TQImage uic_findImage( const TQString& name )\n" "{\n" " for ( int i=0; embed_image_vec[i].data; i++ ) {\n" " if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) {\n" @@ -273,7 +273,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima out << " const TQMimeSource* data( const TQString& abs_name ) const {\n"; out << "\tconst TQMimeSource* d = TQMimeSourceFactory::data( abs_name );\n"; out << "\tif ( d || abs_name.isNull() ) return d;\n"; - out << "\tTQImage img = uic_tqfindImage( abs_name );\n"; + out << "\tTQImage img = uic_findImage( abs_name );\n"; out << "\tif ( !img.isNull() )\n"; out << "\t ((TQMimeSourceFactory*)this)->setImage( abs_name, img );\n"; out << "\treturn TQMimeSourceFactory::data( abs_name );\n"; diff --git a/tqtinterface/qt4/tools/designer/uic/form.cpp b/tqtinterface/qt4/tools/designer/uic/form.cpp index 11a0a69..728a1fd 100644 --- a/tqtinterface/qt4/tools/designer/uic/form.cpp +++ b/tqtinterface/qt4/tools/designer/uic/form.cpp @@ -192,7 +192,7 @@ void Uic::createFormDecl( const TQDomElement &e ) // register the object and unify its name objName = registerObject( objName ); TQString protector = objName.upper() + "_H"; - protector.tqreplace( "::", "_" ); + protector.replace( "::", "_" ); out << "#ifndef " << protector << endl; out << "#define " << protector << endl; out << endl; @@ -204,7 +204,7 @@ void Uic::createFormDecl( const TQDomElement &e ) TQStringList globalIncludes, localIncludes; int wid = WidgetDatabase::idFromClassName( objClass ); { - TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.tqfind( objClass ); + TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( objClass ); if ( it != customWidgetIncludes.end() ) { if ( ( *it ).location == "global" ) globalIncludes += (*it).header; @@ -230,7 +230,7 @@ void Uic::createFormDecl( const TQDomElement &e ) TQDomElement n2 = nl.item(i).toElement(); TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "impldecl", "in implementation" ) == "in declaration" && - n2.attribute( "location" ) == "local" &&!globalIncludes.tqcontains( s ) ) { + n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) { if ( s.right( 5 ) == ".ui.h" ) continue; localIncludes += s; @@ -292,7 +292,7 @@ void Uic::createFormDecl( const TQDomElement &e ) continue; // hide qlayoutwidgets if ( s == "Line" ) s = "TQFrame"; - if ( !(nofwd && customWidgets.tqcontains(s)) ) + if ( !(nofwd && customWidgets.contains(s)) ) forwardDecl += s; if ( s.mid( 2 ) == "ListBox" || s.mid( 2 ) == "ListView" || s.mid( 2 ) == "IconView" ) forwardDecl += "TQ" + s.mid( 2 ) + "Item"; @@ -325,7 +325,7 @@ void Uic::createFormDecl( const TQDomElement &e ) TQDomElement n2 = nl.item(i).toElement(); TQString s = n2.firstChild().toText().data(); if ( n2.attribute( "impldecl", "in implementation" ) == "in declaration" && - n2.attribute( "location" ) == "local" &&!globalIncludes.tqcontains( s ) ) + n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) localIncludes += s; } nl = e.parentNode().toElement().elementsByTagName( "exportmacro" ); @@ -547,7 +547,7 @@ void Uic::createFormDecl( const TQDomElement &e ) writeFunctionsDecl( publicSlots, publicSlotTypes, publicSlotSpecifier ); } - // tqfind Q_SIGNALS + // find Q_SIGNALS TQStringList extraSignals; nl = e.parentNode().toElement().elementsByTagName( "signal" ); for ( i = 0; i < (int) nl.length(); i++ ) { @@ -644,9 +644,9 @@ void Uic::writeFunctionsDecl( const TQStringList &fuLst, const TQStringList &typ if ( *it3 == "pure virtual" || *it3 == "pureVirtual" ) pure = " = 0"; } - type.tqreplace( ">>", "> >" ); - if ( !signature.tqcontains("operator") ) - signature.tqreplace( ">>", "> >" ); + type.replace( ">>", "> >" ); + if ( !signature.contains("operator") ) + signature.replace( ">>", "> >" ); out << " " << specifier << type << " " << signature << pure << ";" << endl; } out << endl; @@ -673,7 +673,7 @@ void Uic::createFormImpl( const TQDomElement &e ) TQMap<TQString, CustomInclude> customWidgetIncludes; - // tqfind additional Q_SLOTS and functions + // find additional Q_SLOTS and functions TQStringList extraFuncts; TQStringList extraFunctTyp; TQStringList extraFunctSpecifier; @@ -778,7 +778,7 @@ void Uic::createFormImpl( const TQDomElement &e ) for ( i = 0; i < (int) nl.length(); i++ ) { TQDomElement n2 = nl.item(i).toElement(); TQString s = n2.firstChild().toText().data(); - if ( n2.attribute( "location" ) == "local" &&!globalIncludes.tqcontains( s ) ) { + if ( n2.attribute( "location" ) == "local" &&!globalIncludes.contains( s ) ) { if ( s.right( 5 ) == ".ui.h" && !TQFile::exists( s ) ) continue; if ( n2.attribute( "impldecl", "in implementation" ) != "in implementation" ) @@ -812,7 +812,7 @@ void Uic::createFormImpl( const TQDomElement &e ) globalIncludes += "tqheader.h"; if ( name != objClass ) { int wid = WidgetDatabase::idFromClassName( name ); - TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.tqfind( name ); + TQMap<TQString, CustomInclude>::Iterator it = customWidgetIncludes.find( name ); if ( it == customWidgetIncludes.end() ) globalIncludes += WidgetDatabase::includeFile( wid ); } @@ -837,7 +837,7 @@ void Uic::createFormImpl( const TQDomElement &e ) out << "#include <tqtoolbar.h>" << endl; } - // tqfind out what images are required + // find out what images are required TQStringList requiredImages; static const char *imgTags[] = { "pixmap", "iconset", 0 }; for ( i = 0; imgTags[i] != 0; i++ ) { @@ -885,7 +885,7 @@ void Uic::createFormImpl( const TQDomElement &e ) nl = n.elementsByTagName( "image" ); for ( i = 0; i < (int) nl.length(); i++ ) { TQString img = registerObject( nl.item(i).toElement().attribute("name") ); - if ( !requiredImages.tqcontains( img ) ) + if ( !requiredImages.contains( img ) ) continue; TQDomElement tmp = nl.item(i).firstChild().toElement(); if ( tmp.tagName() != "data" ) @@ -1047,7 +1047,7 @@ void Uic::createFormImpl( const TQDomElement &e ) if ( objClass == "TQWizard" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, "this" ); TQString comment; TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); @@ -1068,7 +1068,7 @@ void Uic::createFormImpl( const TQDomElement &e ) } } else { // standard widgets for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) + if ( tags.contains( n.tagName() ) ) createObjectImpl( n, objName, "this" ); } } @@ -1213,7 +1213,7 @@ void Uic::createFormImpl( const TQDomElement &e ) } } - if ( extraFuncts.tqfind( "init()" ) != extraFuncts.end() ) + if ( extraFuncts.find( "init()" ) != extraFuncts.end() ) out << indent << "init();" << endl; // end of constructor @@ -1226,7 +1226,7 @@ void Uic::createFormImpl( const TQDomElement &e ) out << " */" << endl; out << nameOfClass << "::~" << bareNameOfClass << "()" << endl; out << "{" << endl; - if ( extraFuncts.tqfind( "destroy()" ) != extraFuncts.end() ) + if ( extraFuncts.find( "destroy()" ) != extraFuncts.end() ) out << indent << "destroy();" << endl; out << indent << "// no need to delete child widgets, TQt does it all for us" << endl; out << "}" << endl; diff --git a/tqtinterface/qt4/tools/designer/uic/object.cpp b/tqtinterface/qt4/tools/designer/uic/object.cpp index 1ce89b8..77ca635 100644 --- a/tqtinterface/qt4/tools/designer/uic/object.cpp +++ b/tqtinterface/qt4/tools/designer/uic/object.cpp @@ -105,7 +105,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla int numColumns = 0; int numRows = 0; - if ( layouts.tqcontains( e.tagName() ) ) + if ( layouts.contains( e.tagName() ) ) return createLayoutImpl( e, parentClass, tqparent, tqlayout ); objClass = getClassName( e ); @@ -137,7 +137,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla // the tqlayout widget is not necessary, hide it by creating its child in the tqparent TQString result; for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if (tags.tqcontains( n.tagName() ) ) + if (tags.contains( n.tagName() ) ) result = createObjectImpl( n, parentClass, tqparent, tqlayout ); } return result; @@ -227,28 +227,28 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla TQString call; TQString value; - if ( objClass.tqcontains( "ListBox" ) ) { + if ( objClass.contains( "ListBox" ) ) { call = createListBoxItemImpl( n, objName ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << indent << objName << "->clear();" << endl; trout << indent << call << endl; } - } else if ( objClass.tqcontains( "ComboBox" ) ) { + } else if ( objClass.contains( "ComboBox" ) ) { call = createListBoxItemImpl( n, objName, &value ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << indent << objName << "->clear();" << endl; trout << indent << call << endl; } - } else if ( objClass.tqcontains( "IconView" ) ) { + } else if ( objClass.contains( "IconView" ) ) { call = createIconViewItemImpl( n, objName ); if ( !call.isEmpty() ) { if ( numItems == 0 ) trout << indent << objName << "->clear();" << endl; trout << indent << call << endl; } - } else if ( objClass.tqcontains( "ListView" ) ) { + } else if ( objClass.contains( "ListView" ) ) { call = createListViewItemImpl( n, objName, TQString() ); if ( !call.isEmpty() ) { if ( numItems == 0 ) @@ -262,7 +262,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla TQString call; TQString value; - if ( objClass.tqcontains( "ListView" ) ) { + if ( objClass.contains( "ListView" ) ) { call = createListViewColumnImpl( n, objName, &value ); if ( !call.isEmpty() ) { out << call; @@ -288,7 +288,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla if ( objClass == "TQTabWidget" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, objName ); TQString comment; TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); @@ -299,7 +299,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } } else if ( objClass == "TQWidgetStack" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, objName ); int id = DomTool::readAttribute( n, "id", "" ).toInt(); out << indent << objName << "->addWidget( " << page << ", " << id << " );" << endl; @@ -307,7 +307,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } } else if ( objClass == "TQToolBox" ) { for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { TQString page = createObjectImpl( n, objClass, objName ); TQString comment; TQString label = DomTool::readAttribute( n, "label", "", comment ).toString(); @@ -328,7 +328,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla if ( iface2 ) { bool supportsPages = iface2->supportsPages( objClass ); for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) { + if ( tags.contains( n.tagName() ) ) { if ( supportsPages ) { TQString page = createObjectImpl( n, objClass, objName ); TQString comment; @@ -345,7 +345,7 @@ TQString Uic::createObjectImpl( const TQDomElement &e, const TQString& parentCla } else { #endif for ( n = e.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) { - if ( tags.tqcontains( n.tagName() ) ) + if ( tags.contains( n.tagName() ) ) createObjectImpl( n, objClass, objName ); } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS @@ -582,7 +582,7 @@ TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj, v = "int( "; TQStringList::Iterator it = lst.begin(); while ( it != lst.end() ) { - if (((*it).tqfind("Align", 0, TRUE) == 0) + if (((*it).find("Align", 0, TRUE) == 0) || ((*it) == "WordBreak")) { v += "TQt::" + *it; } diff --git a/tqtinterface/qt4/tools/designer/uic/subclassing.cpp b/tqtinterface/qt4/tools/designer/uic/subclassing.cpp index 895c7f8..3677b78 100644 --- a/tqtinterface/qt4/tools/designer/uic/subclassing.cpp +++ b/tqtinterface/qt4/tools/designer/uic/subclassing.cpp @@ -80,7 +80,7 @@ void Uic::createSubDecl( const TQDomElement &e, const TQString& subClass ) out << " ~" << subClass << "();" << endl; out << endl; - // tqfind additional functions + // find additional functions TQStringList publicSlots, protectedSlots, privateSlots; TQStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; TQStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; @@ -243,7 +243,7 @@ void Uic::createSubImpl( const TQDomElement &e, const TQString& subClass ) out << endl; - // tqfind additional functions + // find additional functions TQStringList publicSlots, protectedSlots, privateSlots; TQStringList publicSlotTypes, protectedSlotTypes, privateSlotTypes; TQStringList publicSlotSpecifier, protectedSlotSpecifier, privateSlotSpecifier; diff --git a/tqtinterface/qt4/tools/designer/uic/uic.cpp b/tqtinterface/qt4/tools/designer/uic/uic.cpp index 5eed175..7a71eaf 100644 --- a/tqtinterface/qt4/tools/designer/uic/uic.cpp +++ b/tqtinterface/qt4/tools/designer/uic/uic.cpp @@ -77,10 +77,10 @@ TQString Uic::fixString( const TQString &str, bool encode ) TQString s; if ( !encode ) { s = str; - s.tqreplace( "\\", "\\\\" ); - s.tqreplace( "\"", "\\\"" ); - s.tqreplace( "\r", "" ); - s.tqreplace( "\n", "\\n\"\n\"" ); + s.replace( "\\", "\\\\" ); + s.replace( "\"", "\\\"" ); + s.replace( "\r", "" ); + s.replace( "\n", "\\n\"\n\"" ); } else { TQCString utf8 = str.utf8(); const int l = utf8.length(); @@ -236,7 +236,7 @@ TQString Uic::getFormClassName( const TQDomElement& e ) if ( n.tagName() == "class" ) { TQString s = n.firstChild().toText().data(); int i; - while ( ( i = s.tqfind(' ' )) != -1 ) + while ( ( i = s.find(' ' )) != -1 ) s[i] = '_'; cn = s; } @@ -315,7 +315,7 @@ TQString Uic::getDatabaseInfo( const TQDomElement& e, const TQString& tag ) return TQString(); n = getObjectProperty( e, "database" ); if ( n.firstChild().toElement().tagName() == "stringlist" ) { - // tqfind correct stringlist entry + // find correct stringlist entry TQDomElement n1 = n.firstChild().firstChild().toElement(); for ( int i = 0; i < child && !n1.isNull(); ++i ) n1 = n1.nextSibling().toElement(); @@ -329,7 +329,7 @@ TQString Uic::getDatabaseInfo( const TQDomElement& e, const TQString& tag ) void Uic::registerLayouts( const TQDomElement &e ) { - if ( layouts.tqcontains(e.tagName())) { + if ( layouts.contains(e.tagName())) { createObjectDecl(e); TQString t = e.tagName(); if ( t == "vbox" || t == "hbox" || t == "grid" ) @@ -512,10 +512,10 @@ void Uic::createMenuBarImpl( const TQDomElement &n, const TQString &parentClass, out << indent << itemName << " = new TQPopupMenu( this );" << endl; createPopupMenuImpl( c, parentClass, itemName ); out << indent << objName << "->insertItem( TQString(\"\"), " << itemName << ", " << i << " );" << endl; - TQString tqfindItem(objName + "->tqfindItem(%1)"); - tqfindItem = tqfindItem.arg(i); - trout << indent << "if (" << tqfindItem << ")" << endl; - trout << indent << indent << tqfindItem << "->setText( " << trcall( c.attribute( "text" ) ) << " );" << endl; + TQString findItem(objName + "->findItem(%1)"); + findItem = findItem.arg(i); + trout << indent << "if (" << findItem << ")" << endl; + trout << indent << indent << findItem << "->setText( " << trcall( c.attribute( "text" ) ) << " );" << endl; } else if ( c.tagName() == "separator" ) { out << endl; out << indent << objName << "->insertSeparator( " << i << " );" << endl; @@ -854,7 +854,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla if ( n.tagName() == "spacer" ) { TQString child = createSpacerImpl( n, parentClass, tqparent, objName ); out << indent << objName << "->addItem( static_cast<TQLayoutItem*>(static_cast<QLayoutItem*>( " << child << " )) );" << endl; - } else if ( tags.tqcontains( n.tagName() ) ) { + } else if ( tags.contains( n.tagName() ) ) { TQString child = createObjectImpl( n, parentClass, tqparent, objName ); if ( isLayout( child ) ) out << indent << objName << "->addLayout( static_cast<TQLayout*>(static_cast<QLayout*>( " << child << " )) );" << endl; @@ -881,7 +881,7 @@ TQString Uic::createLayoutImpl( const TQDomElement &e, const TQString& parentCla else out << indent << objName << "->addItem( " << child << ", " << row << ", " << col << " );" << endl; - } else if ( tags.tqcontains( n.tagName() ) ) { + } else if ( tags.contains( n.tagName() ) ) { TQString child = createObjectImpl( n, parentClass, tqparent, objName ); out << endl; TQString o = "Widget"; @@ -1052,13 +1052,13 @@ TQString Uic::registerObject( const TQString& name ) TQString result = name; int i; - while ( ( i = result.tqfind(' ' )) != -1 ) { + while ( ( i = result.find(' ' )) != -1 ) { result[i] = '_'; } - if ( objectNames.tqcontains( result ) ) { + if ( objectNames.contains( result ) ) { int i = 2; - while ( objectNames.tqcontains( result + "_" + TQString::number(i) ) ) + while ( objectNames.contains( result + "_" + TQString::number(i) ) ) i++; result += "_"; result += TQString::number(i); @@ -1076,7 +1076,7 @@ TQString Uic::registerObject( const TQString& name ) */ TQString Uic::registeredName( const TQString& name ) { - if ( !objectMapper.tqcontains( name ) ) + if ( !objectMapper.contains( name ) ) return name; return objectMapper[name]; } @@ -1086,7 +1086,7 @@ TQString Uic::registeredName( const TQString& name ) */ bool Uic::isObjectRegistered( const TQString& name ) { - return objectMapper.tqcontains( name ); + return objectMapper.contains( name ); } @@ -1100,7 +1100,7 @@ TQStringList Uic::unique( const TQStringList& list ) TQStringList result; for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it ) { - if ( !result.tqcontains(*it) ) + if ( !result.contains(*it) ) result += *it; } return result; @@ -1122,7 +1122,7 @@ TQString Uic::createObjectInstance( const TQString& objClass, const TQString& tq bool Uic::isLayout( const TQString& name ) const { - return layoutObjects.tqcontains( name ); + return layoutObjects.contains( name ); } diff --git a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp index 57ea838..ef46eea 100644 --- a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp +++ b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.cpp @@ -184,7 +184,7 @@ static TQImage loadImageData( const TQString& format, ulong len, TQByteArray dat dataTmp[3] = ( len & 0x000000ff ); TQByteArray baunzip = tqUncompress( dataTmp ); len = baunzip.size(); - img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.tqfind('.')) ); + img.loadFromData( (const uchar*)baunzip.data(), len, format.left(format.find('.')) ); } else { img.loadFromData( (const uchar*)data.data(), data.size(), format ); } @@ -362,7 +362,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge #ifndef TQT_NO_SQL TQMap<TQWidget*, SqlWidgetConnection>::Iterator cit = widgetFactory->sqlWidgetConnections.begin(); for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) { - if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) != + if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; if ( cit.key()->inherits( "TQDesignerDataBrowser2" ) ) @@ -378,10 +378,10 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" ); if ( !table ) continue; - if ( widgetFactory->noDatabaseWidgets.tqfind( table->name() ) != + if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() ) continue; - TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.tqfind( table ); + TQValueList<Field> fieldMap = *widgetFactory->fieldMaps.find( table ); TQString conn = (*it)[ 0 ]; TQSqlCursor* c = 0; TQSqlDatabase *db = 0; @@ -1370,7 +1370,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, return toplevel; } -/*! Installs a widget factory \a factory, which normally tqcontains +/*! Installs a widget factory \a factory, which normally contains additional widgets that can then be created using a TQWidgetFactory. See createWidget() for further details. */ @@ -1545,7 +1545,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq if ( iface ) { TQWidget *w = iface->create( className, tqparent, name ); if ( w ) { - d->customWidgets.tqreplace( className.latin1(), new bool(TRUE) ); + d->customWidgets.replace( className.latin1(), new bool(TRUE) ); return w; } } @@ -1575,7 +1575,7 @@ otherwise returns FALSE. */ bool TQWidgetFactory::supportsWidget( const TQString &widget ) { setupWidgetListAndMap(); - return ( availableWidgetMap->tqfind( widget ) != availableWidgetMap->end() ); + return ( availableWidgetMap->find( widget ) != availableWidgetMap->end() ); } TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *tqparent, @@ -1638,7 +1638,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget } #ifdef TQT_CONTAINER_CUSTOM_WIDGETS TQString parentClassName = tqparent ? tqparent->className() : 0; - bool isPlugin = tqparent ? !!d->customWidgets.tqfind( tqparent->className() ) : FALSE; + bool isPlugin = tqparent ? !!d->customWidgets.find( tqparent->className() ) : FALSE; if ( isPlugin ) qWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages @@ -1819,7 +1819,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop, TQVariant value ) { - int offset = obj->tqmetaObject()->tqfindProperty( prop, TRUE ); + int offset = obj->tqmetaObject()->findProperty( prop, TRUE ); if ( offset != -1 ) { if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { @@ -2092,7 +2092,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto } } if ( !conn.sender ) - conn.sender = tqfindAction( name ); + conn.sender = findAction( name ); } else if ( n2.tagName() == "signal" ) { conn.signal = n2.firstChild().toText().data(); } else if ( n2.tagName() == "receiver" ) { @@ -2135,7 +2135,7 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto delete l; } if ( !sender ) - sender = tqfindAction( conn.sender->name() ); + sender = findAction( conn.sender->name() ); if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) { receiver = TQT_TQOBJECT(toplevel); @@ -2159,14 +2159,14 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.tqfind( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { + if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { slotList = connector->tqmetaObject()->slotNames( TRUE ); receiver = connector; } // avoid warnings - if ( signalList.tqfind( conn.signal ) == -1 || - slotList.tqfind( conn.slot ) == -1 ) { + if ( signalList.find( conn.signal ) == -1 || + slotList.find( conn.slot ) == -1 ) { n = n.nextSibling().toElement(); continue; } @@ -2235,8 +2235,8 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx } TQValueList<Field> fieldMap; - if ( fieldMaps.tqfind( table ) != fieldMaps.end() ) { - fieldMap = *fieldMaps.tqfind( table ); + if ( fieldMaps.find( table ) != fieldMaps.end() ) { + fieldMap = *fieldMaps.find( table ); fieldMaps.remove( table ); } @@ -2487,7 +2487,7 @@ void TQWidgetFactory::loadToolBars( const TQDomElement &e ) TQDomElement n2 = n.firstChild().toElement(); while ( !n2.isNull() ) { if ( n2.tagName() == "action" ) { - TQAction *a = tqfindAction( n2.attribute( "name" ) ); + TQAction *a = findAction( n2.attribute( "name" ) ); if ( a ) a->addTo( tb ); } else if ( n2.tagName() == "separator" ) { @@ -2530,7 +2530,7 @@ void TQWidgetFactory::loadPopupMenu( TQPopupMenu *p, const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" || n.tagName() == "actiongroup" ) { - TQAction *a = tqfindAction( n.attribute( "name" ) ); + TQAction *a = findAction( n.attribute( "name" ) ); TQDomElement n2 = n.nextSibling().toElement(); if ( n2.tagName() == "item") { // load submenu TQPopupMenu *popup = new TQPopupMenu( mw ); @@ -2563,7 +2563,7 @@ void TQWidgetFactory::loadFunctions( const TQDomElement & ) { } -TQAction *TQWidgetFactory::tqfindAction( const TQString &name ) +TQAction *TQWidgetFactory::findAction( const TQString &name ) { for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( TQString( a->name() ) == name ) diff --git a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h index 06227a2..0ce05e9 100644 --- a/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h +++ b/tqtinterface/qt4/tools/designer/uilib/tqwidgetfactory.h @@ -103,7 +103,7 @@ private: void loadMenuBar( const TQDomElement &e ); void loadPopupMenu( TQPopupMenu *p, const TQDomElement &e ); void loadFunctions( const TQDomElement &e ); - TQAction *tqfindAction( const TQString &name ); + TQAction *findAction( const TQString &name ); void loadExtraSource(); TQString translate( const char *sourceText, const char *comment = "" ); TQString translate( const TQString& sourceText, const TQString& comment = TQString() ); diff --git a/tqtinterface/qt4/tools/linguist/LICENSE.GPL b/tqtinterface/qt4/tools/linguist/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/linguist/LICENSE.GPL +++ b/tqtinterface/qt4/tools/linguist/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf index bdbdb5b..aa99e01 100644 --- a/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf +++ b/tqtinterface/qt4/tools/linguist/book/linguist-manager.leaf @@ -77,13 +77,13 @@ Usage: \c {lupdate myproject.pro} \index Qt Designer This is a simple command line tool. \l lupdate reads a Qt \c .pro -project file, tqfinds the translatable strings in the specified source, +project file, finds the translatable strings in the specified source, header and \e {Qt Designer} interface files, and produces or updates the \c .ts translation files listed in the project file. The translation files are given to the translator who uses \e {Qt Linguist} to read the files and insert the translations. -Companies that have their own translators in-house may tqfind it useful +Companies that have their own translators in-house may find it useful to run \l lupdate regularly, perhaps monthly, as the application develops. This will lead to a fairly low volume of translation work spread evenly over the life of the project and will allow the @@ -134,5 +134,5 @@ validation, the original text will be used instead. \section1 Missing Translations Both \l lupdate and \l lrelease may be used with \c .ts translation -source files which are incomplete. Missing translations will be tqreplaced +source files which are incomplete. Missing translations will be replaced with the native language phrases at runtime. diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf index a4dfa64..7cec631 100644 --- a/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf +++ b/tqtinterface/qt4/tools/linguist/book/linguist-programmer.leaf @@ -157,7 +157,7 @@ Translations \index lupdate The \l lupdate program automatically provides a \e context for every -source text. This context is the class name of the class that tqcontains +source text. This context is the class name of the class that contains the \c 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 @@ -350,7 +350,7 @@ Creates a \l QTranslator object without a tqparent. \index tt1_la.qm Tries to load a file called \c tt1_la.qm (the \c .qm file extension is -implicit) that tqcontains Latin translations for the source texts used in +implicit) that contains Latin translations for the source texts used in the program. No error will occur if the file is not found. \index QApplication!installTranslator() @@ -366,7 +366,7 @@ by the program. \printline hello Creates a push button that displays "Hello world!". If \c tt1_la.qm -was found and tqcontains a translation for "Hello world!", the +was found and contains a translation for "Hello world!", the translation appears; if not, the source text appears. \index tr() @@ -394,7 +394,7 @@ is shown when we run the application: The first step is to create a project file, \c tt1.pro, that lists all the source files for the project. The project file can be a qmake -project file, or even an ordinary makefile. Any file that tqcontains +project file, or even an ordinary makefile. Any file that contains \index SOURCES!in Project Files \index TRANSLATIONS!in Project Files @@ -539,12 +539,12 @@ This example is a slightly more involved and introduces a key \e {Qt Linguist} concept: "contexts". \list -\i \c arrowpad.h tqcontains the definition of \c ArrowPad, a custom widget; -\i \c arrowpad.cpp tqcontains the implementation of \c ArrowPad; -\i \c mainwindow.h tqcontains the definition of \c MainWindow, a subclass of +\i \c arrowpad.h contains the definition of \c ArrowPad, a custom widget; +\i \c arrowpad.cpp contains the implementation of \c ArrowPad; +\i \c mainwindow.h contains the definition of \c MainWindow, a subclass of \l QMainWindow -\i \c mainwindow.cpp tqcontains the implementation of \c MainWindow; -\i \c main.cpp tqcontains main(). +\i \c mainwindow.cpp contains the implementation of \c MainWindow; +\i \c main.cpp contains main(). \endlist \index tt2.pro @@ -814,7 +814,7 @@ conflict between \e \&Bestand and \e \&Boven. \index Portuguese Language \index Brazilian Language -We've included a translation file, \c tt3_pt.ts, which tqcontains some +We've included a translation file, \c tt3_pt.ts, which contains some Portuguese translations for this example. \index Troll Print @@ -834,11 +834,11 @@ Version 1.0 consists of these files: \index tt3_pt.ts \list -\i \c printpanel.h tqcontains the definition of PrintPanel; -\i \c printpanel.cpp tqcontains the implementation of PrintPanel; -\i \c mainwindow.h tqcontains the definition of \c MainWindow; -\i \c mainwindow.cpp tqcontains the implementation of \c MainWindow; -\i \c main.cpp tqcontains main(); +\i \c printpanel.h contains the definition of PrintPanel; +\i \c printpanel.cpp contains the implementation of PrintPanel; +\i \c mainwindow.h contains the definition of \c MainWindow; +\i \c mainwindow.cpp contains the implementation of \c MainWindow; +\i \c main.cpp contains main(); \i \c tt3.pro is the \e qmake project file. \i \c tt3_pt.ts is the Portuguese message file. \endlist @@ -893,7 +893,7 @@ translation shortly. \index MainWindow!in Translation Tutorial -The header file for \c MainWindow, \c mainwindow.h, tqcontains no +The header file for \c MainWindow, \c mainwindow.h, contains no surprises. In the implementation, \c mainwindow.cpp, we have some user-visible source texts that must be marked for translation. @@ -976,10 +976,10 @@ for the second pair of radio buttons: Now run \l lupdate and open \c tt3_pt.ts with \e {Qt Linguist}. You should now see two changes. -First, the translation source file now tqcontains \e three "Enabled", +First, the translation source file now contains \e three "Enabled", "Disabled" pairs. The first pair is marked "(obs.)" signifying that they are obsolete. This is because these texts appeared in \c tr() calls that -have been tqreplaced by new calls with two arguments. The second pair has +have been replaced by new calls with two arguments. The second pair has "two-sided" as their comment, and the third pair has "colors" as their comment. The comments are shown in the \e {Source text and comments} area in \e {Qt Linguist}. @@ -1013,9 +1013,9 @@ the translator. \index Comments!for Translators An additional way of helping the translator is to provide information on -how to navigate to the particular part of the application that tqcontains +how to navigate to the particular part of the application that contains the source texts they must translate. This helps them see the context -in which the translation appears and also helps them to tqfind and test +in which the translation appears and also helps them to find and test the translations. This can be achieved by using a \e TRANSLATOR comment in the source code: \code @@ -1036,7 +1036,7 @@ You should see the comments in the \e {Source text and comments} area as you browse through the list of source texts. Sometimes, particularly with large programs, it can be difficult for -the translator to tqfind their translations and check that they're +the translator to find their translations and check that they're correct. Comments that provide good navigation information can save them time: diff --git a/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf b/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf index 572c903..7a71b6a 100644 --- a/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf +++ b/tqtinterface/qt4/tools/linguist/book/linguist-translator.leaf @@ -21,7 +21,7 @@ choose \Menu File|Open from the menu bar and select a \c .ts translation source file to work on. \e {Qt Linguist}'s main window is divided into four main areas. The -left hand side tqcontains the Context list, the top right is the Source +left hand side contains the Context list, the top right is the Source text area, the middle right is the translation area and the bottom right is the phrases and guesses area. We'll describe them in detail later. @@ -86,7 +86,7 @@ The second column 'Source text' shows the text that must be translated. The third column shows the translation. \e{Qt Linguist} provides three kinds of validation: accelerator, -punctuation and phrase. If the source text tqcontains an accelerator +punctuation and phrase. If the source text contains an accelerator i.e. an ampersand, '\&' and the translated text does not contain an ampersand the translation will fail the accelerator validation. Similarly, if the source text ends with a particular punctuation @@ -103,7 +103,7 @@ The Source Text Area is a dockable window. This area appears at the middle right of the main window by default. It is comprised of three vertical sections. The first section is labelled 'Source text' below which the source text appears. The second section -tqcontains contextual information on a light blue background that the +contains contextual information on a light blue background that the programmer has added to assist the translator. If no contextual information has been given this section does not appear. The third section is labelled 'Translation' and this is where you enter the @@ -227,13 +227,13 @@ Some phrases contain variables. Variables are placeholders for items of text that are filled in at runtime. They are signified in the source text with a percent sign followed by a digit, e.g. \e {After processing file %1, file %2 is next in line}. In this example, \c %1 will be -tqreplaced at runtime with the name of the first file to be processed and +replaced at runtime with the name of the first file to be processed and \c %2 with the name of the next file to be processed. In the translated version the variables must still appear. For example a German translation might reverse the phrases, e.g. \e {Datei %2 wird bearbeitet, wenn. Datei %1 fertig ist}. Note that both variables are still used but their order has changed. The order in which variables -appear does not matter; \c %1 will always be tqreplaced by the same text +appear does not matter; \c %1 will always be replaced by the same text at runtime no matter where it appears in the source text or translation and similarly \c %2, etc. @@ -292,7 +292,7 @@ button (press Esc) once you've finished adding (and removing) phrases. When a phrase or set of phrases appears in the phrase book double clicking the required target phrase will copy it to the translation -pane at the text cursor position. If you want to \e tqreplace the text +pane at the text cursor position. If you want to \e replace the text in the translation pane with the target phrase, click the translation pane, choose \Menu {Edit|Select All} (press \Key Alt+A) and then double click the target phrase. @@ -412,7 +412,7 @@ number of projects and applications. \link {The Find Dialog} Find dialog \endlink. When the dialog pops up enter the text to be found and click the \e {Find Next} button. Source phrases, translations and comments may be searched. - \i \e {Find Next F3} \BR tqfinds the next occurrence of the text that + \i \e {Find Next F3} \BR finds the next occurrence of the text that was last entered in the Find dialog. \endlist @@ -566,7 +566,7 @@ Toggles phrase book validation on or off. \section2 The Find Dialog -\img tqfinddialog.png +\img finddialog.png \caption The Find Dialog Choose \Menu Edit|Find from the menu bar or press \Key Ctrl+F to pop diff --git a/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp b/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp index 6dc876c..fe8129a 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/finddialog.cpp @@ -46,60 +46,60 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, +FindDialog::FindDialog( bool replace, TQWidget *tqparent, const char *name, bool modal ) : TQDialog( tqparent, name, modal ) { sourceText = 0; - led = new TQLineEdit( this, "tqfind line edit" ); - TQLabel *tqfindWhat = new TQLabel( led, tr("Fi&nd what:"), this, "tqfind what" ); - TQLabel *tqreplaceWith = 0; - TQPushButton *tqfindNxt = new TQPushButton( tr("&Find Next"), this, - "tqfind next" ); - tqfindNxt->setDefault( TRUE ); - connect( tqfindNxt, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitFindNext()) ); - TQPushButton *cancel = new TQPushButton( tr("Cancel"), this, "cancel tqfind" ); + led = new TQLineEdit( this, "find line edit" ); + TQLabel *findWhat = new TQLabel( led, tr("Fi&nd what:"), this, "find what" ); + TQLabel *replaceWith = 0; + TQPushButton *findNxt = new TQPushButton( tr("&Find Next"), this, + "find next" ); + findNxt->setDefault( TRUE ); + connect( findNxt, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitFindNext()) ); + TQPushButton *cancel = new TQPushButton( tr("Cancel"), this, "cancel find" ); connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); - TQVBoxLayout *bl = new TQVBoxLayout( 6, "tqfind button tqlayout" ); - bl->addWidget( tqfindNxt ); + TQVBoxLayout *bl = new TQVBoxLayout( 6, "find button tqlayout" ); + bl->addWidget( findNxt ); - matchCase = new TQCheckBox( tr("&Match case"), this, "tqfind match case" ); + matchCase = new TQCheckBox( tr("&Match case"), this, "find match case" ); matchCase->setChecked( FALSE ); - if ( tqreplace ) { - TQWhatsThis::add( this, tr("This window allows you to search and tqreplace" + if ( replace ) { + TQWhatsThis::add( this, tr("This window allows you to search and replace" " some text in the translations.") ); - red = new TQLineEdit( this, "tqreplace line edit" ); - tqreplaceWith = new TQLabel( red, tr("Replace &with:"), this, - "tqreplace with" ); + red = new TQLineEdit( this, "replace line edit" ); + replaceWith = new TQLabel( red, tr("Replace &with:"), this, + "replace with" ); setTabOrder( led, red ); - TQPushButton *tqreplace = new TQPushButton( tr("&Replace"), this, - "tqreplace" ); - connect( tqreplace, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplace()) ); - TQPushButton *tqreplaceAll = new TQPushButton( tr("Replace &All"), this, - "tqreplace all" ); - connect( tqreplaceAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplaceAll()) ); - setTabOrder( tqfindNxt, tqreplace ); - setTabOrder( tqreplace, tqreplaceAll ); - setTabOrder( tqreplaceAll, cancel ); - - TQWhatsThis::add( tqreplace, tr("Click here to tqreplace the next occurrence" + TQPushButton *replace = new TQPushButton( tr("&Replace"), this, + "replace" ); + connect( replace, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplace()) ); + TQPushButton *replaceAll = new TQPushButton( tr("Replace &All"), this, + "replace all" ); + connect( replaceAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(emitReplaceAll()) ); + setTabOrder( findNxt, replace ); + setTabOrder( replace, replaceAll ); + setTabOrder( replaceAll, cancel ); + + TQWhatsThis::add( replace, tr("Click here to replace the next occurrence" " of the text you typed in.") ); - TQWhatsThis::add( tqreplaceAll, tr("Click here to tqreplace all occurrences" + TQWhatsThis::add( replaceAll, tr("Click here to replace all occurrences" " of the text you typed in.") ); - bl->addWidget( tqreplace ); - bl->addWidget( tqreplaceAll ); + bl->addWidget( replace ); + bl->addWidget( replaceAll ); TQGridLayout *gl = new TQGridLayout( this, 4, 3, 11, 11, - "tqfind outer tqlayout" ); - gl->addWidget( tqfindWhat, 0, 0 ); + "find outer tqlayout" ); + gl->addWidget( findWhat, 0, 0 ); gl->addWidget( led, 0, 1 ); - gl->addWidget( tqreplaceWith, 1, 0 ); + gl->addWidget( replaceWith, 1, 0 ); gl->addWidget( red, 1, 1 ); gl->addMultiCellWidget( matchCase, 2, 2, 0, 1 ); gl->addMultiCell( bl, 0, 3, 3, 3 ); @@ -108,12 +108,12 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, " text in the translation source file.") ); sourceText = new TQCheckBox( tr("&Source texts"), this, - "tqfind in source texts" ); + "find in source texts" ); sourceText->setChecked( TRUE ); translations = new TQCheckBox( tr("&Translations"), this, - "tqfind in translations" ); + "find in translations" ); translations->setChecked( TRUE ); - comments = new TQCheckBox( tr("&Comments"), this, "tqfind in comments" ); + comments = new TQCheckBox( tr("&Comments"), this, "find in comments" ); comments->setChecked( TRUE ); TQWhatsThis::add( sourceText, tr("Source texts are searched when" @@ -123,11 +123,11 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, TQWhatsThis::add( comments, tr("Comments and contexts are searched when" " checked.") ); - TQVBoxLayout *cl = new TQVBoxLayout( 6, "tqfind checkbox tqlayout" ); + TQVBoxLayout *cl = new TQVBoxLayout( 6, "find checkbox tqlayout" ); TQGridLayout *gl = new TQGridLayout( this, 3, 4, 11, 11, - "tqfind outer tqlayout" ); - gl->addWidget( tqfindWhat, 0, 0 ); + "find outer tqlayout" ); + gl->addWidget( findWhat, 0, 0 ); gl->addMultiCellWidget( led, 0, 0, 1, 2 ); gl->addWidget( matchCase, 1, 2 ); gl->addMultiCell( bl, 0, 2, 3, 3 ); @@ -147,7 +147,7 @@ FindDialog::FindDialog( bool tqreplace, TQWidget *tqparent, const char *name, TQWhatsThis::add( matchCase, tr("Texts such as 'TeX' and 'tex' are" " considered as different when checked.") ); - TQWhatsThis::add( tqfindNxt, tr("Click here to tqfind the next occurrence of the" + TQWhatsThis::add( findNxt, tr("Click here to find the next occurrence of the" " text you typed in.") ); TQWhatsThis::add( cancel, tr("Click here to close this window.") ); @@ -169,15 +169,15 @@ void FindDialog::emitFindNext() ( comments->isChecked() ? Comments : 0 ); else where = Translations; - emit tqfindNext( led->text(), where, matchCase->isChecked() ); + emit findNext( led->text(), where, matchCase->isChecked() ); } void FindDialog::emitReplace() { - emit tqreplace( led->text(), red->text(), matchCase->isChecked(), FALSE ); + emit replace( led->text(), red->text(), matchCase->isChecked(), FALSE ); } void FindDialog::emitReplaceAll() { - emit tqreplace( led->text(), red->text(), matchCase->isChecked(), TRUE ); + emit replace( led->text(), red->text(), matchCase->isChecked(), TRUE ); } diff --git a/tqtinterface/qt4/tools/linguist/linguist/finddialog.h b/tqtinterface/qt4/tools/linguist/linguist/finddialog.h index 2cf8e43..47d0ec5 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/finddialog.h +++ b/tqtinterface/qt4/tools/linguist/linguist/finddialog.h @@ -46,11 +46,11 @@ class FindDialog : public TQDialog public: enum { SourceText = 0x1, Translations = 0x2, Comments = 0x4 }; - FindDialog( bool tqreplace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE ); + FindDialog( bool replace, TQWidget *tqparent = 0, const char *name = 0, bool modal = FALSE ); Q_SIGNALS: - void tqfindNext( const TQString& text, int where, bool matchCase ); - void tqreplace( const TQString& before, const TQString& after, bool matchCase, bool all ); + void findNext( const TQString& text, int where, bool matchCase ); + void replace( const TQString& before, const TQString& after, bool matchCase, bool all ); private Q_SLOTS: void emitFindNext(); diff --git a/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts b/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts index 31e6737..2c7708b 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts +++ b/tqtinterface/qt4/tools/linguist/linguist/linguist_de.ts @@ -50,7 +50,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>This window allows you to search and tqreplace some text in the translations.</source> + <source>This window allows you to search and replace some text in the translations.</source> <translation type="unfinished"></translation> </message> <message> @@ -66,11 +66,11 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace the next occurrence of the text you typed in.</source> + <source>Click here to replace the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace all occurrences of the text you typed in.</source> + <source>Click here to replace all occurrences of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -110,7 +110,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqfind the next occurrence of the text you typed in.</source> + <source>Click here to find the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -413,7 +413,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot tqfind the string '%1'.</source> + <source>Cannot find the string '%1'.</source> <translation type="unfinished"></translation> </message> <message> @@ -774,7 +774,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Search for some text in the translation source file and tqreplace it by another text.</source> + <source>Search for some text in the translation source file and replace it by another text.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts b/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts index 31e6737..2c7708b 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts +++ b/tqtinterface/qt4/tools/linguist/linguist/linguist_fr.ts @@ -50,7 +50,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>This window allows you to search and tqreplace some text in the translations.</source> + <source>This window allows you to search and replace some text in the translations.</source> <translation type="unfinished"></translation> </message> <message> @@ -66,11 +66,11 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace the next occurrence of the text you typed in.</source> + <source>Click here to replace the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqreplace all occurrences of the text you typed in.</source> + <source>Click here to replace all occurrences of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -110,7 +110,7 @@ <translation type="unfinished"></translation> </message> <message> - <source>Click here to tqfind the next occurrence of the text you typed in.</source> + <source>Click here to find the next occurrence of the text you typed in.</source> <translation type="unfinished"></translation> </message> <message> @@ -413,7 +413,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Cannot tqfind the string '%1'.</source> + <source>Cannot find the string '%1'.</source> <translation type="unfinished"></translation> </message> <message> @@ -774,7 +774,7 @@ All files (*)</source> <translation type="unfinished"></translation> </message> <message> - <source>Search for some text in the translation source file and tqreplace it by another text.</source> + <source>Search for some text in the translation source file and replace it by another text.</source> <translation type="unfinished"></translation> </message> <message> diff --git a/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp b/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp index 5c298b2..5c3c747 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/listviews.cpp @@ -109,12 +109,12 @@ int LVI::compare( TQListViewItem *other, int column, bool ascending ) const TQString thisKey = key( column, ascending ); TQString otherKey = other->key( column, ascending ); - if ( thisKey.tqcontains('&') || otherKey.tqcontains('&') ) { + if ( thisKey.contains('&') || otherKey.contains('&') ) { TQString nicerThisKey = thisKey; TQString nicerOtherKey = otherKey; - nicerThisKey.tqreplace( "&", "" ); - nicerOtherKey.tqreplace( "&", "" ); + nicerThisKey.replace( "&", "" ); + nicerOtherKey.replace( "&", "" ); int delta = nicerThisKey.localeAwareCompare( nicerOtherKey ); if ( delta != 0 ) diff --git a/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp b/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp index 744cd16..5e29875 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/msgedit.cpp @@ -195,7 +195,7 @@ void ShadowWidget::paintEvent( TQPaintEvent * e ) /* EditorPage class impl. - A frame that tqcontains the source text, translated text and any + A frame that contains the source text, translated text and any source code comments and hints. */ EditorPage::EditorPage( TQWidget * tqparent, const char * name ) diff --git a/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp b/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp index 95b4fc2..c38e9e0 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/phrase.cpp @@ -44,11 +44,11 @@ static TQString protect( const TQString& str ) { TQString p = str; - p.tqreplace( "&", "&" ); - p.tqreplace( "\"", """ ); - p.tqreplace( ">", ">" ); - p.tqreplace( "<", "<" ); - p.tqreplace( "'", "'" ); + p.replace( "&", "&" ); + p.replace( "\"", """ ); + p.replace( ">", ">" ); + p.replace( "<", "<" ); + p.replace( "'", "'" ); return p; } diff --git a/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp b/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp index 2d13965..9d78cf7 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/simtexth.cpp @@ -206,7 +206,7 @@ CandidateList similarTextHeuristicCandidates( const MetaTranslator *tor, int delta = TQABS( (int) s.length() - targetLen ); /* - Here is the score formula. A comment above tqcontains a + Here is the score formula. A comment above contains a discussion on a similar (but simpler) formula. */ int score = ( (intersection(cm, cmTarget).worth() + 1) << 10 ) / diff --git a/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp b/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp index 8ebc932..564845f 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp +++ b/tqtinterface/qt4/tools/linguist/linguist/trwindow.cpp @@ -290,12 +290,12 @@ TrWindow::TrWindow() phraseBooks.setAutoDelete( TRUE ); - f = new FindDialog( FALSE, this, "tqfind", FALSE ); + f = new FindDialog( FALSE, this, "find", FALSE ); f->setCaption( tqtr("TQt Linguist") ); - h = new FindDialog( TRUE, this, "tqreplace", FALSE ); + h = new FindDialog( TRUE, this, "replace", FALSE ); h->setCaption( tqtr("TQt Linguist") ); - tqfindMatchCase = FALSE; - tqfindWhere = 0; + findMatchCase = FALSE; + findWhere = 0; foundItem = 0; foundScope = 0; foundWhere = 0; @@ -320,8 +320,8 @@ TrWindow::TrWindow() connect( me, TQT_SIGNAL(nextUnfinished()), this, TQT_SLOT(nextUnfinished()) ); connect( me, TQT_SIGNAL(focusSourceList()), this, TQT_SLOT(focusSourceList()) ); connect( me, TQT_SIGNAL(focusPhraseList()), this, TQT_SLOT(focusPhraseList()) ); - connect( f, TQT_SIGNAL(tqfindNext(const TQString&, int, bool)), - this, TQT_SLOT(tqfindNext(const TQString&, int, bool)) ); + connect( f, TQT_SIGNAL(findNext(const TQString&, int, bool)), + this, TQT_SLOT(findNext(const TQString&, int, bool)) ); TQWhatsThis::add( lv, tqtr("This panel lists the source contexts.") ); @@ -378,7 +378,7 @@ void TrWindow::openFile( const TQString& name ) srcCharsSpc = 0; for ( it = all.begin(); it != all.end(); ++it ) { tqApp->processEvents(); - ContextLVI *c = contexts.tqfind( TQString((*it).context()) ); + ContextLVI *c = contexts.find( TQString((*it).context()) ); if ( c == 0 ) { c = new ContextLVI( lv, tor.toUnicode((*it).context(), (*it).utf8()) ); @@ -434,10 +434,10 @@ void TrWindow::openFile( const TQString& name ) foundWhere = 0; foundOffset = 0; if ( lv->childCount() > 0 ) { - tqfindAct->setEnabled( TRUE ); - tqfindAgainAct->setEnabled( FALSE ); + findAct->setEnabled( TRUE ); + findAgainAct->setEnabled( FALSE ); #ifdef notyet - tqreplaceAct->setEnabled( TRUE ); + replaceAct->setEnabled( TRUE ); #endif lv->setCurrentItem( lv->firstChild() ); } @@ -493,7 +493,7 @@ void TrWindow::saveAs() void TrWindow::release() { TQString newFilename = filename; - newFilename.tqreplace( TQRegExp(".ts$"), "" ); + newFilename.replace( TQRegExp(".ts$"), "" ); newFilename += TQString( ".qm" ); newFilename = TQFileDialog::getSaveFileName( newFilename, @@ -580,7 +580,7 @@ void TrWindow::print() } } -void TrWindow::tqfind() +void TrWindow::find() { h->hide(); f->show(); @@ -588,7 +588,7 @@ void TrWindow::tqfind() f->raise(); } -void TrWindow::tqfindAgain() +void TrWindow::findAgain() { int pass = 0; int oldItemNo = itemToIndex( slv, slv->currentItem() ); @@ -685,13 +685,13 @@ void TrWindow::tqfindAgain() slv->triggerUpdate(); tqApp->beep(); TQMessageBox::warning( this, tqtr("TQt Linguist"), - TQString( tqtr("Cannot tqfind the string '%1'.") ).arg(tqfindText) ); + TQString( tqtr("Cannot find the string '%1'.") ).arg(findText) ); foundItem = 0; foundWhere = 0; foundOffset = 0; } -void TrWindow::tqreplace() +void TrWindow::replace() { f->hide(); h->show(); @@ -729,8 +729,8 @@ TQListViewItem * TrWindow::indexToItem( TQListView * view, int index ) bool TrWindow::searchItem( const TQString & searchWhat, TQListViewItem * j, TQListViewItem * k ) { - if ( (tqfindWhere & foundWhere) != 0 ) { - foundOffset = searchWhat.tqfind( tqfindText, foundOffset, tqfindMatchCase ); + if ( (findWhere & foundWhere) != 0 ) { + foundOffset = searchWhat.find( findText, foundOffset, findMatchCase ); if ( foundOffset >= 0 ) { foundItem = itemToIndex( slv, k ); foundScope = j; @@ -776,7 +776,7 @@ void TrWindow::openPhraseBook() "All files (*)"), this, "open_phrasebook", tqtr("Open Phrase Book") ); - if ( !name.isEmpty() && !phraseBookNames.tqcontains(name) ) { + if ( !name.isEmpty() && !phraseBookNames.contains(name) ) { if ( openPhraseBook(name) ) { int n = (int)(phraseBooks.at( phraseBooks.count() - 1 )->count()); statusBar()->message( tqtr("%1 phrase(s) loaded.").arg(n), @@ -958,7 +958,7 @@ void TrWindow::showNewScope( TQListViewItem *item ) // Make sure that we update the source text and translation text. Use the first message in the new scope. setCurrentMessageItem(slv->firstChild()); - // This must be explicitly called since the signal is not emitted if the context only tqcontains one item + // This must be explicitly called since the signal is not emitted if the context only contains one item showNewCurrent(slv->firstChild()); slv->viewport()->setUpdatesEnabled( upe ); slv->setUpdatesEnabled( upe ); @@ -1342,15 +1342,15 @@ void TrWindow::next() } -void TrWindow::tqfindNext( const TQString& text, int where, bool matchCase ) +void TrWindow::findNext( const TQString& text, int where, bool matchCase ) { - tqfindText = text; - if ( tqfindText.isEmpty() ) - tqfindText = TQString( "magicwordthatyoushouldavoid" ); - tqfindWhere = where; - tqfindMatchCase = matchCase; - tqfindAgainAct->setEnabled( TRUE ); - tqfindAgain(); + findText = text; + if ( findText.isEmpty() ) + findText = TQString( "magicwordthatyoushouldavoid" ); + findWhere = where; + findMatchCase = matchCase; + findAgainAct->setEnabled( TRUE ); + findAgain(); } void TrWindow::revalidate() @@ -1384,8 +1384,8 @@ void TrWindow::revalidate() TQString TrWindow::friendlyString( const TQString& str ) { TQString f = str.lower(); - f.tqreplace( TQRegExp(TQString("[.,:;!?()-]")), TQString(" ") ); - f.tqreplace( "&", TQString("") ); + f.replace( TQRegExp(TQString("[.,:;!?()-]")), TQString(" ") ); + f.replace( "&", TQString("") ); f = f.simplifyWhiteSpace(); f = f.lower(); return f; @@ -1478,16 +1478,16 @@ void TrWindow::setupMenuBar() TQString(), TQAccel::stringToKey(tqtr("Ctrl+A")) ); selectAllAct->setEnabled( FALSE ); editp->insertSeparator(); - tqfindAct = new Action( editp, tqtr("&Find..."), TQT_TQOBJECT(this), TQT_SLOT(tqfind()), + findAct = new Action( editp, tqtr("&Find..."), TQT_TQOBJECT(this), TQT_SLOT(find()), "searchfind.png", TQAccel::stringToKey(tqtr("Ctrl+F")) ); - tqfindAct->setEnabled( FALSE ); - tqfindAgainAct = new Action( editp, tqtr("Find &Next"), - TQT_TQOBJECT(this), TQT_SLOT(tqfindAgain()), TQString(), Qt::Key_F3 ); - tqfindAgainAct->setEnabled( FALSE ); + findAct->setEnabled( FALSE ); + findAgainAct = new Action( editp, tqtr("Find &Next"), + TQT_TQOBJECT(this), TQT_SLOT(findAgain()), TQString(), Qt::Key_F3 ); + findAgainAct->setEnabled( FALSE ); #ifdef notyet - tqreplaceAct = new Action( editp, tqtr("&Replace..."), TQT_TQOBJECT(this), TQT_SLOT(tqreplace()), + replaceAct = new Action( editp, tqtr("&Replace..."), TQT_TQOBJECT(this), TQT_SLOT(replace()), TQAccel::stringToKey(tqtr("Ctrl+H")) ); - tqreplaceAct->setEnabled( FALSE ); + replaceAct->setEnabled( FALSE ); #endif // Translation menu @@ -1591,12 +1591,12 @@ void TrWindow::setupMenuBar() pasteAct->setWhatsThis( tqtr("Paste the clipboard text into the" " translation.") ); selectAllAct->setWhatsThis( tqtr("Select the whole translation text.") ); - tqfindAct->setWhatsThis( tqtr("Search for some text in the translation " + findAct->setWhatsThis( tqtr("Search for some text in the translation " "source file.") ); - tqfindAgainAct->setWhatsThis( tqtr("Continue the search where it was left.") ); + findAgainAct->setWhatsThis( tqtr("Continue the search where it was left.") ); #ifdef notyet - tqreplaceAct->setWhatsThis( tqtr("Search for some text in the translation" - " source file and tqreplace it by another" + replaceAct->setWhatsThis( tqtr("Search for some text in the translation" + " source file and replace it by another" " text.") ); #endif @@ -1654,13 +1654,13 @@ void TrWindow::setupToolBars() copyAct->addToToolbar( editt, tqtr("Copy") ); pasteAct->addToToolbar( editt, tqtr("Paste") ); editt->addSeparator(); - tqfindAct->addToToolbar( editt, tqtr("Find") ); + findAct->addToToolbar( editt, tqtr("Find") ); #ifdef notyet - tqreplaceAct->addToToolbar( editt, tqtr("Replace") ); + replaceAct->addToToolbar( editt, tqtr("Replace") ); #endif // beginFromSourceAct->addToToolbar( translationst, - // tqtr("Begin from Source"), "searchtqfind" ); + // tqtr("Begin from Source"), "searchfind" ); prevAct->addToToolbar( translationst, tqtr("Prev") ); nextAct->addToToolbar( translationst, tqtr("Next") ); prevUnfinishedAct->addToToolbar( translationst, tqtr("Prev Unfinished") ); @@ -1718,7 +1718,7 @@ bool TrWindow::openPhraseBook( const TQString& name ) bool TrWindow::savePhraseBook( TQString& name, const PhraseBook& pb ) { - if ( !name.tqcontains( ".qph" ) && !name.tqcontains(".") ) + if ( !name.contains( ".qph" ) && !name.contains(".") ) name += ".qph"; if ( !pb.save(name) ) { @@ -1754,7 +1754,7 @@ void TrWindow::updatePhraseDict() TQString f = friendlyString( (*p).source() ); if ( f.length() > 0 ) { f = TQStringList::split( TQChar(' '), f ).first(); - ent = phraseDict.tqfind( f ); + ent = phraseDict.find( f ); if ( ent == 0 ) { ent = new PhraseBook; phraseDict.insert( f, ent ); @@ -1776,10 +1776,10 @@ PhraseBook TrWindow::getPhrases( const TQString& source ) PhraseBook::Iterator p; for ( w = lookupWords.begin(); w != lookupWords.end(); ++w ) { - PhraseBook *ent = phraseDict.tqfind( *w ); + PhraseBook *ent = phraseDict.find( *w ); if ( ent != 0 ) { for ( p = ent->begin(); p != ent->end(); ++p ) { - if ( f.tqfind(friendlyString((*p).source())) >= 0 ) + if ( f.find(friendlyString((*p).source())) >= 0 ) phrases.append( *p ); } } @@ -1822,11 +1822,11 @@ bool TrWindow::danger( const TQString& source, const TQString& translation, PhraseBook::Iterator p; for ( w = lookupWords.begin(); w != lookupWords.end(); ++w ) { - PhraseBook *ent = phraseDict.tqfind( *w ); + PhraseBook *ent = phraseDict.find( *w ); if ( ent != 0 ) { for ( p = ent->begin(); p != ent->end(); ++p ) { - if ( fsource.tqfind(friendlyString((*p).source())) < 0 || - ftranslation.tqfind(friendlyString((*p).target())) >= 0 ) + if ( fsource.find(friendlyString((*p).source())) < 0 || + ftranslation.find(friendlyString((*p).target())) >= 0 ) break; } if ( p == ent->end() ) { @@ -1977,7 +1977,7 @@ void TrWindow::recentFileActivated( int id ) void TrWindow::addRecentlyOpenedFile( const TQString &fn, TQStringList &lst ) { - if ( lst.tqfind( fn ) != lst.end() ) + if ( lst.find( fn ) != lst.end() ) return; if ( lst.count() >= 10 ) lst.remove( lst.begin() ); diff --git a/tqtinterface/qt4/tools/linguist/linguist/trwindow.h b/tqtinterface/qt4/tools/linguist/linguist/trwindow.h index 3e69534..142fde2 100644 --- a/tqtinterface/qt4/tools/linguist/linguist/trwindow.h +++ b/tqtinterface/qt4/tools/linguist/linguist/trwindow.h @@ -96,9 +96,9 @@ private Q_SLOTS: void saveAs(); void release(); void print(); - void tqfind(); - void tqfindAgain(); - void tqreplace(); + void find(); + void findAgain(); + void replace(); void newPhraseBook(); void openPhraseBook(); void closePhraseBook( int id ); @@ -119,7 +119,7 @@ private Q_SLOTS: void toggleFinished( TQListViewItem *item, const TQPoint& p, int column ); void prevUnfinished(); void nextUnfinished(); - void tqfindNext( const TQString& text, int where, bool matchCase ); + void findNext( const TQString& text, int where, bool matchCase ); void revalidate(); void toggleGuessing(); void focusSourceList(); @@ -179,9 +179,9 @@ private: FindDialog *f; FindDialog *h; - TQString tqfindText; - int tqfindWhere; - bool tqfindMatchCase; + TQString findText; + int findWhere; + bool findMatchCase; int foundItem; TQListViewItem *foundScope; int foundWhere; @@ -207,9 +207,9 @@ private: Action *copyAct; Action *pasteAct; Action *selectAllAct; - Action *tqfindAct; - Action *tqfindAgainAct; - Action *tqreplaceAct; + Action *findAct; + Action *findAgainAct; + Action *replaceAct; Action *newPhraseBookAct; Action *openPhraseBookAct; Action *acceleratorsAct; diff --git a/tqtinterface/qt4/tools/linguist/lrelease/main.cpp b/tqtinterface/qt4/tools/linguist/lrelease/main.cpp index a23f2ec..1f68326 100644 --- a/tqtinterface/qt4/tools/linguist/lrelease/main.cpp +++ b/tqtinterface/qt4/tools/linguist/lrelease/main.cpp @@ -65,7 +65,7 @@ static bool loadTsFile( MetaTranslator& tor, const TQString& tsFileName, bool /* verbose */ ) { TQString qmFileName = tsFileName; - qmFileName.tqreplace( TQRegExp("\\.ts$"), "" ); + qmFileName.replace( TQRegExp("\\.ts$"), "" ); qmFileName += ".qm"; bool ok = tor.load( tsFileName ); @@ -96,7 +96,7 @@ static void releaseTsFile( const TQString& tsFileName, bool verbose, MetaTranslator tor; if ( loadTsFile(tor, tsFileName, verbose) ) { TQString qmFileName = tsFileName; - qmFileName.tqreplace( TQRegExp("\\.ts$"), "" ); + qmFileName.replace( TQRegExp("\\.ts$"), "" ); qmFileName += ".qm"; releaseMetaTranslator( tor, qmFileName, verbose, stripped ); } @@ -163,7 +163,7 @@ int main( int argc, char **argv ) TQString fullText = t.read(); f.close(); - if ( fullText.tqfind(TQString("<!DOCTYPE TS>")) >= 0 ) { + if ( fullText.find(TQString("<!DOCTYPE TS>")) >= 0 ) { if ( outputFile.isEmpty() ) { releaseTsFile( argv[i], verbose, stripped ); } else { diff --git a/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp b/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp index 3d3f185..de638f7 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/fetchtr.cpp @@ -185,7 +185,7 @@ static int getToken() break; case 'f': /* - TQTranslator::tqfindMessage() has the same parameters as + TQTranslator::findMessage() has the same parameters as TQApplication::translate(). */ if ( strcmp(yyIdent + 1, "indMessage") == 0 ) @@ -228,7 +228,7 @@ static int getToken() delta; } - The code tqcontains, indeed, two opening braces for + The code contains, indeed, two opening braces for one closing brace; yet there's no reason to panic. The solution is to remember yyBraceDepth as it was @@ -424,8 +424,8 @@ static int getToken() /* The second part of this source file is the parser. It accomplishes - a very easy task: It tqfinds all strings inside a tr() or translate() - call, and possibly tqfinds out the context of the call. It supports + a very easy task: It finds all strings inside a tr() or translate() + call, and possibly finds out the context of the call. It supports three cases: (1) the context is specified, as in FunnyDialog::tr("Hello") or translate("FunnyDialog", "Hello"); (2) the call appears within an inlined function; (3) the call @@ -545,12 +545,12 @@ static void parse( MetaTranslator *tor, const char *initialContext, } prefix = (const char *) 0; - if ( qualifiedContexts.tqcontains(context) ) + if ( qualifiedContexts.contains(context) ) context = qualifiedContexts[context]; tor->insert( MetaTranslatorMessage(context, text, com, TQString(), utf8) ); - if ( lacks_TQ_OBJECT.tqcontains(context) ) { + if ( lacks_TQ_OBJECT.contains(context) ) { qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) context ); @@ -597,7 +597,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, com = com.simplifyWhiteSpace(); if ( com.left(sizeof(MagicComment) - 1) == MagicComment ) { com.remove( 0, sizeof(MagicComment) - 1 ); - int k = com.tqfind( ' ' ); + int k = com.find( ' ' ); if ( k == -1 ) { context = com; } else { @@ -612,7 +612,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, namespace". See the manual for details. */ k = 0; - while ( (k = context.tqfind("::", k)) != -1 ) { + while ( (k = context.find("::", k)) != -1 ) { qualifiedContexts.insert( context.mid(k + 2), context ); k++; } @@ -638,7 +638,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, namespaces.remove( namespaces.fromLast() ); if ( yyBraceDepth == (int) namespaces.count() ) { if ( missing_TQ_OBJECT ) { - if ( needs_TQ_OBJECT.tqcontains(functionContext) ) { + if ( needs_TQ_OBJECT.contains(functionContext) ) { qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) functionContext ); @@ -748,7 +748,7 @@ bool UiHandler::endElement( const TQString& /* namespaceURI */, const TQString& /* localName */, const TQString& qName ) { - accum.tqreplace( TQRegExp(TQString("\r\n")), "\n" ); + accum.replace( TQRegExp(TQString("\r\n")), "\n" ); if ( qName == TQString("class") ) { if ( context.isEmpty() ) diff --git a/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp b/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp index bc409db..f734763 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/merge.cpp @@ -66,7 +66,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose ) // skip context comment if ( !TQCString((*it).sourceText()).isEmpty() ) { - if ( !virginTor->tqcontains((*it).context(), (*it).sourceText(), + if ( !virginTor->contains((*it).context(), (*it).sourceText(), (*it).comment()) ) { newType = MetaTranslatorMessage::Obsolete; if ( m.type() != MetaTranslatorMessage::Obsolete ) @@ -102,7 +102,7 @@ void merge( MetaTranslator *tor, const MetaTranslator *virginTor, bool verbose ) all = virginTor->messages(); for ( it = all.begin(); it != all.end(); ++it ) { - if ( !tor->tqcontains((*it).context(), (*it).sourceText(), + if ( !tor->contains((*it).context(), (*it).sourceText(), (*it).comment()) ) { tor->insert( *it ); if ( !TQCString((*it).sourceText()).isEmpty() ) diff --git a/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp b/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp index ba54dae..cc16014 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/numberh.cpp @@ -64,7 +64,7 @@ static int numberLength( const char *s ) } /* - Returns a version of 'key' where all numbers have been tqreplaced by zeroes. If + Returns a version of 'key' where all numbers have been replaced by zeroes. If there were none, returns "". */ static TQCString zeroKey( const char *key ) @@ -97,7 +97,7 @@ static TQString translationAttempt( const TQString& oldTranslation, const char *oldSource, const char *newSource ) { - int p = zeroKey( oldSource ).tqcontains( '0' ); + int p = zeroKey( oldSource ).contains( '0' ); int oldSourceLen = tqstrlen( oldSource ); TQString attempt; TQStringList oldNumbers; @@ -134,7 +134,7 @@ static TQString translationAttempt( const TQString& oldTranslation, /* We now go over the old translation, "XeT 3.0", one letter at a time, looking for numbers found in oldNumbers. Whenever such a - number is met, it is tqreplaced with its newNumber equivalent. In + number is met, it is replaced with its newNumber equivalent. In our example, the "3.0" of "XeT 3.0" becomes "3.1". */ for ( i = 0; i < (int) oldTranslation.length(); i++ ) { @@ -147,7 +147,7 @@ static TQString translationAttempt( const TQString& oldTranslation, } /* - Let's tqfind out if the last character ended a match. We make + Let's find out if the last character ended a match. We make two passes over the data. In the first pass, we try to match only numbers that weren't matched yet; if that fails, the second pass does the trick. This is useful in some @@ -232,7 +232,7 @@ void applyNumberHeuristic( MetaTranslator *tor, bool verbose ) } for ( u = untranslated.begin(); u != untranslated.end(); ++u ) { - t = translated.tqfind( zeroKey((*u).sourceText()) ); + t = translated.find( zeroKey((*u).sourceText()) ); if ( t != translated.end() && !t.key().isEmpty() && qstrcmp((*t).sourceText(), (*u).sourceText()) != 0 ) { MetaTranslatorMessage m( *u ); diff --git a/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp b/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp index 456ad7d..4679917 100644 --- a/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp +++ b/tqtinterface/qt4/tools/linguist/lupdate/sametexth.cpp @@ -64,7 +64,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) untranslated.append( *it ); } else { TQCString key = (*it).sourceText(); - t = translated.tqfind( key ); + t = translated.find( key ); if ( t != translated.end() ) { /* The same source text is translated at least two @@ -74,7 +74,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) translated.remove( key ); avoid.insert( key, *it ); } - } else if ( !avoid.tqcontains(key) && + } else if ( !avoid.contains(key) && !(*it).translation().isEmpty() ) { translated.insert( key, *it ); } @@ -83,7 +83,7 @@ void applySameTextHeuristic( MetaTranslator *tor, bool verbose ) for ( u = untranslated.begin(); u != untranslated.end(); ++u ) { TQCString key = (*u).sourceText(); - t = translated.tqfind( key ); + t = translated.find( key ); if ( t != translated.end() ) { MetaTranslatorMessage m( *u ); m.setTranslation( (*t).translation() ); diff --git a/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph b/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph index 7a71500..906f547 100644 --- a/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph +++ b/tqtinterface/qt4/tools/linguist/phrasebooks/danish.qph @@ -260,7 +260,7 @@ </phrase> <phrase> <source>Explore</source> - <target>Stitqfinder</target> + <target>Stifinder</target> </phrase> <phrase> <source>extended selection</source> @@ -993,7 +993,7 @@ </phrase> <phrase> <source>Windows Explorer</source> - <target>Windows Stitqfinder</target> + <target>Windows Stifinder</target> </phrase> <phrase> <source>wizard</source> diff --git a/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp b/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp index 71e361d..92b56d6 100644 --- a/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp +++ b/tqtinterface/qt4/tools/linguist/qm2ts/main.cpp @@ -72,7 +72,7 @@ int main( int argc, char **argv ) TQTranslator tor( 0 ); if ( tor.load(argv[i], ".") ) { TQString g = argv[i]; - g.tqreplace( TQRegExp(TQString("\\.qm$")), TQString() ); + g.replace( TQRegExp(TQString("\\.qm$")), TQString() ); g += TQString( ".ts" ); if ( verbose ) diff --git a/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 b/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 index 6cdf129..e1eb472 100644 --- a/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 +++ b/tqtinterface/qt4/tools/linguist/qm2ts/qm2ts.1 @@ -28,7 +28,7 @@ and .B qm2ts is provided to ease porting from the old internationalization tools -.B (tqfindtr, +.B (findtr, .B mergetr and .B msg2qm) diff --git a/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp b/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp index e6cde6c..fee2a00 100644 --- a/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp +++ b/tqtinterface/qt4/tools/linguist/shared/metatranslator.cpp @@ -180,7 +180,7 @@ bool TsHandler::endElement( const TQString& /* namespaceURI */, bool TsHandler::characters( const TQString& ch ) { TQString t = ch; - t.tqreplace( "\r", "" ); + t.replace( "\r", "" ); accum += t; return TRUE; } @@ -482,8 +482,8 @@ bool MetaTranslator::release( const TQString& filename, bool verbose, sourceText, comment0). */ if ( comment.isEmpty() - || tqcontains(context, sourceText, "") - || !tor.tqfindMessage(context, sourceText, "").translation() + || contains(context, sourceText, "") + || !tor.findMessage(context, sourceText, "").translation() .isNull() ) { tor.insert( m.key() ); } else { @@ -503,20 +503,20 @@ bool MetaTranslator::release( const TQString& filename, bool verbose, return saved; } -bool MetaTranslator::tqcontains( const char *context, const char *sourceText, +bool MetaTranslator::contains( const char *context, const char *sourceText, const char *comment ) const { - return mm.tqfind( MetaTranslatorMessage(context, sourceText, comment) ) != + return mm.find( MetaTranslatorMessage(context, sourceText, comment) ) != mm.end(); } void MetaTranslator::insert( const MetaTranslatorMessage& m ) { int pos = (int)mm.count(); - TMM::Iterator n = mm.tqfind( m ); + TMM::Iterator n = mm.find( m ); if ( n != mm.end() ) pos = *n; - mm.tqreplace( m, pos ); + mm.replace( m, pos ); } void MetaTranslator::stripObsoleteMessages() diff --git a/tqtinterface/qt4/tools/linguist/shared/metatranslator.h b/tqtinterface/qt4/tools/linguist/shared/metatranslator.h index 1673d57..52b2504 100644 --- a/tqtinterface/qt4/tools/linguist/shared/metatranslator.h +++ b/tqtinterface/qt4/tools/linguist/shared/metatranslator.h @@ -89,7 +89,7 @@ public: bool release( const TQString& filename, bool verbose = FALSE, TQTranslator::SaveMode mode = TQTranslator::Stripped ) const; - bool tqcontains( const char *context, const char *sourceText, + bool contains( const char *context, const char *sourceText, const char *comment ) const; void insert( const MetaTranslatorMessage& m ); diff --git a/tqtinterface/qt4/tools/linguist/shared/proparser.cpp b/tqtinterface/qt4/tools/linguist/shared/proparser.cpp index 12af0ec..ab32500 100644 --- a/tqtinterface/qt4/tools/linguist/shared/proparser.cpp +++ b/tqtinterface/qt4/tools/linguist/shared/proparser.cpp @@ -77,7 +77,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) still need to do it after we include to make sure the included file does not have comments */ - t.tqreplace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); + t.replace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); /* Process include() commands. @@ -89,39 +89,39 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) while ( (i = callToInclude.search(t, i)) != -1 ) { bool doneWithVar = false; TQString fileName = callToInclude.cap(1); - TQString after = fileName.tqreplace("$$PWD", TQDir::currentDirPath()); - if (!tagMap.isEmpty() && after.tqcontains("$$")) { + TQString after = fileName.replace("$$PWD", TQDir::currentDirPath()); + if (!tagMap.isEmpty() && after.contains("$$")) { TQRegExp var( "\\$\\$[({]?([a-zA-Z0-9_]+)[)}]?" ); int ii = 0; - while ((ii = after.tqfind(var, ii)) != -1) { - if (tagMap.tqcontains(var.cap(1))) { - after.tqreplace(ii, var.cap(0).length(), tagMap[var.cap(1)]); - } else { // Couldn't tqfind it + while ((ii = after.find(var, ii)) != -1) { + if (tagMap.contains(var.cap(1))) { + after.replace(ii, var.cap(0).length(), tagMap[var.cap(1)]); + } else { // Couldn't find it doneWithVar = true; break; } } } - if (doneWithVar || !after.tqcontains("$$")) { + if (doneWithVar || !after.contains("$$")) { after = loadFile(after); TQFileInfo fi(callToInclude.cap(1)); - after.tqreplace("$$PWD", fi.dirPath()); - t.tqreplace( i, callToInclude.matchedLength(), after ); + after.replace("$$PWD", fi.dirPath()); + t.replace( i, callToInclude.matchedLength(), after ); } i += after.length(); } /* Strip comments, merge lines ending with backslash, add - spaces around '=' and '+=', tqreplace '\n' with ';', and + spaces around '=' and '+=', replace '\n' with ';', and simplify white spaces. */ - t.tqreplace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); - t.tqreplace( TQRegExp(TQString("\\\\[^\n\\S]*\n")), TQString(" ") ); - t.tqreplace( "=", TQString(" = ") ); - t.tqreplace( "+ =", TQString(" += ") ); - t.tqreplace( "\n", TQString(";") ); + t.replace( TQRegExp(TQString("#[^\n]*\n")), TQString(" ") ); + t.replace( TQRegExp(TQString("\\\\[^\n\\S]*\n")), TQString(" ") ); + t.replace( "=", TQString(" = ") ); + t.replace( "+ =", TQString(" += ") ); + t.replace( "\n", TQString(";") ); t = t.simplifyWhiteSpace(); /* @@ -135,7 +135,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) if ( toks.count() >= 3 && (toks[1] == TQString("=") || toks[1] == TQString("+=")) ) { TQString tag = toks.first(); - int k = tag.tqfindRev( TQChar(':') ); // as in 'unix:' + int k = tag.findRev( TQChar(':') ); // as in 'unix:' if ( k != -1 ) tag = tag.mid( k + 1 ); toks.remove( toks.begin() ); @@ -143,9 +143,9 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) TQString action = toks.first(); toks.remove( toks.begin() ); - if ( tagMap.tqcontains(tag) ) { + if ( tagMap.contains(tag) ) { if ( action == TQString("=") ) - tagMap.tqreplace( tag, toks.join(TQChar(' ')) ); + tagMap.replace( tag, toks.join(TQChar(' ')) ); else tagMap[tag] += TQChar( ' ' ) + toks.join( TQChar(' ') ); } else { @@ -171,11 +171,11 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) // skip system(); it will be handled in the next pass ++i; } else { - if ( tagMap.tqcontains(invocation) ) + if ( tagMap.contains(invocation) ) after = tagMap[invocation]; else if (invocation.lower() == "pwd") after = TQDir::currentDirPath(); - (*it).tqreplace( i, len, after ); + (*it).replace( i, len, after ); i += after.length(); } } @@ -207,7 +207,7 @@ TQMap<TQString, TQString> proFileTagMap( const TQString& text ) buff[read_in] = '\0'; after += buff; } - (*it).tqreplace( i, callToSystem.matchedLength(), after ); + (*it).replace( i, callToSystem.matchedLength(), after ); i += after.length(); } } diff --git a/tqtinterface/qt4/tools/makeqpf/main.cpp b/tqtinterface/qt4/tools/makeqpf/main.cpp index 3425549..98f548e 100644 --- a/tqtinterface/qt4/tools/makeqpf/main.cpp +++ b/tqtinterface/qt4/tools/makeqpf/main.cpp @@ -284,7 +284,7 @@ int main(int argc, char** argv) TQStringList r = TQStringList::split(',',ranges); for (TQStringList::Iterator it=r.begin(); it!=r.end(); ++it) { TQString rng = *it; - int dash = rng.tqfind('-'); + int dash = rng.find('-'); int from,to; if ( dash==0 ) { from=0; diff --git a/tqtinterface/qt4/tools/mergetr/mergetr.cpp b/tqtinterface/qt4/tools/mergetr/mergetr.cpp index c0a33b6..43ccd25 100644 --- a/tqtinterface/qt4/tools/mergetr/mergetr.cpp +++ b/tqtinterface/qt4/tools/mergetr/mergetr.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved. ** -** This is a utility program for merging tqfindtr msgfiles +** This is a utility program for merging findtr msgfiles ** ** This file may be used under the terms of the GNU General ** Public License versions 2.0 or 3.0 as published by the Free @@ -184,7 +184,7 @@ void writecomment( TQTextStream &str, const TQString &s ) int idx = 0; int len = s.length(); while ( idx < len ) { - int nl = s.tqfind( '\n', idx ); + int nl = s.find( '\n', idx ); if ( nl < 0 ) { qWarning( "writecomment: string lacks newline" ); str << "# " << s.mid( idx ) << '\n'; diff --git a/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp b/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp index 96e77c3..ca02cc9 100644 --- a/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp +++ b/tqtinterface/qt4/tools/msg2qm/msg2qm.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved. ** -** This is a utility program for converting tqfindtr msgfiles to +** This is a utility program for converting findtr msgfiles to ** qtranslator message files ** ** This file may be used under the terms of the GNU General @@ -51,7 +51,7 @@ bool hasHandle( const TQString& line, const TQString& handle) TQString extractContents( const TQString& line ) { TQString contents; - if ( line.tqcontains('\"') < 2) + if ( line.contains('\"') < 2) return contents; int pos = 0; while ( pos < int(line.length()) && line[pos] != '\"' ) @@ -101,7 +101,7 @@ void addTranslation( TQTranslator* translator, const TQString& msgid, const TQSt if (!msgid.isNull() && !msgstr.isNull() ) { TQString scope = ""; TQString id = msgid; - int coloncolon = msgid.tqfind("::"); + int coloncolon = msgid.find("::"); if (coloncolon != -1) { scope = msgid.left( coloncolon ); id = msgid.right( msgid.length() - scope.length() - 2 ); @@ -109,7 +109,7 @@ void addTranslation( TQTranslator* translator, const TQString& msgid, const TQSt else if (defaultScope) scope = *defaultScope; - if (translator->tqcontains( scope.ascii(), id.ascii() ) ) { + if (translator->contains( scope.ascii(), id.ascii() ) ) { qWarning("Error: \"%s\" already in use", msgid.ascii() ); } else { @@ -182,7 +182,7 @@ void translate( const TQString& filename, const TQString& qmfile ) if ( pass == 0 && msgid.isEmpty() ) { // Check for the encoding. - int cpos = msgstr.tqfind( "charset=" ); + int cpos = msgstr.find( "charset=" ); if ( cpos >= 0 ) { cpos = cpos + 8; //skip "charset=" int i = cpos; diff --git a/tqtinterface/qt4/tools/qconfig/LICENSE.GPL b/tqtinterface/qt4/tools/qconfig/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/qconfig/LICENSE.GPL +++ b/tqtinterface/qt4/tools/qconfig/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/qconfig/main.cpp b/tqtinterface/qt4/tools/qconfig/main.cpp index 22b6a8b..39ee580 100644 --- a/tqtinterface/qt4/tools/qconfig/main.cpp +++ b/tqtinterface/qt4/tools/qconfig/main.cpp @@ -438,7 +438,7 @@ void Main::loadFeatures(const TQString& filename) nextline = s.readLine(); } - int colon = line.tqfind(':'); + int colon = line.find(':'); if ( colon < 0 ) { qDebug("Cannot parse: %s",line.ascii()); } else { @@ -470,7 +470,7 @@ void Main::loadFeatures(const TQString& filename) do { TQString line = s.readLine(); - line.tqreplace(TQRegExp("# *define"),"#define"); + line.replace(TQRegExp("# *define"),"#define"); TQStringList token = TQStringList::split(TQChar(' '),line); if ( on ) { diff --git a/tqtinterface/qt4/tools/qembed/qembed.cpp b/tqtinterface/qt4/tools/qembed/qembed.cpp index 9c11bc2..763340f 100644 --- a/tqtinterface/qt4/tools/qembed/qembed.cpp +++ b/tqtinterface/qt4/tools/qembed/qembed.cpp @@ -80,7 +80,7 @@ int main( int argc, char **argv ) #ifdef TQ_WS_WIN // Since wildcards are not expanded automatically for us on Windows, we need to do // it ourselves - if ( file.tqcontains( '*' ) || file.tqcontains( '?' ) ) { + if ( file.contains( '*' ) || file.contains( '?' ) ) { TQDir d; const TQFileInfoList *fiList = d.entryInfoList( file, TQDir::Files ); TQFileInfoListIterator it(*fiList); @@ -189,10 +189,10 @@ int main( int argc, char **argv ) out << " { 0, 0, 0 }\n};\n"; out << "\n" -"static const TQByteArray& qembed_tqfindData( const char* name )\n" +"static const TQByteArray& qembed_findData( const char* name )\n" "{\n" " static TQDict<TQByteArray> dict;\n" -" TQByteArray* ba = dict.tqfind( name );\n" +" TQByteArray* ba = dict.find( name );\n" " if ( !ba ) {\n" " for ( int i = 0; embed_vec[i].data; i++ ) {\n" " if ( strcmp(embed_vec[i].name, name) == 0 ) {\n" @@ -243,10 +243,10 @@ int main( int argc, char **argv ) out << " { 0, 0, 0, 0, 0, 0, 0, 0 }\n};\n"; out << "\n" -"static const TQImage& qembed_tqfindImage( const TQString& name )\n" +"static const TQImage& qembed_findImage( const TQString& name )\n" "{\n" " static TQDict<TQImage> dict;\n" -" TQImage* img = dict.tqfind( name );\n" +" TQImage* img = dict.find( name );\n" " if ( !img ) {\n" " for ( int i = 0; embed_image_vec[i].data; i++ ) {\n" " if ( strcmp(embed_image_vec[i].name, name.latin1()) == 0 ) {\n" diff --git a/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL b/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL +++ b/tqtinterface/qt4/tools/qtconfig/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp b/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp index 03c6e1d..42e7033 100644 --- a/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp +++ b/tqtinterface/qt4/tools/qtconfig/mainwindow.cpp @@ -238,14 +238,14 @@ MainWindow::MainWindow() if (s < gstylecombo->count()) { gstylecombo->setCurrentItem(s); } else { - // no predefined style, try to tqfind the closest match + // no predefined style, try to find the closest match // class names usually contain the name of the style, so we // iterate over the items in the combobox, and use the one whose // name is contained in the classname of the style s = 0; git = gstyles.begin(); while (git != gstyles.end()) { - if (currentstyle.tqcontains(*git)) + if (currentstyle.contains(*git)) break; s++; git++; @@ -274,7 +274,7 @@ MainWindow::MainWindow() TQStringList fs2 = TQT_TQSTRINGLIST_OBJECT(TQFont::substitutions()); TQStringList::Iterator fsit = fs2.begin(); while (fsit != fs2.end()) { - if (! fs.tqcontains(*fsit)) + if (! fs.contains(*fsit)) fs += *fsit; fsit++; } @@ -318,13 +318,13 @@ MainWindow::MainWindow() libpathlistbox->clear(); libpathlistbox->insertStringList(TQApplication::libraryPaths()); - // tqfind the default family + // find the default family TQStringList::Iterator sit = families.begin(); int i = 0, possible = -1; while (sit != families.end()) { if (*sit == TQApplication::font().family()) break; - if ((*sit).tqcontains(TQApplication::font().family())) + if ((*sit).contains(TQApplication::font().family())) possible = i; i++; @@ -347,7 +347,7 @@ MainWindow::MainWindow() while (sit != styles.end()) { if (*sit == stylestring) break; - if ((*sit).tqcontains(stylestring)) + if ((*sit).contains(stylestring)) possible = i; i++; @@ -398,7 +398,7 @@ MainWindow::MainWindow() // prevent to be listed in ordinary input method list. TQStringList::Iterator imIt = inputMethodIdentifiers.begin(); while (imIt != inputMethodIdentifiers.end()) { - if ((*imIt).tqfind("imsw-") == 0) + if ((*imIt).find("imsw-") == 0) imIt = inputMethodIdentifiers.remove(imIt); else imIt++; @@ -424,7 +424,7 @@ MainWindow::MainWindow() // default input method is XIM in X11. TQString currentIM = settings.readEntry("/qt/DefaultInputMethod", "xim"); { - int index = inputMethodIdentifiers.tqfindIndex(currentIM); + int index = inputMethodIdentifiers.findIndex(currentIM); // set up Selected input method. if (0 <= index && index < inputMethodIdentifiers.count()) { inputMethodCombo->setCurrentItem(index); diff --git a/tqtinterface/qt4/tools/qvfb/LICENSE.GPL b/tqtinterface/qt4/tools/qvfb/LICENSE.GPL index 149f4ac..3221c03 100644 --- a/tqtinterface/qt4/tools/qvfb/LICENSE.GPL +++ b/tqtinterface/qt4/tools/qvfb/LICENSE.GPL @@ -59,7 +59,7 @@ modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - 0. This License applies to any program or other work which tqcontains + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" @@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions: stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in - whole or in part tqcontains or is derived from the Program or any + whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. @@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following: The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source -code means all the source code for all modules it tqcontains, plus any +code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include diff --git a/tqtinterface/qt4/tools/qvfb/skin.cpp b/tqtinterface/qt4/tools/qvfb/skin.cpp index da6304b..795de3a 100644 --- a/tqtinterface/qt4/tools/qvfb/skin.cpp +++ b/tqtinterface/qt4/tools/qvfb/skin.cpp @@ -128,7 +128,7 @@ void Skin::mousePressEvent( TQMouseEvent *e ) TQPoint p1( areas[i].x1, areas[i].y1 ); TQPoint p2( areas[i].x2, areas[i].y2 ); TQRect r( p1, p2 ); - if ( r.tqcontains( e->pos() ) ) { + if ( r.contains( e->pos() ) ) { buttonPressed = TRUE; buttonIndex = i; buttonCode = areas[buttonIndex].keyCode; @@ -143,7 +143,7 @@ void Skin::mousePressEvent( TQMouseEvent *e ) } } -// This is handy for tqfinding the areas to define rectangles for new skins +// This is handy for finding the areas to define rectangles for new skins // printf("Clicked in %i,%i\n", e->pos().x(), e->pos().y()); clickPos = e->pos(); } diff --git a/tqtinterface/qt4/translations/qt_de.ts b/tqtinterface/qt4/translations/qt_de.ts index ec8f9a8..a1b346e 100644 --- a/tqtinterface/qt4/translations/qt_de.ts +++ b/tqtinterface/qt4/translations/qt_de.ts @@ -1361,15 +1361,15 @@ nach </message> <message> <source><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform GUI &amp; application development.</p><p>Qt provides single-source portability across Windows 95/98/NT4/ME/2000, Mac&nbsp;OS&nbsp;X, Linux, Solaris, HP-UX and many other versions of Unix with X11.<br>Qt is also available for embedded tqdevices.</p><p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> for more information.</p></source> - <translation type="obsolete"><p>Dieses Programm verwendet Qt Version %1</p><p>Qt ist ein multi-platform Framework zum Erstellen von GUI-Programmen in C++.</p><p>Qt bietet Portierungsmöglichkeiten mit nur einer Quellcode-Basis auf Windows 95/98/NT/ME/2000, Mac&nbsp;OS&nbsp;X, Linux, Solaris, HP-UX und vielen anderen Unix-Versionen, die X11 verwenden.<br>Qt ist auch für eingebettete Systeme erhältlich.</p><p>Qt ist ein Produkt von Trolltech. Weitere Informationen tqfinden Sie unter <tt>http://www.trolltech.com/qt/</tt>.</p></translation> + <translation type="obsolete"><p>Dieses Programm verwendet Qt Version %1</p><p>Qt ist ein multi-platform Framework zum Erstellen von GUI-Programmen in C++.</p><p>Qt bietet Portierungsmöglichkeiten mit nur einer Quellcode-Basis auf Windows 95/98/NT/ME/2000, Mac&nbsp;OS&nbsp;X, Linux, Solaris, HP-UX und vielen anderen Unix-Versionen, die X11 verwenden.<br>Qt ist auch für eingebettete Systeme erhältlich.</p><p>Qt ist ein Produkt von Trolltech. Weitere Informationen finden Sie unter <tt>http://www.trolltech.com/qt/</tt>.</p></translation> </message> <message> <source><h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for cross-platform GUI &amp; application development.</p><p>Qt provides single-source portability across Windows 95/98/NT4/ME/2000, Mac&nbsp;OS&nbsp;X, Linux, Solaris, HP-UX and many other versions of Unix with X11.<br>Qt is also available for embedded tqdevices.</p><p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> for more information.</p></source> - <translation type="obsolete"><h3>Über Qt</h3><p>Dieses Programm verwendet Qt Version %1</p><p>Qt ist ein multi-platform Framework zum Erstellen von GUI-Programmen in C++.</p><p>Qt bietet Portierungsmöglichkeiten mit nur einer Quellcode-Basis auf Windows 95/98/NT/ME/2000, Mac&nbsp;OS&nbsp;X, Linux, Solaris, HP-UX und vielen anderen Unix-Versionen, die X11 verwenden.<br>Qt ist auch für eingebettete Systeme erhältlich.</p><p>Qt ist ein Produkt von Trolltech. Weitere Informationen tqfinden Sie unter <tt>http://www.trolltech.com/qt/</tt>.</p></translation> + <translation type="obsolete"><h3>Über Qt</h3><p>Dieses Programm verwendet Qt Version %1</p><p>Qt ist ein multi-platform Framework zum Erstellen von GUI-Programmen in C++.</p><p>Qt bietet Portierungsmöglichkeiten mit nur einer Quellcode-Basis auf Windows 95/98/NT/ME/2000, Mac&nbsp;OS&nbsp;X, Linux, Solaris, HP-UX und vielen anderen Unix-Versionen, die X11 verwenden.<br>Qt ist auch für eingebettete Systeme erhältlich.</p><p>Qt ist ein Produkt von Trolltech. Weitere Informationen finden Sie unter <tt>http://www.trolltech.com/qt/</tt>.</p></translation> </message> <message> <source><h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for multiplatform GUI &amp; application development.</p><p>Qt provides single-source portability across MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants.<br>Qt is also available for embedded tqdevices.</p><p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> for more information.</p></source> - <translation><h3>Über Qt</h3><p>Dieses Programm verwendet Qt Version %1</p><p>Qt ist ein multi-platform Framework zum Erstellen von GUI-Programmen in C++.</p><p>Qt bietet Portierungsmöglichkeiten mit nur einer Quellcode-Basis auf MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux und allen anderen großen kommerziellen Unix-Versionen.<br>Qt ist auch für eingebettete Systeme erhältlich.</p><p>Qt ist ein Produkt von Trolltech. Weitere Informationen tqfinden Sie unter <tt>http://www.trolltech.com/qt/</tt>.</p></translation> + <translation><h3>Über Qt</h3><p>Dieses Programm verwendet Qt Version %1</p><p>Qt ist ein multi-platform Framework zum Erstellen von GUI-Programmen in C++.</p><p>Qt bietet Portierungsmöglichkeiten mit nur einer Quellcode-Basis auf MS&nbsp;Windows, Mac&nbsp;OS&nbsp;X, Linux und allen anderen großen kommerziellen Unix-Versionen.<br>Qt ist auch für eingebettete Systeme erhältlich.</p><p>Qt ist ein Produkt von Trolltech. Weitere Informationen finden Sie unter <tt>http://www.trolltech.com/qt/</tt>.</p></translation> </message> </context> <context> |