summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-01-20 18:12:13 +0100
committerhjk <hjk@theqtcompany.com>2015-01-21 08:56:05 +0100
commit9dee300b6731248cff37ef384d1905338875fa67 (patch)
treed29f18cc1b18f0e87ee0dcaebeeddfc0afc84fbd
parent64cc15bca4f6e91917dea28387c39706a40805f3 (diff)
downloadqt-creator-9dee300b6731248cff37ef384d1905338875fa67.tar.gz
Debugger: Fix scoping bug in watch handler.
Found by clang static analyzer. Change-Id: Ib25232b26c314d4da4707f7903f1b75b907b241d Reviewed-by: hjk <hjk@theqtcompany.com>
-rw-r--r--src/plugins/debugger/watchhandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index a45a9dee19..d89f2ef9bc 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -2042,7 +2042,7 @@ int WatchHandler::format(const QByteArray &iname) const
{
int result = AutomaticFormat;
if (const WatchData *item = m_model->findItem(iname)) {
- int result = theIndividualFormats.value(item->iname, AutomaticFormat);
+ result = theIndividualFormats.value(item->iname, AutomaticFormat);
if (result == AutomaticFormat)
result = theTypeFormats.value(stripForFormat(item->type), AutomaticFormat);
}