diff options
author | hjk <hjk121@nokiamail.com> | 2014-05-17 21:17:15 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-05-19 12:02:27 +0200 |
commit | 29e4ed9f568d4314242a9a4ccb42b254f351b9df (patch) | |
tree | 6c5997346495a5c598e10813cd63519e41904383 | |
parent | 1f45eb2c210b033a30976ec9ddec5b4e8339ade4 (diff) | |
download | qt-creator-29e4ed9f568d4314242a9a4ccb42b254f351b9df.tar.gz |
Find: Fix an issue found by clang static analyzer
Change-Id: Id556e670930b0f8e2ee47fb413c443b79a86f4d4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
-rw-r--r-- | src/plugins/coreplugin/find/findtoolwindow.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp index 66521dc32b..73f5b7c991 100644 --- a/src/plugins/coreplugin/find/findtoolwindow.cpp +++ b/src/plugins/coreplugin/find/findtoolwindow.cpp @@ -32,6 +32,7 @@ #include "findplugin.h" #include <coreplugin/icore.h> +#include <utils/qtcassert.h> #include <QSettings> #include <QStringListModel> @@ -225,17 +226,18 @@ void FindToolWindow::acceptAndGetParameters(QString *term, IFindFilter **filter) void FindToolWindow::search() { QString term; - IFindFilter *filter; + IFindFilter *filter = 0; acceptAndGetParameters(&term, &filter); - if (filter) - filter->findAll(term, m_plugin->findFlags()); + QTC_ASSERT(filter, return); + filter->findAll(term, m_plugin->findFlags()); } void FindToolWindow::replace() { QString term; - IFindFilter *filter; + IFindFilter *filter = 0; acceptAndGetParameters(&term, &filter); + QTC_ASSERT(filter, return); filter->replaceAll(term, m_plugin->findFlags()); } |