diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-13 14:25:18 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-13 15:07:41 +0200 |
| commit | 1582407fc782c0befd0760633324dd5c206524a1 (patch) | |
| tree | e993d66e824da41ece006d44c48acd4df0ba749e /src/gui/text/qfont.h | |
| parent | 30cb91e17d2fbbdce90f7542f44e12af971ba2de (diff) | |
Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.
Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/gui/text/qfont.h')
| -rw-r--r-- | src/gui/text/qfont.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 421c1dd2de..326dc9d63e 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -46,9 +46,6 @@ #include <QtCore/qstring.h> #include <QtCore/qsharedpointer.h> -#if defined(Q_WS_X11) || defined(Q_WS_QWS) -typedef struct FT_FaceRec_* FT_Face; -#endif QT_BEGIN_HEADER @@ -246,17 +243,7 @@ public: { qSwap(d, other.d); qSwap(resolve_mask, other.resolve_mask); return *this; } #endif -#ifdef Q_WS_WIN - HFONT handle() const; -#else // !Q_WS_WIN Qt::HANDLE handle() const; -#endif // Q_WS_WIN -#ifdef Q_WS_MAC - quint32 macFontID() const; -#endif -#if defined(Q_WS_X11) || defined(Q_WS_QWS) - FT_Face freetypeFace() const; -#endif // needed for X11 void setRawName(const QString &); @@ -275,9 +262,7 @@ public: static void removeSubstitution(const QString &); static void initialize(); static void cleanup(); -#ifndef Q_WS_QWS static void cacheStatistics(); -#endif QString defaultFamily() const; QString lastResortFamily() const; @@ -292,12 +277,6 @@ private: void detach(); -#if defined(Q_WS_MAC) - void macSetFont(QPaintDevice *); -#elif defined(Q_WS_X11) - void x11SetScreen(int screen = -1); - int x11Screen() const; -#endif friend class QFontPrivate; friend class QFontDialogPrivate; |