From a5d70b9539700e0091de9756ec38b657090ed6b0 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Sun, 11 Dec 2011 10:57:05 +0200
Subject: [PATCH] Use dumper for non-dynamic type

Change-Id: If053ef7a7f2f16aedb4225eb5b213ca7e6df1680
---
 share/qtcreator/dumper/dumper.py |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/share/qtcreator/dumper/dumper.py b/share/qtcreator/dumper/dumper.py
index 01fd2e1..50a9925 100644
--- a/share/qtcreator/dumper/dumper.py
+++ b/share/qtcreator/dumper/dumper.py
@@ -1348,6 +1348,20 @@ class Dumper:
         with SubItem(self, name):
             self.putItem(result)

+    def putDumped(self, typeName, value):
+        if typeName in qqDumpers:
+            qqDumpers[typeName](self, value)
+            return True
+
+        nsStrippedType = self.stripNamespaceFromType(typeName)\
+            .replace("::", "__")
+        #warn(" STRIPPED: %s" % nsStrippedType)
+        #warn(" DUMPERS: %s" % (nsStrippedType in qqDumpers))
+        if nsStrippedType in qqDumpers:
+            qqDumpers[nsStrippedType](self, value)
+            return True
+        return False
+
     def putItem(self, value):
         if value is None:
             # Happens for non-available watchers in gdb versions that
@@ -1602,16 +1616,8 @@ class Dumper:
             self.putAddress(value.address)
             self.putType(dtypeName)

-            if dtypeName in qqDumpers:
-                qqDumpers[dtypeName](self, expensiveUpcast(value))
-                return
-
-            nsStrippedType = self.stripNamespaceFromType(dtypeName)\
-                .replace("::", "__")
-            #warn(" STRIPPED: %s" % nsStrippedType)
-            #warn(" DUMPERS: %s" % (nsStrippedType in qqDumpers))
-            if nsStrippedType in qqDumpers:
-                qqDumpers[nsStrippedType](self, expensiveUpcast(value))
+            if self.putDumped(dtypeName, expensiveUpcast(value)) or \
+               (self.useDynamicType and self.putDumped(typeName, value)):
                 return

             # Is this derived from QObject?
--
1.7.7.1.msysgit.0