summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qrawfont.h
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-07-21 15:09:24 +0200
committerQt by Nokia <qt-info@nokia.com>2011-07-29 12:49:12 +0200
commit23bf50432b27c544690922652d13d3a537c47d2f (patch)
treec369f2db152920d6c1af24a8ebb26b57786b7ce0 /src/gui/text/qrawfont.h
parentddf444d31a7cb961b79190131cb679fd7a6351fd (diff)
Switch to use floating point pixelSize in QRawFont completely
Reviewed-by: Eskil (cherry picked from commit 500f8a4368be85a0ae8b7c46012deb0ab0c844ad) Change-Id: I6cfebcbb68697c9bf7a5634e98a09a26928467d7 Reviewed-on: http://codereview.qt.nokia.com/2386 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Diffstat (limited to 'src/gui/text/qrawfont.h')
-rw-r--r--src/gui/text/qrawfont.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index e94bd99b8c..f7d7494f0b 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -70,10 +70,10 @@ public:
QRawFont();
QRawFont(const QString &fileName,
- int pixelSize,
+ qreal pixelSize,
QFont::HintingPreference hintingPreference = QFont::PreferDefaultHinting);
QRawFont(const QByteArray &fontData,
- int pixelSize,
+ qreal pixelSize,
QFont::HintingPreference hintingPreference = QFont::PreferDefaultHinting);
QRawFont(const QRawFont &other);
~QRawFont();
@@ -117,11 +117,11 @@ public:
qreal unitsPerEm() const;
void loadFromFile(const QString &fileName,
- int pixelSize,
+ qreal pixelSize,
QFont::HintingPreference hintingPreference);
void loadFromData(const QByteArray &fontData,
- int pixelSize,
+ qreal pixelSize,
QFont::HintingPreference hintingPreference);
bool supportsCharacter(quint32 ucs4) const;