Merge remote-tracking branch 'gerrit/master' into containers

Change-Id: I97ba222435ff50a9e5422e6f2c73e4bb8d1b865c

1 files changed, 0 insertions, 29 deletions

diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index 3d6b0eb709..6999972172 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -105,14 +105,6 @@ QT_BEGIN_NAMESPACE
  */
 void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out)
 {
-#ifndef QT_NO_TEXTCODEC
-    if (QString::codecForCStrings && len) {
-        QString tmp = QString::fromAscii(a, len > 0 ? len : -1);
-        memcpy(out, reinterpret_cast<const char *>(tmp.constData()), sizeof(QChar) * tmp.size());
-        out += tmp.length();
-        return;
-    }
-#endif
     if (len == -1) {
         if (!a)
             return;
@@ -124,25 +116,4 @@ void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out
     }
 }
 
-/*! \internal */
-void QAbstractConcatenable::convertToAscii(const QChar* a, int len, char*& out) 
-{
-#ifndef QT_NO_TEXTCODEC
-    if (QString::codecForCStrings) {
-        QByteArray tmp = QString::codecForCStrings->fromUnicode(a, len);
-        memcpy(out, tmp.constData(), tmp.size());
-        out += tmp.length();
-        return;
-    }
-#endif
-    if (len == -1) {
-        while (a->unicode())
-            convertToLatin1(*a++, out);
-    } else {
-        for (int i = 0; i < len; ++i)
-            convertToLatin1(a[i], out);
-    }
-}
-
-
 QT_END_NAMESPACE