aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/libparser/node
diff options
context:
space:
mode:
Diffstat (limited to 'src/libparser/node')
-rw-r--r--src/libparser/node/allsamenode.h2
-rw-r--r--src/libparser/node/executionnode.h2
-rw-r--r--src/libparser/node/filternode.cpp2
-rw-r--r--src/libparser/node/filternode.h1
-rw-r--r--src/libparser/node/groupnode.h1
-rw-r--r--src/libparser/node/jumpbackwardnode.h1
-rw-r--r--src/libparser/node/keepdiceexecnode.h4
-rw-r--r--src/libparser/node/roundnode.h7
-rw-r--r--src/libparser/node/scalaroperatornode.h1
-rw-r--r--src/libparser/node/uniquenode.h3
-rw-r--r--src/libparser/node/valueslistnode.h2
11 files changed, 14 insertions, 12 deletions
diff --git a/src/libparser/node/allsamenode.h b/src/libparser/node/allsamenode.h
index e5c1dc2..ea67c14 100644
--- a/src/libparser/node/allsamenode.h
+++ b/src/libparser/node/allsamenode.h
@@ -10,7 +10,7 @@ class AllSameNode : public ExecutionNode
{
public:
AllSameNode();
-// virtual ~AllSameNode();
+ // virtual ~AllSameNode();
virtual void run(ExecutionNode* previous);
/**
diff --git a/src/libparser/node/executionnode.h b/src/libparser/node/executionnode.h
index 6dba052..cacd307 100644
--- a/src/libparser/node/executionnode.h
+++ b/src/libparser/node/executionnode.h
@@ -84,7 +84,7 @@ public:
virtual qint64 getScalarResult();
- bool isValid(bool condition, Dice::ERROR_CODE code , const QString& errorTxt, bool error = true);
+ bool isValid(bool condition, Dice::ERROR_CODE code, const QString& errorTxt, bool error= true);
protected:
/**
diff --git a/src/libparser/node/filternode.cpp b/src/libparser/node/filternode.cpp
index af3d166..3274e15 100644
--- a/src/libparser/node/filternode.cpp
+++ b/src/libparser/node/filternode.cpp
@@ -1,7 +1,7 @@
#include "filternode.h"
#include "validatorlist.h"
-FilterNode::FilterNode() : m_diceResult(new DiceResult()), m_eachValue(false)
+FilterNode::FilterNode() : m_diceResult(new DiceResult())
{
m_result= m_diceResult;
}
diff --git a/src/libparser/node/filternode.h b/src/libparser/node/filternode.h
index 7af6fe2..4022aa3 100644
--- a/src/libparser/node/filternode.h
+++ b/src/libparser/node/filternode.h
@@ -34,7 +34,6 @@ public:
private:
DiceResult* m_diceResult;
ValidatorList* m_validatorList;
- bool m_eachValue;
};
#endif // FILTERNODE_H
diff --git a/src/libparser/node/groupnode.h b/src/libparser/node/groupnode.h
index 72e795c..982eb6d 100644
--- a/src/libparser/node/groupnode.h
+++ b/src/libparser/node/groupnode.h
@@ -39,6 +39,7 @@ public:
void setExceptedValue(qint64 exceptedValue);
void sort();
+
private:
qint64 m_exceptedValue= 0;
};
diff --git a/src/libparser/node/jumpbackwardnode.h b/src/libparser/node/jumpbackwardnode.h
index 2e14a00..4de2a05 100644
--- a/src/libparser/node/jumpbackwardnode.h
+++ b/src/libparser/node/jumpbackwardnode.h
@@ -61,6 +61,7 @@ public:
*/
virtual ExecutionNode* getCopy() const override;
virtual void execute(ExecutionNode* previous= nullptr) override;
+
private:
DiceResult* m_diceResult;
ExecutionNode* m_backwardNode;
diff --git a/src/libparser/node/keepdiceexecnode.h b/src/libparser/node/keepdiceexecnode.h
index 0dd6616..e6bd998 100644
--- a/src/libparser/node/keepdiceexecnode.h
+++ b/src/libparser/node/keepdiceexecnode.h
@@ -34,13 +34,13 @@ public:
virtual ~KeepDiceExecNode();
virtual void run(ExecutionNode* previous);
- virtual void setDiceKeepNumber(ExecutionNode* valueNode );
+ virtual void setDiceKeepNumber(ExecutionNode* valueNode);
virtual QString toString(bool) const;
virtual qint64 getPriority() const;
virtual ExecutionNode* getCopy() const;
private:
- ExecutionNode* m_numberOfDiceNode = nullptr;
+ ExecutionNode* m_numberOfDiceNode= nullptr;
DiceResult* m_diceResult;
};
diff --git a/src/libparser/node/roundnode.h b/src/libparser/node/roundnode.h
index 0bf49b7..a16e886 100644
--- a/src/libparser/node/roundnode.h
+++ b/src/libparser/node/roundnode.h
@@ -7,7 +7,8 @@
class RoundNode : public ExecutionNode
{
public:
- enum Mode {
+ enum Mode
+ {
FLOOR,
CEIL,
ROUND
@@ -16,10 +17,10 @@ public:
// ExecutionNode interface
public:
- void run(ExecutionNode *previous);
+ void run(ExecutionNode* previous);
QString toString(bool withLabel) const;
qint64 getPriority() const;
- ExecutionNode *getCopy() const;
+ ExecutionNode* getCopy() const;
void setCommand(ExecutionNode* cmd);
private:
diff --git a/src/libparser/node/scalaroperatornode.h b/src/libparser/node/scalaroperatornode.h
index 73e0bef..fbb30a8 100644
--- a/src/libparser/node/scalaroperatornode.h
+++ b/src/libparser/node/scalaroperatornode.h
@@ -94,7 +94,6 @@ public:
*/
virtual ExecutionNode* getCopy() const override;
-
void setNextNode(ExecutionNode* node) override;
private:
diff --git a/src/libparser/node/uniquenode.h b/src/libparser/node/uniquenode.h
index 039ba11..adab4fc 100644
--- a/src/libparser/node/uniquenode.h
+++ b/src/libparser/node/uniquenode.h
@@ -26,7 +26,8 @@
#include "result/diceresult.h"
/**
- * @brief The UniqueNode class is an ExecutionNode. It is dedicated to unique result of one dice into one dimension array.
+ * @brief The UniqueNode class is an ExecutionNode. It is dedicated to unique result of one dice into one dimension
+ * array.
*/
class UniqueNode : public ExecutionNode
{
diff --git a/src/libparser/node/valueslistnode.h b/src/libparser/node/valueslistnode.h
index 100f275..e37babd 100644
--- a/src/libparser/node/valueslistnode.h
+++ b/src/libparser/node/valueslistnode.h
@@ -18,7 +18,7 @@ public:
private:
std::vector<ExecutionNode*> m_data;
- DiceResult* m_diceResult = nullptr;
+ DiceResult* m_diceResult= nullptr;
};
#endif // VALUESLISTNODE_H