From b78b4593410a876e0664c01ce7afade64bf37660 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Tue, 2 Jun 2009 14:47:29 +0200
Subject: fix MSVC warnings

---
 src/declarative/canvas/qsimplecanvasdebugplugin.cpp | 5 +++--
 src/declarative/debugger/qmldebugger.cpp            | 3 ++-
 src/declarative/debugger/qmlpropertyview.cpp        | 2 +-
 src/declarative/qml/qmlcompiler_p.h                 | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/declarative/canvas/qsimplecanvasdebugplugin.cpp b/src/declarative/canvas/qsimplecanvasdebugplugin.cpp
index 0fd0f81..12088c1 100644
--- a/src/declarative/canvas/qsimplecanvasdebugplugin.cpp
+++ b/src/declarative/canvas/qsimplecanvasdebugplugin.cpp
@@ -58,6 +58,7 @@ public:
 
     virtual int duration() const { return -1; }
     virtual void updateCurrentTime(int msecs) {
+        Q_UNUSED(msecs);
         server->frameBreak();
     }
 
@@ -66,7 +67,7 @@ private:
 };
 
 QSimpleCanvasDebugPlugin::QSimpleCanvasDebugPlugin(QObject *parent)
-: QmlDebugServerPlugin("CanvasFrameRate", parent), _breaks(0)
+: QmlDebugServerPlugin(QLatin1String("CanvasFrameRate"), parent), _breaks(0)
 {
     _time.start();
     new FrameBreakAnimation(this);
@@ -95,7 +96,7 @@ void QSimpleCanvasDebugPlugin::frameBreak()
 }
 
 QSimpleCanvasSceneDebugPlugin::QSimpleCanvasSceneDebugPlugin(QSimpleCanvas *parent)
-: QmlDebugServerPlugin("CanvasScene", parent), m_canvas(parent)
+: QmlDebugServerPlugin(QLatin1String("CanvasScene"), parent), m_canvas(parent)
 {
 }
 
diff --git a/src/declarative/debugger/qmldebugger.cpp b/src/declarative/debugger/qmldebugger.cpp
index c925148..9ab3247 100644
--- a/src/declarative/debugger/qmldebugger.cpp
+++ b/src/declarative/debugger/qmldebugger.cpp
@@ -282,7 +282,7 @@ bool QmlDebugger::makeItem(QObject *obj, QmlDebuggerItem *item)
                 if(!toolTipString.isEmpty()) 
                     toolTipString.prepend(QLatin1Char('\n'));
                 toolTipString.prepend(tr("Root type: ") + text);
-                text = p->typeName;
+                text = QString::fromAscii(p->typeName);
             }
 
             if(!toolTipString.isEmpty())
@@ -333,6 +333,7 @@ bool operator<(const QPair<quint32, QPair<int, QString> > &lhs,
 
 void QmlDebugger::setCanvas(QSimpleCanvas *c)
 {
+    Q_UNUSED(c);
 }
 
 void QmlDebugger::setDebugObject(QObject *obj)
diff --git a/src/declarative/debugger/qmlpropertyview.cpp b/src/declarative/debugger/qmlpropertyview.cpp
index 0d34fd9..abe1902 100644
--- a/src/declarative/debugger/qmlpropertyview.cpp
+++ b/src/declarative/debugger/qmlpropertyview.cpp
@@ -210,7 +210,7 @@ void QmlPropertyView::setObject(QObject *object)
             ++iter) {
 
         QTreeWidgetItem *item = new QTreeWidgetItem(m_tree);
-        item->setText(0, iter.key());
+        item->setText(0, QString::fromAscii(iter.key()));
         item->setForeground(0, Qt::blue);
         item->setText(1, iter.value());
     }
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index eb24b91..6b6e1e2 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -162,7 +162,7 @@ private:
                         int ctxt);
 
     void finalizeComponent(int patch);
-    class BindingReference;
+    struct BindingReference;
     void finalizeBinding(const BindingReference &); 
 
     struct IdReference {
-- 
cgit v0.12