From 30b553466797ddf7e3252f1cab2d02d6ea0bee5a Mon Sep 17 00:00:00 2001 From: Przemyslaw Gorszkowski Date: Tue, 18 Sep 2012 22:12:07 +0200 Subject: [PATCH] Fix "Apply function signature change" for boost::shared_ptr Problem was with nested template type(in this case shared_ptr is nested template type) Task-number: QTCREATORBUG-6784 Change-Id: I8ea9203f2b1fbde73d9ac4e6c8cdeb2b6e0afcef Reviewed-by: David Schulz --- src/libs/cplusplus/CppRewriter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/cplusplus/CppRewriter.cpp b/src/libs/cplusplus/CppRewriter.cpp index 31eefe8deef..8f8da60218e 100644 --- a/src/libs/cplusplus/CppRewriter.cpp +++ b/src/libs/cplusplus/CppRewriter.cpp @@ -395,7 +395,8 @@ FullySpecifiedType UseMinimalNames::apply(const Name *name, Rewrite *rewrite) co SubstitutionEnvironment *env = rewrite->env; Scope *scope = env->scope(); - if (name->isTemplateNameId()) + if (name->isTemplateNameId() || + (name->isQualifiedNameId() && name->asQualifiedNameId()->name()->isTemplateNameId())) return FullySpecifiedType(); if (! scope)