diff options
author | rtk0c <[email protected]> | 2022-11-27 12:04:31 -0800 |
---|---|---|
committer | rtk0c <[email protected]> | 2022-11-27 12:04:31 -0800 |
commit | 182c8f8357739f905bbd721006480502435b6b43 (patch) | |
tree | 082613a474d863182e2ad8f2167f1643f26e67a3 /app/source/Cplt/Model/Workflow/Values | |
parent | b01ed99a1cd0c863c8709930658513c04dd70f61 (diff) |
Update brace style to match rest of my projectscplt-imgui
Diffstat (limited to 'app/source/Cplt/Model/Workflow/Values')
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/Basic.cpp | 54 | ||||
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/Basic.hpp | 9 | ||||
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/Database.cpp | 36 | ||||
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/Database.hpp | 9 | ||||
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/Dictionary.cpp | 21 | ||||
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/Dictionary.hpp | 3 | ||||
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/List.cpp | 57 | ||||
-rw-r--r-- | app/source/Cplt/Model/Workflow/Values/List.hpp | 6 |
8 files changed, 65 insertions, 130 deletions
diff --git a/app/source/Cplt/Model/Workflow/Values/Basic.cpp b/app/source/Cplt/Model/Workflow/Values/Basic.cpp index 198387c..a480e2f 100644 --- a/app/source/Cplt/Model/Workflow/Values/Basic.cpp +++ b/app/source/Cplt/Model/Workflow/Values/Basic.cpp @@ -4,19 +4,16 @@ #include <cmath> #include <limits> -bool NumericValue::IsInstance(const BaseValue* value) -{ +bool NumericValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_Numeric; } NumericValue::NumericValue() - : BaseValue(BaseValue::KD_Numeric) -{ + : BaseValue(BaseValue::KD_Numeric) { } template <class T, int kMaxSize> -static std::string NumberToString(T value) -{ +static std::string NumberToString(T value) { char buf[kMaxSize]; auto res = std::to_chars(buf, buf + kMaxSize, value); if (res.ec == std::errc()) { @@ -26,71 +23,58 @@ static std::string NumberToString(T value) } } -std::string NumericValue::GetTruncatedString() const -{ +std::string NumericValue::GetTruncatedString() const { constexpr auto kMaxSize = std::numeric_limits<int64_t>::digits10; return ::NumberToString<int64_t, kMaxSize>((int64_t)mValue); } -std::string NumericValue::GetRoundedString() const -{ +std::string NumericValue::GetRoundedString() const { constexpr auto kMaxSize = std::numeric_limits<int64_t>::digits10; return ::NumberToString<int64_t, kMaxSize>((int64_t)std::round(mValue)); } -std::string NumericValue::GetString() const -{ +std::string NumericValue::GetString() const { constexpr auto kMaxSize = std::numeric_limits<double>::max_digits10; return ::NumberToString<double, kMaxSize>(mValue); } -int64_t NumericValue::GetInt() const -{ +int64_t NumericValue::GetInt() const { return static_cast<int64_t>(mValue); } -double NumericValue::GetValue() const -{ +double NumericValue::GetValue() const { return mValue; } -void NumericValue::SetValue(double value) -{ +void NumericValue::SetValue(double value) { mValue = value; } -bool TextValue::IsInstance(const BaseValue* value) -{ +bool TextValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_Text; } TextValue::TextValue() - : BaseValue(BaseValue::KD_Text) -{ + : BaseValue(BaseValue::KD_Text) { } -const std::string& TextValue::GetValue() const -{ +const std::string& TextValue::GetValue() const { return mValue; } -void TextValue::SetValue(const std::string& value) -{ +void TextValue::SetValue(const std::string& value) { mValue = value; } -bool DateTimeValue::IsInstance(const BaseValue* value) -{ +bool DateTimeValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_DateTime; } DateTimeValue::DateTimeValue() - : BaseValue(BaseValue::KD_DateTime) -{ + : BaseValue(BaseValue::KD_DateTime) { } -std::string DateTimeValue::GetString() const -{ +std::string DateTimeValue::GetString() const { namespace chrono = std::chrono; auto t = chrono::system_clock::to_time_t(mValue); @@ -100,12 +84,10 @@ std::string DateTimeValue::GetString() const return std::string(data); } -const std::chrono::time_point<std::chrono::system_clock>& DateTimeValue::GetValue() const -{ +const std::chrono::time_point<std::chrono::system_clock>& DateTimeValue::GetValue() const { return mValue; } -void DateTimeValue::SetValue(const std::chrono::time_point<std::chrono::system_clock>& value) -{ +void DateTimeValue::SetValue(const std::chrono::time_point<std::chrono::system_clock>& value) { mValue = value; } diff --git a/app/source/Cplt/Model/Workflow/Values/Basic.hpp b/app/source/Cplt/Model/Workflow/Values/Basic.hpp index 820fb13..65d2100 100644 --- a/app/source/Cplt/Model/Workflow/Values/Basic.hpp +++ b/app/source/Cplt/Model/Workflow/Values/Basic.hpp @@ -6,8 +6,7 @@ #include <cstdint> #include <string> -class NumericValue : public BaseValue -{ +class NumericValue : public BaseValue { private: double mValue; @@ -29,8 +28,7 @@ public: void SetValue(double value); }; -class TextValue : public BaseValue -{ +class TextValue : public BaseValue { private: std::string mValue; @@ -47,8 +45,7 @@ public: void SetValue(const std::string& value); }; -class DateTimeValue : public BaseValue -{ +class DateTimeValue : public BaseValue { private: std::chrono::time_point<std::chrono::system_clock> mValue; diff --git a/app/source/Cplt/Model/Workflow/Values/Database.cpp b/app/source/Cplt/Model/Workflow/Values/Database.cpp index 25b77e9..25487f3 100644 --- a/app/source/Cplt/Model/Workflow/Values/Database.cpp +++ b/app/source/Cplt/Model/Workflow/Values/Database.cpp @@ -5,40 +5,33 @@ #include <limits> -TableKind DatabaseRowIdValue::GetTable() const -{ +TableKind DatabaseRowIdValue::GetTable() const { return mTable; } -int64_t DatabaseRowIdValue::GetRowId() const -{ +int64_t DatabaseRowIdValue::GetRowId() const { return mRowId; } -bool DatabaseRowIdValue::IsInstance(const BaseValue* value) -{ +bool DatabaseRowIdValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_DatabaseRowId; } DatabaseRowIdValue::DatabaseRowIdValue() : BaseValue(KD_DatabaseRowId) , mTable{ TableKind::Sales } - , mRowId{ std::numeric_limits<int64_t>::max() } -{ + , mRowId{ std::numeric_limits<int64_t>::max() } { } -bool SaleDatabaseRowValue::IsInstance(const BaseValue* value) -{ +bool SaleDatabaseRowValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_SaleDatabaseRow; } SaleDatabaseRowValue::SaleDatabaseRowValue() - : BaseObjectValue(KD_SaleDatabaseRow) -{ + : BaseObjectValue(KD_SaleDatabaseRow) { } -const BaseValue* SaleDatabaseRowValue::GetProperty(int idx) const -{ +const BaseValue* SaleDatabaseRowValue::GetProperty(int idx) const { switch (idx) { case 0: return &mCustomerName; case 1: return &mDeadline; @@ -47,8 +40,7 @@ const BaseValue* SaleDatabaseRowValue::GetProperty(int idx) const } } -bool SaleDatabaseRowValue::SetProperty(int idx, std::unique_ptr<BaseValue> value) -{ +bool SaleDatabaseRowValue::SetProperty(int idx, std::unique_ptr<BaseValue> value) { switch (idx) { case 0: return false; case 1: CHECK_VALUE_TYPE_AND_MOVE(DateTimeValue, mDeadline, value.get()); break; @@ -57,18 +49,15 @@ bool SaleDatabaseRowValue::SetProperty(int idx, std::unique_ptr<BaseValue> value return true; } -bool PurchaseDatabaseRowValue::IsInstance(const BaseValue* value) -{ +bool PurchaseDatabaseRowValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_PurchaseDatabaseRow; } PurchaseDatabaseRowValue::PurchaseDatabaseRowValue() - : BaseObjectValue(KD_PurchaseDatabaseRow) -{ + : BaseObjectValue(KD_PurchaseDatabaseRow) { } -const BaseValue* PurchaseDatabaseRowValue::GetProperty(int idx) const -{ +const BaseValue* PurchaseDatabaseRowValue::GetProperty(int idx) const { switch (idx) { case 0: return &mFactoryName; case 1: return &mOrderTime; @@ -77,8 +66,7 @@ const BaseValue* PurchaseDatabaseRowValue::GetProperty(int idx) const } } -bool PurchaseDatabaseRowValue::SetProperty(int idx, std::unique_ptr<BaseValue> value) -{ +bool PurchaseDatabaseRowValue::SetProperty(int idx, std::unique_ptr<BaseValue> value) { switch (idx) { case 0: return false; case 1: CHECK_VALUE_TYPE_AND_MOVE(DateTimeValue, mOrderTime, value.get()); break; diff --git a/app/source/Cplt/Model/Workflow/Values/Database.hpp b/app/source/Cplt/Model/Workflow/Values/Database.hpp index f1c1571..cacbb1a 100644 --- a/app/source/Cplt/Model/Workflow/Values/Database.hpp +++ b/app/source/Cplt/Model/Workflow/Values/Database.hpp @@ -4,8 +4,7 @@ #include <Cplt/Model/Workflow/Values/Basic.hpp> #include <Cplt/fwd.hpp> -class DatabaseRowIdValue : public BaseValue -{ +class DatabaseRowIdValue : public BaseValue { private: TableKind mTable; int64_t mRowId; @@ -18,8 +17,7 @@ public: int64_t GetRowId() const; }; -class SaleDatabaseRowValue : public BaseObjectValue -{ +class SaleDatabaseRowValue : public BaseObjectValue { private: int mCustomerId; TextValue mCustomerName; @@ -34,8 +32,7 @@ public: virtual bool SetProperty(int idx, std::unique_ptr<BaseValue> value); }; -class PurchaseDatabaseRowValue : public BaseObjectValue -{ +class PurchaseDatabaseRowValue : public BaseObjectValue { private: int mFactoryId; TextValue mFactoryName; diff --git a/app/source/Cplt/Model/Workflow/Values/Dictionary.cpp b/app/source/Cplt/Model/Workflow/Values/Dictionary.cpp index 97bf509..718a0c8 100644 --- a/app/source/Cplt/Model/Workflow/Values/Dictionary.cpp +++ b/app/source/Cplt/Model/Workflow/Values/Dictionary.cpp @@ -2,23 +2,19 @@ #include <Cplt/Utils/Macros.hpp> -bool DictionaryValue::IsInstance(const BaseValue* value) -{ +bool DictionaryValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_Dictionary; } DictionaryValue::DictionaryValue() - : BaseValue(KD_Dictionary) -{ + : BaseValue(KD_Dictionary) { } -int DictionaryValue::GetCount() const -{ +int DictionaryValue::GetCount() const { return mElements.size(); } -BaseValue* DictionaryValue::Find(std::string_view key) -{ +BaseValue* DictionaryValue::Find(std::string_view key) { auto iter = mElements.find(key); if (iter != mElements.end()) { return iter.value().get(); @@ -27,8 +23,7 @@ BaseValue* DictionaryValue::Find(std::string_view key) } } -BaseValue* DictionaryValue::Insert(std::string_view key, std::unique_ptr<BaseValue>& value) -{ +BaseValue* DictionaryValue::Insert(std::string_view key, std::unique_ptr<BaseValue>& value) { auto [iter, success] = mElements.insert(key, std::move(value)); if (success) { return iter.value().get(); @@ -37,13 +32,11 @@ BaseValue* DictionaryValue::Insert(std::string_view key, std::unique_ptr<BaseVal } } -BaseValue& DictionaryValue::InsertOrReplace(std::string_view key, std::unique_ptr<BaseValue> value) -{ +BaseValue& DictionaryValue::InsertOrReplace(std::string_view key, std::unique_ptr<BaseValue> value) { auto [iter, DISCARD] = mElements.emplace(key, std::move(value)); return *iter.value(); } -void DictionaryValue::Remove(std::string_view key) -{ +void DictionaryValue::Remove(std::string_view key) { mElements.erase(mElements.find(key)); } diff --git a/app/source/Cplt/Model/Workflow/Values/Dictionary.hpp b/app/source/Cplt/Model/Workflow/Values/Dictionary.hpp index 6eff308..f14e04f 100644 --- a/app/source/Cplt/Model/Workflow/Values/Dictionary.hpp +++ b/app/source/Cplt/Model/Workflow/Values/Dictionary.hpp @@ -7,8 +7,7 @@ #include <string> #include <string_view> -class DictionaryValue : public BaseValue -{ +class DictionaryValue : public BaseValue { private: tsl::array_map<char, std::unique_ptr<BaseValue>> mElements; diff --git a/app/source/Cplt/Model/Workflow/Values/List.cpp b/app/source/Cplt/Model/Workflow/Values/List.cpp index 9fd6bfd..e274344 100644 --- a/app/source/Cplt/Model/Workflow/Values/List.cpp +++ b/app/source/Cplt/Model/Workflow/Values/List.cpp @@ -2,99 +2,80 @@ #include <utility> -BaseValue* ListValue::Iterator::operator*() const -{ +BaseValue* ListValue::Iterator::operator*() const { return mIter->get(); } -BaseValue* ListValue::Iterator::operator->() const -{ +BaseValue* ListValue::Iterator::operator->() const { return mIter->get(); } -ListValue::Iterator& ListValue::Iterator::operator++() -{ +ListValue::Iterator& ListValue::Iterator::operator++() { ++mIter; return *this; } -ListValue::Iterator ListValue::Iterator::operator++(int) const -{ +ListValue::Iterator ListValue::Iterator::operator++(int) const { return Iterator(mIter + 1); } -ListValue::Iterator& ListValue::Iterator::operator--() -{ +ListValue::Iterator& ListValue::Iterator::operator--() { --mIter; return *this; } -ListValue::Iterator ListValue::Iterator::operator--(int) const -{ +ListValue::Iterator ListValue::Iterator::operator--(int) const { return Iterator(mIter - 1); } -bool operator==(const ListValue::Iterator& a, const ListValue::Iterator& b) -{ +bool operator==(const ListValue::Iterator& a, const ListValue::Iterator& b) { return a.mIter == b.mIter; } ListValue::Iterator::Iterator(decltype(mIter) iter) - : mIter{ iter } -{ + : mIter{ iter } { } -bool ListValue::IsInstance(const BaseValue* value) -{ +bool ListValue::IsInstance(const BaseValue* value) { return value->GetKind() == KD_List; } ListValue::ListValue() - : BaseValue(KD_List) -{ + : BaseValue(KD_List) { } -int ListValue::GetCount() const -{ +int ListValue::GetCount() const { return mElements.size(); } -BaseValue* ListValue::GetElement(int i) const -{ +BaseValue* ListValue::GetElement(int i) const { return mElements[i].get(); } -void ListValue::Append(std::unique_ptr<BaseValue> element) -{ +void ListValue::Append(std::unique_ptr<BaseValue> element) { mElements.push_back(std::move(element)); } -void ListValue::Insert(int i, std::unique_ptr<BaseValue> element) -{ +void ListValue::Insert(int i, std::unique_ptr<BaseValue> element) { mElements.insert(mElements.begin() + i, std::move(element)); } -void ListValue::Insert(Iterator iter, std::unique_ptr<BaseValue> element) -{ +void ListValue::Insert(Iterator iter, std::unique_ptr<BaseValue> element) { mElements.insert(iter.mIter, std::move(element)); } -void ListValue::Remove(int i) -{ +void ListValue::Remove(int i) { mElements.erase(mElements.begin() + i); } -void ListValue::Remove(Iterator iter) -{ +void ListValue::Remove(Iterator iter) { mElements.erase(iter.mIter); } -ListValue::Iterator ListValue::begin() -{ +ListValue::Iterator ListValue::begin() { return Iterator(mElements.begin()); } -ListValue::Iterator ListValue::end() -{ +ListValue::Iterator ListValue::end() { return Iterator(mElements.end()); } diff --git a/app/source/Cplt/Model/Workflow/Values/List.hpp b/app/source/Cplt/Model/Workflow/Values/List.hpp index cc8e061..36f71a1 100644 --- a/app/source/Cplt/Model/Workflow/Values/List.hpp +++ b/app/source/Cplt/Model/Workflow/Values/List.hpp @@ -5,11 +5,9 @@ #include <memory> #include <vector> -class ListValue : public BaseValue -{ +class ListValue : public BaseValue { public: - class Iterator - { + class Iterator { private: std::vector<std::unique_ptr<BaseValue>>::iterator mIter; |