From aa3cc9f7c5502d3d1f9f4a383bbfff6f4c8a735f Mon Sep 17 00:00:00 2001 From: hjk <qtc-committer@nokia.com> Date: Wed, 24 Nov 2010 18:54:51 +0100 Subject: [PATCH] debugger: code cosmetics --- src/plugins/debugger/debuggeragents.cpp | 2 +- src/plugins/debugger/disassemblerlines.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/debuggeragents.cpp b/src/plugins/debugger/debuggeragents.cpp index b355937ec8a..2f581c6f64d 100644 --- a/src/plugins/debugger/debuggeragents.cpp +++ b/src/plugins/debugger/debuggeragents.cpp @@ -389,7 +389,7 @@ void DisassemblerViewAgent::setContents(const DisassemblerLines &contents) d->editor->setDisplayName(_("Disassembler (%1)").arg(d->frame.function)); d->cache.insert(frameKey(d->frame), contents); - int lineNumber = contents.m_rowCache[d->frame.address]; + int lineNumber = contents.lineForAddress(d->frame.address); if (lineNumber && d->setMarker) d->editor->markableInterface()->addMark(d->locationMark, lineNumber); diff --git a/src/plugins/debugger/disassemblerlines.h b/src/plugins/debugger/disassemblerlines.h index 33612ab0346..a32d83b574a 100644 --- a/src/plugins/debugger/disassemblerlines.h +++ b/src/plugins/debugger/disassemblerlines.h @@ -27,8 +27,8 @@ ** **************************************************************************/ -#ifndef DEBUGGER_disassemblerlines_H -#define DEBUGGER_disassemblerlines_H +#ifndef DEBUGGER_DISASSEMBLERLINES_H +#define DEBUGGER_DISASSEMBLERLINES_H #include <QtCore/QString> #include <QtCore/QHash> @@ -43,6 +43,7 @@ public: DisassemblerLine() : address(0) {} DisassemblerLine(const QString &unparsed); +public: quint64 address; QString data; }; @@ -60,12 +61,11 @@ public: int lineForAddress(quint64 address) const; private: - friend class DisassemblerViewAgent; QVector<DisassemblerLine> m_data; QHash<quint64, int> m_rowCache; }; -} -} +} // namespace Internal +} // namespace Debugger -#endif +#endif // DEBUGGER_DISASSEMBLERLINES_H -- GitLab