From f79554ab3737b7601a3cebdbbba3d0480cfa1ae6 Mon Sep 17 00:00:00 2001
From: Sarah Smith <sarah.j.smith@nokia.com>
Date: Sat, 10 Mar 2012 21:08:24 +0100
Subject: Fix deprecated string warnings.

Bare C-style strings must be explicit - eg QLatin1Strings - else
comp_ctor QString deprecation warnings.

Change-Id: Ie5b7c4da2764cc47d116eb23d83db385adbb28de
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
---
 src/quick3d/capsulemesh.cpp  | 8 ++++----
 src/quick3d/cylindermesh.cpp | 2 +-
 src/quick3d/spheremesh.cpp   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/quick3d/capsulemesh.cpp b/src/quick3d/capsulemesh.cpp
index bab5b95a4..cc14e3896 100644
--- a/src/quick3d/capsulemesh.cpp
+++ b/src/quick3d/capsulemesh.cpp
@@ -152,7 +152,7 @@ CapsuleMeshPrivate::CapsuleMeshPrivate()
     , lod(5)
     , sceneSet(false)
 {
-    topNode->setObjectName("CapsuleMesh");
+    topNode->setObjectName(QLatin1String("CapsuleMesh"));
 }
 
 CapsuleMeshPrivate::~CapsuleMeshPrivate()
@@ -332,7 +332,7 @@ void CapsuleMesh::createGeometry(bool bForce)
         builder << QGL::Faceted;
         QGLSceneNode *s = 0;
         s = builder.newNode();
-        s->setObjectName("Cylinder");
+        s->setObjectName(QLatin1String("Cylinder"));
         builder << QGLCylinder(diameter, diameter, cylinderHeight,
                                facets, layers, false, false);
         QMatrix4x4 translateMatrix;
@@ -340,7 +340,7 @@ void CapsuleMesh::createGeometry(bool bForce)
         builder.currentNode()->setLocalTransform(translateMatrix);
 
         s = builder.newNode();
-        s->setObjectName("LeftEndCap");
+        s->setObjectName(QLatin1String("LeftEndCap"));
         builder << QGLDome(diameter, divisions, false);
         translateMatrix.setToIdentity();
         translateMatrix.rotate(180, 0, 1,0);
@@ -348,7 +348,7 @@ void CapsuleMesh::createGeometry(bool bForce)
         builder.currentNode()->setLocalTransform(translateMatrix);
 
         s = builder.newNode();
-        s->setObjectName("RightEndCap");
+        s->setObjectName(QLatin1String("RightEndCap"));
         builder << QGLDome(diameter, divisions, false);
         translateMatrix.setToIdentity();
         translateMatrix.translate(0, 0, offset);
diff --git a/src/quick3d/cylindermesh.cpp b/src/quick3d/cylindermesh.cpp
index a71e899ee..a161337be 100644
--- a/src/quick3d/cylindermesh.cpp
+++ b/src/quick3d/cylindermesh.cpp
@@ -146,7 +146,7 @@ CylinderMeshPrivate::CylinderMeshPrivate()
     , lod(5)
     , sceneSet(false)
 {
-    topNode->setObjectName("CylinderMesh");
+    topNode->setObjectName(QLatin1String("CylinderMesh"));
 }
 
 CylinderMeshPrivate::~CylinderMeshPrivate()
diff --git a/src/quick3d/spheremesh.cpp b/src/quick3d/spheremesh.cpp
index cd16ae40f..085aff929 100644
--- a/src/quick3d/spheremesh.cpp
+++ b/src/quick3d/spheremesh.cpp
@@ -174,7 +174,7 @@ SphereMeshPrivate::SphereMeshPrivate()
     , axis(Qt::ZAxis)
     , sceneSet(false)
 {
-    topNode->setObjectName("SphereMesh");
+    topNode->setObjectName(QLatin1String("SphereMesh"));
 }
 
 SphereMeshPrivate::~SphereMeshPrivate()
-- 
cgit v1.2.3