diff options
author | hjk <qtc-committer@nokia.com> | 2011-11-18 19:18:10 +0100 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2011-11-24 10:33:50 +0100 |
commit | 06f53a4e2551f9c261dc61178f17f0a04f39817f (patch) | |
tree | 0a85057855482044d54a3e5d08cd98be0510e799 /src/plugins/debugger/watchhandler.cpp | |
parent | a866a1dea76a60d371113b34142dd5ab8b5b464e (diff) | |
download | qt-creator-06f53a4e2551f9c261dc61178f17f0a04f39817f.tar.gz |
debugger: don't try to escape translated strings
Task-number: QTCREATORBUG-5838
Change-Id: I897af2919d3762c23c788d276e755d8d598483ed
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/debugger/watchhandler.cpp')
-rw-r--r-- | src/plugins/debugger/watchhandler.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index fa5a5ee5c3..9b54c64c2e 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -437,16 +437,16 @@ QString WatchModel::formattedValue(const WatchData &data) const QString result = value; if (result.startsWith(QLatin1Char('<'))) { if (result == QLatin1String("<Edit>")) - result = WatchHandler::tr("<Edit>"); - else if (result == QLatin1String("<empty>")) - result = WatchHandler::tr("<empty>"); - else if (result == QLatin1String("<uninitialized>")) - result = WatchHandler::tr("<uninitialized>"); - else if (result == QLatin1String("<invalid>")) - result = WatchHandler::tr("<invalid>"); - else if (result == QLatin1String("<not accessible>")) - result = WatchHandler::tr("<not accessible>"); - else if (result.endsWith(" items>")) { + return WatchHandler::tr("<Edit>"); + if (result == QLatin1String("<empty>")) + return WatchHandler::tr("<empty>"); + if (result == QLatin1String("<uninitialized>")) + return WatchHandler::tr("<uninitialized>"); + if (result == QLatin1String("<invalid>")) + return WatchHandler::tr("<invalid>"); + if (result == QLatin1String("<not accessible>")) + return WatchHandler::tr("<not accessible>"); + if (result.endsWith(" items>")) { // '<10 items>' or '<>10 items>' (more than) bool ok; const bool moreThan = result.at(1) == QLatin1Char('>'); @@ -455,7 +455,7 @@ QString WatchModel::formattedValue(const WatchData &data) const const int size = result.mid(numberPos, len).toInt(&ok); QTC_ASSERT(ok, qWarning("WatchHandler: Invalid item count '%s'", qPrintable(result))) - result = moreThan ? + return moreThan ? WatchHandler::tr("<more than %n items>", 0, size) : WatchHandler::tr("<%n items>", 0, size); } |