diff --git a/src/MeoAssistant/AbstractImageAnalyzer.cpp b/src/MeoAssistant/AbstractImageAnalyzer.cpp index 44d8b8754c..47b64df6df 100644 --- a/src/MeoAssistant/AbstractImageAnalyzer.cpp +++ b/src/MeoAssistant/AbstractImageAnalyzer.cpp @@ -48,7 +48,7 @@ asst::Rect asst::AbstractImageAnalyzer::empty_rect_to_full(const Rect& rect, con return rect; } if (rect.empty()) { - return Rect(0, 0, image.cols, image.rows); + return {0, 0, image.cols, image.rows}; } Rect res = rect; diff --git a/src/MeoAssistant/Assistant.cpp b/src/MeoAssistant/Assistant.cpp index c74b93e499..ffca0304d2 100644 --- a/src/MeoAssistant/Assistant.cpp +++ b/src/MeoAssistant/Assistant.cpp @@ -162,7 +162,7 @@ bool asst::Assistant::set_task_params(TaskId task_id, const std::string& params) std::vector asst::Assistant::get_image() const { if (!m_inited) { - return std::vector(); + return {}; } return m_ctrler->get_image_encode(); } diff --git a/src/MeoAssistant/AsstTypes.h b/src/MeoAssistant/AsstTypes.h index 4672024e19..18d77de3be 100644 --- a/src/MeoAssistant/AsstTypes.h +++ b/src/MeoAssistant/AsstTypes.h @@ -98,7 +98,7 @@ namespace asst } Rect move(Rect move) const { - return Rect(x + move.x, y + move.y, move.width, move.height); + return {x + move.x, y + move.y, move.width, move.height}; } int x = 0; diff --git a/src/MeoAssistant/AsstUtils.hpp b/src/MeoAssistant/AsstUtils.hpp index 10920d928a..67be640045 100644 --- a/src/MeoAssistant/AsstUtils.hpp +++ b/src/MeoAssistant/AsstUtils.hpp @@ -156,7 +156,7 @@ namespace asst { std::ifstream ifs(filename, std::ios::in); if (!ifs.is_open()) { - return std::string(); + return {}; } std::stringstream iss; iss << ifs.rdbuf(); diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index ebd0199335..066724f659 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -407,7 +407,7 @@ asst::Point asst::Controller::rand_point_in_rect(const Rect& rect) y = y_rand + rect.y; } - return Point(x, y); + return {x, y}; } void asst::Controller::random_delay() const @@ -682,7 +682,7 @@ cv::Mat asst::Controller::get_resized_image() const std::shared_lock image_lock(m_image_mutex); if (m_cache_image.empty()) { Log.error("image is empty"); - return cv::Mat(dsize, CV_8UC3); + return {dsize, CV_8UC3}; } cv::Mat resized_mat; cv::resize(m_cache_image, resized_mat, dsize, 0.0, 0.0, cv::INTER_AREA); diff --git a/src/MeoAssistant/InfrastFacilityImageAnalyzer.h b/src/MeoAssistant/InfrastFacilityImageAnalyzer.h index 2c2159324d..ed19661b03 100644 --- a/src/MeoAssistant/InfrastFacilityImageAnalyzer.h +++ b/src/MeoAssistant/InfrastFacilityImageAnalyzer.h @@ -31,11 +31,11 @@ namespace asst { if (auto iter = m_result.find(name); iter == m_result.cend()) { - return Rect(); + return {}; } else { if (index < 0 || index >= iter->second.size()) { - return Rect(); + return {}; } else { return iter->second.at(index).rect; diff --git a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp index 6c7d0140a9..6d015650c5 100644 --- a/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp +++ b/src/MeoAssistant/RoguelikeSkillSelectionImageAnalyzer.cpp @@ -54,7 +54,7 @@ std::string asst::RoguelikeSkillSelectionImageAnalyzer::name_analyze(const Rect& ->replace_map); if (!analyzer.analyze()) { - return std::string(); + return {}; } return analyzer.get_result().front().text; } diff --git a/src/MeoAssistant/StageDropsImageAnalyzer.cpp b/src/MeoAssistant/StageDropsImageAnalyzer.cpp index 289a09dbaa..9f37cb5ce6 100644 --- a/src/MeoAssistant/StageDropsImageAnalyzer.cpp +++ b/src/MeoAssistant/StageDropsImageAnalyzer.cpp @@ -380,7 +380,7 @@ std::string asst::StageDropsImageAnalyzer::match_item(const Rect& roi, StageDrop } else { Log.error("StageDropType::ExpAndLMB, size", size); - return std::string(); + return {}; } break; case StageDropType::Furniture: diff --git a/src/MeoAssistant/TilePack.cpp b/src/MeoAssistant/TilePack.cpp index 2798da9313..aee9e8bbf7 100644 --- a/src/MeoAssistant/TilePack.cpp +++ b/src/MeoAssistant/TilePack.cpp @@ -40,7 +40,7 @@ std::unordered_map asst::TilePack::calc( Log.trace("After tiles cacl run"); if (!ret) { Log.info("Tiles calc error!"); - return std::unordered_map(); + return {}; } std::unordered_map dst;