forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Kai Koehne
parent
0faf7ab922
commit
97ca81fc6d
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user