From d631c31235dc3ab682ba5d4cbb466680d47b36f2 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 20 Oct 2011 12:47:04 +0200
Subject: Make QStringLiteral and QByteArrayLiteral always return the real
 types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Up until now, the macros would return an internal type that contained
the pointer to the data. This breaks code that tried to use the macros
with operators, like QStringBuilder but also when writing:

     QStringList() << QStringLiteral("a") << QStringLiteral("b");

This change seems to work fine now and I can also verify that this
works:

     const auto str = QStringLiteral("Hello");

Even though it creates a QString, which is non-POD and non-constexpr.

Change-Id: Iaf82af9bea4245513a1128ea54f9d2d3d785fb09
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---
 src/corelib/tools/qstringbuilder.h | 31 -------------------------------
 1 file changed, 31 deletions(-)

(limited to 'src/corelib/tools/qstringbuilder.h')

diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 9a1fd6949b..9b1cd1ee7e 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -253,19 +253,6 @@ template <> struct QConcatenable<QString> : private QAbstractConcatenable
     }
 };
 
-template <> struct QConcatenable<QStringDataPtr> : private QAbstractConcatenable
-{
-    typedef QStringDataPtr type;
-    typedef QString ConvertTo;
-    enum { ExactSize = true };
-    static int size(const type &a) { return a.ptr->size; }
-    static inline void appendTo(const type &a, QChar *&out)
-    {
-        memcpy(out, reinterpret_cast<const char*>(a.ptr->data()), sizeof(QChar) * a.ptr->size);
-        out += a.ptr->size;
-    }
-};
-
 template <> struct QConcatenable<QStringRef> : private QAbstractConcatenable
 {
     typedef QStringRef type;
@@ -358,24 +345,6 @@ template <> struct QConcatenable<QByteArray> : private QAbstractConcatenable
     }
 };
 
-template <> struct QConcatenable<QByteArrayDataPtr> : private QAbstractConcatenable
-{
-    typedef QByteArrayDataPtr type;
-    typedef QByteArray ConvertTo;
-    enum { ExactSize = false };
-    static int size(const type &ba) { return ba.ptr->size; }
-#ifndef QT_NO_CAST_FROM_ASCII
-    static inline QT_ASCII_CAST_WARN void appendTo(const type &a, QChar *&out)
-    {
-        QAbstractConcatenable::convertFromAscii(a.ptr->data(), a.ptr->size, out);
-    }
-#endif
-    static inline void appendTo(const type &ba, char *&out)
-    {
-        ::memcpy(out, ba.ptr->data(), ba.ptr->size);
-        out += ba.ptr->size;
-    }
-};
 
 template <typename A, typename B>
 struct QConcatenable< QStringBuilder<A, B> >
-- 
cgit v1.2.3