From ba31dba5c0bccf06e29911fb3722fa8ae4350ece Mon Sep 17 00:00:00 2001 From: Mauro Iazzi Date: Sun, 1 Feb 2009 15:17:17 +0100 Subject: [PATCH] only store modifiers in the new list --- cpptoxml/parser/class_compiler.cpp | 13 +++++++------ cpptoxml/parser/class_compiler.h | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cpptoxml/parser/class_compiler.cpp b/cpptoxml/parser/class_compiler.cpp index 79b0f42..098437d 100644 --- a/cpptoxml/parser/class_compiler.cpp +++ b/cpptoxml/parser/class_compiler.cpp @@ -58,27 +58,28 @@ void ClassCompiler::visitBaseSpecifier(BaseSpecifierAST *node) { name_cc.run(node->name); QString name = name_cc.name(); - QString spec_name = name; + QString modifier = ""; if (! name.isEmpty()) { _M_base_classes.append(name); switch (_M_token_stream->kind(node->access_specifier)) { case Token_public: - spec_name = spec_name.prepend("public "); + modifier = modifier.prepend("public"); break; case Token_private: - spec_name = spec_name.prepend("private "); + modifier = modifier.prepend("private"); break; case Token_protected: - spec_name = spec_name.prepend("protected "); + modifier = modifier.prepend("protected"); break; default: + modifier = modifier.prepend("private"); break; } if (_M_token_stream->kind(node->virt)==Token_virtual) { - spec_name = spec_name.prepend("virtual "); + modifier = modifier.prepend("virtual "); } - _M_base_classes_spec.append(spec_name); + _M_base_classes_mod.append(modifier); } } diff --git a/cpptoxml/parser/class_compiler.h b/cpptoxml/parser/class_compiler.h index d6a738f..4e46e07 100644 --- a/cpptoxml/parser/class_compiler.h +++ b/cpptoxml/parser/class_compiler.h @@ -56,7 +56,7 @@ private: TokenStream *_M_token_stream; QString _M_name; QStringList _M_base_classes; - QStringList _M_base_classes_spec; + QStringList _M_base_classes_mod; NameCompiler name_cc; TypeCompiler type_cc; }; -- 2.11.4.GIT