summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2014-06-03 16:25:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-03 17:27:17 +0200
commit9e3a780c6a9823f1058a8856bac9f3c53e378936 (patch)
tree9738141cc5953c767544ffb96eb02fea40726866 /src/tools
parentb8961e799b367da25792cf09a345704039f8acdf (diff)
RCC: Avoid some needless to/fromLatin1 cycle
Change-Id: I70f330ee5ce083fb90f0c6d70e5b99063bc6e974 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/rcc/rcc.cpp21
1 files changed, 11 insertions, 10 deletions
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;