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

Reapply unconnected changes from reverted commit

Browse Source 
Only revert stuff that is linked to fast string concat.
This commit is contained in:
Kai Koehne
2010-02-08 11:07:18 +01:00
parent 999c73ad9d
commit 6c4b9ba227
9 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/registerhandler.cpp
View File

@@ -79,18 +79,18 @@ QVariant RegisterHandler::data(const QModelIndex &index, int role) const
// Return some address associated with the register.
bool ok = true;
qulonglong value = reg.value.toULongLong(&ok, 0);
return ok ? QString::fromLatin1("0x") + QString::number(value, 16) : QVariant();
return ok ? QVariant(QString::fromLatin1("0x") + QString::number(value, 16)) : QVariant();
}
const QString padding = " ";
if (role == Qt::DisplayRole) {
switch (index.column()) {
case 0: return padding + reg.name + padding;
case 0: return QVariant(padding + reg.name + padding);
case 1: {
bool ok = true;
qulonglong value = reg.value.toULongLong(&ok, 0);
QString res = ok ? QString::number(value, m_base) : reg.value;
return QString(m_strlen - res.size(), QLatin1Char(' ')) + res;
return QVariant(QString(m_strlen - res.size(), QLatin1Char(' ')) + res);
}
}
}