Make QStringBuilder work out-of-the-box if QT_NO_CAST_FROM_ASCII is defined

So far, only operator% was working for concatenation in those circumnstances.
Now, defining QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION is
enough, so user code will work without any source changes.

Reviewed-by: joao

1 files changed, 0 insertions, 35 deletions

diff --git a/tests/auto/qstringbuilder/tst_qstringbuilder.cpp b/tests/auto/qstringbuilder/tst_qstringbuilder.cpp
index f5df79e..5501204 100644
--- a/tests/auto/qstringbuilder/tst_qstringbuilder.cpp
+++ b/tests/auto/qstringbuilder/tst_qstringbuilder.cpp
@@ -95,41 +95,6 @@
 
 #define LITERAL "some literal"
 
-#ifndef QT_NO_CAST_FROM_ASCII
-
-// Plan is to move the QConcatenable specialications below
-// to qstringbuilder.h as soon as the QByteArray builder is
-// implemented. 
-
-QT_BEGIN_NAMESPACE
-
-template <int N> struct QConcatenable<char[N]>
-{
-    typedef char type[N];
-    static int size(const char *) { return N - 1; }
-    static inline void appendTo(const type &a, QChar *&out)
-    {
-        memcpy(out, a, N - 1);
-        out += N - 1; 
-    }
-};
-
-template <int N> struct QConcatenable<const char[N]>
-{
-    typedef char type[N];
-    static int size(const char *) { return N - 1; }
-    static inline void appendTo(const type &a, QChar *&out)
-    {
-        memcpy(out, a, N - 1);
-        out += N - 1; 
-    }
-};
-
-QT_END_NAMESPACE
-
-#endif
-
-
 class tst_QStringBuilder : public QObject
 {
     Q_OBJECT