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

Debugger: Fix broken display of containers with truncated item count.

Browse Source 
Introduce convention '<>10 items>' meaning <more than 10 items>.

Task-number: QTCREATORBUG-3132
This commit is contained in:
Friedemann Kleint
2010-11-18 15:40:07 +01:00
parent 1c18090b90
commit f9eea7e1ec
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -481,8 +481,15 @@ static inline QString formattedValue(const WatchData &data, int format)
else if (result == QLatin1String("<not accessible>"))
result = WatchHandler::tr("<not accessible>");
else if (result.endsWith(" items>")) {
const int size = result.mid(1, result.indexOf(' ') - 1).toInt();
result = WatchHandler::tr("<%n items>", 0, size);
// '<10 items>' or '<>10 items>' (more than)
bool ok;
const bool moreThan = result.at(1) == QLatin1Char('>');
const int numberPos = moreThan ? 2 : 1;
const int size = result.mid(numberPos, result.indexOf(' ') - numberPos).toInt(&ok);
QTC_ASSERT(ok, qWarning("WatchHandler: Invalid item count '%s'", qPrintable(result)) ; )
result = moreThan ?
WatchHandler::tr("<more than %n items>", 0, size) :
WatchHandler::tr("<%n items>", 0, size);
}
}
return result;