Merge pull request #5406 from huffman/variadic-print

Update script print() to be variadic
This commit is contained in:
Howard Stearns 2015-07-23 18:03:37 -05:00
commit e59304ae74

View file

@ -46,13 +46,21 @@
static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine){
qCDebug(scriptengine) << "script:print()<<" << context->argument(0).toString(); QString message = "";
QString message = context->argument(0).toString() for (int i = 0; i < context->argumentCount(); i++) {
.replace("\\", "\\\\") if (i > 0) {
.replace("\n", "\\n") message += " ";
.replace("\r", "\\r") }
.replace("'", "\\'"); message += context->argument(i).toString();
}
qCDebug(scriptengine) << "script:print()<<" << message;
message = message.replace("\\", "\\\\")
.replace("\n", "\\n")
.replace("\r", "\\r")
.replace("'", "\\'");
engine->evaluate("Script.print('" + message + "')"); engine->evaluate("Script.print('" + message + "')");
return QScriptValue(); return QScriptValue();
} }