From f42d6ce2ffe9e53e2ac1723e14e8797dc7b2fffd Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sat, 23 Mar 2019 11:28:40 +0100 Subject: Use new way to replace pattern in string result. --- cli/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cli') diff --git a/cli/main.cpp b/cli/main.cpp index e261d63..2f0d8e4 100644 --- a/cli/main.cpp +++ b/cli/main.cpp @@ -352,18 +352,20 @@ int startDiceParsing(QStringList& cmds, QString& treeFile, bool withColor, EXPOR bool ok; QStringList allStringlist= parser.getAllStringResult(ok); QString stringResult= allStringlist.join(" ; "); + stringResult.replace("%1", scalarText); stringResult.replace("%2", listOfDiceResult.join(",").trimmed()); stringResult.replace("%3", lastScalarText); stringResult.replace("\\n", "\n"); - int i= strLst.size(); - for(auto it= strLst.rbegin(); it != strLst.rend(); ++it) + stringResult= ParsingToolBox::replaceVariableToValue(stringResult, strLst); + /*for(auto it= strLst.rbegin(); it != strLst.rend(); ++it) { stringResult.replace(QStringLiteral("$%1").arg(i), (*it)); --i; - } - i= listFull.size(); + }*/ + + int i= strLst.size(); for(auto it= strLst.rbegin(); it != strLst.rend(); ++it) { stringResult.replace(QStringLiteral("ยต%1").arg(i), (*it)); -- cgit v1.2.3-70-g09d2