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/qfontdatabase_x11.cpp | |
| parent | a829bcdc533e154000803d517200d32fe762e85c (diff) | |
| download | tqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz tqt3-359640943bcf155faa9a067dde9e00a123276290.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qfontdatabase_x11.cpp')
| -rw-r--r-- | src/kernel/qfontdatabase_x11.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp index 9231bf50d..c027bfc41 100644 --- a/src/kernel/qfontdatabase_x11.cpp +++ b/src/kernel/qfontdatabase_x11.cpp @@ -618,7 +618,7 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) fd->family += TQString::fromLatin1(" [") + foundry + TQString::fromLatin1("]"); - if ( qstrlen( tokens[AddStyle] ) > 0 ) + if ( tqstrlen( tokens[AddStyle] ) > 0 ) fd->addStyle = TQString::fromLatin1(tokens[AddStyle]); else fd->addStyle = TQString::null; @@ -638,10 +638,10 @@ bool qt_fillFontDef( const TQCString &xlfd, TQFontDef *fd, int screen ) if ( r && fd->pixelSize && TQPaintDevice::x11AppDpiY( screen ) && r != TQPaintDevice::x11AppDpiY( screen ) ) { // calculate actual pointsize for display DPI - fd->pointSize = qRound(qt_pointSize(fd->pixelSize, 0, screen) * 10.); + fd->pointSize = tqRound(qt_pointSize(fd->pixelSize, 0, screen) * 10.); } else if ( fd->pixelSize == 0 && fd->pointSize ) { // calculate pixel size from pointsize/dpi - fd->pixelSize = qRound(qt_pixelSize(fd->pointSize / 10., 0, screen)); + fd->pixelSize = tqRound(qt_pixelSize(fd->pointSize / 10., 0, screen)); } return TRUE; @@ -1977,7 +1977,7 @@ static TQFontEngine *loadFontConfigFont(const TQFontPrivate *fp, const TQFontDef double px; if (XftPatternGetDouble(xft->pattern(), XFT_PIXEL_SIZE, 0, &px) == XftResultMatch) - xft->fontDef.pixelSize = qRound(px); + xft->fontDef.pixelSize = tqRound(px); int weight = XFT_WEIGHT_MEDIUM; XftPatternGetInteger(xft->pattern(), XFT_WEIGHT, 0, &weight); |