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

clearer and less inefficient

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-10-22 20:04:59 +02:00
parent 231eac88cb
commit 8882e8e4a4
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -489,12 +489,13 @@ void GdbEngine::handleResponse(const QByteArray &buff)
} }
// Show some messages to give the impression something happens. // Show some messages to give the impression something happens.
if (data.startsWith("Reading symbols from ")) if (data.startsWith("Reading symbols from ")) {
showStatusMessage(tr("Reading %1...").arg(_(data.mid(21))), 1000); showStatusMessage(tr("Reading %1...").arg(_(data.mid(21))), 1000);
if (data.endsWith('\n')) } else if (data.startsWith("[New ") || data.startsWith("[Thread ")) {
data.chop(1); if (data.endsWith('\n'))
if (data.startsWith("[New ") || data.startsWith("[Thread ")) data.chop(1);
showStatusMessage(_(data), 1000); showStatusMessage(_(data), 1000);
}
break; break;
} }
@@ -875,13 +876,15 @@ void GdbEngine::handleQuerySources(const GdbResponse &response)
foreach (const GdbMi &item, files.children()) { foreach (const GdbMi &item, files.children()) {
QString fileName = QString::fromLocal8Bit(item.findChild("file").data()); QString fileName = QString::fromLocal8Bit(item.findChild("file").data());
GdbMi fullName = item.findChild("fullname"); GdbMi fullName = item.findChild("fullname");
QString full = QString::fromLocal8Bit(fullName.data()); if (fullName.isValid()) {
#ifdef Q_OS_WIN QString full = QString::fromLocal8Bit(fullName.data());
full = QDir::cleanPath(full); if (QFileInfo(full).isReadable()) {
#endif #ifdef Q_OS_WIN
if (fullName.isValid() && QFileInfo(full).isReadable()) { full = QDir::cleanPath(full);
m_shortToFullName[fileName] = full; #endif
m_fullToShortName[full] = fileName; m_shortToFullName[fileName] = full;
m_fullToShortName[full] = fileName;
}
} }
} }
if (m_shortToFullName != oldShortToFull) if (m_shortToFullName != oldShortToFull)
@@ -1150,12 +1153,11 @@ void GdbEngine::handleStop1(const GdbResponse &response)
void GdbEngine::handleStop1(const GdbMi &data) void GdbEngine::handleStop1(const GdbMi &data)
{ {
QByteArray reason = data.findChild("reason").data();
if (m_modulesListOutdated) { if (m_modulesListOutdated) {
reloadModules(); reloadModules();
m_modulesListOutdated = false; m_modulesListOutdated = false;
} }
// Need another round trip QByteArray reason = data.findChild("reason").data();
if (reason == "breakpoint-hit") { if (reason == "breakpoint-hit") {
showStatusMessage(tr("Stopped at breakpoint.")); showStatusMessage(tr("Stopped at breakpoint."));
GdbMi frame = data.findChild("frame"); GdbMi frame = data.findChild("frame");
@@ -4064,14 +4066,14 @@ QString GdbEngine::parseDisassembler(const GdbMi &lines)
foreach (const GdbMi &child, lines.children()) { foreach (const GdbMi &child, lines.children()) {
if (child.hasName("src_and_asm_line")) { if (child.hasName("src_and_asm_line")) {
// mixed mode // mixed mode
int line = child.findChild("line").data().toInt();
QString fileName = QFile::decodeName(child.findChild("file").data());
if (!fileLoaded) { if (!fileLoaded) {
QString fileName = QFile::decodeName(child.findChild("file").data());
QFile file(fullName(fileName)); QFile file(fullName(fileName));
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
fileContents = file.readAll().split('\n'); fileContents = file.readAll().split('\n');
fileLoaded = true; fileLoaded = true;
} }
int line = child.findChild("line").data().toInt();
if (line >= 0 && line < fileContents.size()) if (line >= 0 && line < fileContents.size())
ba += " " + fileContents.at(line) + '\n'; ba += " " + fileContents.at(line) + '\n';
GdbMi insn = child.findChild("line_asm_insn"); GdbMi insn = child.findChild("line_asm_insn");