aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/diceroller.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'diceroller.cpp')
-rw-r--r--diceroller.cpp51
1 files changed, 27 insertions, 24 deletions
diff --git a/diceroller.cpp b/diceroller.cpp
index cba24df..e970a7c 100644
--- a/diceroller.cpp
+++ b/diceroller.cpp
@@ -60,39 +60,42 @@ QString DiceRoller::diceToText(QList<ExportedDiceResult>& diceList)
for(auto& face : keys)
{
QStringList result;
- ListDiceResult diceResult= dice.value(face);
- for(const HighLightDice& tmp : diceResult)
+ auto list= dice.value(face);
+ for(auto diceResult : list)
{
- QStringList diceListStr;
- QStringList diceListChildren;
- int i= 0;
- for(qint64& dievalue : tmp.getResult())
+ for(const HighLightDice& tmp : diceResult)
{
- QString prefix("%1");
- if(i == 0)
+ QStringList diceListStr;
+ QStringList diceListChildren;
+ int i= 0;
+ for(qint64& dievalue : tmp.result())
{
- diceListStr << prefix.arg(QString::number(dievalue));
+ QString prefix("%1");
+ if(i == 0)
+ {
+ diceListStr << prefix.arg(QString::number(dievalue));
+ }
+ else
+ {
+ diceListChildren << prefix.arg(QString::number(dievalue));
+ }
+ ++i;
}
- else
+ if(!diceListChildren.isEmpty())
{
- diceListChildren << prefix.arg(QString::number(dievalue));
+ diceListStr << QString("[%1]").arg(diceListChildren.join(' '));
}
- ++i;
+ result << diceListStr.join(' ');
}
- if(!diceListChildren.isEmpty())
+
+ if(keys.size() > 1)
{
- diceListStr << QString("[%1]").arg(diceListChildren.join(' '));
+ resultGlobal << QString(" d%2:(%1)").arg(result.join(',')).arg(face);
+ }
+ else
+ {
+ resultGlobal << result;
}
- result << diceListStr.join(' ');
- }
-
- if(keys.size() > 1)
- {
- resultGlobal << QString(" d%2:(%1)").arg(result.join(',')).arg(face);
- }
- else
- {
- resultGlobal << result;
}
}
global << resultGlobal.join(' ');