change rejection file format

florianlink · florianlink · commit cc2122e459de · 2016-04-25T14:54:07.000Z
diff --git a/generator/abstractmetabuilder.cpp b/generator/abstractmetabuilder.cpp
@@ -2373,7 +2373,7 @@ void AbstractMetaBuilder::setupClonable(AbstractMetaClass *cls)
     }
 }
 
-static void write_reject_log_file(const QString &name,
+static void write_reject_log_file(const QString &name, const QString &tagName,
                                   const QMap<QString, AbstractMetaBuilder::RejectReason> &rejects)
 {
     QFile f(name);
@@ -2418,7 +2418,12 @@ static void write_reject_log_file(const QString &name,
              it != rejects.constEnd(); ++it) {
             if (it.value() != reason)
                 continue;
-            s << " - " << it.key() << endl;
+            if (tagName.isEmpty()) {
+              s << it.key() << endl;
+            } else {
+              s << "<" << tagName << " name=\"" << it.key() << "\"/>" << endl;
+//              s << "<rejection class=\"" << it.key() << "\"/>" << endl;
+            }
         }
 
         s << QString(72, '*') << endl << endl;
@@ -2429,10 +2434,10 @@ static void write_reject_log_file(const QString &name,
 
 void AbstractMetaBuilder::dumpLog()
 {
-    write_reject_log_file("mjb_rejected_classes.log", m_rejected_classes);
-    write_reject_log_file("mjb_rejected_enums.log", m_rejected_enums);
-    write_reject_log_file("mjb_rejected_functions.log", m_rejected_functions);
-    write_reject_log_file("mjb_rejected_fields.log", m_rejected_fields);
+    write_reject_log_file("mjb_rejected_classes.log", "object-type",  m_rejected_classes);
+    write_reject_log_file("mjb_rejected_enums.log", "enum-type", m_rejected_enums);
+    write_reject_log_file("mjb_rejected_functions.log","", m_rejected_functions);
+    write_reject_log_file("mjb_rejected_fields.log","", m_rejected_fields);
 }
 
 AbstractMetaClassList AbstractMetaBuilder::classesTopologicalSorted() const

Original file line number	Diff line number	Diff line change
`@@ -2373,7 +2373,7 @@ void AbstractMetaBuilder::setupClonable(AbstractMetaClass *cls)`
`2373`	`2373`	`}`
`2374`	`2374`	`}`
`2375`	`2375`
`2376`		`-static void write_reject_log_file(const QString &name,`
	`2376`	`+static void write_reject_log_file(const QString &name, const QString &tagName,`
`2377`	`2377`	`const QMap<QString, AbstractMetaBuilder::RejectReason> &rejects)`
`2378`	`2378`	`{`
`2379`	`2379`	`QFile f(name);`
`@@ -2418,7 +2418,12 @@ static void write_reject_log_file(const QString &name,`
`2418`	`2418`	`it != rejects.constEnd(); ++it) {`
`2419`	`2419`	`if (it.value() != reason)`
`2420`	`2420`	`continue;`
`2421`		`- s << " - " << it.key() << endl;`
	`2421`	`+ if (tagName.isEmpty()) {`
	`2422`	`+ s << it.key() << endl;`
	`2423`	`+ } else {`
	`2424`	`+ s << "<" << tagName << " name=\"" << it.key() << "\"/>" << endl;`
	`2425`	`+// s << "<rejection class=\"" << it.key() << "\"/>" << endl;`
	`2426`	`+ }`
`2422`	`2427`	`}`
`2423`	`2428`
`2424`	`2429`	`s << QString(72, '*') << endl << endl;`
`@@ -2429,10 +2434,10 @@ static void write_reject_log_file(const QString &name,`
`2429`	`2434`
`2430`	`2435`	`void AbstractMetaBuilder::dumpLog()`
`2431`	`2436`	`{`
`2432`		`- write_reject_log_file("mjb_rejected_classes.log", m_rejected_classes);`
`2433`		`- write_reject_log_file("mjb_rejected_enums.log", m_rejected_enums);`
`2434`		`- write_reject_log_file("mjb_rejected_functions.log", m_rejected_functions);`
`2435`		`- write_reject_log_file("mjb_rejected_fields.log", m_rejected_fields);`
	`2437`	`+ write_reject_log_file("mjb_rejected_classes.log", "object-type", m_rejected_classes);`
	`2438`	`+ write_reject_log_file("mjb_rejected_enums.log", "enum-type", m_rejected_enums);`
	`2439`	`+ write_reject_log_file("mjb_rejected_functions.log","", m_rejected_functions);`
	`2440`	`+ write_reject_log_file("mjb_rejected_fields.log","", m_rejected_fields);`
`2436`	`2441`	`}`
`2437`	`2442`
`2438`	`2443`	`AbstractMetaClassList AbstractMetaBuilder::classesTopologicalSorted() const`