diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-05-29 12:50:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-06-13 12:42:13 +0000 |
| commit | 247639d9c301cfd6bed6096260d047c2b82ea129 (patch) | |
| tree | d360d5a887e837d663e6badb8d04748b5f34707b /src/plugins/macros | |
| parent | 19a47fed29969484313d76c125915dedf19cb6e6 (diff) | |
Remove 1-1 dependency between locator and locator input widget
Add possibility for filters to set a new search text when accepting
an entry.
Move placeholder text update from locator manager to widget.
Propagate filter update through signal-slot connection instead of directly.
LocatorManager::show is the only place left that directly references the locator widget.
Change-Id: Id61354d9f166c2af8c9d5528ad8998c7c6b8e1ab
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/macros')
| -rw-r--r-- | src/plugins/macros/macrolocatorfilter.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/macros/macrolocatorfilter.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/macros/macrolocatorfilter.cpp b/src/plugins/macros/macrolocatorfilter.cpp index a631eafd54..b38ef531d8 100644 --- a/src/plugins/macros/macrolocatorfilter.cpp +++ b/src/plugins/macros/macrolocatorfilter.cpp @@ -86,8 +86,12 @@ QList<Core::LocatorFilterEntry> MacroLocatorFilter::matchesFor(QFutureInterface< return betterEntries; } -void MacroLocatorFilter::accept(Core::LocatorFilterEntry selection) const +void MacroLocatorFilter::accept(Core::LocatorFilterEntry selection, + QString *newText, int *selectionStart, int *selectionLength) const { + Q_UNUSED(newText) + Q_UNUSED(selectionStart) + Q_UNUSED(selectionLength) // Give the focus back to the editor Core::IEditor *editor = Core::EditorManager::currentEditor(); if (editor) diff --git a/src/plugins/macros/macrolocatorfilter.h b/src/plugins/macros/macrolocatorfilter.h index 442de6d3e2..f8dc657753 100644 --- a/src/plugins/macros/macrolocatorfilter.h +++ b/src/plugins/macros/macrolocatorfilter.h @@ -45,7 +45,8 @@ public: QList<Core::LocatorFilterEntry> matchesFor(QFutureInterface<Core::LocatorFilterEntry> &future, const QString &entry) override; - void accept(Core::LocatorFilterEntry selection) const override; + void accept(Core::LocatorFilterEntry selection, + QString *newText, int *selectionStart, int *selectionLength) const override; void refresh(QFutureInterface<void> &future) override; private: |