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

Revert "debugger: Open memory editor at pointee address, not at pointer address"

Browse Source 
This reverts commit 07b118197a.

Does not work when display format was changed.
This commit is contained in:
Robert Loehning
2010-05-19 16:11:47 +02:00
parent 07b118197a
commit a25280fca0
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/debugger/watchhandler.h
View File

@@ -61,7 +61,7 @@ enum WatchRoles
TypeFormatListRole,
TypeFormatRole, // Used to communicate alternative formats to the view.
IndividualFormatRole,
AddressRole, // Address of the object.
AddressRole, // Some memory address related to the object.
};
enum IntegerFormat

8
src/plugins/debugger/watchwindow.cpp
View File

@@ -37,7 +37,6 @@
#include "debuggerdialogs.h"
#include "debuggermanager.h"
#include "idebuggerengine.h"
#include "watchutils.h"
#include <utils/qtcassert.h>
#include <utils/savedaction.h>
@@ -300,12 +299,9 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
const bool canShowMemory = engineCapabilities & ShowMemoryCapability;
actWatchUnknownMemory->setEnabled(actionsEnabled && canShowMemory);
QString editAddress = address;
if (isPointerType(type))
editAddress = model()->data(mi1).toString();
if (canShowMemory && !editAddress.isEmpty())
if (canShowMemory && !address.isEmpty())
actWatchKnownMemory =
new QAction(tr("Open Memory Editor at %1").arg(editAddress), &menu);
new QAction(tr("Open Memory Editor at %1").arg(address), &menu);
menu.addSeparator();
QAction *actSetWatchpoint = 0;