diff options
Diffstat (limited to 'experimental/tqtinterface/qt4/src/kernel')
96 files changed, 974 insertions, 975 deletions
diff --git a/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps b/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps index b38868ff6..9ea2dc093 100644 --- a/experimental/tqtinterface/qt4/src/kernel/qpsprinter.ps +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp index 4c15ee267..6954cb3d4 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqabstractlayout.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp b/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp index fd47345ff..96a3470f4 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqaccel.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqaccel.h b/experimental/tqtinterface/qt4/src/kernel/tqaccel.h index d60a3b856..1726aca4b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqaccel.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp b/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp index ba19cf7d5..8d7e588a2 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqaccessible.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp index 74d2f085f..0e3b55cdc 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqapplication.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqapplication.h b/experimental/tqtinterface/qt4/src/kernel/tqapplication.h index e5e2ea941..1c161179a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqapplication.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp index aaa9faffb..64a270475 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqapplication_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp b/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp index 508002f1c..8c6ba7471 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqasyncimageio.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp b/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp index 9c7a318fe..4c2b3415a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqclipboard.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqclipboard_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqclipboard_x11.cpp index 9fd90e48c..b1f76c081 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqclipboard_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp index f2457736c..f6fcce61c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcolor.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqcolor_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcolor_x11.cpp index 909ecbb08..ed3a764a0 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcolor_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqcursor.h b/experimental/tqtinterface/qt4/src/kernel/tqcursor.h index 9aa643738..1c1d4c12a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcursor.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp index 36f25047d..aac333607 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqcursor_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqdesktopwidget_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdesktopwidget_x11.cpp index 84da179a0..8235e8119 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdesktopwidget_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp index 56d00d45f..471df7008 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdnd_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp index 5a4d2fee7..579eab8cf 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdragobject.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp b/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp index 6ce07d5ee..07e2bb4ba 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqdrawutil.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp b/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp index 59a6ca788..6b9f90b5d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqevent.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqevent.h b/experimental/tqtinterface/qt4/src/kernel/tqevent.h index 224759f7e..143c766f6 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqevent.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqeventloop_unix.cpp b/experimental/tqtinterface/qt4/src/kernel/tqeventloop_unix.cpp index a86597820..53ca9430e 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqeventloop_unix.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqeventloop_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqeventloop_x11.cpp index 2c60d1095..61b61170f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqeventloop_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfocusdata.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfocusdata.cpp index 025994067..d46553ea7 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfocusdata.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp index 48fe5a05e..5570afd9e 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfont.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp index 84ea2d6f3..fda292f4b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfont_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h b/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h index b6d7a54f7..36b709ff8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfontdata_p.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase.cpp index e70be038a..219aa98c8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase.h b/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase.h index f2556ef34..e6af3f816 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp index 97cb544a3..66c23622a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfontdatabase_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfontengine_p.h b/experimental/tqtinterface/qt4/src/kernel/tqfontengine_p.h index cba46a7f1..37aba1c2f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfontengine_p.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp index 8d76e0b4d..02cf60ca0 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqfontengine_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp b/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp index e5769f862..09a1126c1 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqiconset.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp b/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp index 0c97e646c..2a99fc929 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqimage.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp b/experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp index 20b7b17e4..dbaa301f9 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqjpegio.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqkeysequence.cpp b/experimental/tqtinterface/qt4/src/kernel/tqkeysequence.cpp index f34f69797..7b06b22fd 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqkeysequence.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp index 9a74fcee7..9c3132a03 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqlayout.h b/experimental/tqtinterface/qt4/src/kernel/tqlayout.h index 5423cad5b..38dd33e2b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayout.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp b/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp index 7dca5e0e6..7833b2702 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqlayoutengine.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp index 09d843932..6b2b17f65 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.h b/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.h index 55027433d..f6e163179 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqmetaobject.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqmime.cpp b/experimental/tqtinterface/qt4/src/kernel/tqmime.cpp index 46d07d383..943ba5531 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqmime.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp b/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp index 4b77249be..87a339c1c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqmovie.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqnetworkprotocol.cpp b/experimental/tqtinterface/qt4/src/kernel/tqnetworkprotocol.cpp index 83cc0942c..d980b357d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqnetworkprotocol.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp b/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp index 9bec0241f..4f465d1aa 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqobject.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqobjectcleanuphandler.cpp b/experimental/tqtinterface/qt4/src/kernel/tqobjectcleanuphandler.cpp index fdee28217..f9a593770 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqobjectcleanuphandler.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h b/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h index 794d1f0b2..c87689897 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqobjectdefs.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice.h b/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice.h index 5c7a2c7d0..738dd761f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpaintdevice.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpaintdevicemetrics.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpaintdevicemetrics.cpp index 601306271..07633527f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpaintdevicemetrics.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp index 66596f5b5..6d481280c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpainter.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpainter.h b/experimental/tqtinterface/qt4/src/kernel/tqpainter.h index c491f8ba6..c1a509249 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpainter.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp index ac788d461..05d5c76ad 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpainter_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpalette.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpalette.cpp index 2e9e49eee..6935d092c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpalette.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpicture.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpicture.cpp index c9c5c0e20..8a6fff112 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpicture.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp index f47fb38dd..8fb53805b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp index a16235c25..37bb0ee09 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpixmap_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpixmapcache.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpixmapcache.cpp index 6724d82dd..e42ec382d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpixmapcache.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpixmapcache.h b/experimental/tqtinterface/qt4/src/kernel/tqpixmapcache.h index ba543ac3d..c1c6bce5f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpixmapcache.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpointarray.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpointarray.cpp index f5d0016e1..c63421055 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpointarray.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpolygonscanner.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpolygonscanner.cpp index 78e35ab01..20f65dad8 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpolygonscanner.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp b/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp index f9ff93287..047247949 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqprinter_unix.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp b/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp index a80999672..c85e2debf 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqprocess.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqprocess_unix.cpp b/experimental/tqtinterface/qt4/src/kernel/tqprocess_unix.cpp index 0895ae2c3..5b60f6a3b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqprocess_unix.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp b/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp index 18227cf1f..f881bf8e0 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqpsprinter.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqrect.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrect.cpp index aa16303b1..2c9b9f31e 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrect.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqrect.h b/experimental/tqtinterface/qt4/src/kernel/tqrect.h index e20897874..8d5dc2bde 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrect.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqregion.cpp b/experimental/tqtinterface/qt4/src/kernel/tqregion.cpp index 58bf4ebb0..20d42c3e6 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqregion.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqregion.h b/experimental/tqtinterface/qt4/src/kernel/tqregion.h index 179d33dc1..d8a5d2917 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqregion.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqregion_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqregion_x11.cpp index 4e573c92d..ddc80a086 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqregion_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp index 00484d60c..e8e91b3df 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp index d8504dfab..31649dd5c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h b/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h index edb8c7636..bcfdb9bc4 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqrichtext_p.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp b/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp index a45237f53..0bb29fc7d 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqscriptengine.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqscriptengine_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqscriptengine_x11.cpp index 3cd84d770..d42b8d216 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqscriptengine_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp index 262164a81..836f87084 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsignal.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp index 8a99c5443..40b08eeb0 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsignalmapper.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqsimplerichtext.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsimplerichtext.cpp index 4721fd89d..dd4ec7b4c 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsimplerichtext.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp index 6ffe6e80e..80b6dbf88 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqsound_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp b/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp index ac14dcbcb..9aa3a59b9 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstyle.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp b/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp index 25f6c0c00..08a29dca0 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqstylesheet.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqtextengine.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtextengine.cpp index dd5d9d3b5..becf604a4 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtextengine.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqtextlayout.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtextlayout.cpp index 1a007a8eb..67004701a 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtextlayout.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqtextlayout_p.h b/experimental/tqtinterface/qt4/src/kernel/tqtextlayout_p.h index 049ede280..f857011df 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtextlayout_p.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp index d1a98e17d..7062b6a49 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtimer.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp index ec0856bf5..fabbb98ef 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h b/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h index b42c983d8..67135681b 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqtranslator.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqurl.cpp b/experimental/tqtinterface/qt4/src/kernel/tqurl.cpp index a355c4a8f..81f8ca4c1 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqurl.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqurlinfo.cpp b/experimental/tqtinterface/qt4/src/kernel/tqurlinfo.cpp index 60b9f1557..b0b2596ec 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqurlinfo.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqurloperator.cpp b/experimental/tqtinterface/qt4/src/kernel/tqurloperator.cpp index bae40bc8e..59c485f25 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqurloperator.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp b/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp index bd022e148..90a2afdc3 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp.new b/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp.new index 22c05b3c8..b518a7ecd 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqvariant.cpp.new +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqvariant.h b/experimental/tqtinterface/qt4/src/kernel/tqvariant.h index 5fb5e65df..400705cdb 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqvariant.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp index 67d0e1be9..c6523df35 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqwidget.h b/experimental/tqtinterface/qt4/src/kernel/tqwidget.h index 0a75dad43..6af93ed35 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget.h +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp index 0a608337e..60df4121f 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwidget_x11.cpp +++ b/experimental/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/experimental/tqtinterface/qt4/src/kernel/tqwmatrix.cpp b/experimental/tqtinterface/qt4/src/kernel/tqwmatrix.cpp index ffa0388f8..97eccf2b2 100644 --- a/experimental/tqtinterface/qt4/src/kernel/tqwmatrix.cpp +++ b/experimental/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> |