diff --git a/src/MeoAssistant/CreditShopImageAnalyzer.h b/src/MeoAssistant/CreditShopImageAnalyzer.h index cde3cc757a..51bcc2841c 100644 --- a/src/MeoAssistant/CreditShopImageAnalyzer.h +++ b/src/MeoAssistant/CreditShopImageAnalyzer.h @@ -21,10 +21,7 @@ namespace asst private: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; bool commodities_analyze(); bool whether_to_buy_analyze(); bool sold_out_analyze(); diff --git a/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.h b/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.h index 5900a2f807..bd4a027d56 100644 --- a/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.h +++ b/src/MeoAssistant/InfrastClueVacancyImageAnalyzer.h @@ -25,10 +25,7 @@ namespace asst private: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; std::vector m_to_be_analyzed; std::unordered_map m_clue_vacancy; diff --git a/src/MeoAssistant/InfrastFacilityImageAnalyzer.h b/src/MeoAssistant/InfrastFacilityImageAnalyzer.h index 209a1cf0fa..221263c227 100644 --- a/src/MeoAssistant/InfrastFacilityImageAnalyzer.h +++ b/src/MeoAssistant/InfrastFacilityImageAnalyzer.h @@ -49,10 +49,7 @@ namespace asst private: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; // key:设施名,value:所有这种设施的当前Rect(例如所有制造站的位置) std::unordered_map> m_result; diff --git a/src/MeoAssistant/InfrastOperImageAnalyzer.h b/src/MeoAssistant/InfrastOperImageAnalyzer.h index 6c8b6c09e9..19fbd7ceab 100644 --- a/src/MeoAssistant/InfrastOperImageAnalyzer.h +++ b/src/MeoAssistant/InfrastOperImageAnalyzer.h @@ -51,10 +51,7 @@ namespace asst private: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; void oper_detect(); void mood_analyze(); diff --git a/src/MeoAssistant/ProcessTaskImageAnalyzer.h b/src/MeoAssistant/ProcessTaskImageAnalyzer.h index 07f26943b6..499e680f07 100644 --- a/src/MeoAssistant/ProcessTaskImageAnalyzer.h +++ b/src/MeoAssistant/ProcessTaskImageAnalyzer.h @@ -41,10 +41,7 @@ namespace asst private: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; bool match_analyze(const std::shared_ptr& task_ptr); bool ocr_analyze(const std::shared_ptr& task_ptr); void reset() noexcept; diff --git a/src/MeoAssistant/RecruitImageAnalyzer.h b/src/MeoAssistant/RecruitImageAnalyzer.h index 11d459a64b..980d277c7a 100644 --- a/src/MeoAssistant/RecruitImageAnalyzer.h +++ b/src/MeoAssistant/RecruitImageAnalyzer.h @@ -33,10 +33,7 @@ namespace asst private: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; bool tags_analyze(); bool time_analyze(); bool refresh_analyze(); diff --git a/src/MeoAssistant/RoguelikeFormationImageAnalyzer.h b/src/MeoAssistant/RoguelikeFormationImageAnalyzer.h index ccbe7b1dd8..98833eea12 100644 --- a/src/MeoAssistant/RoguelikeFormationImageAnalyzer.h +++ b/src/MeoAssistant/RoguelikeFormationImageAnalyzer.h @@ -21,10 +21,7 @@ namespace asst const std::vector& get_result() const noexcept; protected: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; bool selected_analyze(const Rect& roi); diff --git a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.h b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.h index 235f51361d..fae11ce530 100644 --- a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.h +++ b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.h @@ -20,10 +20,7 @@ namespace asst private: // 该分析器不支持外部设置ROI - virtual void set_roi(const Rect& roi) noexcept override - { - AbstractImageAnalyzer::set_roi(roi); - } + using AbstractImageAnalyzer::set_roi; std::string name_analyze(const Rect& roi); std::vector skill_analyze(const Rect& roi);