Commit a25280fc authored by Robert Loehning's avatar Robert Loehning
Browse files

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

This reverts commit 07b11819.

Does not work when display format was changed.
parent 07b11819
......@@ -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
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment