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

InfoBar::enableInfo -> InfoBar::unsuppressInfo

Browse Source 
"enableInfo" actually was the reverse of "suppressInfo", so make that
obvious in the naming.

Change-Id: Ie9210533d9169d9bf486eb4034c8264b5bddda8b
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2017-12-18 09:17:25 +01:00
parent b7bdb8e275
commit 90c7170dae
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/find/searchresultwidget.cpp
View File

@@ -411,7 +411,7 @@ void SearchResultWidget::restart()
m_count = 0; m_count = 0;
Id sizeWarningId(SIZE_WARNING_ID); Id sizeWarningId(SIZE_WARNING_ID);
m_infoBar.removeInfo(sizeWarningId); m_infoBar.removeInfo(sizeWarningId);
m_infoBar.enableInfo(sizeWarningId); m_infoBar.unsuppressInfo(sizeWarningId);
m_cancelButton->setVisible(true); m_cancelButton->setVisible(true);
m_searchAgainButton->setVisible(false); m_searchAgainButton->setVisible(false);
m_messageWidget->setVisible(false); m_messageWidget->setVisible(false);
@@ -434,7 +434,7 @@ void SearchResultWidget::finishSearch(bool canceled)
{ {
Id sizeWarningId(SIZE_WARNING_ID); Id sizeWarningId(SIZE_WARNING_ID);
m_infoBar.removeInfo(sizeWarningId); m_infoBar.removeInfo(sizeWarningId);
m_infoBar.enableInfo(sizeWarningId); m_infoBar.unsuppressInfo(sizeWarningId);
m_replaceTextEdit->setEnabled(m_count > 0); m_replaceTextEdit->setEnabled(m_count > 0);
m_replaceButton->setEnabled(m_count > 0); m_replaceButton->setEnabled(m_count > 0);
m_preserveCaseCheck->setEnabled(m_count > 0); m_preserveCaseCheck->setEnabled(m_count > 0);

2
src/plugins/coreplugin/infobar.cpp
View File

@@ -117,7 +117,7 @@ bool InfoBar::canInfoBeAdded(Id id) const
return !containsInfo(id) && !m_suppressed.contains(id) && !globallySuppressed.contains(id); return !containsInfo(id) && !m_suppressed.contains(id) && !globallySuppressed.contains(id);
} }
void InfoBar::enableInfo(Id id) void InfoBar::unsuppressInfo(Id id)
{ {
m_suppressed.remove(id); m_suppressed.remove(id);
} }

2
src/plugins/coreplugin/infobar.h
View File

@@ -90,7 +90,7 @@ public:
bool containsInfo(Id id) const; bool containsInfo(Id id) const;
void suppressInfo(Id id); void suppressInfo(Id id);
bool canInfoBeAdded(Id id) const; bool canInfoBeAdded(Id id) const;
void enableInfo(Id id); void unsuppressInfo(Id id);
void clear(); void clear();
static void globallySuppressInfo(Id id); static void globallySuppressInfo(Id id);
static void globallyUnsuppressInfo(Id id); static void globallyUnsuppressInfo(Id id);