diff --git a/TranslateUI/TranslateBasic.h b/TranslateUI/TranslateBasic.h index b176b2e..e164127 100644 --- a/TranslateUI/TranslateBasic.h +++ b/TranslateUI/TranslateBasic.h @@ -99,8 +99,8 @@ public: class RuleMatch : public Serializable { public: virtual QString matchType() const = 0; - virtual std::shared_ptr bindRule() const = 0; - virtual void bindRule(std::shared_ptr rule) = 0; + virtual std::shared_ptr bindRule() const = 0; + virtual void bindRule(std::shared_ptr rule) = 0; virtual bool checkpass(const QByteArray& buffer) const = 0; }; diff --git a/TranslateUI/extract_basic.cpp b/TranslateUI/extract_basic.cpp index 522efe5..2458f9f 100644 --- a/TranslateUI/extract_basic.cpp +++ b/TranslateUI/extract_basic.cpp @@ -332,12 +332,12 @@ QString AsUnsigned::topic() } #include -std::shared_ptr AsList::elementRule() const +std::shared_ptr AsList::elementRule() const { return this->_list._bind_unit; } -bool AsList::setElementRule(std::shared_ptr u) +bool AsList::setElementRule(std::shared_ptr u) { this->_list._bind_unit = u; return true; @@ -381,7 +381,7 @@ void AsList::loadFrom(std::shared_ptr core, const QJsonObject& o QString bind_unit_name = ""; STRING_PEAK(bind_unit_name, obj); xdev = core->operator[](bind_unit_name)->newDefault(); - this->_list._bind_unit = std::dynamic_pointer_cast(xdev); + this->_list._bind_unit = std::dynamic_pointer_cast(xdev); QJsonObject unit_obj; @@ -623,7 +623,7 @@ void AsRuleSet::loadFrom(std::shared_ptr core, const QJsonObject auto xdev = core->operator[](match_name)->newDefault(); xdev->loadFrom(core, match_obj); - _bind.sub_units << std::dynamic_pointer_cast(xdev); + _bind.sub_units << std::dynamic_pointer_cast(xdev); } } @@ -653,17 +653,17 @@ std::shared_ptr AsRuleSet::newDefault() const return std::make_shared(); } -std::shared_ptr AsRuleSet::operator[](int index) const +std::shared_ptr AsRuleSet::operator[](int index) const { return this->_bind.sub_units[index]; } -void AsRuleSet::replace(int index, std::shared_ptr inst) +void AsRuleSet::replace(int index, std::shared_ptr inst) { this->_bind.sub_units.replace(index, inst); } -extract::AsRuleSet& AsRuleSet::append(std::shared_ptr u) +extract::AsRuleSet& AsRuleSet::append(std::shared_ptr u) { this->_bind.sub_units.append(u); return *this; @@ -683,14 +683,14 @@ QList AsRuleSet::fieldNames() const return fields_store;; } -std::shared_ptr AsRuleSet::operator[](const QString& field) const +std::shared_ptr AsRuleSet::operator[](const QString& field) const { for (auto pair : this->_bind.sub_units) { if(pair->name() == field) return pair; } - return std::shared_ptr(); + return std::shared_ptr(); } void AsRuleSet::setAlias(const QString& typeAlias) @@ -713,33 +713,33 @@ QString AsRuleSet::topic() return NAME(AsRuleSet); } -QString ExtractProcess::name() const +QString SingleBasedUnit::name() const { return _inst._field_name; } -bool ExtractProcess::setOffsetSpan(int bytes) +bool SingleBasedUnit::setOffsetSpan(int bytes) { _inst._bytes_offset = bytes; return true; } -int ExtractProcess::offsetSpan() const +int SingleBasedUnit::offsetSpan() const { return _inst._bytes_offset; } -std::shared_ptr ExtractProcess::delegateInst() const +std::shared_ptr SingleBasedUnit::delegateInst() const { return _inst._delegate_inst; } -void ExtractProcess::setDelegate(std::shared_ptr inst) +void SingleBasedUnit::setDelegate(std::shared_ptr inst) { _inst._delegate_inst = inst; } -void ExtractProcess::registSubField(std::shared_ptr inst) +void SingleBasedUnit::registSubField(std::shared_ptr inst) { inst->setField(name(), _inst._delegate_inst->outType()); @@ -747,7 +747,7 @@ void ExtractProcess::registSubField(std::shared_ptr inst) _inst._delegate_inst->registSubField(nlayer); } -void ExtractProcess::parse(const QByteArray& bytes, std::shared_ptr out) const +void SingleBasedUnit::parse(const QByteArray& bytes, std::shared_ptr out) const { auto context = std::make_shared(); context->init(name(), out); @@ -756,7 +756,7 @@ void ExtractProcess::parse(const QByteArray& bytes, std::shared_ptr _inst._delegate_inst->parse(bytes_sec, context); } -void ExtractProcess::loadFrom(std::shared_ptr core, const QJsonObject& obj) +void SingleBasedUnit::loadFrom(std::shared_ptr core, const QJsonObject& obj) { QJsonObject field_obj; OBJECT_PEAK(field_obj, obj); @@ -773,7 +773,7 @@ void ExtractProcess::loadFrom(std::shared_ptr core, const QJsonO _inst._delegate_inst->loadFrom(core, data_obj); } -void ExtractProcess::saveTo(QJsonObject& obj) const +void SingleBasedUnit::saveTo(QJsonObject& obj) const { QJsonObject field_obj; STRING_SAVE(_inst._field_name, field_obj); @@ -788,17 +788,17 @@ void ExtractProcess::saveTo(QJsonObject& obj) const OBJECT_SAVE(field_obj, obj); } -std::shared_ptr ExtractProcess::newDefault() const +std::shared_ptr SingleBasedUnit::newDefault() const { - return std::make_shared(); + return std::make_shared(); } -void ExtractProcess::setName(const QString& name) +void SingleBasedUnit::setName(const QString& name) { _inst._field_name = name; } -int ExtractProcess::countWithin() const +int SingleBasedUnit::countWithin() const { return _inst._delegate_inst->countWithin() + offsetSpan(); } diff --git a/TranslateUI/extract_basic.h b/TranslateUI/extract_basic.h index 486bae3..ecea2f6 100644 --- a/TranslateUI/extract_basic.h +++ b/TranslateUI/extract_basic.h @@ -63,7 +63,7 @@ public: /// /// ×ֶδúÀí /// -class ExtractWrap : public ExtractStruct { +class ExtractUnit : public ExtractStruct { public: /// /// ×Ö¶ÎÃû³Æ @@ -246,15 +246,15 @@ namespace extract { struct __Private { QString _alias_name = ""; int count_acculate = 0; - std::shared_ptr _bind_unit = nullptr; + std::shared_ptr _bind_unit = nullptr; std::shared_ptr _bind_size_v = nullptr; } _list; public: static QString topic(); - std::shared_ptr elementRule() const; - bool setElementRule(std::shared_ptr u); + std::shared_ptr elementRule() const; + bool setElementRule(std::shared_ptr u); std::shared_ptr sizeProvider() const; bool setSizeProvider(std::shared_ptr ins); @@ -312,20 +312,20 @@ namespace extract { private: struct __Private { QString alias_name = ""; - QList> sub_units; + QList> sub_units; }_bind; public: static QString topic(); QList fieldNames() const; - std::shared_ptr operator[](const QString& field) const; + std::shared_ptr operator[](const QString& field) const; int memberCount() const; - std::shared_ptr operator[](int index) const; - void replace(int index, std::shared_ptr inst); + std::shared_ptr operator[](int index) const; + void replace(int index, std::shared_ptr inst); void removeAt(int index); - AsRuleSet& append(std::shared_ptr u); + AsRuleSet& append(std::shared_ptr u); public: QString unitType() const override; @@ -345,7 +345,7 @@ namespace extract { }; - class ExtractProcess : public ExtractWrap { + class SingleBasedUnit : public ExtractUnit { private: struct __Private { QString _field_name = "";