feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Replace the cdbext prefix member...

Browse Source 
...and replace it with a static variable.

Change-Id: Ic9f03ee9e00e7b32f66a573ef9b15225aa3f13bf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
David Schulz
2013-12-02 07:32:00 +01:00
parent f7397224ea
commit 78081ecb49
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -339,7 +339,6 @@ void addCdbOptionPages(QList<Core::IOptionsPage *> *opts)
CdbEngine::CdbEngine(const DebuggerStartParameters &sp) : CdbEngine::CdbEngine(const DebuggerStartParameters &sp) :
DebuggerEngine(sp), DebuggerEngine(sp),
m_creatorExtPrefix("<qtcreatorcdbext>|"),
m_tokenPrefix("<token>"), m_tokenPrefix("<token>"),
m_effectiveStartMode(NoStartMode), m_effectiveStartMode(NoStartMode),
m_accessible(false), m_accessible(false),
@@ -2554,11 +2553,12 @@ void CdbEngine::parseOutputLine(QByteArray line)
while (isCdbPrompt(line)) while (isCdbPrompt(line))
line.remove(0, CdbPromptLength); line.remove(0, CdbPromptLength);
// An extension notification (potentially consisting of several chunks) // An extension notification (potentially consisting of several chunks)
if (line.startsWith(m_creatorExtPrefix)) { static const QByteArray creatorExtPrefix = "<qtcreatorcdbext>|";
if (line.startsWith(creatorExtPrefix)) {
// "<qtcreatorcdbext>|type_char|token|remainingChunks|serviceName|message" // "<qtcreatorcdbext>|type_char|token|remainingChunks|serviceName|message"
const char type = line.at(m_creatorExtPrefix.size()); const char type = line.at(creatorExtPrefix.size());
// integer token // integer token
const int tokenPos = m_creatorExtPrefix.size() + 2; const int tokenPos = creatorExtPrefix.size() + 2;
const int tokenEndPos = line.indexOf('|', tokenPos); const int tokenEndPos = line.indexOf('|', tokenPos);
QTC_ASSERT(tokenEndPos != -1, return); QTC_ASSERT(tokenEndPos != -1, return);
const int token = line.mid(tokenPos, tokenEndPos - tokenPos).toInt(); const int token = line.mid(tokenPos, tokenEndPos - tokenPos).toInt();

1
src/plugins/debugger/cdb/cdbengine.h
View File

@@ -251,7 +251,6 @@ private:
unsigned parseStackTrace(const GdbMi &data, bool sourceStepInto); unsigned parseStackTrace(const GdbMi &data, bool sourceStepInto);
void mergeStartParametersSourcePathMap(); void mergeStartParametersSourcePathMap();
const QByteArray m_creatorExtPrefix;
const QByteArray m_tokenPrefix; const QByteArray m_tokenPrefix;
QProcess m_process; QProcess m_process;