shiboken2: Improve debug output of type entries

Don't output the generateCode field in hex after
4761ea81d1789d153ae986be6f749853f5a68332.
Output typedef entries of type database.

Task-number: PYSIDE-725
Task-number: PYSIDE-1202
Change-Id: Ib194eceedf2764a9c23353f4a833cb1e57a6e359
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 12 insertions, 3 deletions

diff --git a/sources/shiboken2/ApiExtractor/typedatabase.cpp b/sources/shiboken2/ApiExtractor/typedatabase.cpp
index c9b3fcd91..9fcf474c6 100644
--- a/sources/shiboken2/ApiExtractor/typedatabase.cpp
+++ b/sources/shiboken2/ApiExtractor/typedatabase.cpp
@@ -898,9 +898,8 @@ void TypeEntry::formatDebug(QDebug &d) const
     d << '"' << m_name << '"';
     if (m_name != cppName)
         d << "\", cppName=\"" << cppName << '"';
-    d << ", type=" << m_type << ", codeGeneration=0x"
-        << Qt::hex << m_codeGeneration << Qt::dec
-        << ", target=\"" << targetLangName() << '"';
+    d << ", type=" << m_type << ", codeGeneration="
+        << m_codeGeneration << ", target=\"" << targetLangName() << '"';
     FORMAT_NONEMPTY_STRING("package", m_targetLangPackage)
     FORMAT_BOOL("stream", m_stream)
     FORMAT_LIST_SIZE("codeSnips", m_codeSnips)
@@ -1011,6 +1010,16 @@ void TypeDatabase::formatDebug(QDebug &d) const
       << "entries[" << m_entries.size() << "]=";
     for (auto it = m_entries.cbegin(), end = m_entries.cend(); it != end; ++it)
         d << "  " << it.value() << '\n';
+    if (!m_typedefEntries.isEmpty()) {
+        d << "typedefs[" << m_typedefEntries.size() << "]=(";
+        const auto begin = m_typedefEntries.cbegin();
+        for (auto it = begin, end = m_typedefEntries.cend(); it != end; ++it) {
+            if (it != begin)
+                d << ", ";
+            d << "  " << it.value() << '\n';
+        }
+        d << ")\n";
+    }
     if (!m_templates.isEmpty()) {
         d << "templates[" << m_templates.size() << "]=(";
         const auto begin = m_templates.cbegin();