Debugeger: A bit of polishing for the register window.

Pad all registers up to width of largest value. Pass on unpadded values
to the editor.

src/plugins/debugger/registerhandler.cpp

@@ -68,6 +68,19 @@ int RegisterHandler::columnCount(const QModelIndex &parent) const
     return parent.isValid() ? 0 : 2;
 }
 
+inline QString RegisterHandler::value(const Register &reg, bool padded) const
+{
+    bool ok = true;
+    // Try to convert to number?
+    const qulonglong value = reg.value.toULongLong(&ok, 0); // Autodetect format
+    if (ok)
+        return QString::fromAscii("%1").arg(value, (padded ? m_strlen : 0), m_base);
+    // Cannot convert, return raw string.
+    if (padded && reg.value.size() < m_strlen)
+        return QString(m_strlen - reg.value.size(), QLatin1Char(' ')) + reg.value;
+    return reg.value;
+}
+
 QVariant RegisterHandler::data(const QModelIndex &index, int role) const
 {
     switch (role) {
@@ -89,32 +102,33 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
 
     const Register &reg = m_registers.at(index.row());
 
-    if (role == RegisterAddressRole) {
+    switch (role) {
-        // Return some address associated with the register.
+    case RegisterAddressRole: {
+        // Return some address associated with the register. Autodetect format
         bool ok = true;
         qulonglong value = reg.value.toULongLong(&ok, 0);
         return ok ? QVariant(QString::fromLatin1("0x") + QString::number(value, 16)) : QVariant();
     }
+        break;
 
-    const QString padding = "  ";
+    case Qt::DisplayRole:
-    if (role == Qt::DisplayRole) {
         switch (index.column()) {
-            case 0: return QVariant(padding + reg.name + padding);
+        case 0: {
-            case 1: {
+            const QString padding = QLatin1String("  ");
-                bool ok = true;
+            return QVariant(padding + reg.name + padding);
-                qulonglong value = reg.value.toULongLong(&ok, 0);
-                QString res = ok ? QString::number(value, m_base) : reg.value;
-                return QVariant(QString(m_strlen - res.size(), QLatin1Char(' ')) + res);
-            }
         }
+        case 1: // Display: Pad value for alignment
+            return value(reg, true);
+        } // switch column
+    case Qt::EditRole: // Edit: Unpadded for editing
+        return value(reg, false);
+    case Qt::TextAlignmentRole:
+        return index.column() == 1 ? QVariant(Qt::AlignRight) : QVariant();
+    case RegisterChangedRole:
+        return QVariant(reg.changed);
+    default:
+        break;
     }
-
-    if (role == Qt::TextAlignmentRole && index.column() == 1)
-        return Qt::AlignRight;
-
-    if (role == RegisterChangedRole)
-        return reg.changed;
-
     return QVariant();
 }
 
@@ -184,6 +198,7 @@ bool RegisterHandler::isEmpty() const
 void RegisterHandler::setRegisters(const Registers &registers)
 {
     m_registers = registers;
+    calculateWidth();
     reset();
 }
 
@@ -193,6 +208,7 @@ void RegisterHandler::setAndMarkRegisters(const Registers &registers)
     m_registers = registers;
     for (int i = qMin(m_registers.size(), old.size()); --i >= 0; )
         m_registers[i].changed = m_registers[i].value != old[i].value;
+    calculateWidth();
     reset();
 }
 
@@ -201,9 +217,19 @@ Registers RegisterHandler::registers() const
     return m_registers;
 }
 
+void RegisterHandler::calculateWidth()
+{
+    m_strlen = (m_base == 2 ? 64 : m_base == 8 ? 32 : m_base == 10 ? 26 : 16);
+    foreach(const Register &reg, m_registers)
+        if (reg.value.size() > m_strlen)
+            m_strlen = reg.value.size();
+}
+
 void RegisterHandler::setNumberBase(int base)
 {
-    m_base = base;
+    if (m_base != base) {
-    m_strlen = (base == 2 ? 64 : base == 8 ? 32 : base == 10 ? 26 : 16);
+        m_base = base;
-    emit reset();
+        calculateWidth();
+        emit reset();
+    }
 }

src/plugins/debugger/registerhandler.h

@@ -45,6 +45,10 @@ public:
 
 public:
     QByteArray name;
+    /* Value should be an integer for which autodetection by passing
+     * base=0 to QString::toULongLong() should work (C-language conventions).
+     * Values that cannot be converted (such as 128bit MMX-registers) are
+     * passed through. */
     QString value;
     bool changed;
 };
@@ -68,6 +72,8 @@ public:
     Q_SLOT void setNumberBase(int base);
 
 private:
+    void calculateWidth();
+    inline QString value(const Register &reg, bool padded) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

src/plugins/debugger/registerwindow.cpp

@@ -77,7 +77,7 @@ public:
     {
         QLineEdit *lineEdit = qobject_cast<QLineEdit *>(editor);
         QTC_ASSERT(lineEdit, return);
-        lineEdit->setText(index.data(Qt::DisplayRole).toString());
+        lineEdit->setText(index.data(Qt::EditRole).toString());
     }
 
     void setModelData(QWidget *editor, QAbstractItemModel *model,