From 7f20428c91bad817b2d350536756dd55a8d2103b Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 25 Nov 2011 08:49:45 +0100 Subject: QtDeclarative: Fix warnings in tests. - Unused parameters - Missing interfaces - tst_QQuickListView: Fix call canvas->rootContext()->setContextProperty to use a QVariant (instead of implicitly converting to QObject*) which was apparently intended. Change-Id: Idc95d9408051e6f5b7005a7eccd764ac218ff867 Reviewed-by: Rohan McGovern --- .../qdeclarativechangeset/tst_qdeclarativechangeset.cpp | 2 +- tests/auto/declarative/qdeclarativeincubator/testtypes.h | 6 ++++-- .../qdeclarativeincubator/tst_qdeclarativeincubator.cpp | 2 +- tests/auto/declarative/qdeclarativelanguage/testtypes.h | 1 + .../qdeclarativemoduleplugin/pluginMixed/plugin.cpp | 2 +- tests/auto/declarative/qjsengine/tst_qjsengine.cpp | 11 ++++++----- tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp | 2 +- tests/auto/declarative/qquickimage/tst_qquickimage.cpp | 2 ++ tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp | 4 ++-- .../qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp | 4 ++-- 10 files changed, 21 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/auto/declarative/qdeclarativechangeset/tst_qdeclarativechangeset.cpp b/tests/auto/declarative/qdeclarativechangeset/tst_qdeclarativechangeset.cpp index 8da3d9b814..d5b430670f 100644 --- a/tests/auto/declarative/qdeclarativechangeset/tst_qdeclarativechangeset.cpp +++ b/tests/auto/declarative/qdeclarativechangeset/tst_qdeclarativechangeset.cpp @@ -137,7 +137,7 @@ bool operator ==(const tst_qdeclarativemodelchange::Signal &left, const tst_qdec return left.index == right.index && left.count == right.count && left.to == right.to - && ((left.moveId == -1 && right.moveId == -1) || left.moveId != -1 && right.moveId != -1); + && ((left.moveId == -1 && right.moveId == -1) || (left.moveId != -1 && right.moveId != -1)); } diff --git a/tests/auto/declarative/qdeclarativeincubator/testtypes.h b/tests/auto/declarative/qdeclarativeincubator/testtypes.h index 8d9968de3c..d7d31493f6 100644 --- a/tests/auto/declarative/qdeclarativeincubator/testtypes.h +++ b/tests/auto/declarative/qdeclarativeincubator/testtypes.h @@ -86,7 +86,8 @@ private: class CompletionRegisteringType : public QObject, public QDeclarativeParserStatus { -Q_OBJECT + Q_OBJECT + Q_INTERFACES(QDeclarativeParserStatus) public: CompletionRegisteringType(); @@ -102,7 +103,8 @@ private: class CompletionCallbackType : public QObject, public QDeclarativeParserStatus { -Q_OBJECT + Q_OBJECT + Q_INTERFACES(QDeclarativeParserStatus) public: CompletionCallbackType(); diff --git a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp index efa46264c3..74a6b83bf4 100644 --- a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp +++ b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp @@ -811,7 +811,7 @@ void tst_qdeclarativeincubator::chainedAsynchronousIfNestedOnCompleted() QDeclarativeComponent *component; MyIncubator *incubator; QDeclarativeContext *ctxt; - static void callback(CompletionCallbackType *o, void *data) { + static void callback(CompletionCallbackType *, void *data) { CallbackData *d = (CallbackData *)data; d->component->create(*d->incubator, 0, d->ctxt); } diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h index dad0e23ae3..6e325b393b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h +++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h @@ -597,6 +597,7 @@ public: class MyParserStatus : public QObject, public QDeclarativeParserStatus { + Q_INTERFACES(QDeclarativeParserStatus) Q_OBJECT public: MyParserStatus() : m_cbc(0), m_ccc(0) {} diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp index 977a60c514..3a6ccc9999 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp @@ -46,7 +46,7 @@ class BarPluginType : public QObject { Q_OBJECT - Q_PROPERTY(int value READ value); + Q_PROPERTY(int value READ value) public: int value() const { return 16; } diff --git a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp index 8517850c5b..1c29391e0f 100644 --- a/tests/auto/declarative/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/declarative/qjsengine/tst_qjsengine.cpp @@ -793,7 +793,7 @@ void tst_QJSEngine::newVariant_promoteNonQScriptObject() void tst_QJSEngine::newRegExp() { - QSKIP("Test failing - QTBUG-22238", SkipAll); + QSKIP("Test failing - QTBUG-22238"); QJSEngine eng; for (int x = 0; x < 2; ++x) { QJSValue rexp; @@ -817,7 +817,7 @@ void tst_QJSEngine::newRegExp() void tst_QJSEngine::jsRegExp() { - QSKIP("Test failing - QTBUG-22238", SkipAll); + QSKIP("Test failing - QTBUG-22238"); // See ECMA-262 Section 15.10, "RegExp Objects". // These should really be JS-only tests, as they test the implementation's @@ -1463,7 +1463,7 @@ static QScriptValue getSetFoo(QScriptContext *ctx, QScriptEngine *) void tst_QJSEngine::globalObjectProperties() { - QSKIP("Test failing - QTBUG-22238", SkipAll); + QSKIP("Test failing - QTBUG-22238"); // See ECMA-262 Section 15.1, "The Global Object". QJSEngine eng; @@ -1552,7 +1552,7 @@ void tst_QJSEngine::globalObjectEquals() void tst_QJSEngine::globalObjectProperties_enumerate() { - QSKIP("Test failing - QTBUG-22238", SkipAll); + QSKIP("Test failing - QTBUG-22238"); QJSEngine eng; QJSValue global = eng.globalObject(); @@ -3072,6 +3072,7 @@ class Klazz : public QWidget, public QStandardItem, public QGraphicsItem { + Q_INTERFACES(QGraphicsItem) Q_OBJECT public: Klazz(QWidget *parent = 0) : QWidget(parent) { } @@ -6080,7 +6081,7 @@ void tst_QJSEngine::qRegExpInport_data() void tst_QJSEngine::qRegExpInport() { - QSKIP("Test failing - QTBUG-22238", SkipAll); + QSKIP("Test failing - QTBUG-22238"); QFETCH(QRegExp, rx); QFETCH(QString, string); diff --git a/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp b/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp index 640b4b4f40..95fcd82dfa 100644 --- a/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp +++ b/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp @@ -149,7 +149,7 @@ protected: event->accept(); } - virtual void mousePressEvent(QMouseEvent *event) { + virtual void mousePressEvent(QMouseEvent *) { mousePressId = ++mousePressNum; } diff --git a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp b/tests/auto/declarative/qquickimage/tst_qquickimage.cpp index 5106e3fc81..1dd88ca743 100644 --- a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/declarative/qquickimage/tst_qquickimage.cpp @@ -339,6 +339,8 @@ void tst_qquickimage::mirror() p_e.setTransform(transform); p_e.drawTiledPixmap(QRect(0, 0, width, height), srcPixmap); break; + case QQuickImage::Pad: + break; } QImage img = expected.toImage(); diff --git a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp b/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp index a39082d738..b12bf3eb50 100644 --- a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp @@ -911,7 +911,7 @@ void tst_QQuickListView::insertBeforeVisible_data() } template -void tst_QQuickListView::removed(bool animated) +void tst_QQuickListView::removed(bool /* animated */) { QQuickView *canvas = createView(); @@ -3027,7 +3027,7 @@ void tst_QQuickListView::header_delayItemCreation() TestModel model; - canvas->rootContext()->setContextProperty("setCurrentToZero", false); + canvas->rootContext()->setContextProperty("setCurrentToZero", QVariant(false)); canvas->setSource(QUrl::fromLocalFile(TESTDATA("fillModelOnComponentCompleted.qml"))); qApp->processEvents(); diff --git a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index e382a015dd..0278b0cf2c 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -80,7 +80,7 @@ class SingleRoleModel : public QAbstractListModel Q_OBJECT public: - SingleRoleModel(const QByteArray &role = "name", QObject *parent = 0) { + SingleRoleModel(const QByteArray &role = "name", QObject * /* parent */ = 0) { QHash roles; roles.insert(Qt::DisplayRole , role); setRoleNames(roles); @@ -101,7 +101,7 @@ public slots: } protected: - int rowCount(const QModelIndex &parent = QModelIndex()) const { + int rowCount(const QModelIndex & /* parent */ = QModelIndex()) const { return list.count(); } QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const { -- cgit v1.2.3