Skip to content

Commit 24a10fa

Browse files
FelixPetriconimrbean-bremen
authored andcommitted
Also generate python function for operator!=()
1 parent 7129956 commit 24a10fa

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

generator/abstractmetabuilder.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,25 +547,26 @@ bool AbstractMetaBuilder::build()
547547

548548
{
549549
FunctionList hash_functions = m_dom->findFunctions("qHash");
550-
foreach (FunctionModelItem item, hash_functions) {
550+
for (FunctionModelItem item : hash_functions) {
551551
registerHashFunction(item);
552552
}
553553
}
554554

555555
{
556556
FunctionList hash_functions = m_dom->findFunctions("operator<<");
557-
foreach (FunctionModelItem item, hash_functions) {
557+
for (FunctionModelItem item : hash_functions) {
558558
registerToStringCapability(item);
559559
}
560560
}
561561

562562
{
563563
FunctionList compare_operators = m_dom->findFunctions("operator==")
564+
+ m_dom->findFunctions("operator!=")
564565
+ m_dom->findFunctions("operator<=")
565566
+ m_dom->findFunctions("operator>=")
566567
+ m_dom->findFunctions("operator<")
567568
+ m_dom->findFunctions("operator>");
568-
foreach (FunctionModelItem item, compare_operators) {
569+
for (FunctionModelItem item : compare_operators) {
569570
traverseCompareOperator(item);
570571
}
571572
}

generator/generator.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include "generator.h"
4343
#include "reporthandler.h"
4444
#include "fileout.h"
45-
4645
#include <QDir>
4746
#include <QFile>
4847
#include <QFileInfo>

generator/generator.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ class Generator : public QObject
120120
{ return m_qmetatype_declared_typenames; }
121121

122122
protected:
123+
124+
123125
void verifyDirectoryFor(const QFile &file);
124126

125127
AbstractMetaClassList m_classes;

generator/shellgenerator.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,10 @@ void ShellGenerator::writeFunctionArguments(QTextStream &s,
158158
s << " = ";
159159

160160
QString expr = arg->defaultValueExpression();
161+
if (expr == "NULL")
162+
{
163+
expr = "nullptr";
164+
}
161165
if (expr != "0") {
162166
QString qualifier;
163167
if (arg->type()->typeEntry()->isEnum() && expr.indexOf("::") < 0) {

0 commit comments

Comments
 (0)