diff options
| author |   Renaud G <renaud@rolisteam.org> | 2017-10-27 22:19:20 +0200 |
|---|---|---|
| committer | Renaud G <renaud@rolisteam.org> | 2017-10-29 03:30:46 +0100 |
| commit | f053853e87624a045438bacd4dd1494e91ae381f (patch) | |
| tree | cbf98ae65d48f4158c3af73be6bd0a1fb9417335 /result | |
| parent | a543a6ca8ddc2826a4433044ed1a040acbbf36a3 (diff) | |
| download | OneRoll-f053853e87624a045438bacd4dd1494e91ae381f.tar.gz OneRoll-f053853e87624a045438bacd4dd1494e91ae381f.zip | |
-c++11 update about for and nullptr.
Diffstat (limited to 'result')
| -rw-r--r-- | result/diceresult.cpp | 2 | ||||
| -rw-r--r-- | result/result.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/result/diceresult.cpp b/result/diceresult.cpp index ddedd1c..dd624e9 100644 --- a/result/diceresult.cpp +++ b/result/diceresult.cpp @@ -143,7 +143,7 @@ void DiceResult::setOperator(const Die::ArithmeticOperator& dieOperator) QString DiceResult::toString(bool wl) { QStringList scalarSum; - foreach(Die* die,m_diceValues) + for(Die* die:m_diceValues) { scalarSum << QString::number(die->getValue()); } diff --git a/result/result.cpp b/result/result.cpp index 6e1ea7a..f79e004 100644 --- a/result/result.cpp +++ b/result/result.cpp @@ -23,7 +23,7 @@ #include <QUuid> Result::Result() - : m_resultTypes(NONE),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString())),m_previous(NULL) + : m_resultTypes(NONE),m_id(QString("\"%1\"").arg(QUuid::createUuid().toString())),m_previous(nullptr) { } Result::~Result() @@ -55,7 +55,7 @@ void Result::generateDotTree(QString& s) s.append(toString(true)); s.append(";\n"); - if(NULL!=m_previous) + if(nullptr!=m_previous) { s.append(toString(false)); s.append(" -> "); @@ -67,7 +67,7 @@ void Result::generateDotTree(QString& s) { s.append(toString(false)); s.append(" -> "); - s.append("NULL"); + s.append("nullptr"); s.append(" [label=\"previousResult\"];\n"); } |