Make QStaticText public API again

QStaticText was previously made private API to support inclusion in
Qt 4.6.x. This change turns it back into public API for Qt 4.7.0.

5 files changed, 172 insertions, 183 deletions

diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 659324b..74c5958 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
+#include "qstatictext.h"
 #include "qstatictext_p.h"
-#include "qstatictext_p_p.h"
 #include <private/qtextengine_p.h>
 #include <private/qfontengine_p.h>
 
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h
new file mode 100644
index 0000000..11a4249
--- /dev/null
+++ b/src/gui/text/qstatictext.h
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** 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 either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QSTATICTEXT_H
+#define QSTATICTEXT_H
+
+#include <QtCore/qsize.h>
+#include <QtCore/qstring.h>
+#include <QtCore/qmetatype.h>
+
+#include <QtGui/qtransform.h>
+#include <QtGui/qfont.h>
+
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
+class QStaticTextPrivate;
+class Q_GUI_EXPORT QStaticText
+{    
+public:
+    QStaticText();
+    QStaticText(const QString &text, const QSizeF &maximumSize = QSizeF());
+    QStaticText(const QStaticText &other);
+    ~QStaticText();
+
+    void setText(const QString &text);
+    QString text() const;
+
+    void setMaximumSize(const QSizeF &maximumSize);
+    QSizeF maximumSize() const;
+
+    void prepare(const QTransform &matrix, const QFont &font);
+
+    void setUseBackendOptimizations(bool on);
+    bool useBackendOptimizations() const;
+
+    QStaticText &operator=(const QStaticText &);
+    bool operator==(const QStaticText &) const;
+    bool operator!=(const QStaticText &) const;
+
+    bool isEmpty() const;
+
+private:
+    void detach();
+
+    QExplicitlySharedDataPointer<QStaticTextPrivate> data;
+    friend class QStaticTextPrivate;
+};
+
+Q_DECLARE_METATYPE(QStaticText)
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QSTATICTEXT_H
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index a19fb6c..72c8439 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QSTATICTEXT_H
-#define QSTATICTEXT_H
+#ifndef QSTATICTEXT_P_H
+#define QSTATICTEXT_P_H
 
 //
 //  W A R N I N G
@@ -53,57 +53,89 @@
 // We mean it.
 //
 
-#include <QtCore/qsize.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qmetatype.h>
+#include <private/qtextureglyphcache_p.h>
 
-#include <QtGui/qtransform.h>
-#include <QtGui/qfont.h>
+QT_BEGIN_NAMESPACE
 
+class QStaticTextUserData
+{
+public:
+    enum Type {
+        NoUserData,
+        OpenGLUserData
+    };
 
-QT_BEGIN_HEADER
+    QStaticTextUserData(Type t) : type(t) {}
+    virtual ~QStaticTextUserData() {}
 
-QT_BEGIN_NAMESPACE
+    Type type;
+};
 
-QT_MODULE(Gui)
+class Q_GUI_EXPORT QStaticTextItem
+{
+public:    
+    QStaticTextItem() : chars(0), numChars(0), fontEngine(0), userData(0),
+                        useBackendOptimizations(false), userDataNeedsUpdate(0) {}
+    ~QStaticTextItem() { delete userData; }
+
+    void setUserData(QStaticTextUserData *newUserData)
+    {
+        if (userData == newUserData)
+            return;
+
+        delete userData;
+        userData = newUserData;
+    }
+
+    QFixedPoint *glyphPositions;                 // 8 bytes per glyph
+    glyph_t *glyphs;                             // 4 bytes per glyph
+    const QChar *chars;                          // 2 bytes per glyph
+                                                 // =================
+                                                 // 14 bytes per glyph
+
+                                                 // 12 bytes for pointers
+    int numGlyphs;                               // 4 bytes per item
+    int numChars;                                // 4 bytes per item
+    QFontEngine *fontEngine;                     // 4 bytes per item
+    QFont font;                                  // 8 bytes per item
+    QStaticTextUserData *userData;               // 8 bytes per item
+    char useBackendOptimizations : 1;            // 1 byte per item
+    char userDataNeedsUpdate : 1;                //
+                                                 // ================
+                                                 // 41 bytes per item
+};
 
-class QStaticTextPrivate;
-class Q_GUI_EXPORT QStaticText
-{    
+class QStaticText;
+class Q_AUTOTEST_EXPORT QStaticTextPrivate
+{
 public:
-    QStaticText();
-    QStaticText(const QString &text, const QSizeF &maximumSize = QSizeF());
-    QStaticText(const QStaticText &other);
-    ~QStaticText();
+    QStaticTextPrivate();
+    QStaticTextPrivate(const QStaticTextPrivate &other);
+    ~QStaticTextPrivate();
 
-    void setText(const QString &text);
-    QString text() const;
+    void init();
 
-    void setMaximumSize(const QSizeF &maximumSize);
-    QSizeF maximumSize() const;
+    QAtomicInt ref;                      // 4 bytes per text
 
-    void prepare(const QTransform &matrix, const QFont &font);
+    QString text;                        // 4 bytes per text
+    QFont font;                          // 8 bytes per text
+    QSizeF size;                         // 16 bytes per text
+    QPointF position;                    // 16 bytes per text
 
-    void setUseBackendOptimizations(bool on);
-    bool useBackendOptimizations() const;
+    QTransform matrix;                   // 80 bytes per text
+    QStaticTextItem *items;              // 4 bytes per text
+    int itemCount;                       // 4 bytes per text
+    glyph_t *glyphPool;                  // 4 bytes per text
+    QFixedPoint *positionPool;           // 4 bytes per text
 
-    QStaticText &operator=(const QStaticText &);
-    bool operator==(const QStaticText &) const;
-    bool operator!=(const QStaticText &) const;
+    char needsClipRect           : 1;    // 1 byte per text
+    char useBackendOptimizations : 1;
+                                         // ================
+                                         // 145 bytes per text
 
-    bool isEmpty() const;
-
-private:
-    void detach();
-
-    QExplicitlySharedDataPointer<QStaticTextPrivate> data;
-    friend class QStaticTextPrivate;
+    static QStaticTextPrivate *get(const QStaticText *q);
 };
 
-Q_DECLARE_METATYPE(QStaticText)
-
 QT_END_NAMESPACE
 
-QT_END_HEADER
-
-#endif // QSTATICTEXT_H
+#endif // QSTATICTEXT_P_H
diff --git a/src/gui/text/qstatictext_p_p.h b/src/gui/text/qstatictext_p_p.h
deleted file mode 100644
index 72c8439..0000000
--- a/src/gui/text/qstatictext_p_p.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** 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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QSTATICTEXT_P_H
-#define QSTATICTEXT_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of internal files.  This header file may change from version to version
-// without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qtextureglyphcache_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QStaticTextUserData
-{
-public:
-    enum Type {
-        NoUserData,
-        OpenGLUserData
-    };
-
-    QStaticTextUserData(Type t) : type(t) {}
-    virtual ~QStaticTextUserData() {}
-
-    Type type;
-};
-
-class Q_GUI_EXPORT QStaticTextItem
-{
-public:    
-    QStaticTextItem() : chars(0), numChars(0), fontEngine(0), userData(0),
-                        useBackendOptimizations(false), userDataNeedsUpdate(0) {}
-    ~QStaticTextItem() { delete userData; }
-
-    void setUserData(QStaticTextUserData *newUserData)
-    {
-        if (userData == newUserData)
-            return;
-
-        delete userData;
-        userData = newUserData;
-    }
-
-    QFixedPoint *glyphPositions;                 // 8 bytes per glyph
-    glyph_t *glyphs;                             // 4 bytes per glyph
-    const QChar *chars;                          // 2 bytes per glyph
-                                                 // =================
-                                                 // 14 bytes per glyph
-
-                                                 // 12 bytes for pointers
-    int numGlyphs;                               // 4 bytes per item
-    int numChars;                                // 4 bytes per item
-    QFontEngine *fontEngine;                     // 4 bytes per item
-    QFont font;                                  // 8 bytes per item
-    QStaticTextUserData *userData;               // 8 bytes per item
-    char useBackendOptimizations : 1;            // 1 byte per item
-    char userDataNeedsUpdate : 1;                //
-                                                 // ================
-                                                 // 41 bytes per item
-};
-
-class QStaticText;
-class Q_AUTOTEST_EXPORT QStaticTextPrivate
-{
-public:
-    QStaticTextPrivate();
-    QStaticTextPrivate(const QStaticTextPrivate &other);
-    ~QStaticTextPrivate();
-
-    void init();
-
-    QAtomicInt ref;                      // 4 bytes per text
-
-    QString text;                        // 4 bytes per text
-    QFont font;                          // 8 bytes per text
-    QSizeF size;                         // 16 bytes per text
-    QPointF position;                    // 16 bytes per text
-
-    QTransform matrix;                   // 80 bytes per text
-    QStaticTextItem *items;              // 4 bytes per text
-    int itemCount;                       // 4 bytes per text
-    glyph_t *glyphPool;                  // 4 bytes per text
-    QFixedPoint *positionPool;           // 4 bytes per text
-
-    char needsClipRect           : 1;    // 1 byte per text
-    char useBackendOptimizations : 1;
-                                         // ================
-                                         // 145 bytes per text
-
-    static QStaticTextPrivate *get(const QStaticText *q);
-};
-
-QT_END_NAMESPACE
-
-#endif // QSTATICTEXT_P_H
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index 2eaa418..9ec3142 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -38,8 +38,8 @@ HEADERS += \
 	text/qzipreader_p.h \
 	text/qzipwriter_p.h \
 	text/qtextodfwriter_p.h \
-	text/qstatictext_p_p.h \
-	text/qstatictext_p.h
+	text/qstatictext_p.h \
+	text/qstatictext.h
 
 SOURCES += \
 	text/qfont.cpp \