Compile with clang when C++11 support is enabled

[profile/ivi/qtbase.git] / src / gui / text / qfont.h

diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 1035b66..45186ce 100644 (file)
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -46,20 +46,15 @@
 #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
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QFontPrivate;                                     /* don't touch */
 class QStringList;
 class QVariant;
-class Q3TextFormatCollection;
 
 class Q_GUI_EXPORT QFont
 {
@@ -246,17 +241,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 &);
@@ -272,12 +257,13 @@ public:
     static QStringList substitutions();
     static void insertSubstitution(const QString&, const QString &);
     static void insertSubstitutions(const QString&, const QStringList &);
-    static void removeSubstitution(const QString &);
+    static void removeSubstitutions(const QString &);
+#if QT_DEPRECATED_SINCE(5, 0)
+    static QT_DEPRECATED void removeSubstitution(const QString &family) { removeSubstitutions(family); }
+#endif
     static void initialize();
     static void cleanup();
-#ifndef Q_WS_QWS
     static void cacheStatistics();
-#endif
 
     QString defaultFamily() const;
     QString lastResortFamily() const;
@@ -288,16 +274,10 @@ public:
     inline void resolve(uint mask) { resolve_mask = mask; }
 
 private:
-    QFont(QFontPrivate *);
+    explicit QFont(QFontPrivate *);
 
     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;
@@ -310,13 +290,12 @@ private:
     friend class QApplication;
     friend class QWidget;
     friend class QWidgetPrivate;
-    friend class Q3TextFormatCollection;
     friend class QTextLayout;
     friend class QTextEngine;
     friend class QStackTextEngine;
     friend class QTextLine;
     friend struct QScriptLine;
-    friend class QGLContext;
+    friend class QOpenGLContext;
     friend class QWin32PaintEngine;
     friend class QAlphaPaintEngine;
     friend class QPainterPath;