diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-13 17:43:39 -0600 |
| commit | 359640943bcf155faa9a067dde9e00a123276290 (patch) | |
| tree | fb3d55ea5e18949042fb0064123fb73d2b1eb932 /src/kernel/qfont.cpp | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qfont.cpp')
| -rw-r--r-- | src/kernel/qfont.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index 6e78fa43a..4521e89b4 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -97,7 +97,7 @@ bool TQFontDef::operator==( const TQFontDef &other ) const } else if (pointSize != -1 && other.pointSize != -1) { if (pointSize != other.pointSize && (TQABS(pointSize - other.pointSize) >= 5 - || qRound(pointSize/10.) != qRound(other.pointSize/10.))) + || tqRound(pointSize/10.) != tqRound(other.pointSize/10.))) return FALSE; } else { return FALSE; @@ -535,7 +535,7 @@ TQFontEngineData::~TQFontEngineData() TQFont::TQFont( TQFontPrivate *data, TQPaintDevice *pd ) { d = new TQFontPrivate( *data ); - Q_CHECK_PTR( d ); + TQ_CHECK_PTR( d ); d->paintdevice = pd; // now a single reference @@ -604,7 +604,7 @@ TQFont::TQFont( const TQString &family, int pointSize, int weight, bool italic ) { d = new TQFontPrivate; - Q_CHECK_PTR( d ); + TQ_CHECK_PTR( d ); d->mask = TQFontPrivate::Family; @@ -765,7 +765,7 @@ void TQFont::setPointSizeFloat( float pointSize ) detach(); - d->request.pointSize = qRound(pointSize * 10.0); + d->request.pointSize = tqRound(pointSize * 10.0); d->request.pixelSize = -1; d->mask |= TQFontPrivate::Size; @@ -1403,7 +1403,7 @@ static void initFontSubst() return; fontSubst = new TQFontSubst(17, FALSE); - Q_CHECK_PTR( fontSubst ); + TQ_CHECK_PTR( fontSubst ); fontSubst->setAutoDelete( TRUE ); qfont_cleanup_fontsubst.set(&fontSubst); @@ -1929,7 +1929,7 @@ TQFontMetrics::TQFontMetrics( const TQPainter *p ) #if defined(Q_WS_X11) if ( d->screen != p->scrn ) { TQFontPrivate *new_d = new TQFontPrivate( *d ); - Q_CHECK_PTR( new_d ); + TQ_CHECK_PTR( new_d ); d = new_d; d->screen = p->scrn; d->count = 1; |