From 63a5f15f9d5e287debe8944259ded24b719570b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Tue, 3 Feb 2009 11:37:38 +0100
Subject: [PATCH] Don't replace . with -> in case of primitive types

Reviewed-by: Roberto Raggi
---
 src/plugins/cpptools/cppcodecompletion.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index df68e5778dc..b6bac92bf9b 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -689,12 +689,14 @@ bool CppCodeCompletion::completeMember(const QList<TypeOfExpression::Result> &re
         }
 
         if (PointerType *ptrTy = ty->asPointerType()) {
-            // Replace . with ->
-            int length = m_editor->position() - m_startPosition + 1;
-            m_editor->setCurPos(m_startPosition - 1);
-            m_editor->replace(length, QLatin1String("->"));
-            ++m_startPosition;
-            namedTy = ptrTy->elementType()->asNamedType();
+            if (ptrTy->elementType()->isNamedType()) {
+                // Replace . with ->
+                int length = m_editor->position() - m_startPosition + 1;
+                m_editor->setCurPos(m_startPosition - 1);
+                m_editor->replace(length, QLatin1String("->"));
+                ++m_startPosition;
+                namedTy = ptrTy->elementType()->asNamedType();
+            }
         } else {
             namedTy = ty->asNamedType();
             if (! namedTy) {