QtQuick: Fix string related warnings, single character strings.

- Fix warnings about truncation from size_t to int (MSVC 2010,
  64bit).
- Remove single character strings.

Change-Id: Iaf4406e4e04d55d2d8b762f3433269868842a6f9
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>

3 files changed, 8 insertions, 8 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgnode.cpp b/src/quick/scenegraph/coreapi/qsgnode.cpp
index 496a8d0fde..a10e963c46 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.cpp
+++ b/src/quick/scenegraph/coreapi/qsgnode.cpp
@@ -1193,7 +1193,7 @@ QDebug operator<<(QDebug d, const QSGGeometryNode *n)
         d << "effect=" << n->material() << "type=" << n->material()->type();
 
 
-    d << ")";
+    d << ')';
 #ifdef QML_RUNTIME_TESTING
     d << n->description;
 #endif
@@ -1214,7 +1214,7 @@ QDebug operator<<(QDebug d, const QSGClipNode *n)
 
     d << "is rect?" << (n->isRectangular() ? "yes" : "no");
 
-    d << ")";
+    d << ')';
 #ifdef QML_RUNTIME_TESTING
     d << n->description;
 #endif
@@ -1241,7 +1241,7 @@ QDebug operator<<(QDebug d, const QSGTransformNode *n)
     d << n->description;
 #endif
     d << "dirty=" << hex << (int) n->dirtyState() << dec << (n->isSubtreeBlocked() ? "*BLOCKED*" : "");
-    d << ")";
+    d << ')';
     return d;
 }
 
@@ -1260,7 +1260,7 @@ QDebug operator<<(QDebug d, const QSGOpacityNode *n)
     d << n->description;
 #endif
     d << "dirty=" << hex << (int) n->dirtyState() << dec;
-    d << ")";
+    d << ')';
     return d;
 }
 
@@ -1276,7 +1276,7 @@ QDebug operator<<(QDebug d, const QSGRootNode *n)
 #ifdef QML_RUNTIME_TESTING
     d << n->description;
 #endif
-    d << ")";
+    d << ')';
     return d;
 }
 
@@ -1312,7 +1312,7 @@ QDebug operator<<(QDebug d, const QSGNode *n)
 #ifdef QML_RUNTIME_TESTING
         d << n->description;
 #endif
-        d << ")";
+        d << ')';
         break;
     }
     return d;
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 379a81ecdf..c7a6b323f5 100644
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -310,7 +310,7 @@ QSGDistanceFieldGlyphCache *QSGContext::distanceFieldGlyphCache(const QRawFont &
                 if (font.style() != QFont::StyleNormal)
                     keyName += QByteArray(" I");
                 if (font.weight() != QFont::Normal)
-                    keyName += " " + QByteArray::number(font.weight());
+                    keyName += ' ' + QByteArray::number(font.weight());
                 keyName += QByteArray(" DF");
                 QPlatformSharedGraphicsCache *sharedGraphicsCache =
                         platformIntegration->createPlatformSharedGraphicsCache(keyName);
diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
index a204550fe2..cece95d85a 100644
--- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp
@@ -401,7 +401,7 @@ void QSGSharedDistanceFieldGlyphCache::saveTexture(GLuint textureId, int width,
     for (int i=0; i<width*height; ++i)
         dest[i] = qRgba(0xff, 0xff, 0xff, data[i]);
 
-    QByteArray fileName = m_cacheId + " " + QByteArray::number(textureId);
+    QByteArray fileName = m_cacheId + ' ' + QByteArray::number(textureId);
     fileName = fileName.replace('/', '_').replace(' ', '_') + ".png";
     image.save(QString::fromLocal8Bit(fileName));