From 94dae7a1f119c290431685267cd7068c50aa7765 Mon Sep 17 00:00:00 2001 From: lethosor Date: Tue, 1 Aug 2023 00:59:26 -0400 Subject: [PATCH] dts::make_unique -> std::make_unique in unbuilt plugins Followup to #3537 --- plugins/devel/check-structures-sanity/types.cpp | 4 ++-- plugins/dwarfmonitor.cpp | 8 ++++---- plugins/embark-assistant/finder_ui.cpp | 2 +- plugins/embark-assistant/help_ui.cpp | 2 +- plugins/embark-tools.cpp | 2 +- plugins/manipulator.cpp | 10 +++++----- plugins/stocks.cpp | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/devel/check-structures-sanity/types.cpp b/plugins/devel/check-structures-sanity/types.cpp index 86d691f1d..3e6ae5a2d 100644 --- a/plugins/devel/check-structures-sanity/types.cpp +++ b/plugins/devel/check-structures-sanity/types.cpp @@ -162,7 +162,7 @@ type_identity *Checker::wrap_in_stl_ptr_vector(type_identity *base) { return it->second.get(); } - return (wrappers[base] = dts::make_unique(base, nullptr)).get(); + return (wrappers[base] = std::make_unique(base, nullptr)).get(); } type_identity *Checker::wrap_in_pointer(type_identity *base) @@ -173,7 +173,7 @@ type_identity *Checker::wrap_in_pointer(type_identity *base) { return it->second.get(); } - return (wrappers[base] = dts::make_unique(base)).get(); + return (wrappers[base] = std::make_unique(base)).get(); } std::map> known_types_by_size; diff --git a/plugins/dwarfmonitor.cpp b/plugins/dwarfmonitor.cpp index 2b546bfad..27e5b87e0 100644 --- a/plugins/dwarfmonitor.cpp +++ b/plugins/dwarfmonitor.cpp @@ -951,7 +951,7 @@ public: { df::unit *selected_unit = (selected_column == 1) ? dwarf_activity_column.getFirstSelectedElem() : nullptr; Screen::dismiss(this); - Screen::show(dts::make_unique(selected_unit), plugin_self); + Screen::show(std::make_unique(selected_unit), plugin_self); } else if (input->count(interface_key::CUSTOM_SHIFT_Z)) { @@ -1676,7 +1676,7 @@ private: static void open_stats_screen() { - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); } static void add_work_history(df::unit *unit, activity_type type) { @@ -1776,12 +1776,12 @@ static command_result dwarfmonitor_cmd(color_ostream &, vector & parame if (cmd == 's' || cmd == 'S') { CoreSuspender guard; if(Maps::IsValid()) - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); } else if (cmd == 'p' || cmd == 'P') { CoreSuspender guard; if(Maps::IsValid()) - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); } else return CR_WRONG_USAGE; diff --git a/plugins/embark-assistant/finder_ui.cpp b/plugins/embark-assistant/finder_ui.cpp index 6501f7f21..9a76794c2 100644 --- a/plugins/embark-assistant/finder_ui.cpp +++ b/plugins/embark-assistant/finder_ui.cpp @@ -1805,7 +1805,7 @@ void embark_assist::finder_ui::init(DFHack::Plugin *plugin_self, embark_assist:: embark_assist::finder_ui::ui_setup(find_callback, max_inorganic); } if (!fileresult) { - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); } else { diff --git a/plugins/embark-assistant/help_ui.cpp b/plugins/embark-assistant/help_ui.cpp index a49a9b5e0..804617d92 100644 --- a/plugins/embark-assistant/help_ui.cpp +++ b/plugins/embark-assistant/help_ui.cpp @@ -411,5 +411,5 @@ namespace embark_assist{ //=============================================================================== void embark_assist::help_ui::init(DFHack::Plugin *plugin_self) { - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); } diff --git a/plugins/embark-tools.cpp b/plugins/embark-tools.cpp index 924def798..19e4ef7b6 100644 --- a/plugins/embark-tools.cpp +++ b/plugins/embark-tools.cpp @@ -694,7 +694,7 @@ struct choose_start_site_hook : df::viewscreen_choose_start_sitest void display_settings() { - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); } inline bool is_valid_page() diff --git a/plugins/manipulator.cpp b/plugins/manipulator.cpp index b8f6ce706..0a8e18a27 100644 --- a/plugins/manipulator.cpp +++ b/plugins/manipulator.cpp @@ -1875,14 +1875,14 @@ void viewscreen_unitlaborsst::feed(set *events) if (events->count(interface_key::CUSTOM_B)) { - Screen::show(dts::make_unique(units, true, &do_refresh_names), plugin_self); + Screen::show(std::make_unique(units, true, &do_refresh_names), plugin_self); } if (events->count(interface_key::CUSTOM_E)) { vector tmp; tmp.push_back(cur); - Screen::show(dts::make_unique(tmp, false, &do_refresh_names), plugin_self); + Screen::show(std::make_unique(tmp, false, &do_refresh_names), plugin_self); } if (events->count(interface_key::CUSTOM_P)) @@ -1893,11 +1893,11 @@ void viewscreen_unitlaborsst::feed(set *events) has_selected = true; if (has_selected) { - Screen::show(dts::make_unique(units, true), plugin_self); + Screen::show(std::make_unique(units, true), plugin_self); } else { vector tmp; tmp.push_back(cur); - Screen::show(dts::make_unique(tmp, false), plugin_self); + Screen::show(std::make_unique(tmp, false), plugin_self); } } @@ -2286,7 +2286,7 @@ struct unitlist_hook : df::viewscreen_unitlistst { if (units[page].size()) { - Screen::show(dts::make_unique(units[page], cursor_pos[page]), plugin_self); + Screen::show(std::make_unique(units[page], cursor_pos[page]), plugin_self); return; } } diff --git a/plugins/stocks.cpp b/plugins/stocks.cpp index 8cc27067c..40ebdc960 100644 --- a/plugins/stocks.cpp +++ b/plugins/stocks.cpp @@ -685,7 +685,7 @@ public: } else if (input->count(interface_key::HELP)) { - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); } bool key_processed = false; @@ -1350,7 +1350,7 @@ struct stocks_hook : public df::viewscreen_storesst if (input->count(interface_key::CUSTOM_E)) { Screen::dismiss(this); - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); return; } INTERPOSE_NEXT(feed)(input); @@ -1385,7 +1385,7 @@ struct stocks_stockpile_hook : public df::viewscreen_dwarfmodest if (input->count(interface_key::CUSTOM_I)) { - Screen::show(dts::make_unique(sp), plugin_self); + Screen::show(std::make_unique(sp), plugin_self); return true; } @@ -1459,7 +1459,7 @@ static command_result stocks_cmd(color_ostream &out, vector & parameter } else if (toLower(parameters[0])[0] == 's') { - Screen::show(dts::make_unique(), plugin_self); + Screen::show(std::make_unique(), plugin_self); return CR_OK; } }