Highlight user defined types.

2010-05-25 14:53:21 +02:00
parent 2a0f901e16
commit b68a16f1b5
9 changed files with 406 additions and 29 deletions
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -779,12 +779,9 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
                    if (! env->isBuiltinMacro(spell)) {
                        Macro *m = env->resolve(spell);
                        if (m && ! m->isFunctionLike()) {
-                            QByteArray expandedDefinition;
-                            expandObjectLikeMacro(identifierToken, spell, m, &expandedDefinition);
-                            if (expandedDefinition.trimmed().isEmpty()) {
-                                out(QByteArray(spell.length(), ' '));
-                                continue;
-                            }
+                            // expand object-like macros.
+                            processObjectLikeMacro(identifierToken, spell, m);
+                            continue;
                        }
                    }
                    out(spell);