From 7d9160967175c565528360526c19ebc78fd90362 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 7 Jul 2011 11:27:58 +0200 Subject: [PATCH] debugger: display pointers in hexadecimal again Change-Id: Ie4b65fcfba99dca08d893b77d2b7fa5b724a1dfa Reviewed-on: http://codereview.qt.nokia.com/1292 Reviewed-by: Qt Sanity Bot Reviewed-by: hjk --- src/plugins/debugger/watchhandler.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index f23aad883e..b7653ba98a 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -370,10 +370,12 @@ static inline QString formattedValue(const WatchData &data, int format) return reformatInteger(data.value.toLongLong(), format); } - bool ok = false; - qulonglong integer = data.value.toULongLong(&ok, 0); - if (ok) - return reformatInteger(integer, format); + if (!isPointerType(data.type)) { + bool ok = false; + qulonglong integer = data.value.toULongLong(&ok, 0); + if (ok) + return reformatInteger(integer, format); + } QString result = data.value; result.replace(QLatin1Char('\n'), QLatin1String("\\n")); @@ -712,7 +714,7 @@ QVariant WatchModel::data(const QModelIndex &idx, int role) const return m_handler->m_expandedINames.contains(data.iname); case LocalsTypeFormatListRole: { - if (data.referencingAddress || data.type.endsWith('*')) + if (data.referencingAddress || isPointerType(data.type)) return QStringList() << tr("Raw pointer") << tr("Latin1 string") -- 2.11.0