Change stateChanged(State) signatures to have (QmlDebugWatch::State)

and (QmlDebugQuery::State) parameters.

8 files changed, 14 insertions, 14 deletions

diff --git a/src/declarative/debugger/qmldebug_p.h b/src/declarative/debugger/qmldebug_p.h
index 4bc54e8..cd2adf6 100644
--- a/src/declarative/debugger/qmldebug_p.h
+++ b/src/declarative/debugger/qmldebug_p.h
@@ -113,7 +113,7 @@ public:
     State state() const;
 
 Q_SIGNALS:
-    void stateChanged(State);
+    void stateChanged(QmlDebugWatch::State);
     //void objectChanged(int, const QmlDebugObjectReference &);
     //void valueChanged(int, const QVariant &);
 
@@ -170,7 +170,7 @@ public:
 //    bool waitUntilCompleted();
 
 Q_SIGNALS:
-    void stateChanged(State);
+    void stateChanged(QmlDebugQuery::State);
 
 protected:
     QmlDebugQuery(QObject *);
diff --git a/tests/auto/declarative/debugger/qmldebug/tst_qmldebug.cpp b/tests/auto/declarative/debugger/qmldebug/tst_qmldebug.cpp
index d2305f8..03c9c69 100644
--- a/tests/auto/declarative/debugger/qmldebug/tst_qmldebug.cpp
+++ b/tests/auto/declarative/debugger/qmldebug/tst_qmldebug.cpp
@@ -156,7 +156,7 @@ void tst_QmlDebug::waitForQuery(QmlDebugQuery *query)
     QVERIFY(query);
     QCOMPARE(query->parent(), this);
     QVERIFY(query->state() == QmlDebugQuery::Waiting);
-    if (!QmlDebuggerTest::waitForSignal(query, SIGNAL(stateChanged(State))))
+    if (!QmlDebuggerTest::waitForSignal(query, SIGNAL(stateChanged(QmlDebugWatch::State))))
         QFAIL("query timed out");
 }
 
@@ -276,7 +276,7 @@ void tst_QmlDebug::watch_property()
     m_rootItem->setProperty("width", origWidth*2);
 
     // stateChanged() is received before valueChanged()
-    QVERIFY(QmlDebuggerTest::waitForSignal(watch, SIGNAL(stateChanged(State))));
+    QVERIFY(QmlDebuggerTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
     QCOMPARE(spy.count(), 1);
 
     m_dbg->removeWatch(watch);
@@ -320,7 +320,7 @@ void tst_QmlDebug::watch_object()
     m_rootItem->setProperty("height", origHeight*2);
 
     // stateChanged() is received before any valueChanged() signals
-    QVERIFY(QmlDebuggerTest::waitForSignal(watch, SIGNAL(stateChanged(State))));
+    QVERIFY(QmlDebuggerTest::waitForSignal(watch, SIGNAL(stateChanged(QmlDebugWatch::State))));
     QVERIFY(spy.count() > 0);
 
     int newWidth = -1;
diff --git a/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp b/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
index ce8ef30..aa7d292 100644
--- a/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
+++ b/tools/qmldebugger/creatorplugin/qmlinspectormode.cpp
@@ -489,7 +489,7 @@ void QmlInspectorMode::reloadEngines()
     if (!m_engineQuery->isWaiting())
         enginesChanged();
     else
-        QObject::connect(m_engineQuery, SIGNAL(stateChanged(State)), 
+        QObject::connect(m_engineQuery, SIGNAL(stateChanged(QmlDebugQuery::State)), 
                          this, SLOT(enginesChanged()));    
 }
 
@@ -528,7 +528,7 @@ void QmlInspectorMode::queryEngineContext(int id)
     if (!m_contextQuery->isWaiting())
         contextChanged();
     else
-        QObject::connect(m_contextQuery, SIGNAL(stateChanged(State)),
+        QObject::connect(m_contextQuery, SIGNAL(stateChanged(QmlDebugQuery::State)),
                          this, SLOT(contextChanged()));
 }
 
diff --git a/tools/qmldebugger/standalone/engine.cpp b/tools/qmldebugger/standalone/engine.cpp
index d438518..6cfd82b 100644
--- a/tools/qmldebugger/standalone/engine.cpp
+++ b/tools/qmldebugger/standalone/engine.cpp
@@ -163,7 +163,7 @@ void EnginePane::queryContext(int id)
     if (!m_context->isWaiting())
         contextChanged();
     else
-        QObject::connect(m_context, SIGNAL(stateChanged(State)),
+        QObject::connect(m_context, SIGNAL(stateChanged(QmlDebugQuery::State)),
                          this, SLOT(contextChanged()));
 }
 
@@ -186,7 +186,7 @@ void EnginePane::refreshEngines()
     if (!m_engines->isWaiting())
         enginesChanged();
     else
-        QObject::connect(m_engines, SIGNAL(stateChanged(State)), 
+        QObject::connect(m_engines, SIGNAL(stateChanged(QmlDebugQuery::State)), 
                          this, SLOT(enginesChanged()));
 }
 
diff --git a/tools/qmldebugger/standalone/expressionquerywidget.cpp b/tools/qmldebugger/standalone/expressionquerywidget.cpp
index 5b7bc8f..cd59871 100644
--- a/tools/qmldebugger/standalone/expressionquerywidget.cpp
+++ b/tools/qmldebugger/standalone/expressionquerywidget.cpp
@@ -173,7 +173,7 @@ void ExpressionQueryWidget::executeExpression()
         if (!m_query->isWaiting())
             showResult();
         else
-            QObject::connect(m_query, SIGNAL(stateChanged(State)),
+            QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)),
                             this, SLOT(showResult()));
 
         m_lastExpr = m_expr;
diff --git a/tools/qmldebugger/standalone/objectpropertiesview.cpp b/tools/qmldebugger/standalone/objectpropertiesview.cpp
index abfb7a5..3a8d8c8 100644
--- a/tools/qmldebugger/standalone/objectpropertiesview.cpp
+++ b/tools/qmldebugger/standalone/objectpropertiesview.cpp
@@ -124,7 +124,7 @@ void ObjectPropertiesView::reload(const QmlDebugObjectReference &obj)
     if (!m_query->isWaiting())
         queryFinished();
     else
-        QObject::connect(m_query, SIGNAL(stateChanged(State)),
+        QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)),
                          this, SLOT(queryFinished()));
 }
 
@@ -223,7 +223,7 @@ void ObjectPropertiesView::watchCreated(QmlDebugWatch *watch)
 {
     if (watch->objectDebugId() == m_object.debugId()
             && qobject_cast<QmlDebugPropertyWatch*>(watch)) {
-        connect(watch, SIGNAL(stateChanged(State)), SLOT(watchStateChanged()));
+        connect(watch, SIGNAL(stateChanged(QmlDebugWatch::State)), SLOT(watchStateChanged()));
         setWatched(qobject_cast<QmlDebugPropertyWatch*>(watch)->name(), true);
     }
 }
diff --git a/tools/qmldebugger/standalone/objecttree.cpp b/tools/qmldebugger/standalone/objecttree.cpp
index 4dbc1a7..cf467f2 100644
--- a/tools/qmldebugger/standalone/objecttree.cpp
+++ b/tools/qmldebugger/standalone/objecttree.cpp
@@ -86,7 +86,7 @@ void ObjectTree::reload(int objectDebugId)
     if (!m_query->isWaiting())
         objectFetched();
     else
-        QObject::connect(m_query, SIGNAL(stateChanged(State)), 
+        QObject::connect(m_query, SIGNAL(stateChanged(QmlDebugQuery::State)), 
                          this, SLOT(objectFetched()));
 }
 
diff --git a/tools/qmldebugger/standalone/watchtable.cpp b/tools/qmldebugger/standalone/watchtable.cpp
index 47c1c88..0e73de5 100644
--- a/tools/qmldebugger/standalone/watchtable.cpp
+++ b/tools/qmldebugger/standalone/watchtable.cpp
@@ -77,7 +77,7 @@ void WatchTableModel::addWatch(QmlDebugWatch *watch, const QString &title)
     connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)),
             SLOT(watchedValueChanged(QByteArray,QVariant)));
 
-    connect(watch, SIGNAL(stateChanged(State)), SLOT(watchStateChanged()));
+    connect(watch, SIGNAL(stateChanged(QmlDebugWatch::State)), SLOT(watchStateChanged()));
 
     int col = columnCount(QModelIndex());
     beginInsertColumns(QModelIndex(), col, col);