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

CppEditor: Add "= 0" for pure virtual functions in override popup

Browse Source 
Change-Id: If1887424f240eba750aeb13d52a101c00904f71b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2014-02-14 10:42:36 +02:00
committed by Orgad Shaneh
parent 5a909111e1
commit 0357531796
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ public:
hintItem->setOrder(-1000);
QList<BasicProposalItem *> items;
items << itemFromFunction(maybeDefinitionFor(m_params.function));
items << itemFromFunction(m_params.function);
items << hintItem;
return new VirtualFunctionProposal(m_params.cursorPosition,
new BasicProposalItemListModel(items),
@@ -151,7 +151,7 @@ public:
QList<BasicProposalItem *> items;
foreach (Function *func, overrides)
items << itemFromFunction(maybeDefinitionFor(func));
items << itemFromFunction(func);
items.first()->setOrder(1000); // Ensure top position for function of static type
return new VirtualFunctionProposal(m_params.cursorPosition,
@@ -160,7 +160,7 @@ public:
}
private:
Function *maybeDefinitionFor(Function *func)
Function *maybeDefinitionFor(Function *func) const
{
if (Function *definition = m_finder.findMatchingDefinition(func, m_params.snapshot))
return definition;
@@ -169,8 +169,10 @@ private:
BasicProposalItem *itemFromFunction(Function *func) const
{
const QString text = m_overview.prettyName(LookupContext::fullyQualifiedName(func));
const CPPEditorWidget::Link link = CPPEditorWidget::linkToSymbol(func);
const CPPEditorWidget::Link link = CPPEditorWidget::linkToSymbol(maybeDefinitionFor(func));
QString text = m_overview.prettyName(LookupContext::fullyQualifiedName(func));
if (func->isPureVirtual())
text += QLatin1String(" = 0");
BasicProposalItem *item = new VirtualFunctionProposalItem(link, m_params.openInNextSplit);
item->setText(text);
@@ -182,7 +184,7 @@ private:
VirtualFunctionAssistProvider::Parameters m_params;
Overview m_overview;
Icons m_icons;
CppTools::SymbolFinder m_finder;
mutable CppTools::SymbolFinder m_finder;
};
VirtualFunctionAssistProvider::VirtualFunctionAssistProvider()