# HG changeset patch # User thomas_-_s # Date 1286023736 0 # Node ID a884b5861e93ee2ef581e58531fb850e691dd8cc # Parent 65171b865963c448f7b36e1a79c439d522943155 Correction to make the JsDecoder work again. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1027 59b1889a-e5ac-428c-b0c7-476e01d41282 diff -r 65171b865963 -r a884b5861e93 indenters/JsDecoder.js --- a/indenters/JsDecoder.js Sat Oct 02 12:15:20 2010 +0000 +++ b/indenters/JsDecoder.js Sat Oct 02 12:48:56 2010 +0000 @@ -1175,4 +1175,5 @@ jsdecoder.s = unformattedCode; formattedCode = jsdecoder.decode(); -return formattedCode; +// Newer Qt versions doesn't seem to need the return statement. +//return formattedCode; diff -r 65171b865963 -r a884b5861e93 src/IndentHandler.cpp --- a/src/IndentHandler.cpp Sat Oct 02 12:15:20 2010 +0000 +++ b/src/IndentHandler.cpp Sat Oct 02 12:48:56 2010 +0000 @@ -348,8 +348,7 @@ QString IndentHandler::callJavaScriptIndenter(QString sourceCode) { QScriptEngine engine; - QScriptValue unformattedCode(&engine, sourceCode); - engine.globalObject().setProperty("unformattedCode", unformattedCode); + engine.globalObject().setProperty("unformattedCode", sourceCode); QFile jsDecoderFile( indenterExecutableCallString ); QString jsDecoderCode;