aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-11-29 11:33:29 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-12-06 07:34:52 +0100
commit870b7f4c849ebbc5f39f1f2398e39a3b7dfd9562 (patch)
tree2550caa1038d9b507942502fe9709bbc713f9a5d /sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
parent509f4fa026ff61ef3c8c9a8e14a585900f3b1fcb (diff)
shiboken: Fix usage of Qt's endl, preparing for Qt 6
endl and other manipulators will move into the Qt namespace in Qt 6. Replace it by '\n' or add the namespace. Change-Id: Id9632973b253557c99b2f4e0a84c3db12c55f5b4 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/shiboken2/generator/shiboken2/shibokengenerator.cpp')
-rw-r--r--sources/shiboken2/generator/shiboken2/shibokengenerator.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
index b9a7d087d..35bd363b5 100644
--- a/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/shibokengenerator.cpp
@@ -1533,7 +1533,7 @@ void ShibokenGenerator::writeFunctionCall(QTextStream &s,
void ShibokenGenerator::writeUnusedVariableCast(QTextStream &s, const QString &variableName)
{
- s << INDENT << "SBK_UNUSED(" << variableName<< ')' << endl;
+ s << INDENT << "SBK_UNUSED(" << variableName<< ")\n";
}
AbstractMetaFunctionList ShibokenGenerator::filterFunctions(const AbstractMetaClass *metaClass)
@@ -1716,9 +1716,9 @@ void ShibokenGenerator::writeCodeSnips(QTextStream &s,
if (code.isEmpty())
return;
processCodeSnip(code, context);
- s << INDENT << "// Begin code injection" << endl;
+ s << INDENT << "// Begin code injection\n";
s << code;
- s << INDENT << "// End of code injection" << endl;
+ s << INDENT << "// End of code injection\n";
}
void ShibokenGenerator::writeCodeSnips(QTextStream &s,
@@ -1943,9 +1943,9 @@ void ShibokenGenerator::writeCodeSnips(QTextStream &s,
replaceTemplateVariables(code, func);
processCodeSnip(code);
- s << INDENT << "// Begin code injection" << endl;
+ s << INDENT << "// Begin code injection\n";
s << code;
- s << INDENT << "// End of code injection" << endl;
+ s << INDENT << "// End of code injection\n";
}
// Returns true if the string is an expression,
@@ -2039,7 +2039,7 @@ void ShibokenGenerator::replaceConverterTypeSystemVariable(TypeSystemConverterVa
qFatal("%s", qPrintable(msgConversionTypesDiffer(varType, conversionSignature)));
c << getFullTypeName(conversionType) << ' ' << varName;
writeMinimalConstructorExpression(c, conversionType);
- c << ';' << endl;
+ c << ";\n";
Indentation indent(INDENT);
c << INDENT;
}
@@ -2728,7 +2728,7 @@ void ShibokenGenerator::writeMinimalConstructorExpression(QTextStream &s, const
} else {
const QString message = msgCouldNotFindMinimalConstructor(QLatin1String(__FUNCTION__), type->qualifiedCppName());
qCWarning(lcShiboken()).noquote() << message;
- s << ";\n#error " << message << endl;
+ s << ";\n#error " << message << Qt::endl;
}
}