Skip to content

Commit 0117a73

Browse files
kovacsvkovacsv
committed
Const correctness: the calculations result should be a const pointer.
1 parent 4d6932f commit 0117a73

57 files changed

Lines changed: 501 additions & 450 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Sources/BuiltInNodes/BI_ArithmeticUINodes.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ void BinaryOperationNode::Initialize ()
3636
RegisterFeature (NUIE::NodeFeaturePtr (new BI::ValueCombinationFeature (NE::ValueCombinationMode::Longest)));
3737
}
3838

39-
NE::ValuePtr BinaryOperationNode::Calculate (NE::EvaluationEnv& env) const
39+
NE::ValueConstPtr BinaryOperationNode::Calculate (NE::EvaluationEnv& env) const
4040
{
41-
NE::ValuePtr aValue = EvaluateSingleInputSlot (NE::SlotId ("a"), env);
42-
NE::ValuePtr bValue = EvaluateSingleInputSlot (NE::SlotId ("b"), env);
41+
NE::ValueConstPtr aValue = EvaluateSingleInputSlot (NE::SlotId ("a"), env);
42+
NE::ValueConstPtr bValue = EvaluateSingleInputSlot (NE::SlotId ("b"), env);
4343
if (!NE::IsComplexType<NE::NumberValue> (aValue) || !NE::IsComplexType<NE::NumberValue> (bValue)) {
4444
return nullptr;
4545
}

‎Sources/BuiltInNodes/BI_ArithmeticUINodes.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class BinaryOperationNode : public BasicUINode
1818
virtual ~BinaryOperationNode ();
1919

2020
virtual void Initialize () override;
21-
virtual NE::ValuePtr Calculate (NE::EvaluationEnv& env) const override;
21+
virtual NE::ValueConstPtr Calculate (NE::EvaluationEnv& env) const override;
2222

2323
virtual void RegisterParameters (NUIE::NodeParameterList& parameterList) const override;
2424
virtual bool IsForceCalculated () const override;

‎Sources/BuiltInNodes/BI_BuiltInFeatures.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,14 +133,14 @@ void EnableDisableFeature::RegisterParameters (NUIE::NodeParameterList& paramete
133133

134134
}
135135

136-
virtual NE::ValuePtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
136+
virtual NE::ValueConstPtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
137137
{
138138
bool enableState = GetEnableDisableFeature (uiNode)->GetEnableState ();
139139
int enableStateInt = (enableState ? 0 : 1);
140140
return NE::ValuePtr (new NE::IntValue (enableStateInt));
141141
}
142142

143-
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv& evaluationEnv, NUIE::UINodePtr& uiNode, const NE::ValuePtr& value) override
143+
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv& evaluationEnv, NUIE::UINodePtr& uiNode, const NE::ValueConstPtr& value) override
144144
{
145145
int enableStateInt = NE::IntValue::Get (value);
146146
bool enableState = (enableStateInt == 0 ? true : false);
@@ -207,7 +207,7 @@ void ValueCombinationFeature::SetValueCombinationMode (NE::ValueCombinationMode
207207
valueCombinationMode = newValueCombinationMode;
208208
}
209209

210-
bool ValueCombinationFeature::CombineValues (const std::vector<NE::ValuePtr>& values, const std::function<bool (const NE::ValueCombination&)>& processor) const
210+
bool ValueCombinationFeature::CombineValues (const std::vector<NE::ValueConstPtr>& values, const std::function<bool (const NE::ValueCombination&)>& processor) const
211211
{
212212
return NE::CombineValues (valueCombinationMode, values, processor);
213213
}
@@ -232,14 +232,14 @@ void ValueCombinationFeature::RegisterParameters (NUIE::NodeParameterList& param
232232

233233
}
234234

235-
virtual NE::ValuePtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
235+
virtual NE::ValueConstPtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
236236
{
237237
NE::ValueCombinationMode valueCombination = GetValueCombinationFeature (uiNode)->GetValueCombinationMode ();
238238
int valueCombinationInt = (int) valueCombination;
239239
return NE::ValuePtr (new NE::IntValue (valueCombinationInt));
240240
}
241241

242-
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv& evaluationEnv, NUIE::UINodePtr& uiNode, const NE::ValuePtr& value) override
242+
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv& evaluationEnv, NUIE::UINodePtr& uiNode, const NE::ValueConstPtr& value) override
243243
{
244244
int valueCombinationInt = NE::IntValue::Get (value);
245245
NE::ValueCombinationMode valueCombination = (NE::ValueCombinationMode) valueCombinationInt;

‎Sources/BuiltInNodes/BI_BuiltInFeatures.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ValueCombinationFeature : public NUIE::NodeFeature
4545

4646
NE::ValueCombinationMode GetValueCombinationMode () const;
4747
void SetValueCombinationMode (NE::ValueCombinationMode newValueCombinationMode);
48-
bool CombineValues (const std::vector<NE::ValuePtr>& values, const std::function<bool (const NE::ValueCombination&)>& processor) const;
48+
bool CombineValues (const std::vector<NE::ValueConstPtr>& values, const std::function<bool (const NE::ValueCombination&)>& processor) const;
4949

5050
virtual void RegisterCommands (NUIE::NodeCommandRegistrator& commandRegistrator) const override;
5151
virtual void RegisterParameters (NUIE::NodeParameterList& parameterList) const override;

‎Sources/BuiltInNodes/BI_InputUINodes.cpp‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ IntegerUpDownNode::~IntegerUpDownNode ()
112112

113113
}
114114

115-
NE::ValuePtr IntegerUpDownNode::Calculate (NE::EvaluationEnv&) const
115+
NE::ValueConstPtr IntegerUpDownNode::Calculate (NE::EvaluationEnv&) const
116116
{
117-
return NE::ValuePtr (new NE::IntValue (val));
117+
return NE::ValueConstPtr (new NE::IntValue (val));
118118
}
119119

120120
void IntegerUpDownNode::RegisterParameters (NUIE::NodeParameterList& parameterList) const
@@ -128,12 +128,12 @@ void IntegerUpDownNode::RegisterParameters (NUIE::NodeParameterList& parameterLi
128128

129129
}
130130

131-
virtual NE::ValuePtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
131+
virtual NE::ValueConstPtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
132132
{
133133
return NE::ValuePtr (new NE::IntValue (GetTypedNode (uiNode)->GetValue ()));
134134
}
135135

136-
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValuePtr& value) override
136+
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValueConstPtr& value) override
137137
{
138138
GetTypedNode (uiNode)->SetValue (NE::IntValue::Get (value));
139139
uiManager.InvalidateNodeValue (uiNode);
@@ -151,12 +151,12 @@ void IntegerUpDownNode::RegisterParameters (NUIE::NodeParameterList& parameterLi
151151

152152
}
153153

154-
virtual NE::ValuePtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
154+
virtual NE::ValueConstPtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
155155
{
156156
return NE::ValuePtr (new NE::IntValue (GetTypedNode (uiNode)->GetStep ()));
157157
}
158158

159-
virtual bool SetValueInternal (NUIE::NodeUIManager&, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValuePtr& value) override
159+
virtual bool SetValueInternal (NUIE::NodeUIManager&, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValueConstPtr& value) override
160160
{
161161
GetTypedNode (uiNode)->SetStep (NE::IntValue::Get (value));
162162
return true;
@@ -238,9 +238,9 @@ DoubleUpDownNode::~DoubleUpDownNode ()
238238

239239
}
240240

241-
NE::ValuePtr DoubleUpDownNode::Calculate (NE::EvaluationEnv&) const
241+
NE::ValueConstPtr DoubleUpDownNode::Calculate (NE::EvaluationEnv&) const
242242
{
243-
return NE::ValuePtr (new NE::DoubleValue (val));
243+
return NE::ValueConstPtr (new NE::DoubleValue (val));
244244
}
245245

246246
void DoubleUpDownNode::RegisterParameters (NUIE::NodeParameterList& parameterList) const
@@ -254,12 +254,12 @@ void DoubleUpDownNode::RegisterParameters (NUIE::NodeParameterList& parameterLis
254254

255255
}
256256

257-
virtual NE::ValuePtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
257+
virtual NE::ValueConstPtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
258258
{
259259
return NE::ValuePtr (new NE::DoubleValue (GetTypedNode (uiNode)->GetValue ()));
260260
}
261261

262-
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValuePtr& value) override
262+
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValueConstPtr& value) override
263263
{
264264
GetTypedNode (uiNode)->SetValue (NE::DoubleValue::Get (value));
265265
uiManager.InvalidateNodeValue (uiNode);
@@ -277,12 +277,12 @@ void DoubleUpDownNode::RegisterParameters (NUIE::NodeParameterList& parameterLis
277277

278278
}
279279

280-
virtual NE::ValuePtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
280+
virtual NE::ValueConstPtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
281281
{
282282
return NE::ValuePtr (new NE::DoubleValue (GetTypedNode (uiNode)->GetStep ()));
283283
}
284284

285-
virtual bool SetValueInternal (NUIE::NodeUIManager&, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValuePtr& value) override
285+
virtual bool SetValueInternal (NUIE::NodeUIManager&, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValueConstPtr& value) override
286286
{
287287
GetTypedNode (uiNode)->SetStep (NE::DoubleValue::Get (value));
288288
return true;
@@ -406,11 +406,11 @@ void IntegerRangeNode::Initialize ()
406406
RegisterUIOutputSlot (NUIE::UIOutputSlotPtr (new NUIE::UIOutputSlot (NE::SlotId ("out"), L"List")));
407407
}
408408

409-
NE::ValuePtr IntegerRangeNode::Calculate (NE::EvaluationEnv& env) const
409+
NE::ValueConstPtr IntegerRangeNode::Calculate (NE::EvaluationEnv& env) const
410410
{
411-
NE::ValuePtr start = EvaluateSingleInputSlot (NE::SlotId ("start"), env);
412-
NE::ValuePtr step = EvaluateSingleInputSlot (NE::SlotId ("step"), env);
413-
NE::ValuePtr count = EvaluateSingleInputSlot (NE::SlotId ("count"), env);
411+
NE::ValueConstPtr start = EvaluateSingleInputSlot (NE::SlotId ("start"), env);
412+
NE::ValueConstPtr step = EvaluateSingleInputSlot (NE::SlotId ("step"), env);
413+
NE::ValueConstPtr count = EvaluateSingleInputSlot (NE::SlotId ("count"), env);
414414
if (!NE::IsSingleType<NE::NumberValue> (start) || !NE::IsSingleType<NE::NumberValue> (step) || !NE::IsSingleType<NE::NumberValue> (count)) {
415415
return nullptr;
416416
}
@@ -437,7 +437,7 @@ void IntegerRangeNode::RegisterParameters (NUIE::NodeParameterList& parameterLis
437437

438438
}
439439

440-
virtual bool IsValidValue (const NUIE::UINodeConstPtr&, const std::shared_ptr<NE::IntValue>& value) const override
440+
virtual bool IsValidValue (const NUIE::UINodeConstPtr&, const std::shared_ptr<const NE::IntValue>& value) const override
441441
{
442442
return value->GetValue () >= 0.0;
443443
}
@@ -488,11 +488,11 @@ void DoubleRangeNode::Initialize ()
488488
RegisterUIOutputSlot (NUIE::UIOutputSlotPtr (new NUIE::UIOutputSlot (NE::SlotId ("out"), L"List")));
489489
}
490490

491-
NE::ValuePtr DoubleRangeNode::Calculate (NE::EvaluationEnv& env) const
491+
NE::ValueConstPtr DoubleRangeNode::Calculate (NE::EvaluationEnv& env) const
492492
{
493-
NE::ValuePtr start = EvaluateSingleInputSlot (NE::SlotId ("start"), env);
494-
NE::ValuePtr step = EvaluateSingleInputSlot (NE::SlotId ("step"), env);
495-
NE::ValuePtr count = EvaluateSingleInputSlot (NE::SlotId ("count"), env);
493+
NE::ValueConstPtr start = EvaluateSingleInputSlot (NE::SlotId ("start"), env);
494+
NE::ValueConstPtr step = EvaluateSingleInputSlot (NE::SlotId ("step"), env);
495+
NE::ValueConstPtr count = EvaluateSingleInputSlot (NE::SlotId ("count"), env);
496496
if (!NE::IsSingleType<NE::NumberValue> (start) || !NE::IsSingleType<NE::NumberValue> (step) || !NE::IsSingleType<NE::NumberValue> (count)) {
497497
return nullptr;
498498
}
@@ -519,7 +519,7 @@ void DoubleRangeNode::RegisterParameters (NUIE::NodeParameterList& parameterList
519519

520520
}
521521

522-
virtual bool IsValidValue (const NUIE::UINodeConstPtr&, const std::shared_ptr<NE::IntValue>& value) const override
522+
virtual bool IsValidValue (const NUIE::UINodeConstPtr&, const std::shared_ptr<const NE::IntValue>& value) const override
523523
{
524524
return value->GetValue () >= 0.0;
525525
}

‎Sources/BuiltInNodes/BI_InputUINodes.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class IntegerUpDownNode : public NumericUpDownNode
4242
IntegerUpDownNode (const std::wstring& name, const NUIE::Point& position, int val, int step);
4343
virtual ~IntegerUpDownNode ();
4444

45-
virtual NE::ValuePtr Calculate (NE::EvaluationEnv& env) const override;
45+
virtual NE::ValueConstPtr Calculate (NE::EvaluationEnv& env) const override;
4646
virtual void RegisterParameters (NUIE::NodeParameterList& parameterList) const override;
4747

4848
virtual NE::Stream::Status Read (NE::InputStream& inputStream) override;
@@ -71,7 +71,7 @@ class DoubleUpDownNode : public NumericUpDownNode
7171
DoubleUpDownNode (const std::wstring& name, const NUIE::Point& position, double val, double step);
7272
virtual ~DoubleUpDownNode ();
7373

74-
virtual NE::ValuePtr Calculate (NE::EvaluationEnv& env) const override;
74+
virtual NE::ValueConstPtr Calculate (NE::EvaluationEnv& env) const override;
7575
virtual void RegisterParameters (NUIE::NodeParameterList& parameterList) const override;
7676

7777
virtual NE::Stream::Status Read (NE::InputStream& inputStream) override;
@@ -116,7 +116,7 @@ class IntegerRangeNode : public NumericRangeNode
116116
virtual ~IntegerRangeNode ();
117117

118118
virtual void Initialize () override;
119-
virtual NE::ValuePtr Calculate (NE::EvaluationEnv& env) const override;
119+
virtual NE::ValueConstPtr Calculate (NE::EvaluationEnv& env) const override;
120120
virtual void RegisterParameters (NUIE::NodeParameterList& parameterList) const override;
121121

122122
virtual NE::Stream::Status Read (NE::InputStream& inputStream) override;
@@ -133,7 +133,7 @@ class DoubleRangeNode : public NumericRangeNode
133133
virtual ~DoubleRangeNode ();
134134

135135
virtual void Initialize () override;
136-
virtual NE::ValuePtr Calculate (NE::EvaluationEnv& env) const override;
136+
virtual NE::ValueConstPtr Calculate (NE::EvaluationEnv& env) const override;
137137
virtual void RegisterParameters (NUIE::NodeParameterList& parameterList) const override;
138138

139139
virtual NE::Stream::Status Read (NE::InputStream& inputStream) override;

‎Sources/BuiltInNodes/BI_UINodeLayouts.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ void DrawHeaderWithSlotsAndButtonsLayout ( const NUIE::UINode& uiNode,
3030
{
3131
std::wstring nodeText = L"<empty>";
3232
if (uiNode.HasCalculatedValue ()) {
33-
NE::ValuePtr nodeValue = uiNode.GetCalculatedValue ();
33+
NE::ValueConstPtr nodeValue = uiNode.GetCalculatedValue ();
3434
if (nodeValue != nullptr) {
3535
nodeText = nodeValue->ToString (env.GetStringSettings ());
3636
}

‎Sources/BuiltInNodes/BI_ViewerUINodes.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ void MultiLineViewerNode::Initialize ()
3636
RegisterUIOutputSlot (NUIE::UIOutputSlotPtr (new NUIE::UIOutputSlot (NE::SlotId ("out"), L"Output")));
3737
}
3838

39-
NE::ValuePtr MultiLineViewerNode::Calculate (NE::EvaluationEnv& env) const
39+
NE::ValueConstPtr MultiLineViewerNode::Calculate (NE::EvaluationEnv& env) const
4040
{
4141
return EvaluateSingleInputSlot (NE::SlotId ("in"), env);
4242
}
@@ -52,12 +52,12 @@ void MultiLineViewerNode::RegisterParameters (NUIE::NodeParameterList& parameter
5252

5353
}
5454

55-
virtual NE::ValuePtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
55+
virtual NE::ValueConstPtr GetValueInternal (const NUIE::UINodeConstPtr& uiNode) const override
5656
{
5757
return NE::ValuePtr (new NE::IntValue ((int) GetTypedNode (uiNode)->GetTextsPerPage ()));
5858
}
5959

60-
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValuePtr& value) override
60+
virtual bool SetValueInternal (NUIE::NodeUIManager& uiManager, NE::EvaluationEnv&, NUIE::UINodePtr& uiNode, const NE::ValueConstPtr& value) override
6161
{
6262
GetTypedNode (uiNode)->SetTextsPerPage (NE::IntValue::Get (value));
6363
uiManager.InvalidateNodeDrawing (uiNode);
@@ -125,11 +125,11 @@ void MultiLineViewerNode::UpdateNodeDrawingImage (NUIE::NodeUIDrawingEnvironment
125125

126126
std::vector<std::wstring> nodeTexts;
127127
if (HasCalculatedValue ()) {
128-
NE::ValuePtr nodeValue = GetCalculatedValue ();
128+
NE::ValueConstPtr nodeValue = GetCalculatedValue ();
129129
if (nodeValue != nullptr) {
130-
NE::IListValuePtr listValue = NE::CreateListValue (nodeValue);
130+
NE::IListValueConstPtr listValue = NE::CreateListValue (nodeValue);
131131
nodeTexts.clear ();
132-
listValue->Enumerate ([&] (const NE::ValuePtr& value) {
132+
listValue->Enumerate ([&] (const NE::ValueConstPtr& value) {
133133
nodeTexts.push_back (value->ToString (env.GetStringSettings ()));
134134
});
135135
}

‎Sources/BuiltInNodes/BI_ViewerUINodes.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class MultiLineViewerNode : public NUIE::UINode
1717
virtual ~MultiLineViewerNode ();
1818

1919
virtual void Initialize () override;
20-
virtual NE::ValuePtr Calculate (NE::EvaluationEnv& env) const override;
20+
virtual NE::ValueConstPtr Calculate (NE::EvaluationEnv& env) const override;
2121
virtual void RegisterParameters (NUIE::NodeParameterList& parameterList) const override;
2222

2323
virtual NUIE::EventHandlerResult HandleMouseClick (NUIE::NodeUIEnvironment& env, const NUIE::ModifierKeys& modifierKeys, NUIE::MouseButton mouseButton, const NUIE::Point& position, NUIE::UINodeCommandInterface& commandInterface) override;

‎Sources/NodeEngine/NE_GenericValue.hpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class GenericValue : public SingleValue
1818
void SetValue (const Type& newVal);
1919
const Type& GetValue () const;
2020

21+
static const Type& Get (const ValueConstPtr& val);
2122
static const Type& Get (const ValuePtr& val);
2223
static const Type& Get (Value* val);
2324

@@ -54,6 +55,12 @@ const Type& GenericValue<Type>::GetValue () const
5455
return val;
5556
}
5657

58+
template <class Type>
59+
const Type& GenericValue<Type>::Get (const ValueConstPtr& val)
60+
{
61+
return Value::Cast<GenericValue<Type>> (val.get ())->GetValue ();
62+
}
63+
5764
template <class Type>
5865
const Type& GenericValue<Type>::Get (const ValuePtr& val)
5966
{

0 commit comments

Comments
 (0)