rename the following methods:

tqfind find
tqreplace replace
tqcontains contains

1 files changed, 18 insertions, 18 deletions

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 );