V4 Debuger: Drop namesAsObjects option

There is no client that uses this anymore, and dropping it allows us to
eliminate a lot of code.

Change-Id: I6b09669c9dd7fcf9c2d249f133bfbb78d2b6f7f4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 29 insertions, 57 deletions

diff --git a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
index afd1afaabc..59e1cd8160 100644
--- a/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
+++ b/tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp
@@ -260,7 +260,7 @@ public:
                          this, &QJSDebugClient::onStateChanged);
     }
 
-    void connect(bool namesAsObjects = false);
+    void connect();
     void interrupt();
 
     void continueDebugging(StepAction stepAction);
@@ -306,10 +306,9 @@ public:
 
 };
 
-void QJSDebugClient::connect(bool namesAsObjects)
+void QJSDebugClient::connect()
 {
-    QJSValue jsonVal = parser.call(QJSValueList() << QLatin1String("{}"));
-    jsonVal.setProperty("namesAsObjects", QJSValue(namesAsObjects));
+    const QJSValue jsonVal = parser.call(QJSValueList() << QLatin1String("{}"));
     sendMessage(packMessage(CONNECT,
                             stringify.call(QJSValueList() << jsonVal).toString().toUtf8()));
 }
@@ -807,10 +806,9 @@ void tst_QQmlDebugJS::interrupt()
 {
     //void connect()
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     QCOMPARE(init(qmlscene), ConnectSuccess);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
 
     m_client->interrupt();
     QVERIFY(waitForClientSignal(SIGNAL(interruptRequested())));
@@ -820,10 +818,9 @@ void tst_QQmlDebugJS::getVersion()
 {
     //void version()
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     QCOMPARE(init(qmlscene), ConnectSuccess);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(connected())));
 
     m_client->version();
@@ -834,10 +831,9 @@ void tst_QQmlDebugJS::getVersionWhenAttaching()
 {
     //void version()
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     QCOMPARE(init(qmlscene, QLatin1String(TIMER_QMLFILE), false), ConnectSuccess);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
 
     m_client->version();
     QVERIFY(waitForClientSignal(SIGNAL(result())));
@@ -847,10 +843,9 @@ void tst_QQmlDebugJS::disconnect()
 {
     //void disconnect()
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     QCOMPARE(init(qmlscene), ConnectSuccess);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
 
     m_client->disconnect();
     QVERIFY(waitForClientSignal(SIGNAL(result())));
@@ -860,13 +855,12 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnCompleted()
 {
     //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1)
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 34;
     QCOMPARE(init(qmlscene, ONCOMPLETED_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(ONCOMPLETED_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     QString jsonString(m_client->response);
@@ -882,13 +876,12 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnComponentCreated()
 {
     //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1)
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 34;
     QCOMPARE(init(qmlscene, CREATECOMPONENT_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(ONCOMPLETED_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     QString jsonString(m_client->response);
@@ -903,12 +896,11 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnComponentCreated()
 void tst_QQmlDebugJS::setBreakpointInScriptOnTimerCallback()
 {
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 35;
     QCOMPARE(init(qmlscene, TIMER_QMLFILE), ConnectSuccess);
 
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     //We can set the breakpoint after connect() here because the timer is repeating and if we miss
     //its first iteration we can still catch the second one.
     m_client->setBreakpoint(QLatin1String(TIMER_QMLFILE), sourceLine, -1, true);
@@ -927,13 +919,12 @@ void tst_QQmlDebugJS::setBreakpointInScriptInDifferentFile()
 {
     //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1)
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 31;
     QCOMPARE(init(qmlscene, LOADJSFILE_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(TEST_JSFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     QString jsonString(m_client->response);
@@ -949,14 +940,13 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnComment()
 {
     //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1)
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 34;
     int actualLine = 36;
     QCOMPARE(init(qmlscene, BREAKPOINTRELOCATION_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(BREAKPOINTRELOCATION_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QEXPECT_FAIL("", "Relocation of breakpoints is disabled right now", Abort);
     QVERIFY(waitForClientSignal(SIGNAL(stopped()), 1));
 
@@ -973,14 +963,13 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnEmptyLine()
 {
     //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1)
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 35;
     int actualLine = 36;
     QCOMPARE(init(qmlscene, BREAKPOINTRELOCATION_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(BREAKPOINTRELOCATION_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QEXPECT_FAIL("", "Relocation of breakpoints is disabled right now", Abort);
     QVERIFY(waitForClientSignal(SIGNAL(stopped()), 1));
 
@@ -997,13 +986,12 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnOptimizedBinding()
 {
     //void setBreakpoint(QString type, QString target, int line = -1, int column = -1, bool enabled = false, QString condition = QString(), int ignoreCount = -1)
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 39;
     QCOMPARE(init(qmlscene, BREAKPOINTRELOCATION_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(BREAKPOINTRELOCATION_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     QString jsonString(m_client->response);
@@ -1018,13 +1006,12 @@ void tst_QQmlDebugJS::setBreakpointInScriptOnOptimizedBinding()
 void tst_QQmlDebugJS::setBreakpointInScriptWithCondition()
 {
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int out = 10;
     int sourceLine = 37;
     QCOMPARE(init(qmlscene, CONDITION_QMLFILE), ConnectSuccess);
 
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     //The breakpoint is in a timer loop so we can set it after connect().
     m_client->setBreakpoint(QLatin1String(CONDITION_QMLFILE), sourceLine, 1, true, QLatin1String("a > 10"));
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
@@ -1057,14 +1044,13 @@ void tst_QQmlDebugJS::setBreakpointInScriptWithCondition()
 void tst_QQmlDebugJS::setBreakpointInScriptThatQuits()
 {
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     QCOMPARE(init(qmlscene, QUIT_QMLFILE), ConnectSuccess);
 
     int sourceLine = 36;
 
     m_client->setBreakpoint(QLatin1String(QUIT_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     QString jsonString(m_client->response);
@@ -1101,13 +1087,12 @@ void tst_QQmlDebugJS::clearBreakpoint()
 {
     //void clearBreakpoint(int breakpoint);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine1 = 37;
     int sourceLine2 = 38;
     QCOMPARE(init(qmlscene, CHANGEBREAKPOINT_QMLFILE), ConnectSuccess);
 
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     //The breakpoints are in a timer loop so we can set them after connect().
     //Furthermore the breakpoints should be hit in the right order because setting of breakpoints
     //can only occur in the QML event loop. (see QCOMPARE for sourceLine2 below)
@@ -1150,11 +1135,10 @@ void tst_QQmlDebugJS::setExceptionBreak()
 {
     //void setExceptionBreak(QString type, bool enabled = false);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     QCOMPARE(init(qmlscene, EXCEPTION_QMLFILE), ConnectSuccess);
     m_client->setExceptionBreak(QJSDebugClient::All,true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 }
 
@@ -1162,13 +1146,12 @@ void tst_QQmlDebugJS::stepNext()
 {
     //void continueDebugging(StepAction stepAction, int stepCount = 1);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 37;
     QCOMPARE(init(qmlscene, STEPACTION_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(STEPACTION_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     m_client->continueDebugging(QJSDebugClient::Next);
@@ -1195,14 +1178,13 @@ void tst_QQmlDebugJS::stepIn()
 {
     //void continueDebugging(StepAction stepAction, int stepCount = 1);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 41;
     int actualLine = 36;
     QCOMPARE(init(qmlscene, STEPACTION_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(STEPACTION_QMLFILE), sourceLine, 1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
     QCOMPARE(responseBody(m_client).value("sourceLine").toInt(), sourceLine);
 
@@ -1218,14 +1200,13 @@ void tst_QQmlDebugJS::stepOut()
 {
     //void continueDebugging(StepAction stepAction, int stepCount = 1);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 37;
     int actualLine = 41;
     QCOMPARE(init(qmlscene, STEPACTION_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(STEPACTION_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
     QCOMPARE(responseBody(m_client).value("sourceLine").toInt(), sourceLine);
 
@@ -1241,7 +1222,6 @@ void tst_QQmlDebugJS::continueDebugging()
 {
     //void continueDebugging(StepAction stepAction, int stepCount = 1);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine1 = 41;
     int sourceLine2 = 38;
@@ -1249,7 +1229,7 @@ void tst_QQmlDebugJS::continueDebugging()
 
     m_client->setBreakpoint(QLatin1String(STEPACTION_QMLFILE), sourceLine1, -1, true);
     m_client->setBreakpoint(QLatin1String(STEPACTION_QMLFILE), sourceLine2, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     m_client->continueDebugging(QJSDebugClient::Continue);
@@ -1268,13 +1248,12 @@ void tst_QQmlDebugJS::backtrace()
 {
     //void backtrace(int fromFrame = -1, int toFrame = -1, bool bottom = false);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 34;
     QCOMPARE(init(qmlscene, ONCOMPLETED_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(ONCOMPLETED_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     m_client->backtrace();
@@ -1285,13 +1264,12 @@ void tst_QQmlDebugJS::getFrameDetails()
 {
     //void frame(int number = -1);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 34;
     QCOMPARE(init(qmlscene, ONCOMPLETED_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(ONCOMPLETED_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     m_client->frame();
@@ -1302,13 +1280,12 @@ void tst_QQmlDebugJS::getScopeDetails()
 {
     //void scope(int number = -1, int frameNumber = -1);
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 34;
     QCOMPARE(init(qmlscene, ONCOMPLETED_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(ONCOMPLETED_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     m_client->scope();
@@ -1337,13 +1314,12 @@ void tst_QQmlDebugJS::evaluateInLocalScope()
 {
     //void evaluate(QString expr, bool global = false, bool disableBreak = false, int frame = -1, const QVariantMap &addContext = QVariantMap());
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     int sourceLine = 34;
     QCOMPARE(init(qmlscene, ONCOMPLETED_QMLFILE), ConnectSuccess);
 
     m_client->setBreakpoint(QLatin1String(ONCOMPLETED_QMLFILE), sourceLine, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     m_client->frame();
@@ -1421,12 +1397,11 @@ void tst_QQmlDebugJS::getScripts()
 {
     //void scripts(int types = -1, QList<int> ids = QList<int>(), bool includeSource = false, QVariant filter = QVariant());
     QFETCH(bool, qmlscene);
-    QFETCH(bool, namesAsObjects);
 
     QCOMPARE(init(qmlscene), ConnectSuccess);
 
     m_client->setBreakpoint(QString(TEST_QMLFILE), 35, -1, true);
-    m_client->connect(namesAsObjects);
+    m_client->connect();
     QVERIFY(waitForClientSignal(SIGNAL(stopped())));
 
     m_client->scripts();
@@ -1514,11 +1489,8 @@ QList<QQmlDebugClient *> tst_QQmlDebugJS::createClients()
 void tst_QQmlDebugJS::targetData()
 {
     QTest::addColumn<bool>("qmlscene");
-    QTest::addColumn<bool>("namesAsObjects");
-    QTest::newRow("custom / objects")   << false << true;
-    QTest::newRow("qmlscene / objects") << true  << true;
-    QTest::newRow("custom / strings")   << false << false;
-    QTest::newRow("qmlscene / strings") << true  << false;
+    QTest::newRow("custom")   << false;
+    QTest::newRow("qmlscene") << true;
 }
 
 bool tst_QQmlDebugJS::waitForClientSignal(const char *signal, int timeout)