diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-07 03:45:53 +0000 |
commit | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (patch) | |
tree | 4bc444c00a79e88105f2cfce5b6209994c413ca0 /khtml/test_regression_fontoverload.cpp | |
parent | 307136d8eef0ba133b78ceee8e901138d4c996a1 (diff) | |
download | tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.tar.gz tdelibs-10308be19ef7fa44699562cc75946e7ea1fdf6b9.zip |
Revert automated changes
Sorry guys, they are just not ready for prime time
Work will continue as always
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khtml/test_regression_fontoverload.cpp')
-rw-r--r-- | khtml/test_regression_fontoverload.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp index 5bbd05d31..a10146480 100644 --- a/khtml/test_regression_fontoverload.cpp +++ b/khtml/test_regression_fontoverload.cpp @@ -98,7 +98,7 @@ QFakeFontEngine::QFakeFontEngine( XFontStruct *fs, const char *name, int size ) : QFontEngineXLFD( fs, name, 0) { pixS = size; - ahem = TQString::tqfromLatin1(name).tqcontains("ahem"); + ahem = TQString::fromLatin1(name).contains("ahem"); } QFakeFontEngine::~QFakeFontEngine() @@ -152,7 +152,7 @@ int QFakeFontEngine::leading() const // the original uses double and creates quite random results depending // on the compiler flags int l = ( _size * 15 + 50) / 100; - // only valid on i386 without -O2 assert(l == int(tqRound(_size * 0.15))); + // only valid on i386 without -O2 assert(l == int(qRound(_size * 0.15))); return (l > 0) ? l : 1; } @@ -207,7 +207,7 @@ static TQString helv_pickxlfd( int pixelsize, bool italic, bool bold ) } KDE_EXPORT QFontEngine * -TQFontDatabase::tqfindFont( TQFont::Script script, const QFontPrivate *fp, +TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp, const QFontDef &request, int ) { TQString xlfd; @@ -361,7 +361,7 @@ void KApplication::dcopFailure( const TQString & ) #include <kparts/historyprovider.h> -bool KParts::HistoryProvider::tqcontains( const TQString& t ) const +bool KParts::HistoryProvider::contains( const TQString& t ) const { return ( t == "http://www.kde.org/" || t == "http://www.google.com/"); } |