Declarative: Fix compiler warnings.

- Unused parameters, variables
- Usage of deprecated QAtomic::operator=(int)

Change-Id: I2861968dac8ef8a3126783e3447c593808116871
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>

diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index a9cdfac..aed7866 100644 (file)
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -91,13 +91,13 @@ QDeclarativeDebugTrace::~QDeclarativeDebugTrace()
 {
 }
 
-void QDeclarativeDebugTrace::addEngine(QDeclarativeEngine * /*engine*/)
+void QDeclarativeDebugTrace::addEngine(QDeclarativeEngine *)
 {
     // just make sure that the service is properly registered
     traceInstance();
 }
 
-void QDeclarativeDebugTrace::removeEngine(QDeclarativeEngine */*engine*/)
+void QDeclarativeDebugTrace::removeEngine(QDeclarativeEngine *)
 {
 
 }

diff --git a/src/declarative/qml/v4/qv4irbuilder.cpp b/src/declarative/qml/v4/qv4irbuilder.cpp
index eefaf67..258627a 100644 (file)
--- a/src/declarative/qml/v4/qv4irbuilder.cpp
+++ b/src/declarative/qml/v4/qv4irbuilder.cpp
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 
 using namespace QDeclarativeJS;
 
-static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine, const QMetaObject *meta)
+static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine, const QMetaObject * /* meta */)
 {
     switch (t) {
     case QMetaType::Bool:
@@ -74,7 +74,7 @@ static IR::Type irTypeFromVariantType(int t, QDeclarativeEnginePrivate *engine,
             return IR::AnchorLineType;
         else if (t == qMetaTypeId<QQuickAnchorLine>())
             return IR::SGAnchorLineType;
-        else if (const QMetaObject *m = engine->metaObjectForType(t)) {
+        else if (engine->metaObjectForType(t)) {
             return IR::ObjectType;
         }
 

diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index daec00d..b393c3d 100644 (file)
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -165,7 +165,7 @@ public:
         qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil");
     }
 
-    void initializeEngine(QDeclarativeEngine *engine, const char *)
+    void initializeEngine(QDeclarativeEngine *, const char *)
     {
     }
 };
@@ -174,4 +174,4 @@ QT_END_NAMESPACE
 
 #include "main.moc"
 
-Q_EXPORT_PLUGIN2(qmltestplugin, QT_PREPEND_NAMESPACE(QTestQmlModule));
+Q_EXPORT_PLUGIN2(qmltestplugin, QT_PREPEND_NAMESPACE(QTestQmlModule))

diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 91362bb..2ab4689 100644 (file)
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -84,7 +84,7 @@ void myMessageOutput(QtMsgType type, const char *msg)
         if (!logger.isNull()) {
             if (recursiveLock.testAndSetOrdered(0, 1)) {
                 QMetaObject::invokeMethod(logger.data(), "append", Q_ARG(QString, strMsg));
-                recursiveLock = 0;
+                recursiveLock.store(0);
             }
         } else {
             warnings += strMsg;