Remove more QByteArray<->QString conversions

Prefer to store types as QStrings. It's only when we manipulate
raw (compiled, meta-)data that utf conversion is needed.

Change-Id: Ie138a69c9a409804e1b90b21c1d60dedea35bddb
Reviewed-on: http://codereview.qt-project.org/5781
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

5 files changed, 14 insertions, 14 deletions

diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 57bb79c302..adb9b15fe7 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -202,7 +202,7 @@ QDeclarativeConnectionsParser::compile(const QList<QDeclarativeCustomParserPrope
 
     for(int ii = 0; ii < props.count(); ++ii)
     {
-        QString propName = QString::fromUtf8(props.at(ii).name());
+        QString propName = props.at(ii).name();
         if (!propName.startsWith(QLatin1String("on")) || !propName.at(2).isUpper()) {
             error(props.at(ii), QDeclarativeConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
             return QByteArray();
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 3add850570..cf1dd3b894 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -792,14 +792,14 @@ bool QDeclarativeListModelParser::compileProperty(const QDeclarativeCustomParser
                     error(nodeProp, QDeclarativeListModel::tr("ListElement: cannot contain nested elements"));
                     return false;
                 }
-                if (nodeProp.name() == "id") {
+                if (nodeProp.name() == QStringLiteral("id")) {
                     error(nodeProp, QDeclarativeListModel::tr("ListElement: cannot use reserved \"id\" property"));
                     return false;
                 }
 
                 ListInstruction li;
                 int ref = data.count();
-                data.append(nodeProp.name());
+                data.append(nodeProp.name().toUtf8());
                 data.append('\0');
                 li.type = ListInstruction::Set;
                 li.dataIdx = ref;
@@ -895,12 +895,12 @@ QByteArray QDeclarativeListModelParser::compile(const QList<QDeclarativeCustomPa
 {
     QList<ListInstruction> instr;
     QByteArray data;
-    listElementTypeName = QByteArray(); // unknown
+    listElementTypeName = QString(); // unknown
 
     for(int ii = 0; ii < customProps.count(); ++ii) {
         const QDeclarativeCustomParserProperty &prop = customProps.at(ii);
         if(!prop.name().isEmpty()) { // isn't default property
-            error(prop, QDeclarativeListModel::tr("ListModel: undefined property '%1'").arg(QString::fromUtf8(prop.name())));
+            error(prop, QDeclarativeListModel::tr("ListModel: undefined property '%1'").arg(prop.name()));
             return QByteArray();
         }
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index e7c5632ce3..ea83ae1e7e 100644
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -145,7 +145,7 @@ private:
 
     bool definesEmptyList(const QString &);
 
-    QByteArray listElementTypeName;
+    QString listElementTypeName;
 };
 
 
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 039803002c..3684b38048 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -240,11 +240,11 @@ public:
 };
 
 void
-QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant> > &list,
-                                     const QByteArray &pre,
+QDeclarativePropertyChangesParser::compileList(QList<QPair<QString, QVariant> > &list,
+                                     const QString &pre,
                                      const QDeclarativeCustomParserProperty &prop)
 {
-    QByteArray propName = pre + prop.name();
+    QString propName = pre + prop.name();
 
     QList<QVariant> values = prop.assignedValues();
     for (int ii = 0; ii < values.count(); ++ii) {
@@ -258,7 +258,7 @@ QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant>
 
             QDeclarativeCustomParserProperty prop =
                 qvariant_cast<QDeclarativeCustomParserProperty>(value);
-            QByteArray pre = propName + '.';
+            QString pre = propName + QLatin1Char('.');
             compileList(list, pre, prop);
 
         } else {
@@ -270,9 +270,9 @@ QDeclarativePropertyChangesParser::compileList(QList<QPair<QByteArray, QVariant>
 QByteArray
 QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserProperty> &props)
 {
-    QList<QPair<QByteArray, QVariant> > data;
+    QList<QPair<QString, QVariant> > data;
     for(int ii = 0; ii < props.count(); ++ii)
-        compileList(data, QByteArray(), props.at(ii));
+        compileList(data, QString(), props.at(ii));
 
     QByteArray rv;
     QDataStream ds(&rv, QIODevice::WriteOnly);
@@ -304,7 +304,7 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP
             break;
         }
 
-        ds << QString::fromUtf8(data.at(ii).first) << isScript << var;
+        ds << data.at(ii).first << isScript << var;
         if (isScript)
             ds << id;
     }
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h
index cb553e032b..fe3dc39626 100644
--- a/src/declarative/util/qdeclarativepropertychanges_p.h
+++ b/src/declarative/util/qdeclarativepropertychanges_p.h
@@ -96,7 +96,7 @@ public:
     QDeclarativePropertyChangesParser()
     : QDeclarativeCustomParser(AcceptsAttachedProperties) {}
 
-    void compileList(QList<QPair<QByteArray, QVariant> > &list, const QByteArray &pre, const QDeclarativeCustomParserProperty &prop);
+    void compileList(QList<QPair<QString, QVariant> > &list, const QString &pre, const QDeclarativeCustomParserProperty &prop);
 
     virtual QByteArray compile(const QList<QDeclarativeCustomParserProperty> &);
     virtual void setCustomData(QObject *, const QByteArray &);