summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-01-13 17:09:00 +0200
committerhjk <qthjk@ovi.com>2013-01-15 21:22:25 +0100
commit14e4c19c2ce29b153c6655ff77e91a9e1c7c878c (patch)
tree464bf77c2951b01d17a67d87f2e49255209c3564
parent44e61c82defe9e1bafc630a805cc5afbad350e78 (diff)
downloadqt-creator-14e4c19c2ce29b153c6655ff77e91a9e1c7c878c.tar.gz
Search: Fix false positive rename warning
Change-Id: Ic483d2ef05112463bc80d96ac4adf858b5f158fd Reviewed-by: hjk <qthjk@ovi.com>
-rw-r--r--src/plugins/find/searchresultwidget.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/find/searchresultwidget.cpp b/src/plugins/find/searchresultwidget.cpp
index 28eb8a9fae..6acfeabb13 100644
--- a/src/plugins/find/searchresultwidget.cpp
+++ b/src/plugins/find/searchresultwidget.cpp
@@ -230,14 +230,13 @@ void SearchResultWidget::addResults(const QList<SearchResultItem> &items, Search
m_searchResultTreeView->addResults(items, mode);
updateMatchesFoundLabel();
if (firstItems) {
- QByteArray undoWarningIdName(UNDO_WARNING_ID);
- if (!m_dontAskAgainGroup.isEmpty())
- undoWarningIdName.append('/' + m_dontAskAgainGroup.toLatin1());
- Core::Id undoWarningId(undoWarningIdName);
- if (m_infoBar.canInfoBeAdded(undoWarningId)) {
- Core::InfoBarEntry info(undoWarningId, tr("This change cannot be undone."),
- Core::InfoBarEntry::GlobalSuppressionEnabled);
- m_infoBar.addInfo(info);
+ if (!m_dontAskAgainGroup.isEmpty()) {
+ Core::Id undoWarningId(QByteArray(UNDO_WARNING_ID) + '/' + m_dontAskAgainGroup.toLatin1());
+ if (m_infoBar.canInfoBeAdded(undoWarningId)) {
+ Core::InfoBarEntry info(undoWarningId, tr("This change cannot be undone."),
+ Core::InfoBarEntry::GlobalSuppressionEnabled);
+ m_infoBar.addInfo(info);
+ }
}
m_replaceTextEdit->setEnabled(true);