From 39d8a01a62e77acaf517a3380844b2914e5bc418 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Wed, 17 Apr 2013 10:46:06 +0200 Subject: [PATCH] QmlDebugging: Remove Ost related code Change-Id: I02c8b68cc9b000cdf3ead6bf547f43e51964c48a Reviewed-by: Kai Koehne --- src/libs/qmldebug/qmldebugclient.cpp | 1 - src/libs/qmldebug/qmldebugconstants.h | 1 - src/libs/qmldebug/qmloutputparser.cpp | 5 ----- src/libs/qmldebug/qmloutputparser.h | 1 - src/plugins/debugger/qml/qmlengine.cpp | 2 -- src/plugins/qmlprofiler/qmlprofilerengine.cpp | 2 -- 6 files changed, 12 deletions(-) diff --git a/src/libs/qmldebug/qmldebugclient.cpp b/src/libs/qmldebug/qmldebugclient.cpp index 5fc4f6c50f2..6fd35d3c130 100644 --- a/src/libs/qmldebug/qmldebugclient.cpp +++ b/src/libs/qmldebug/qmldebugclient.cpp @@ -40,7 +40,6 @@ namespace QmlDebug { const int protocolVersion = 1; const QString serverId = QLatin1String("QDeclarativeDebugServer"); const QString clientId = QLatin1String("QDeclarativeDebugClient"); -static const uchar KQmlOstProtocolId = 0x94; class QmlDebugClientPrivate { diff --git a/src/libs/qmldebug/qmldebugconstants.h b/src/libs/qmldebug/qmldebugconstants.h index f88d7c0b0a6..8f207a1af5b 100644 --- a/src/libs/qmldebug/qmldebugconstants.h +++ b/src/libs/qmldebug/qmldebugconstants.h @@ -35,7 +35,6 @@ namespace Constants { const char STR_WAITING_FOR_CONNECTION[] = "Waiting for connection "; const char STR_ON_PORT_PATTERN[] = "on port (\\d+)"; -const char STR_VIA_OST[] = "via OST"; const char STR_UNABLE_TO_LISTEN[] = "Unable to listen "; const char STR_IGNORING_DEBUGGER[] = "Ignoring \"-qmljsdebugger="; const char STR_IGNORING_DEBUGGER2[] = "Ignoring\"-qmljsdebugger="; // There is (was?) a bug in one of the error strings - safest to handle both diff --git a/src/libs/qmldebug/qmloutputparser.cpp b/src/libs/qmldebug/qmloutputparser.cpp index 955fc6ee7fa..33a44a30863 100644 --- a/src/libs/qmldebug/qmloutputparser.cpp +++ b/src/libs/qmldebug/qmloutputparser.cpp @@ -91,11 +91,6 @@ void QmlOutputParser::processOutput(const QString &output) emit waitingForConnectionOnPort(port); continue; } - - static QString waitingOst - = QLatin1String(Constants::STR_VIA_OST); - if (status.startsWith(waitingOst)) - emit waitingForConnectionViaOst(); } else if (status.startsWith(unableToListen)) { //: Error message shown after 'Could not connect ... debugger:" emit errorMessage(tr("The port seems to be in use.")); diff --git a/src/libs/qmldebug/qmloutputparser.h b/src/libs/qmldebug/qmloutputparser.h index 77851358556..8d394c789fc 100644 --- a/src/libs/qmldebug/qmloutputparser.h +++ b/src/libs/qmldebug/qmloutputparser.h @@ -47,7 +47,6 @@ public: signals: void waitingForConnectionOnPort(quint16 port); - void waitingForConnectionViaOst(); void connectionEstablishedMessage(); void errorMessage(const QString &detailedError); void unknownMessage(const QString &unknownMessage); diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index c508cc2f4ab..6d053e4cbc6 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -306,8 +306,6 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters, DebuggerEng ::msgWinCannotRetrieveDebuggingOutput()); connect(&m_outputParser, SIGNAL(waitingForConnectionOnPort(quint16)), this, SLOT(beginConnection(quint16))); - connect(&m_outputParser, SIGNAL(waitingForConnectionViaOst()), - this, SLOT(beginConnection())); connect(&m_outputParser, SIGNAL(noOutputMessage()), this, SLOT(tryToConnect())); connect(&m_outputParser, SIGNAL(errorMessage(QString)), diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index 7d06a40ed3a..4ff5d328425 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -154,8 +154,6 @@ QmlProfilerEngine::QmlProfilerEngine(IAnalyzerTool *tool, d->m_outputParser.setNoOutputText(ApplicationLauncher::msgWinCannotRetrieveDebuggingOutput()); connect(&d->m_outputParser, SIGNAL(waitingForConnectionOnPort(quint16)), this, SLOT(processIsRunning(quint16))); - connect(&d->m_outputParser, SIGNAL(waitingForConnectionViaOst()), - this, SLOT(processIsRunning())); connect(&d->m_outputParser, SIGNAL(noOutputMessage()), this, SLOT(processIsRunning())); connect(&d->m_outputParser, SIGNAL(errorMessage(QString)),