diff options
Diffstat (limited to 'tqtinterface/qt4/src/kernel/tqfont_x11.cpp')
| -rw-r--r-- | tqtinterface/qt4/src/kernel/tqfont_x11.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tqtinterface/qt4/src/kernel/tqfont_x11.cpp b/tqtinterface/qt4/src/kernel/tqfont_x11.cpp index 84ea2d6..fda292f 100644 --- a/tqtinterface/qt4/src/kernel/tqfont_x11.cpp +++ b/tqtinterface/qt4/src/kernel/tqfont_x11.cpp @@ -168,7 +168,7 @@ TQString qt_fallback_font_family( TQFont::Script script ) if ( fallbackMap ) { FallbackMap::ConstIterator it, end = fallbackMap->end(); - it = fallbackMap->tqfind( script ); + it = fallbackMap->find( script ); if ( it != end ) ret = it.data(); } @@ -370,7 +370,7 @@ void TQFontPrivate::load( TQFont::Script script ) TQFontCache::Key key( req, TQFont::NoScript, screen, painttqdevice ); // look for the requested font in the engine data cache - engineData = TQFontCache::instance->tqfindEngineData( key ); + engineData = TQFontCache::instance->findEngineData( key ); if ( ! engineData ) { // create a new one @@ -407,12 +407,12 @@ void TQFontPrivate::load( TQFont::Script script ) // append the default fallback font for the specified script TQString fallback = qt_fallback_font_family( script ); - if ( ! fallback.isEmpty() && ! family_list.tqcontains( fallback ) ) + if ( ! fallback.isEmpty() && ! family_list.contains( fallback ) ) family_list << fallback; // add the default family TQString defaultFamily = TQApplication::font().family(); - if ( ! family_list.tqcontains( defaultFamily ) ) + if ( ! family_list.contains( defaultFamily ) ) family_list << defaultFamily; // add TQFont::defaultFamily() to the list, for compatibility with @@ -421,14 +421,14 @@ void TQFontPrivate::load( TQFont::Script script ) #endif // TQT_XFT2 } - // null family means tqfind the first font matching the specified script + // null family means find the first font matching the specified script family_list << TQString::null; TQStringList::ConstIterator it = family_list.begin(), end = family_list.end(); for ( ; ! engine && it != end; ++it ) { req.family = *it; - engine = TQFontDatabase::tqfindFont( script, this, req ); + engine = TQFontDatabase::findFont( script, this, req ); if ( engine ) { if ( engine->type() != TQFontEngine::Box ) break; @@ -543,7 +543,7 @@ void TQFont::setRawName( const TQString &name ) Returns the "last resort" font family name. The current implementation tries a wide variety of common fonts, - returning the first one it tqfinds. Is is possible that no family is + returning the first one it finds. Is is possible that no family is found in which case a null string is returned. \sa lastResortFont() @@ -583,7 +583,7 @@ TQString TQFont::defaultFamily() const This is used if even the last resort family is not available. It returns \e something, almost no matter what. The current implementation tries a wide variety of common fonts, returning the - first one it tqfinds. The implementation may change at any time. + first one it finds. The implementation may change at any time. */ static const char * const tryFonts[] = { "-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*", @@ -625,7 +625,7 @@ static bool fontExists( const TQString &fontName ) "fixed" or "system". The current implementation tries a wide variety of common fonts, - returning the first one it tqfinds. The implementation may change + returning the first one it finds. The implementation may change at any time, but this function will always return a string containing something. |