Commit 38f1eab4 authored by hjk's avatar hjk

Debugger: Use enum instead of int in display format handling

Change-Id: I6fab37a0f5a9b227a6504aa2181a8e5c63c095a3
Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
parent 3ac589e4
......@@ -121,7 +121,7 @@ bool isIntOrFloatType(const QByteArray &type)
WatchData::WatchData() :
id(0),
state(InitialState),
editformat(0),
editformat(StopDisplay),
address(0),
origaddr(0),
size(0),
......@@ -602,7 +602,7 @@ void parseChildrenData(const WatchData &data0, const GdbMi &item,
data.editvalue = mi.data();
mi = item["editformat"];
data.editformat = mi.toInt();
data.editformat = DebuggerDisplay(mi.toInt());
mi = item["valueelided"];
if (mi.isValid())
......
......@@ -31,6 +31,8 @@
#ifndef DEBUGGER_WATCHDATA_H
#define DEBUGGER_WATCHDATA_H
#include "debuggerprotocol.h"
#include <QCoreApplication>
#include <QMetaType>
......@@ -105,28 +107,28 @@ public:
void updateDisplayedType(const GdbMi &item);
public:
quint64 id; // Token for the engine for internal mapping
qint32 state; // 'needed' flags;
QByteArray iname; // Internal name sth like 'local.baz.public.a'
QByteArray exp; // The expression
QString name; // Displayed name
QString value; // Displayed value
QByteArray editvalue; // Displayed value
qint32 editformat; // Format of displayed value
QByteArray type; // Type for further processing
QString displayedType;// Displayed type (optional)
quint64 address; // Displayed address of the actual object
quint64 origaddr; // Address of the pointer referencing this item (gdb auto-deref)
uint size; // Size
uint bitpos; // Position within bit fields
uint bitsize; // Size in case of bit fields
int elided; // Full size if value was cut off, -1 if cut on unknown size, 0 otherwise
bool wantsChildren;
bool valueEnabled; // Value will be enabled or not
bool valueEditable; // Value will be editable
bool error;
qint32 sortId;
QByteArray dumperFlags;
quint64 id; // Token for the engine for internal mapping
qint32 state; // 'needed' flags;
QByteArray iname; // Internal name sth like 'local.baz.public.a'
QByteArray exp; // The expression
QString name; // Displayed name
QString value; // Displayed value
QByteArray editvalue; // Displayed value
DebuggerDisplay editformat; // Format of displayed value
QByteArray type; // Type for further processing
QString displayedType; // Displayed type (optional)
quint64 address; // Displayed address of the actual object
quint64 origaddr; // Address of the pointer referencing this item (gdb auto-deref)
uint size; // Size
uint bitpos; // Position within bit fields
uint bitsize; // Size in case of bit fields
int elided; // Full size if value was cut off, -1 if cut on unknown size, 0 otherwise
bool wantsChildren;
bool valueEnabled; // Value will be enabled or not
bool valueEditable; // Value will be editable
bool error;
qint32 sortId;
QByteArray dumperFlags;
Q_DECLARE_TR_FUNCTIONS(Debugger::Internal::WatchHandler)
......
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