From e325aa38d91c9d11b9645004e786924c49e2b325 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <qtc-committer@nokia.com>
Date: Mon, 22 Dec 2008 13:55:42 +0100
Subject: Nicer implementation of CPlusPlus::Macro.

---
 src/plugins/cpptools/cppcodecompletion.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/plugins/cpptools/cppcodecompletion.cpp')

diff --git a/src/plugins/cpptools/cppcodecompletion.cpp b/src/plugins/cpptools/cppcodecompletion.cpp
index 1e54a2ae09..f8c5fe9b48 100644
--- a/src/plugins/cpptools/cppcodecompletion.cpp
+++ b/src/plugins/cpptools/cppcodecompletion.cpp
@@ -741,7 +741,7 @@ void CppCodeCompletion::addMacros(const LookupContext &context)
         processed.insert(fn);
         if (Document::Ptr doc = context.document(fn)) {
             foreach (const Macro &macro, doc->definedMacros()) {
-                macroNames.insert(macro.name);
+                macroNames.insert(macro.name());
             }
             todo += doc->includedFiles();
         }
@@ -749,7 +749,7 @@ void CppCodeCompletion::addMacros(const LookupContext &context)
 
     foreach (const QByteArray &macroName, macroNames) {
         TextEditor::CompletionItem item(this);
-        item.m_text = QString::fromLatin1(macroName.constData(), macroName.length());
+        item.m_text = QString::fromUtf8(macroName.constData(), macroName.length());
         item.m_icon = m_icons.macroIcon();
         m_completions.append(item);
     }
-- 
cgit v1.2.1