Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

2 files changed, 1 insertions, 4 deletions

diff --git a/src/libs/cplusplus/MatchingText.h b/src/libs/cplusplus/MatchingText.h
index 5b12d5cc78..32db6df60a 100644
--- a/src/libs/cplusplus/MatchingText.h
+++ b/src/libs/cplusplus/MatchingText.h
@@ -36,9 +36,6 @@ QT_FORWARD_DECLARE_CLASS(QChar)
 
 namespace CPlusPlus {
 
-class BackwardsScanner;
-class TokenCache;
-
 class CPLUSPLUS_EXPORT MatchingText
 {
 public:
diff --git a/src/libs/cplusplus/TypePrettyPrinter.cpp b/src/libs/cplusplus/TypePrettyPrinter.cpp
index 6ec363ba92..364edb66af 100644
--- a/src/libs/cplusplus/TypePrettyPrinter.cpp
+++ b/src/libs/cplusplus/TypePrettyPrinter.cpp
@@ -436,7 +436,7 @@ void TypePrettyPrinter::visit(Function *type)
 
                 if (_overview->showDefaultArguments) {
                     if (const StringLiteral *initializer = arg->initializer()) {
-                        _text += QLatin1String(" =");
+                        _text += QLatin1String(" = ");
                         _text += QString::fromUtf8(initializer->chars(), initializer->size());
                     }
                 }