From eb8efdd8a38ca2304634155bdab60b973aa44c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Tue, 7 Sep 2010 14:07:37 +0200
Subject: Fixed compiler warnings in meego graphics system helper.

---
 .../qmeegographicssystemhelper.cpp                     | 18 +++++++++---------
 tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp  |  4 ++--
 .../qmeegographicssystemhelper/qmeegooverlaywidget.cpp |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
index 22b8d5f..0670ac4 100644
--- a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.cpp
@@ -51,11 +51,11 @@ QString QMeeGoGraphicsSystemHelper::runningGraphicsSystemName()
 {
     if (! QApplicationPrivate::instance()) {
         qWarning("Querying graphics system but application not running yet!");
-        return "";
+        return QString();
     }
 
     QString name = QApplicationPrivate::instance()->graphics_system_name;
-    if (name == "runtime") {
+    if (name == QLatin1String("runtime")) {
         QRuntimeGraphicsSystem *rsystem = (QRuntimeGraphicsSystem *) QApplicationPrivate::instance()->graphics_system;
         name = rsystem->graphicsSystemName();
     }
@@ -65,32 +65,32 @@ QString QMeeGoGraphicsSystemHelper::runningGraphicsSystemName()
 
 bool QMeeGoGraphicsSystemHelper::isRunningMeeGo()
 {
-    return (runningGraphicsSystemName() == "meego");
+    return (runningGraphicsSystemName() == QLatin1String("meego"));
 }
 
 void QMeeGoGraphicsSystemHelper::switchToMeeGo()
 {
-    if (runningGraphicsSystemName() == "meego")
+    if (isRunningMeeGo())
         return;
 
-    if (QApplicationPrivate::instance()->graphics_system_name != "runtime")
+    if (QApplicationPrivate::instance()->graphics_system_name != QLatin1String("runtime"))
         qWarning("Can't switch to meego - switching only supported with 'runtime' graphics system.");
     else {
         QApplication *app = static_cast<QApplication *>(QCoreApplication::instance());
-        app->setGraphicsSystem("meego");
+        app->setGraphicsSystem(QLatin1String("meego"));
     }
 }
 
 void QMeeGoGraphicsSystemHelper::switchToRaster()
 {
-    if (runningGraphicsSystemName() == "raster")
+    if (runningGraphicsSystemName() == QLatin1String("raster"))
         return;
 
-    if (QApplicationPrivate::instance()->graphics_system_name != "runtime")
+    if (QApplicationPrivate::instance()->graphics_system_name != QLatin1String("runtime"))
         qWarning("Can't switch to raster - switching only supported with 'runtime' graphics system.");
     else {
         QApplication *app = static_cast<QApplication *>(QCoreApplication::instance());
-        app->setGraphicsSystem("raster");
+        app->setGraphicsSystem(QLatin1String("raster"));
     }
 }
 
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
index f159b58..2a1c04b 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
@@ -95,7 +95,7 @@ QMeeGoLivePixmap* QMeeGoLivePixmap::fromLiveImage(QMeeGoLiveImage *liveImage)
     int h = liveImage->height();
     
     counter++;
-    shm = new QSharedMemory(QString("QMeeGoLivePixmap%1").arg(counter));
+    shm = new QSharedMemory(QString(QLatin1String("QMeeGoLivePixmap%1")).arg(counter));
     shm->create((w * h * 4) + 2 * sizeof(int)); // +2 to store width & height
     shm->attach();
     
@@ -129,7 +129,7 @@ QMeeGoLivePixmap* QMeeGoLivePixmap::fromHandle(Qt::HANDLE handle)
     int height;
     uchar* imgData;
     
-    shm = new QSharedMemory(QString("QMeeGoLivePixmap%1").arg(handle));
+    shm = new QSharedMemory(QString(QLatin1String("QMeeGoLivePixmap%1")).arg(handle));
     shm->attach();
     
     shm->lock();
diff --git a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
index 90991e7..f9f14ae 100644
--- a/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegooverlaywidget.cpp
@@ -68,12 +68,12 @@ QPoint QMeeGoOverlayWidget::convertPoint(const QPoint &p)
     return QPoint(x, y);
 }
 
-void QMeeGoOverlayWidget::showEvent(QShowEvent *event)
+void QMeeGoOverlayWidget::showEvent(QShowEvent *)
 {
     QMeeGoRuntime::setSurfaceScaling(0, 0, width(), height());
 }
 
-bool QMeeGoOverlayWidget::eventFilter(QObject *obj, QEvent *event)
+bool QMeeGoOverlayWidget::eventFilter(QObject *, QEvent *event)
 {
     if (event->spontaneous() == false)
         return false;
-- 
cgit v0.12