From 97ca81fc6dfe0247d58a97e24a19b44fbe8f6ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Tue, 24 May 2011 14:07:50 +0200
Subject: [PATCH] QmlJSInspector: Removed context path related things

Apparently this part of the protocol was already not being used at all.
Now that the SubcomponentEditorTool will be removed it is no longer
relevant.

Change-Id: I5710fe815be233548e590e90410b85ed4fa3487c
Reviewed-on: http://codereview.qt.nokia.com/88
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
---
 .../qmljsinspector/qmljsclientproxy.cpp       |  8 ------
 src/plugins/qmljsinspector/qmljsclientproxy.h |  2 --
 .../qmljsinspector/qmljsobserverclient.cpp    | 26 -------------------
 .../qmljsinspector/qmljsobserverclient.h      |  2 --
 4 files changed, 38 deletions(-)

diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
index 83efb1d5b5a..303e1cab3c4 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp
@@ -95,8 +95,6 @@ void ClientProxy::connectToServer()
         SIGNAL(serverReloaded()));
     connect(m_observerClient, SIGNAL(selectedColorChanged(QColor)),
         SIGNAL(selectedColorChanged(QColor)));
-    connect(m_observerClient, SIGNAL(contextPathUpdated(QStringList)),
-        SIGNAL(contextPathUpdated(QStringList)));
     connect(m_observerClient, SIGNAL(logActivity(QString,QString)),
             m_adapter, SLOT(logServiceActivity(QString,QString)));
 
@@ -599,12 +597,6 @@ void ClientProxy::reparentQmlObject(int debugId, int newParent)
         m_observerClient->reparentQmlObject(debugId, newParent);
 }
 
-void ClientProxy::setContextPathIndex(int contextIndex)
-{
-    if (isConnected())
-        m_observerClient->setContextPathIndex(contextIndex);
-}
-
 void ClientProxy::updateConnected()
 {
     bool isConnected = m_observerClient && m_observerClient->status() == QDeclarativeDebugClient::Enabled
diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h
index b5d79bdb4c1..c88b8f5d351 100644
--- a/src/plugins/qmljsinspector/qmljsclientproxy.h
+++ b/src/plugins/qmljsinspector/qmljsclientproxy.h
@@ -113,7 +113,6 @@ signals:
     void showAppOnTopChanged(bool showAppOnTop);
     void serverReloaded();
     void selectedColorChanged(const QColor &color);
-    void contextPathUpdated(const QStringList &contextPath);
     void propertyChanged(int debugId, const QByteArray &propertyName, const QVariant &propertyValue);
 
 public slots:
@@ -133,7 +132,6 @@ public slots:
                          const QStringList &imports, const QString &filename = QString(), int order = 0);
     void destroyQmlObject(int debugId);
     void reparentQmlObject(int debugId, int newParent);
-    void setContextPathIndex(int contextIndex);
 
 private slots:
     void connectToServer();
diff --git a/src/plugins/qmljsinspector/qmljsobserverclient.cpp b/src/plugins/qmljsinspector/qmljsobserverclient.cpp
index 4c25c0b4a09..6eaa7733d8b 100644
--- a/src/plugins/qmljsinspector/qmljsobserverclient.cpp
+++ b/src/plugins/qmljsinspector/qmljsobserverclient.cpp
@@ -145,15 +145,6 @@ void QmlJSObserverClient::messageReceived(const QByteArray &message)
         emit selectedColorChanged(col);
         break;
     }
-    case ObserverProtocol::ContextPathUpdated: {
-        QStringList contextPath;
-        ds >> contextPath;
-
-        log(LogReceive, type, contextPath.join(", "));
-
-        emit contextPathUpdated(contextPath);
-        break;
-    }
     default:
         qWarning() << "Warning: Not handling message:" << type;
     }
@@ -224,23 +215,6 @@ void QmlJSObserverClient::setObjectIdList(const QList<QDeclarativeDebugObjectRef
     sendMessage(message);
 }
 
-void QmlJSObserverClient::setContextPathIndex(int contextPathIndex)
-{
-    if (!m_connection || !m_connection->isConnected())
-        return;
-
-    QByteArray message;
-    QDataStream ds(&message, QIODevice::WriteOnly);
-
-    ObserverProtocol::Message cmd = ObserverProtocol::SetContextPathIdx;
-    ds << cmd
-       << contextPathIndex;
-
-    log(LogSend, cmd, QString::number(contextPathIndex));
-
-    sendMessage(message);
-}
-
 void QmlJSObserverClient::clearComponentCache()
 {
     if (!m_connection || !m_connection->isConnected())
diff --git a/src/plugins/qmljsinspector/qmljsobserverclient.h b/src/plugins/qmljsinspector/qmljsobserverclient.h
index 7772de3a82b..c9e1e285555 100644
--- a/src/plugins/qmljsinspector/qmljsobserverclient.h
+++ b/src/plugins/qmljsinspector/qmljsobserverclient.h
@@ -70,7 +70,6 @@ public:
     // ### Qt 4.8: remove if we can have access to qdeclarativecontextdata or id's
     void setObjectIdList(const QList<QDeclarativeDebugObjectReference> &objectRoots);
 
-    void setContextPathIndex(int contextPathIndex);
     void clearComponentCache();
 
 signals:
@@ -87,7 +86,6 @@ signals:
     void designModeBehaviorChanged(bool inDesignMode);
     void showAppOnTopChanged(bool showAppOnTop);
     void reloaded(); // the server has reloadetd he document
-    void contextPathUpdated(const QStringList &path);
 
     void logActivity(QString client, QString message);