X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fcpp%2FDataBoardTest%2FDataBoard%2FOptionalValue.cpp;fp=bundles%2Forg.simantics.databoard%2Fcpp%2FDataBoardTest%2FDataBoard%2FOptionalValue.cpp;h=85f5cc42a6483143374e0fcf09711f08dd9d36a8;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=bb8d4ce2c190e9fbbb09f547b5dfcc81ba6f886d;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.databoard/cpp/DataBoardTest/DataBoard/OptionalValue.cpp b/bundles/org.simantics.databoard/cpp/DataBoardTest/DataBoard/OptionalValue.cpp index bb8d4ce2c..85f5cc42a 100644 --- a/bundles/org.simantics.databoard/cpp/DataBoardTest/DataBoard/OptionalValue.cpp +++ b/bundles/org.simantics.databoard/cpp/DataBoardTest/DataBoard/OptionalValue.cpp @@ -1,88 +1,88 @@ -#include "OptionalValue.h" - -#include "Constants.h" - -namespace Databoard { - namespace Value { - OptionalValue::OptionalValue(Databoard::Type::DataType* dataBoard) : Value(dataBoard) - { - this->value = NULL; - } - - OptionalValue::~OptionalValue() - { - if(value != NULL) - { - delete value; - - value = NULL; - } - } - - void OptionalValue::setValue(Value* value) - { - if(this->value != NULL) - { - delete this->value; - - this->value = NULL; - } - - this->value = value; - } - - void OptionalValue::setNoValue() - { - if(value != NULL) - { - delete value; - - value = NULL; - } - } - - Value* OptionalValue::getValue() - { - return value; - } - - bool OptionalValue::hasValue() - { - return (value != NULL); - } - - std::string OptionalValue::writeOut(int /*indent*/) - { - std::string s; - - if(value != NULL) - { - s += value->writeOut(); - } - - return s; - } - - bool OptionalValue::equals(const Value* other) - { - OptionalValue* o = (OptionalValue*)other; - - if(hasValue() != o->hasValue()) - { - return hasValue(); - } - - return value->equals(o->value); - } - - std::string OptionalValue::isValid() - { - if(hasValue() == true) - { - return value->isValid(); - } - - return STR_EMPTY; - } - } -} +#include "OptionalValue.h" + +#include "Constants.h" + +namespace Databoard { + namespace Value { + OptionalValue::OptionalValue(Databoard::Type::DataType* dataBoard) : Value(dataBoard) + { + this->value = NULL; + } + + OptionalValue::~OptionalValue() + { + if(value != NULL) + { + delete value; + + value = NULL; + } + } + + void OptionalValue::setValue(Value* value) + { + if(this->value != NULL) + { + delete this->value; + + this->value = NULL; + } + + this->value = value; + } + + void OptionalValue::setNoValue() + { + if(value != NULL) + { + delete value; + + value = NULL; + } + } + + Value* OptionalValue::getValue() + { + return value; + } + + bool OptionalValue::hasValue() + { + return (value != NULL); + } + + std::string OptionalValue::writeOut(int /*indent*/) + { + std::string s; + + if(value != NULL) + { + s += value->writeOut(); + } + + return s; + } + + bool OptionalValue::equals(const Value* other) + { + OptionalValue* o = (OptionalValue*)other; + + if(hasValue() != o->hasValue()) + { + return hasValue(); + } + + return value->equals(o->value); + } + + std::string OptionalValue::isValid() + { + if(hasValue() == true) + { + return value->isValid(); + } + + return STR_EMPTY; + } + } +}