Great debugger helper bug fixing spree.

- Fix extractTemplate() not to kill blanks in case there is no
  blank after a comma, fix hardcoded types accordingly.
- Make niceType()'s regexps ignore blanks after commas, add
  unsigned short as char_type and cache the mappings, making
  them work for CDB.
- CDB: Parse map output of dumpers correctly, generally don't
  confuse the parser by unknown keywords encountered when
  parsing children, thus enabling simple QMap types.
- Make dumpInnerValueHelper output std::string types.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/plugins/debugger/watchutils.h b/src/plugins/debugger/watchutils.h
index 94948499e7..9d39372aa0 100644
--- a/src/plugins/debugger/watchutils.h
+++ b/src/plugins/debugger/watchutils.h
@@ -90,13 +90,15 @@ struct QtDumperResult
     struct Child {
         Child();
 
-        int valueEncoded;
+        int keyEncoded;
+        int valueEncoded;        
         int childCount;
         bool valuedisabled;
         QString name;
         QString address;
         QString exp;
         QString type;
+        QByteArray key;
         QByteArray value;
     };
 
@@ -107,6 +109,7 @@ struct QtDumperResult
     QString iname;
     QString address;
     QString type;
+    QString extra;
     QString displayedType;
     QByteArray value;
     int valueEncoded;