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

Debugger: Fix non-decimal display of negative numbers

Browse Source 
Task-number: QTCREATORBUG-7322

Change-Id: Iabef05a8f9e77ce9ee3d6f7a456e876a0f823fd4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-02-14 00:38:45 +01:00
parent 7adc674e16
commit 8e50ff5b7a
1 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/debugger/watchhandler.cpp
View File

@@ -537,15 +537,44 @@ template <class IntType> QString reformatInteger(IntType value, int format)
case OctalFormat: case OctalFormat:
return QLatin1String("(oct) ") + QString::number(value, 8); return QLatin1String("(oct) ") + QString::number(value, 8);
} }
return QString::number(value); // not reached return QString::number(value, 10); // not reached
}
static QString reformatInteger(quint64 value, int format, int size, bool isSigned)
{
// Follow convention and don't show negative non-decimal numbers.
if (format != DecimalFormat)
isSigned = false;
switch (size) {
case 1:
value = value & 0xff;
return isSigned
? reformatInteger<qint8>(value, format)
: reformatInteger<quint8>(value, format);
case 2:
value = value & 0xffff;
return isSigned
? reformatInteger<qint16>(value, format)
: reformatInteger<quint16>(value, format);
case 4:
value = value & 0xffffffff;
return isSigned
? reformatInteger<qint32>(value, format)
: reformatInteger<quint32>(value, format);
default:
case 8: return isSigned
? reformatInteger<qint64>(value, format)
: reformatInteger<quint64>(value, format);
}
} }
// Format printable (char-type) characters // Format printable (char-type) characters
static QString reformatCharacter(int code, int format) static QString reformatCharacter(int code, int format)
{ {
const QString codeS = reformatInteger(code, format); const QString codeS = reformatInteger(code, format, 1, true);
if (code < 0) // Append unsigned value. if (code < 0) // Append unsigned value.
return codeS + QLatin1String(" / ") + reformatInteger(256 + code, format); return codeS + QLatin1String(" / ") + reformatInteger(256 + code, format, 1, false);
const QChar c = QChar(uint(code)); const QChar c = QChar(uint(code));
if (c.isPrint()) if (c.isPrint())
return codeS + QLatin1String(" '") + c + QLatin1Char('\''); return codeS + QLatin1String(" '") + c + QLatin1Char('\'');
@@ -653,10 +682,10 @@ QString WatchModel::formattedValue(const WatchData &data) const
// Rest: Leave decimal as is // Rest: Leave decimal as is
if (format <= 0) if (format <= 0)
return value; return value;
// Evil hack, covers 'unsigned' as well as quint64.
if (data.type.contains('u')) bool isSigned = value.startsWith(QLatin1Char('-'));
return reformatInteger(value.toULongLong(0, 0), format); quint64 raw = isSigned ? quint64(value.toLongLong()): value.toULongLong();
return reformatInteger(value.toLongLong(), format); return reformatInteger(raw, format, data.size, isSigned);
} }
if (data.type == "va_list") if (data.type == "va_list")
@@ -667,7 +696,7 @@ QString WatchModel::formattedValue(const WatchData &data) const
qulonglong integer = value.toULongLong(&ok, 0); qulonglong integer = value.toULongLong(&ok, 0);
if (ok) { if (ok) {
const int format = itemFormat(data); const int format = itemFormat(data);
return reformatInteger(integer, format); return reformatInteger(integer, format, data.size, false);
} }
} }