1 files changed, 32 insertions, 53 deletions

diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index 49ca24d51c..7fdf46c101 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, 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 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -75,46 +81,18 @@ public:
                         userDataNeedsUpdate(0), usesRawFont(0),
                         m_fontEngine(0), m_userData(0) {}
 
-    QStaticTextItem(const QStaticTextItem &other)
-    {
-        operator=(other);
-    }
-
-    void operator=(const QStaticTextItem &other)
+    void setUserData(QStaticTextUserData *newUserData)
     {
-        glyphPositions = other.glyphPositions;
-        glyphs = other.glyphs;
-        numGlyphs = other.numGlyphs;
-        font = other.font;
-        color = other.color;
-        useBackendOptimizations = other.useBackendOptimizations;
-        userDataNeedsUpdate = other.userDataNeedsUpdate;
-        usesRawFont = other.usesRawFont;
-
-        m_fontEngine = 0;
-        m_userData = 0;
-        setUserData(other.userData());
-        setFontEngine(other.fontEngine());
+        m_userData = newUserData;
     }
+    QStaticTextUserData *userData() const { return m_userData.data(); }
 
-    ~QStaticTextItem();
-
-    void setUserData(QStaticTextUserData *newUserData)
+    void setFontEngine(QFontEngine *fe)
     {
-        if (m_userData == newUserData)
-            return;
-
-        if (m_userData != 0 && !m_userData->ref.deref())
-            delete m_userData;
-
-        m_userData = newUserData;
-        if (m_userData != 0)
-            m_userData->ref.ref();
+        m_fontEngine = fe;
     }
-    QStaticTextUserData *userData() const { return m_userData; }
 
-    void setFontEngine(QFontEngine *fe);
-    QFontEngine *fontEngine() const { return m_fontEngine; }
+    QFontEngine *fontEngine() const { return m_fontEngine.data(); }
 
     union {
         QFixedPoint *glyphPositions;             // 8 bytes per glyph
@@ -135,12 +113,13 @@ public:
     char userDataNeedsUpdate : 1;                //
     char usesRawFont : 1;                        //
 
-private: // Needs special handling in setters, so private to avoid abuse
-    QFontEngine *m_fontEngine;                     // 4 bytes per item
-    QStaticTextUserData *m_userData;               // 8 bytes per item
-                                                 // ================
-                                                 // 43 bytes per item
+private: // private to avoid abuse
+    QExplicitlySharedDataPointer<QFontEngine> m_fontEngine;       // 4 bytes per item
+    QExplicitlySharedDataPointer<QStaticTextUserData> m_userData; // 8 bytes per item
+                                                                  // ================
+                                                                  // 43 bytes per item
 };
+Q_DECLARE_TYPEINFO(QStaticTextItem, Q_MOVABLE_TYPE);
 
 class QStaticText;
 class Q_AUTOTEST_EXPORT QStaticTextPrivate