diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index b19a479a3cc9aee8c4e48cf3f02a2fdf83371c13..59d2b8aa53429672a4a92f0a46a80ab9d8479e37 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -639,11 +639,6 @@ CppCompletionAssistProcessor::CppCompletionAssistProcessor() CppCompletionAssistProcessor::~CppCompletionAssistProcessor() {} -IAssistProposal *CppCompletionAssistProcessor::immediateProposal(const IAssistInterface *) -{ - return 0; -} - IAssistProposal * CppCompletionAssistProcessor::perform(const IAssistInterface *interface) { m_interface.reset(static_cast<const CppCompletionAssistInterface *>(interface)); diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index 1ec57cf4d8ab2733e3af5ec62fd1bfc5cb9b9cd1..6345d895b25a44cbf977afa8f1538bbcffdcdf4f 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -102,7 +102,6 @@ public: CppCompletionAssistProcessor(); virtual ~CppCompletionAssistProcessor(); - virtual TextEditor::IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *); virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); private: diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 179dd86b714d747d44ada1224a7816ac87e46b1c..f8e79162f2e5f603957407719c4c1ec80e519b78 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -808,8 +808,6 @@ public: : m_provider(static_cast<const FakeVimCompletionAssistProvider *>(provider)) {} - IAssistProposal *immediateProposal(const IAssistInterface *) { return 0; } - IAssistProposal *perform(const IAssistInterface *interface) { const QString &needle = m_provider->needle(); diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp index 768bd0b149a3d62fe5522c9c40482f14942ee596..f5ecd2c98341fec6679b75465d1576e66c64e219 100644 --- a/src/plugins/glsleditor/glslcompletionassist.cpp +++ b/src/plugins/glsleditor/glslcompletionassist.cpp @@ -214,11 +214,6 @@ GLSLCompletionAssistProcessor::GLSLCompletionAssistProcessor() GLSLCompletionAssistProcessor::~GLSLCompletionAssistProcessor() {} -IAssistProposal *GLSLCompletionAssistProcessor::immediateProposal(const IAssistInterface *) -{ - return 0; -} - IAssistProposal *GLSLCompletionAssistProcessor::perform(const IAssistInterface *interface) { m_interface.reset(static_cast<const GLSLCompletionAssistInterface *>(interface)); diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h index 5d96452cc64a1244fa11236c47d58eb4e54fac24..bf75cfe31fa8f22a91f6d0611dc16cdb91ce3470 100644 --- a/src/plugins/glsleditor/glslcompletionassist.h +++ b/src/plugins/glsleditor/glslcompletionassist.h @@ -71,7 +71,6 @@ public: GLSLCompletionAssistProcessor(); virtual ~GLSLCompletionAssistProcessor(); - virtual TextEditor::IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *); virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); private: diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index c3edc8394dcef036612e5c4fd958e9027b3b9965..65a80f6d295df5632d7e5155687fe7b57de1ff1b 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -510,11 +510,6 @@ QmlJSCompletionAssistProcessor::QmlJSCompletionAssistProcessor() QmlJSCompletionAssistProcessor::~QmlJSCompletionAssistProcessor() {} -IAssistProposal *QmlJSCompletionAssistProcessor::immediateProposal(const IAssistInterface *) -{ - return 0; -} - IAssistProposal *QmlJSCompletionAssistProcessor::createContentProposal() const { IGenericProposalModel *model = new QmlJSAssistProposalModel(m_completions); diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h index 40a4239a5ba24ecfb1b5a303550bc70c99091f14..a8437211e3ee8399fe79b24ecd61d0014288021c 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.h +++ b/src/plugins/qmljseditor/qmljscompletionassist.h @@ -95,7 +95,6 @@ public: QmlJSCompletionAssistProcessor(); virtual ~QmlJSCompletionAssistProcessor(); - virtual TextEditor::IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *); virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); private: diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp index 3370fa0faeba82e9d277a460431e2bd2d6d91cd5..046f1b836d94f36cbcd791539a95e20bb64ac74b 100644 --- a/src/plugins/texteditor/circularclipboardassist.cpp +++ b/src/plugins/texteditor/circularclipboardassist.cpp @@ -86,8 +86,6 @@ private: class ClipboardAssistProcessor: public IAssistProcessor { public: - IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *) { return 0; } - IAssistProposal *perform(const IAssistInterface *interface) { if (!interface) diff --git a/src/plugins/texteditor/codeassist/iassistprocessor.h b/src/plugins/texteditor/codeassist/iassistprocessor.h index 3a66c0279d4500406e8915e2637269779d48fee9..1bcefc29acfd676bf3db1f4ab0cb1b8523a8b213 100644 --- a/src/plugins/texteditor/codeassist/iassistprocessor.h +++ b/src/plugins/texteditor/codeassist/iassistprocessor.h @@ -46,7 +46,7 @@ public: IAssistProcessor(); virtual ~IAssistProcessor(); - virtual IAssistProposal *immediateProposal(const IAssistInterface *interface) = 0; + virtual IAssistProposal *immediateProposal(const IAssistInterface *) { return 0; } virtual IAssistProposal *perform(const IAssistInterface *interface) = 0; }; diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp index 46b395b89c61ed4e62b2eb2cf0ad63b874df33f4..e58f395f1b2818ce2b5f689b0de4402a713cb11c 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.cpp @@ -177,11 +177,6 @@ KeywordsCompletionAssistProcessor::KeywordsCompletionAssistProcessor(Keywords ke KeywordsCompletionAssistProcessor::~KeywordsCompletionAssistProcessor() {} -IAssistProposal *KeywordsCompletionAssistProcessor::immediateProposal(const IAssistInterface *) -{ - return 0; -} - IAssistProposal *KeywordsCompletionAssistProcessor::perform(const IAssistInterface *interface) { m_interface.reset(interface); diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.h b/src/plugins/texteditor/codeassist/keywordscompletionassist.h index 45e202429dc553198e9e40ecc30ca3bd154910d4..80aa1c8e04cf1a5be4c37008eb68277834b81309 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.h +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.h @@ -88,7 +88,6 @@ public: KeywordsCompletionAssistProcessor(Keywords keywords); virtual ~KeywordsCompletionAssistProcessor(); - virtual TextEditor::IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *); virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); virtual QChar startOfCommentChar() const; diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp index 6fa8e7c4059982f8b76d2a50b8efbc0019da84ea..db90f5d4d1b045d453e7e621af9f9f6f5f09da25 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp +++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.cpp @@ -47,11 +47,6 @@ QuickFixAssistProcessor::QuickFixAssistProcessor() QuickFixAssistProcessor::~QuickFixAssistProcessor() {} -IAssistProposal *QuickFixAssistProcessor::immediateProposal(const IAssistInterface *) -{ - return 0; -} - IAssistProposal *QuickFixAssistProcessor::perform(const IAssistInterface *interface) { if (!interface) diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h index a79a793c804aae747d00a4247f9f9f98f937cd67..96737a1a4df4e7b6cf89425252ce3d110f802188 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h +++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h @@ -42,7 +42,6 @@ public: virtual const IAssistProvider *provider() const = 0; - virtual TextEditor::IAssistProposal *immediateProposal(const IAssistInterface *interface); virtual IAssistProposal *perform(const IAssistInterface *interface); };