#include <stddef.h>
#include <dpl/utils/widget_version.h>
#include <dpl/assert.h>
-#include <dpl/log/log.h>
+#include <dpl/log/wrt_log.h>
#include <ctype.h>
#include <list>
m_isWac(false),
m_raw(str)
{
- LogDebug("Parsing version string: " << str);
+ WrtLogD("Parsing version string: %ls", str.c_str());
// Split optional an mandatory parts
size_t optionalPartPosition = str.find(
WAC_CERTIFY_MANDATORY_VS_OPTIONAL_SPLIT_CHAR);
DPL::String mandatoryPart;
- DPL::Optional<DPL::String> optionalPart;
+ DPL::OptionalString optionalPart;
if (optionalPartPosition == DPL::String::npos) {
mandatoryPart = str;
optionalPart = str.substr(optionalPartPosition + 1, DPL::String::npos);
}
- LogDebug("Mandatory part is: " << mandatoryPart);
- LogDebug("Optional part is: " << optionalPart);
+ WrtLogD("Mandatory part is: %ls", mandatoryPart.c_str());
+ WrtLogD("Optional part is: %ls",
+ optionalPart.get_value_or(DPL::String()).c_str());
// Split string and construct version
std::vector<DPL::String> parts;
std::back_inserter(parts),
false);
- LogDebug("Tokenized mandatory parts: " << parts.size());
+ WrtLogD("Tokenized mandatory parts: %i", parts.size());
if (parts.size() != WAC_CERTIFY_MANDATORY_PART_LOW_COUNT &&
parts.size() != WAC_CERTIFY_MANDATORY_PART_HIGH_COUNT)
DPL::String major;
DPL::String minor;
- DPL::Optional<DPL::String> micro;
+ DPL::OptionalString micro;
// Certify for Wac
major = parts[WAC_CERTIFY_MANDATORY_PART_MAJOR_INDEX];
WidgetVersion::WidgetVersion(const DPL::String &major,
const DPL::String &minor,
- const DPL::Optional<DPL::String> µ,
- const DPL::Optional<DPL::String> &optional) :
+ const DPL::OptionalString µ,
+ const DPL::OptionalString &optional) :
m_isWac(false)
{
// Create Raw version
void WidgetVersion::WacCertify(const DPL::String &major,
const DPL::String &minor,
- const DPL::Optional<DPL::String> µ,
- const DPL::Optional<DPL::String> &optional)
+ const DPL::OptionalString µ,
+ const DPL::OptionalString &optional)
{
- LogDebug("Certyfing...");
+ WrtLogD("Certyfing...");
- LogDebug("Major candidate: " << major);
- LogDebug("Minor candidate: " << minor);
- LogDebug("Micro candidate: " << micro);
- LogDebug("Optional candidate: " << optional);
+ WrtLogD("Major candidate: %ls", major.c_str());
+ WrtLogD("Minor candidate: %ls", minor.c_str());
+ WrtLogD("Micro candidate: %ls", micro.get_value_or(DPL::String()).c_str());
+ WrtLogD("Optional candidate: %ls",
+ optional.get_value_or(DPL::String()).c_str());
// Check strings
if (major.empty() || !WacCertifyNumberString(major)) {
- LogDebug("Major version not certified!");
+ WrtLogD("Major version not certified!");
return;
}
if (minor.empty() || !WacCertifyNumberString(minor)) {
- LogDebug("Minor version not certified!");
+ WrtLogD("Minor version not certified!");
return;
}
if (!!micro && (micro->empty() || !WacCertifyNumberString(*micro))) {
- LogDebug("Microversion not certified!");
+ WrtLogD("Microversion not certified!");
return;
}
if (!!optional &&
(optional->empty() || !WacCertifyAlphaNumberStringSpace(*optional)))
{
- LogDebug("Optional version not certified!");
+ WrtLogD("Optional version not certified!");
return;
}
m_isWac = true;
- LogDebug("Certified.");
+ WrtLogD("Certified.");
}
bool WidgetVersion::IsWac() const
return m_minor;
}
-const DPL::Optional<DPL::String> &WidgetVersion::Micro() const
+const DPL::OptionalString &WidgetVersion::Micro() const
{
return m_micro;
}
-const DPL::Optional<DPL::String> &WidgetVersion::Optional() const
+const DPL::OptionalString &WidgetVersion::Optional() const
{
return m_optional;
}