upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 04:59:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actions/Undo: use make_unique over new

Browse Source
This commit is contained in:
Charles Dang 2024-10-12 14:42:07 -04:00
parent f79e8b444c
commit 28414a933d
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/actions/undo.cpp
View File

@ -59,16 +59,15 @@ namespace actions {
* Creates an undo_action based on a config.
* @return a pointer that must be deleted, or nullptr if the @a cfg could not be parsed.
*/
undo_action_base * undo_list::create_action(const config & cfg)
std::unique_ptr<undo_action_base> undo_list::create_action(const config & cfg)
{
const std::string str = cfg["type"];
undo_action_base * res = nullptr;
// The general division of labor in this function is that the various
// constructors will parse the "unit" child config, while this function
// parses everything else.
if ( str == "move" ) {
res = new undo::move_action(cfg, cfg.child_or_empty("unit"),
return std::make_unique<undo::move_action>(cfg, cfg.child_or_empty("unit"),
cfg["starting_moves"].to_int(),
map_location::parse_direction(cfg["starting_direction"]));
}
@ -84,29 +83,28 @@ undo_action_base * undo_list::create_action(const config & cfg)
<< child["type"] << "' was not found.\n";
return nullptr;
}
res = new undo::recruit_action(cfg, *u_type, map_location(cfg.child_or_empty("leader"), nullptr));
return std::make_unique<undo::recruit_action>(cfg, *u_type, map_location(cfg.child_or_empty("leader"), nullptr));
}
else if ( str == "recall" )
res = new undo::recall_action(cfg, map_location(cfg.child_or_empty("leader"), nullptr));
return std::make_unique<undo::recall_action>(cfg, map_location(cfg.child_or_empty("leader"), nullptr));
else if ( str == "dismiss" )
res = new undo::dismiss_action(cfg, cfg.mandatory_child("unit"));
return std::make_unique<undo::dismiss_action>(cfg, cfg.mandatory_child("unit"));
else if ( str == "auto_shroud" )
res = new undo::auto_shroud_action(cfg["active"].to_bool());
return std::make_unique<undo::auto_shroud_action>(cfg["active"].to_bool());
else if ( str == "update_shroud" )
res = new undo::update_shroud_action();
return std::make_unique<undo::update_shroud_action>();
else if ( str == "dummy" )
res = new undo_dummy_action(cfg);
return std::make_unique<undo_dummy_action>(cfg);
else
{
// Unrecognized type.
ERR_NG << "Unrecognized undo action type: " << str << ".";
return nullptr;
}
return res;
}
@ -134,12 +132,12 @@ undo_list::~undo_list()
*/
void undo_list::add_auto_shroud(bool turned_on)
{
add(new undo::auto_shroud_action(turned_on));
add(std::make_unique<undo::auto_shroud_action>(turned_on));
}
void undo_list::add_dummy()
{
add(new undo_dummy_action());
add(std::make_unique<undo_dummy_action>());
}
/**
@ -147,7 +145,7 @@ void undo_list::add_dummy()
*/
void undo_list::add_dismissal(const unit_const_ptr u)
{
add(new undo::dismiss_action(u));
add(std::make_unique<undo::dismiss_action>(u));
}
/**
@ -159,7 +157,7 @@ void undo_list::add_move(const unit_const_ptr u,
int start_moves, int timebonus, int village_owner,
const map_location::direction dir)
{
add(new undo::move_action(u, begin, end, start_moves, timebonus, village_owner, dir));
add(std::make_unique<undo::move_action>(u, begin, end, start_moves, timebonus, village_owner, dir));
}
/**
@ -168,7 +166,7 @@ void undo_list::add_move(const unit_const_ptr u,
void undo_list::add_recall(const unit_const_ptr u, const map_location& loc,
const map_location& from, int orig_village_owner, bool time_bonus)
{
add(new undo::recall_action(u, loc, from, orig_village_owner, time_bonus));
add(std::make_unique<undo::recall_action>(u, loc, from, orig_village_owner, time_bonus));
}
/**
@ -177,7 +175,7 @@ void undo_list::add_recall(const unit_const_ptr u, const map_location& loc,
void undo_list::add_recruit(const unit_const_ptr u, const map_location& loc,
const map_location& from, int orig_village_owner, bool time_bonus)
{
add(new undo::recruit_action(u, loc, from, orig_village_owner, time_bonus));
add(std::make_unique<undo::recruit_action>(u, loc, from, orig_village_owner, time_bonus));
}
/**
@ -187,7 +185,7 @@ void undo_list::add_recruit(const unit_const_ptr u, const map_location& loc,
*/
void undo_list::add_update_shroud()
{
add(new undo::update_shroud_action());
add(std::make_unique<undo::update_shroud_action>());
}
@ -275,9 +273,8 @@ void undo_list::read(const config & cfg)
// Build the undo stack.
for (const config & child : cfg.child_range("undo")) {
try {
undo_action_base * action = create_action(child);
if ( action ) {
undos_.emplace_back(action);
if(auto action = create_action(child)) {
undos_.push_back(std::move(action));
}
} catch (const bad_lexical_cast &) {
ERR_NG << "Error when parsing undo list from config: bad lexical cast.";

6
src/actions/undo.hpp
View File

@ -48,7 +48,7 @@ public:
* Creates an undo_action based on a config.
* Throws bad_lexical_cast or config::error if it cannot parse the config properly.
*/
static undo_action_base * create_action(const config & cfg);
static std::unique_ptr<undo_action_base> create_action(const config & cfg);
// Functions related to managing the undo stack:
@ -106,8 +106,8 @@ public:
private: // functions
/** Adds an action to the undo stack. */
void add(undo_action_base * action)
{ undos_.emplace_back(action); redos_.clear(); }
void add(std::unique_ptr<undo_action_base>&& action)
{ undos_.push_back(std::move(action)); redos_.clear(); }
/** Applies the pending fog/shroud changes from the undo stack. */
bool apply_shroud_changes() const;