forked from qt-creator/qt-creator
Don't insert `(' when completing ambiguous symbols.
This commit is contained in:
@@ -157,6 +157,7 @@ bool CheckDeclarator::visit(NestedDeclaratorAST *ast)
|
||||
bool CheckDeclarator::visit(FunctionDeclaratorAST *ast)
|
||||
{
|
||||
Function *fun = control()->newFunction(ast->firstToken());
|
||||
fun->setAmbiguous(ast->as_cpp_initializer != 0);
|
||||
ast->symbol = fun;
|
||||
fun->setReturnType(_fullySpecifiedType);
|
||||
|
||||
|
||||
@@ -255,6 +255,12 @@ bool Function::isPureVirtual() const
|
||||
void Function::setPureVirtual(bool isPureVirtual)
|
||||
{ _isPureVirtual = isPureVirtual; }
|
||||
|
||||
bool Function::isAmbiguous() const
|
||||
{ return _isAmbiguous; }
|
||||
|
||||
void Function::setAmbiguous(bool isAmbiguous)
|
||||
{ _isAmbiguous = isAmbiguous; }
|
||||
|
||||
void Function::visitSymbol0(SymbolVisitor *visitor)
|
||||
{
|
||||
if (visitor->visit(this)) {
|
||||
|
||||
@@ -322,6 +322,9 @@ public:
|
||||
virtual Function *asFunctionType()
|
||||
{ return this; }
|
||||
|
||||
bool isAmbiguous() const; // internal
|
||||
void setAmbiguous(bool isAmbiguous); // internal
|
||||
|
||||
protected:
|
||||
virtual void visitSymbol0(SymbolVisitor *visitor);
|
||||
virtual void accept0(TypeVisitor *visitor);
|
||||
@@ -337,6 +340,7 @@ private:
|
||||
unsigned _isPureVirtual: 1;
|
||||
unsigned _isConst: 1;
|
||||
unsigned _isVolatile: 1;
|
||||
unsigned _isAmbiguous: 1;
|
||||
unsigned _methodKey: 3;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user