From 61c215bb4b57da8390412662af41c0af647d32cc Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 26 Apr 2012 11:10:04 +0200 Subject: Port tst_qquickshadereffect to QMetaMethod-based connectNotify() The const char *-based API is deprecated and will be removed in Qt5. Change-Id: Ib265719c4314f260f2cf0ee478990658449ca7d5 Reviewed-by: Olivier Goffart --- .../quick/qquickshadereffect/tst_qquickshadereffect.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp index 2816fe62ea..6a7040c7da 100644 --- a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp +++ b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp @@ -59,17 +59,17 @@ class TestShaderEffect : public QQuickShaderEffect public: QVariant dummyRead() const { return QVariant(); } - bool isConnected(const char *signal) const { return m_signals.contains(signal); } + bool isConnected(const QMetaMethod &signal) const { return m_signals.contains(signal); } protected: - void connectNotify(const char *signal) { m_signals.append(signal); } - void disconnectNotify(const char *signal) { m_signals.removeOne(signal); } + void connectNotify(const QMetaMethod &signal) { m_signals.append(signal); } + void disconnectNotify(const QMetaMethod &signal) { m_signals.removeOne(signal); } signals: void dummyChanged(); private: - QList m_signals; + QList m_signals; }; class tst_qquickshadereffect : public QQmlDataTest @@ -257,7 +257,8 @@ void tst_qquickshadereffect::lookThroughShaderCode() QFETCH(int, presenceFlags); TestShaderEffect item; - QVERIFY(!item.isConnected(SIGNAL(dummyChanged()))); // Nothing connected yet. + QMetaMethod dummyChangedSignal = QMetaMethod::fromSignal(&TestShaderEffect::dummyChanged); + QVERIFY(!item.isConnected(dummyChangedSignal)); // Nothing connected yet. QString expected; if ((presenceFlags & VertexPresent) == 0) @@ -274,7 +275,7 @@ void tst_qquickshadereffect::lookThroughShaderCode() QCOMPARE(item.parseLog(), expected); // If the uniform was successfully parsed, the notify signal has been connected to an update slot. - QCOMPARE(item.isConnected(SIGNAL(dummyChanged())), (presenceFlags & PropertyPresent) != 0); + QCOMPARE(item.isConnected(dummyChangedSignal), (presenceFlags & PropertyPresent) != 0); } void tst_qquickshadereffect::deleteSourceItem() -- cgit v1.2.3