Undo prior accidental commit

1 files changed, 21 insertions, 21 deletions

diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index 18074d4..05bdbb8 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -65,9 +65,9 @@
 #endif
 
 #ifdef QFONTDATABASE_DEBUG
-#  define FD_DEBUG tqDebug
+#  define FD_DEBUG qDebug
 #else
-#  define FD_DEBUG if (FALSE) tqDebug
+#  define FD_DEBUG if (FALSE) qDebug
 #endif // QFONTDATABASE_DEBUG
 
 // from qfont_x11.cpp
@@ -450,7 +450,7 @@ const int numEncodings = sizeof( xlfd_encoding ) / sizeof( XlfdEncoding ) - 1;
 
 int qt_xlfd_encoding_id( const char *encoding )
 {
-    // tqDebug("looking for encoding id for '%s'", encoding );
+    // qDebug("looking for encoding id for '%s'", encoding );
     int len = strlen( encoding );
     if ( len < 4 )
 	return -1;
@@ -468,11 +468,11 @@ int qt_xlfd_encoding_id( const char *encoding )
 	const char *n = enc->name;
 	const char *e = encoding;
 	while ( 1 ) {
- 	    // tqDebug("bol: *e='%c', *n='%c'", *e,  *n );
+ 	    // qDebug("bol: *e='%c', *n='%c'", *e,  *n );
 	    if ( *e == '\0' ) {
 		if ( *n )
 		    break;
-		// tqDebug( "found encoding id %d", enc->id );
+		// qDebug( "found encoding id %d", enc->id );
 		return enc->id;
 	    }
 	    if ( *e == *n ) {
@@ -483,12 +483,12 @@ int qt_xlfd_encoding_id( const char *encoding )
 	    if ( *n != '*' )
 		break;
 	    ++n;
- 	    // tqDebug("skip: *e='%c', *n='%c'", *e,  *n );
+ 	    // qDebug("skip: *e='%c', *n='%c'", *e,  *n );
 	    while ( *e && *e != *n )
 		++e;
 	}
     }
-    // tqDebug( "couldn't find encoding %s", encoding );
+    // qDebug( "couldn't find encoding %s", encoding );
     return -1;
 }
 
@@ -734,7 +734,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id )
     char **fontList = XListFonts( QPaintDevice::x11AppDisplay(),
 				  xlfd_pattern.data(),
 				  0xffff, &fontCount );
-    // tqDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount );
+    // qDebug("requesting xlfd='%s', got %d fonts", xlfd_pattern.data(), fontCount );
 
 
     char *tokens[NFontFields];
@@ -787,9 +787,9 @@ static void loadXlfds( const char *reqFamily, int encoding_id )
 	QtFontStyle *style = foundry->style( styleKey, TRUE );
 
 	delete [] style->weightName;
-	style->weightName = tqstrdup( tokens[Weight] );
+	style->weightName = qstrdup( tokens[Weight] );
 	delete [] style->setwidthName;
-	style->setwidthName = tqstrdup( tokens[Width] );
+	style->setwidthName = qstrdup( tokens[Width] );
 
 	if ( smooth_scalable ) {
 	    style->smoothScalable = TRUE;
@@ -1095,7 +1095,7 @@ static Q_UINT16 getGlyphIndex( unsigned char *table, Q_UINT16 format, unsigned s
 	if ( unicode < 256 )
 	    return (int) *(table+6+unicode);
     } else if ( format == 2 ) {
-	tqWarning("format 2 encoding table for Unicode, not implemented!");
+	qWarning("format 2 encoding table for Unicode, not implemented!");
     } else if ( format == 4 ) {
 	Q_UINT16 segCountX2 = getUShort( table + 6 );
 	unsigned char *ends = table + 14;
@@ -1137,7 +1137,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
     QCString ext = family->fontFilename.mid( family->fontFilename.findRev( '.' ) ).lower();
     if ( family->fontFileIndex == 0 && ( ext == ".ttf" || ext == ".otf" ) ) {
 	void *map;
-	// tqDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() );
+	// qDebug("using own ttf code coverage checking of '%s'!", family->name.latin1() );
 	int fd = open( family->fontFilename.data(), O_RDONLY );
 	size_t pagesize = getpagesize();
 	off_t offset = 0;
@@ -1152,7 +1152,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 	    unsigned char *ttf = (unsigned char *)map;
 	    Q_UINT32 version = getUInt( ttf );
 	    if ( version != 0x00010000 ) {
-		// tqDebug("file has wrong version %x",  version );
+		// qDebug("file has wrong version %x",  version );
 		goto error1;
 	    }
 	    Q_UINT16 numTables =  getUShort( ttf+4 );
@@ -1169,7 +1169,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 		}
 	    }
 	    if ( !cmap_offset ) {
-		// tqDebug("no cmap found" );
+		// qDebug("no cmap found" );
 		goto error1;
 	    }
 
@@ -1186,7 +1186,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 
 	    version = getUShort( cmap );
 	    if ( version != 0 ) {
-		// tqDebug("wrong cmap version" );
+		// qDebug("wrong cmap version" );
 		goto error1;
 	    }
 	    numTables = getUShort( cmap + 2 );
@@ -1205,7 +1205,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 	    }
 
 	    if ( !unicode_table ) {
-		// tqDebug("no unicode table found" );
+		// qDebug("no unicode table found" );
 		goto error1;
 	    }
 
@@ -1230,7 +1230,7 @@ static inline void checkXftCoverage( QtFontFamily *family )
 		        }
 		    }
 		    if ( supported ){
-			// tqDebug("font can render script %d",  i );
+			// qDebug("font can render script %d",  i );
 			family->scripts[i] = QtFontFamily::Supported;
 		    } else {
 			family->scripts[i] |= QtFontFamily::UnSupported_Xft;
@@ -1451,7 +1451,7 @@ static void initializeDb()
 		else if ( style->bitmapScalable )
 		    FD_DEBUG("\t\t\t\tbitmap scalable" );
 		if ( style->pixelSizes ) {
-		    tqDebug("\t\t\t\t%d pixel sizes",  style->count );
+		    qDebug("\t\t\t\t%d pixel sizes",  style->count );
 		    for ( int z = 0; z < style->count; ++z ) {
 			QtFontSize *size = style->pixelSizes + z;
 			for ( int e = 0; e < size->count; ++e ) {
@@ -1809,7 +1809,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r
 
     double scale = addPatternProps(pattern, key, FALSE, TRUE, fp, request);
 #ifdef FONT_MATCH_DEBUG
-    tqDebug("original pattern contains:");
+    qDebug("original pattern contains:");
     FcPatternPrint(pattern);
 #endif
 
@@ -1818,7 +1818,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r
     FcConfigSubstitute(0, pattern, FcMatchPattern);
     XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
 
-//     tqDebug("1: pattern contains:");
+//     qDebug("1: pattern contains:");
 //     FcPatternPrint(pattern);
 
     {
@@ -1951,7 +1951,7 @@ static QFontEngine *loadFontConfigFont(const QFontPrivate *fp, const QFontDef &r
 
 	if ( !xftfs ) {
 	    // Xft couldn't find a font?
-	    tqDebug("couldn't open fontconfigs chosen font with Xft!!!");
+	    qDebug("couldn't open fontconfigs chosen font with Xft!!!");
 	} else {
 	    fe = new QFontEngineXft( xftfs, result, 0 );
 	    if (fp->paintdevice