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

TextEditor: Wiggle codeassist setup

Browse Source 
Remove GenericProposalModel convenience constructor,
add GenericProposal instead. Less user side code.

Change-Id: I833f9943df27b50579485c93efb96943ec403f65
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-09-13 02:22:24 +02:00
parent fef838eed7
commit 78a04f0a6d
13 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -107,8 +107,8 @@ private:
class VirtualFunctionProposal : public GenericProposal
{
public:
VirtualFunctionProposal(int cursorPos, GenericProposalModel *model, bool openInSplit)
: GenericProposal(cursorPos, model)
VirtualFunctionProposal(int cursorPos, const QList<AssistProposalItem *> &items, bool openInSplit)
: GenericProposal(cursorPos, items)
, m_openInSplit(openInSplit)
{}
@@ -140,9 +140,7 @@ public:
QList<AssistProposalItem *> items;
items << itemFromFunction(m_params.function);
items << hintItem;
return new VirtualFunctionProposal(m_params.cursorPosition,
new GenericProposalModel(items),
m_params.openInNextSplit);
return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
}
IAssistProposal *perform(const AssistInterface *) QTC_OVERRIDE
@@ -166,9 +164,7 @@ public:
items << itemFromFunction(func);
items.first()->setOrder(1000); // Ensure top position for function of static type
return new VirtualFunctionProposal(m_params.cursorPosition,
new GenericProposalModel(items),
m_params.openInNextSplit);
return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
}
private: