From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Mon, 6 Jun 2011 05:45:22 +0000 (+0200)
Subject: Removed warning
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=33e349ac6bdab5c55b428c999ced253890c82305;p=konrad%2Fqtdeclarative.git

Removed warning
---

diff --git a/src/declarative/items/qsgcanvasitem.cpp b/src/declarative/items/qsgcanvasitem.cpp
index ba3c4ba..fa99c9b 100644
--- a/src/declarative/items/qsgcanvasitem.cpp
+++ b/src/declarative/items/qsgcanvasitem.cpp
@@ -111,7 +111,7 @@ QSGContext2D* QSGCanvasItem::getContext(const QString &contextId)
 
 void QSGCanvasItem::requestPaint()
 {
-    Q_D(QSGCanvasItem);
+    // Q_D(QSGCanvasItem);
     //TODO:update(d->context->dirtyRect());
     update();
 }
@@ -140,19 +140,19 @@ QString QSGCanvasItem::toDataURL(const QString& mimeType) const
         QString mime = mimeType;
         QString type;
         if (mimeType == QLatin1String("image/bmp"))
-            type = "BMP";
+            type = QLatin1String("BMP");
         else if (mimeType == QLatin1String("image/jpeg"))
-            type = "JPEG";
+            type = QLatin1String("JPEG");
         else if (mimeType == QLatin1String("image/x-portable-pixmap"))
-            type = "PPM";
+            type = QLatin1String("PPM");
         else if (mimeType == QLatin1String("image/tiff"))
-            type = "TIFF";
+            type = QLatin1String("TIFF");
         else if (mimeType == QLatin1String("image/xbm"))
-            type = "XBM";
+            type = QLatin1String("XBM");
         else if (mimeType == QLatin1String("image/xpm"))
-            type = "XPM";
+            type = QLatin1String("XPM");
         else {
-            type = "PNG";
+            type = QLatin1String("PNG");
             mime = QLatin1String("image/png");
         }
         image.save(&buffer, type.toAscii());