diff options
author | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-06-18 17:12:31 +0200 |
---|---|---|
committer | Fawzi Mohamed <fawzi.mohamed@qt.io> | 2020-06-24 22:44:16 +0000 |
commit | 96c1b4119e7053981a3109b658a656430c4abaaf (patch) | |
tree | 1d12c2f5d08fc26aa6328b892e4f9a6c01f16982 | |
parent | 848054ce3ca12c1cbe2aaf03222a64571e812542 (diff) | |
download | qt-creator-96c1b4119e7053981a3109b658a656430c4abaaf.tar.gz |
QML: ensure that signal treated like functions/slots in completions
Renames enumerateSlots -> enumerateMethods to mirror the new usage
Fixes: QTCREATORBUG-24124
Change-Id: I31ac7d5f4bf568e1ab9c9463b1ebd0011dfcb9d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r-- | src/plugins/qmljseditor/qmljscompletionassist.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index 839e3fd19f..5cfa28c609 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -187,7 +187,7 @@ class ProcessProperties: private MemberProcessor QSet<const ObjectValue *> _processed; bool _globalCompletion = false; bool _enumerateGeneratedSlots = false; - bool _enumerateSlots = true; + bool _enumerateMethods = true; const ScopeChain *_scopeChain; const ObjectValue *_currentObject = nullptr; PropertyProcessor *_propertyProcessor = nullptr; @@ -208,9 +208,9 @@ public: _enumerateGeneratedSlots = enumerate; } - void setEnumerateSlots(bool enumerate) + void setEnumerateMethods(bool enumerate) { - _enumerateSlots = enumerate; + _enumerateMethods = enumerate; } void operator ()(const Value *value, PropertyProcessor *processor) @@ -251,14 +251,14 @@ private: bool processSignal(const QString &name, const Value *value) override { - if (_globalCompletion) + if (_globalCompletion || _enumerateMethods) process(name, value); return true; } bool processSlot(const QString &name, const Value *value) override { - if (_enumerateSlots) + if (_enumerateMethods) process(name, value); return true; } @@ -771,7 +771,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const AssistInterface * ProcessProperties processProperties(&scopeChain); processProperties.setGlobalCompletion(true); processProperties.setEnumerateGeneratedSlots(true); - processProperties.setEnumerateSlots(false); + processProperties.setEnumerateMethods(false); // id: is special AssistProposalItem *idProposalItem = new QmlJSAssistProposalItem; |