Compile with clang when C++11 support is enabled

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

diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h
index dcc166e..b590775 100644 (file)
--- a/src/gui/text/qglyphrun.h
+++ b/src/gui/text/qglyphrun.h
@@ -1,34 +1,34 @@
 /****************************************************************************
 **
-** 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.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
+** rights. These rights are described in the Nokia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
 **
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
 **
 **
 **
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGLYPHRUN_H
-#define QGLYPHRUN_H
+#ifndef QOpenGLYPHRUN_H
+#define QOpenGLYPHRUN_H
 
 #include <QtCore/qsharedpointer.h>
 #include <QtCore/qvector.h>
@@ -53,12 +53,20 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-QT_MODULE(Gui)
 
 class QGlyphRunPrivate;
 class Q_GUI_EXPORT QGlyphRun
 {
 public:
+    enum GlyphRunFlag {
+        Overline        = 0x01,
+        Underline       = 0x02,
+        StrikeOut       = 0x04,
+        RightToLeft     = 0x08,
+        SplitLigature   = 0x10
+    };
+    Q_DECLARE_FLAGS(GlyphRunFlags, GlyphRunFlag)
+
     QGlyphRun();
     QGlyphRun(const QGlyphRun &other);
     ~QGlyphRun();
@@ -66,6 +74,10 @@ public:
     QRawFont rawFont() const;
     void setRawFont(const QRawFont &rawFont);
 
+    void setRawData(const quint32 *glyphIndexArray,
+                    const QPointF *glyphPositionArray,
+                    int size);
+
     QVector<quint32> glyphIndexes() const;
     void setGlyphIndexes(const QVector<quint32> &glyphIndexes);
 
@@ -75,8 +87,10 @@ public:
     void clear();
 
     QGlyphRun &operator=(const QGlyphRun &other);
+
     bool operator==(const QGlyphRun &other) const;
-    bool operator!=(const QGlyphRun &other) const;
+    inline bool operator!=(const QGlyphRun &other) const
+    { return !operator==(other); }
 
     void setOverline(bool overline);
     bool overline() const;
@@ -87,6 +101,18 @@ public:
     void setStrikeOut(bool strikeOut);
     bool strikeOut() const;
 
+    void setRightToLeft(bool on);
+    bool isRightToLeft() const;
+
+    void setFlag(GlyphRunFlag flag, bool enabled = true);
+    void setFlags(GlyphRunFlags flags);
+    GlyphRunFlags flags() const;
+
+    void setBoundingRect(const QRectF &boundingRect);
+    QRectF boundingRect() const;
+
+    bool isEmpty() const;
+
 private:
     friend class QGlyphRunPrivate;
     friend class QTextLine;
@@ -98,10 +124,12 @@ private:
     QExplicitlySharedDataPointer<QGlyphRunPrivate> d;
 };
 
+Q_DECLARE_TYPEINFO(QGlyphRun, Q_MOVABLE_TYPE);
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
 
 #endif // QT_NO_RAWFONT
 
-#endif // QGLYPHS_H
+#endif // QOpenGLYPHS_H