From 62811941de9ed31ae29477aa9bdd8fbec4be050b Mon Sep 17 00:00:00 2001 From: hjk <qtc-committer@nokia.com> Date: Mon, 8 Mar 2010 13:33:07 +0100 Subject: [PATCH] debugger: fix display of QContainer<T>::NestedType --- share/qtcreator/gdbmacros/dumper.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/gdbmacros/dumper.py b/share/qtcreator/gdbmacros/dumper.py index 0cbbacd6d5c..3db8be0a5d5 100644 --- a/share/qtcreator/gdbmacros/dumper.py +++ b/share/qtcreator/gdbmacros/dumper.py @@ -877,13 +877,15 @@ class Dumper: # subsequent underscores are reserved for the implemention. if typeobj.code == gdb.TYPE_CODE_PTR: return self.stripNamespaceFromType(typeobj.target()) + "__star" - # FIXME: pass ns from plugin type = stripClassTag(str(typeobj)) if len(self.ns) > 0 and type.startswith(self.ns): type = type[len(self.ns):] pos = type.find("<") - if pos != -1: - type = type[0:pos] + # FIXME: make it recognize foo<A>::bar<B>::iterator? + while pos != -1: + pos1 = type.rfind(">", pos) + type = type[0:pos] + type[pos1+1:] + pos = type.find("<") return type def isMovableType(self, type): -- GitLab