From 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:11:59 -0600 Subject: Undo prior accidental commit --- src/kernel/qfont_x11.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/kernel/qfont_x11.cpp') diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp index b14d953..fea0b58 100644 --- a/src/kernel/qfont_x11.cpp +++ b/src/kernel/qfont_x11.cpp @@ -350,7 +350,7 @@ void QFontPrivate::load( QFont::Script script ) #ifdef QT_CHECK_STATE // sanity checks if (!QFontCache::instance) - tqWarning("Must construct a QApplication before a QFont"); + qWarning("Must construct a QApplication before a QFont"); Q_ASSERT( script >= 0 && script < QFont::LastPrivateScript ); #endif // QT_CHECK_STATE @@ -521,7 +521,7 @@ void QFont::setRawName( const QString &name ) if ( ! qt_fillFontDef( qt_fixXLFD( name.latin1() ), &d->request, d->screen ) ) { #ifdef QT_CHECK_STATE - tqWarning("QFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1()); + qWarning("QFont::setRawName(): Invalid XLFD: \"%s\"", name.latin1()); #endif // QT_CHECK_STATE setFamily( name ); @@ -650,7 +650,7 @@ QString QFont::lastResortFont() const } #if defined(CHECK_NULL) - tqFatal( "QFontPrivate::lastResortFont: Cannot find any reasonable font" ); + qFatal( "QFontPrivate::lastResortFont: Cannot find any reasonable font" ); #endif return last; -- cgit v1.2.1