diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-05-10 15:09:34 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-05-13 12:44:54 +0000 |
| commit | f341dd0b8e21fecfd5d6c1e38c092fbecf073658 (patch) | |
| tree | 5c16d1f2c929f05bff6cceda79b7d8cf096566e4 /src/plugins/coreplugin | |
| parent | 9c403f498ec90e88763681dc0dafac5389a53896 (diff) | |
| download | qt-creator-f341dd0b8e21fecfd5d6c1e38c092fbecf073658.tar.gz | |
Locator: Remove default argument and default behavior for refresh
With lambdas there really is no reason to do special behavior for an
empty list. Instead always expect the full list of filters to refresh.
Change-Id: I8bae0d4790de97e6d6d23d51b1a620c76c80cc8a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/coreplugin')
| -rw-r--r-- | src/plugins/coreplugin/locator/locator.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/coreplugin/locator/locator.h | 2 | ||||
| -rw-r--r-- | src/plugins/coreplugin/locator/locatorwidget.cpp | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp index 17f8fbbd86..d3de093e17 100644 --- a/src/plugins/coreplugin/locator/locator.cpp +++ b/src/plugins/coreplugin/locator/locator.cpp @@ -92,7 +92,7 @@ Locator::Locator() { m_instance = this; m_refreshTimer.setSingleShot(false); - connect(&m_refreshTimer, &QTimer::timeout, this, [this]() { refresh(); }); + connect(&m_refreshTimer, &QTimer::timeout, this, [this]() { refresh(filters()); }); } Locator::~Locator() @@ -339,8 +339,6 @@ void Locator::setRefreshInterval(int interval) void Locator::refresh(QList<ILocatorFilter *> filters) { - if (filters.isEmpty()) - filters = m_filters; QFuture<void> task = Utils::map(filters, &ILocatorFilter::refresh, Utils::MapReduceOption::Unordered); FutureProgress *progress = ProgressManager::addTask(task, tr("Updating Locator Caches"), Constants::TASK_INDEX); diff --git a/src/plugins/coreplugin/locator/locator.h b/src/plugins/coreplugin/locator/locator.h index 10b2dc256a..bb68c4a336 100644 --- a/src/plugins/coreplugin/locator/locator.h +++ b/src/plugins/coreplugin/locator/locator.h @@ -64,7 +64,7 @@ signals: void filtersChanged(); public slots: - void refresh(QList<ILocatorFilter *> filters = QList<ILocatorFilter *>()); + void refresh(QList<ILocatorFilter *> filters); void saveSettings() const; private: diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp index 994c9e5d0e..dfcc50a9a5 100644 --- a/src/plugins/coreplugin/locator/locatorwidget.cpp +++ b/src/plugins/coreplugin/locator/locatorwidget.cpp @@ -579,8 +579,9 @@ LocatorWidget::LocatorWidget(Locator *locator) : m_fileLineEdit->setButtonMenu(Utils::FancyLineEdit::Left, m_filterMenu); - connect(m_refreshAction, &QAction::triggered, - locator, [locator]() { locator->refresh(); }); + connect(m_refreshAction, &QAction::triggered, locator, [locator]() { + locator->refresh(locator->filters()); + }); connect(m_configureAction, &QAction::triggered, this, &LocatorWidget::showConfigureDialog); connect(m_fileLineEdit, &QLineEdit::textChanged, this, &LocatorWidget::showPopupDelayed); |