Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 20 insertions, 20 deletions

diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index cac94cd..9fb03fa 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -505,7 +505,7 @@ QmlDeclarativeData::QmlDeclarativeData(QmlContext *ctxt)
 {
 }
 
-void QmlDeclarativeData::destroyed(QObject *object)
+void QmlDeclarativeData::destroyed(QObject * /*object*/)
 {
     if (deferredComponent)
         deferredComponent->release();
@@ -767,9 +767,9 @@ QScriptValue QmlEnginePrivate::lighter(QScriptContext *ctxt, QScriptEngine *engi
         return engine->nullValue();
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
-    if (v.type() == QVariant::Color)
+    if (v.userType() == QVariant::Color)
         color = v.value<QColor>();
-    else if (v.type() == QVariant::String) {
+    else if (v.userType() == QVariant::String) {
         bool ok;
         color = QmlStringConverters::colorFromString(v.toString(), &ok);
         if (!ok)
@@ -786,9 +786,9 @@ QScriptValue QmlEnginePrivate::darker(QScriptContext *ctxt, QScriptEngine *engin
         return engine->nullValue();
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
-    if (v.type() == QVariant::Color)
+    if (v.userType() == QVariant::Color)
         color = v.value<QColor>();
-    else if (v.type() == QVariant::String) {
+    else if (v.userType() == QVariant::String) {
         bool ok;
         color = QmlStringConverters::colorFromString(v.toString(), &ok);
         if (!ok)
@@ -877,7 +877,7 @@ QScriptValue QmlEnginePrivate::consoleLog(QScriptContext *ctxt, QScriptEngine *e
         // does just ignore the format letter, which makes it pointless.
     }
 
-    qDebug("%s",msg.data());
+    qDebug(msg.constData());
 
     return e->newVariant(QVariant(true));
 }
@@ -888,7 +888,7 @@ void QmlEnginePrivate::sendQuit ()
     emit q->quit ();
 }
 
-QScriptValue QmlEnginePrivate::quit(QScriptContext *ctxt, QScriptEngine *e)
+QScriptValue QmlEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptEngine *e)
 {
     QmlEnginePrivate *qe = get (e);
     qe->sendQuit ();
@@ -921,9 +921,9 @@ QScriptValue QmlEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
     //get color
     QVariant v = ctxt->argument(0).toVariant();
     QColor color;
-    if (v.type() == QVariant::Color)
+    if (v.userType() == QVariant::Color)
         color = v.value<QColor>();
-    else if (v.type() == QVariant::String) {
+    else if (v.userType() == QVariant::String) {
         bool ok;
         color = QmlStringConverters::colorFromString(v.toString(), &ok);
         if (!ok)
@@ -934,9 +934,9 @@ QScriptValue QmlEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
     //get tint color
     v = ctxt->argument(1).toVariant();
     QColor tintColor;
-    if (v.type() == QVariant::Color)
+    if (v.userType() == QVariant::Color)
         tintColor = v.value<QColor>();
-    else if (v.type() == QVariant::String) {
+    else if (v.userType() == QVariant::String) {
         bool ok;
         tintColor = QmlStringConverters::colorFromString(v.toString(), &ok);
         if (!ok)
@@ -1037,7 +1037,7 @@ struct QmlEnginePrivate::ImportedNamespace {
 
             if (isBuiltin.at(i)) {
                 QByteArray qt = urls.at(i).toUtf8();
-                qt += "/";
+                qt += '/';
                 qt += type;
                 QmlType *t = QmlMetaType::qmlType(qt,vmaj,vmin);
                 if (vmajor) *vmajor = vmaj;
@@ -1048,7 +1048,7 @@ struct QmlEnginePrivate::ImportedNamespace {
                     return true;
                 }
             } else {
-                QUrl url = QUrl(urls.at(i) + QLatin1String("/") + QString::fromUtf8(type) + QLatin1String(".qml"));
+                QUrl url = QUrl(urls.at(i) + QLatin1Char('/') + QString::fromUtf8(type) + QLatin1String(".qml"));
                 QString qmldircontent = qmlDirContent.at(i);
                 if (vmaj || vmin || !qmldircontent.isEmpty()) {
                     // Check version file - XXX cache these in QmlEngine!
@@ -1167,7 +1167,7 @@ public:
             if (s->find(unqualifiedtype,vmajor,vminor,type_return,url_return))
                 return true;
             if (s->urls.count() == 1 && !s->isBuiltin[0] && !s->isLibrary[0] && url_return) {
-                *url_return = QUrl(s->urls[0]+QLatin1String("/")).resolved(QUrl(QString::fromUtf8(unqualifiedtype) + QLatin1String(".qml")));
+                *url_return = QUrl(s->urls[0]+QLatin1Char('/')).resolved(QUrl(QString::fromUtf8(unqualifiedtype) + QLatin1String(".qml")));
                 return true;
             }
         }
@@ -1188,7 +1188,7 @@ public:
     int ref;
 
 private:
-    friend class QmlEnginePrivate::Imports;
+    friend struct QmlEnginePrivate::Imports;
     QmlEnginePrivate::ImportedNamespace unqualifiedset;
     QHash<QString,QmlEnginePrivate::ImportedNamespace* > set;
 };
@@ -1233,7 +1233,7 @@ static QmlTypeNameCache *cacheForNamespace(QmlEngine *engine, const QmlEnginePri
         if (!set.isBuiltin.at(ii))
             continue;
 
-        QByteArray base = set.urls.at(ii).toUtf8() + "/";
+        QByteArray base = set.urls.at(ii).toUtf8() + '/';
         int major = set.majversions.at(ii);
         int minor = set.minversions.at(ii);
 
@@ -1375,7 +1375,7 @@ bool QmlEnginePrivate::addToImport(Imports* imports, const QString& qmldirconten
 {
     bool ok = imports->d->add(imports->d->base,qmldircontent,uri,prefix,vmaj,vmin,importType,fileImportPath);
     if (qmlImportTrace())
-        qDebug() << "QmlEngine::addToImport(" << imports << uri << prefix << vmaj << "." << vmin << (importType==QmlScriptParser::Import::Library? "Library" : "File") << ": " << ok;
+        qDebug() << "QmlEngine::addToImport(" << imports << uri << prefix << vmaj << '.' << vmin << (importType==QmlScriptParser::Import::Library? "Library" : "File") << ": " << ok;
     return ok;
 }
 
@@ -1405,9 +1405,9 @@ bool QmlEnginePrivate::resolveType(const Imports& imports, const QByteArray& typ
         if (imports.d->find(type,vmaj,vmin,type_return,url_return)) {
             if (qmlImportTrace()) {
                 if (type_return && *type_return)
-                    qDebug() << "QmlEngine::resolveType" << type << "=" << (*type_return)->typeName();
+                    qDebug() << "QmlEngine::resolveType" << type << '=' << (*type_return)->typeName();
                 if (url_return)
-                    qDebug() << "QmlEngine::resolveType" << type << "=" << *url_return;
+                    qDebug() << "QmlEngine::resolveType" << type << '=' << *url_return;
             }
             return true;
         }
@@ -1451,7 +1451,7 @@ void QmlEnginePrivate::registerCompositeType(QmlCompiledData *data)
 {
     QByteArray name = data->root->className();
 
-    QByteArray ptr = name + "*";
+    QByteArray ptr = name + '*';
     QByteArray lst = "QmlList<" + ptr + ">*";
 
     int ptr_type = QMetaType::registerType(ptr.constData(), voidptr_destructor,