From 9e3a780c6a9823f1058a8856bac9f3c53e378936 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Tue, 3 Jun 2014 16:25:25 +0200
Subject: RCC: Avoid some needless to/fromLatin1 cycle

Change-Id: I70f330ee5ce083fb90f0c6d70e5b99063bc6e974
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 src/tools/rcc/rcc.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/tools/rcc')

diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index cd9fe2ac86..0d0c4ea444 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -968,11 +968,12 @@ bool RCCResourceLibrary::writeInitializer()
 {
     if (m_format == C_Code) {
         //write("\nQT_BEGIN_NAMESPACE\n");
-        QString initName = m_initName;
-        if (!initName.isEmpty()) {
-            initName.prepend(QLatin1Char('_'));
-            initName.replace(QRegExp(QLatin1String("[^a-zA-Z0-9_]")), QLatin1String("_"));
+        QString initNameStr = m_initName;
+        if (!initNameStr.isEmpty()) {
+            initNameStr.prepend(QLatin1Char('_'));
+            initNameStr.replace(QRegExp(QLatin1String("[^a-zA-Z0-9_]")), QLatin1String("_"));
         }
+        QByteArray initName = initNameStr.toLatin1();
 
         //init
         if (m_useNameSpace)
@@ -987,10 +988,10 @@ bool RCCResourceLibrary::writeInitializer()
         }
         if (m_useNameSpace)
             writeString("QT_END_NAMESPACE\n\n\n");
-        QString initResources = QLatin1String("qInitResources");
+        QByteArray initResources = "qInitResources";
         initResources += initName;
         writeString("int ");
-        writeMangleNamespaceFunction(initResources.toLatin1());
+        writeMangleNamespaceFunction(initResources);
         writeString("()\n{\n");
 
         if (m_root) {
@@ -1002,14 +1003,14 @@ bool RCCResourceLibrary::writeInitializer()
         writeString("    return 1;\n");
         writeString("}\n\n");
         writeString("Q_CONSTRUCTOR_FUNCTION(");
-        writeMangleNamespaceFunction(initResources.toLatin1());
+        writeMangleNamespaceFunction(initResources);
         writeString(")\n\n");
 
         //cleanup
-        QString cleanResources = QLatin1String("qCleanupResources");
+        QByteArray cleanResources = "qCleanupResources";
         cleanResources += initName;
         writeString("int ");
-        writeMangleNamespaceFunction(cleanResources.toLatin1());
+        writeMangleNamespaceFunction(cleanResources);
         writeString("()\n{\n");
         if (m_root) {
             writeString("    ");
@@ -1020,7 +1021,7 @@ bool RCCResourceLibrary::writeInitializer()
         writeString("    return 1;\n");
         writeString("}\n\n");
         writeString("Q_DESTRUCTOR_FUNCTION(");
-        writeMangleNamespaceFunction(cleanResources.toLatin1());
+        writeMangleNamespaceFunction(cleanResources);
         writeString(")\n\n");
     } else if (m_format == Binary) {
         int i = 4;
-- 
cgit v1.2.3