Skip to content

Commit 9b57cc7

Browse files
MjnMixaelMjnMixael
authored
wing editor stylization pass (scp-fs2open#7433)
1 parent ddb6c2e commit 9b57cc7

4 files changed

Lines changed: 235 additions & 241 deletions

File tree

‎qtfred/src/mission/dialogs/WingEditorDialogModel.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ wing* WingEditorDialogModel::getCurrentWing() const
7070
return &Wings[_currentWingIndex];
7171
}
7272

73-
std::vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getDockBayPathsForWingMask(uint32_t mask, int anchorShipnum)
73+
SCP_vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getDockBayPathsForWingMask(uint32_t mask, int anchorShipnum)
7474
{
75-
std::vector<std::pair<SCP_string, bool>> out;
75+
SCP_vector<std::pair<SCP_string, bool>> out;
7676

7777
if (anchorShipnum < 0 || !ship_has_hangar_bay(anchorShipnum))
7878
return out;
@@ -104,7 +104,7 @@ void WingEditorDialogModel::prepareSquadLogoList()
104104
pilot_load_squad_pic_list();
105105

106106
for (int i = 0; i < Num_pilot_squad_images; i++) {
107-
squadLogoList.emplace_back(Pilot_squad_image_names[i]);
107+
_squadLogoList.emplace_back(Pilot_squad_image_names[i]);
108108
}
109109
}
110110

@@ -277,9 +277,9 @@ std::pair<int, SCP_vector<SCP_string>> WingEditorDialogModel::getLeaderList() co
277277
return items;
278278
}
279279

280-
std::vector<std::pair<int, std::string>> WingEditorDialogModel::getHotkeyList()
280+
SCP_vector<std::pair<int, SCP_string>> WingEditorDialogModel::getHotkeyList()
281281
{
282-
std::vector<std::pair<int, std::string>> items;
282+
SCP_vector<std::pair<int, SCP_string>> items;
283283
items.emplace_back(-1, "None");
284284

285285
for (int i = 0; i < MAX_KEYED_TARGETS; ++i) {
@@ -293,9 +293,9 @@ std::vector<std::pair<int, std::string>> WingEditorDialogModel::getHotkeyList()
293293
return items;
294294
}
295295

296-
std::vector<std::pair<int, std::string>> WingEditorDialogModel::getFormationList()
296+
SCP_vector<std::pair<int, SCP_string>> WingEditorDialogModel::getFormationList()
297297
{
298-
std::vector<std::pair<int, std::string>> items;
298+
SCP_vector<std::pair<int, SCP_string>> items;
299299
items.emplace_back(-1, "Default");
300300

301301
for (int i = 0; i < static_cast<int>(Wing_formations.size()); i++) {
@@ -305,19 +305,19 @@ std::vector<std::pair<int, std::string>> WingEditorDialogModel::getFormationList
305305
return items;
306306
}
307307

308-
std::vector<std::pair<int, std::string>> WingEditorDialogModel::getArrivalLocationList()
308+
SCP_vector<std::pair<int, SCP_string>> WingEditorDialogModel::getArrivalLocationList()
309309
{
310-
std::vector<std::pair<int, std::string>> items;
310+
SCP_vector<std::pair<int, SCP_string>> items;
311311
items.reserve(MAX_ARRIVAL_NAMES);
312312
for (int i = 0; i < MAX_ARRIVAL_NAMES; i++) {
313313
items.emplace_back(i, Arrival_location_names[i]);
314314
}
315315
return items;
316316
}
317317

318-
std::vector<std::pair<int, std::string>> WingEditorDialogModel::getDepartureLocationList()
318+
SCP_vector<std::pair<int, SCP_string>> WingEditorDialogModel::getDepartureLocationList()
319319
{
320-
std::vector<std::pair<int, std::string>> items;
320+
SCP_vector<std::pair<int, SCP_string>> items;
321321
items.reserve(MAX_DEPARTURE_NAMES);
322322
for (int i = 0; i < MAX_DEPARTURE_NAMES; i++) {
323323
items.emplace_back(i, Departure_location_names[i]);
@@ -336,9 +336,9 @@ static bool shipHasDockBay(int ship_info_index)
336336
return pm && pm->ship_bay && pm->ship_bay->num_paths > 0;
337337
}
338338

339-
std::vector<std::pair<int, std::string>> WingEditorDialogModel::getArrivalTargetList() const
339+
SCP_vector<std::pair<int, SCP_string>> WingEditorDialogModel::getArrivalTargetList() const
340340
{
341-
std::vector<std::pair<int, std::string>> items;
341+
SCP_vector<std::pair<int, SCP_string>> items;
342342
const auto* w = getCurrentWing();
343343
if (!w)
344344
return items;
@@ -378,9 +378,9 @@ std::vector<std::pair<int, std::string>> WingEditorDialogModel::getArrivalTarget
378378
return items;
379379
}
380380

381-
std::vector<std::pair<int, std::string>> WingEditorDialogModel::getDepartureTargetList() const
381+
SCP_vector<std::pair<int, SCP_string>> WingEditorDialogModel::getDepartureTargetList() const
382382
{
383-
std::vector<std::pair<int, std::string>> items;
383+
SCP_vector<std::pair<int, SCP_string>> items;
384384
const auto* w = getCurrentWing();
385385
if (!w)
386386
return items;
@@ -688,9 +688,9 @@ void WingEditorDialogModel::disbandCurrentWing()
688688
reloadFromCurWing();
689689
}
690690

691-
std::vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getWingFlags() const
691+
SCP_vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getWingFlags() const
692692
{
693-
std::vector<std::pair<SCP_string, bool>> flags;
693+
SCP_vector<std::pair<SCP_string, bool>> flags;
694694
if (!wingIsValid())
695695
return flags;
696696

@@ -713,10 +713,10 @@ std::vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getWingFlags() c
713713
return flags;
714714
}
715715

716-
std::vector<std::pair<SCP_string, SCP_string>> WingEditorDialogModel::getWingFlagDescriptions()
716+
SCP_vector<std::pair<SCP_string, SCP_string>> WingEditorDialogModel::getWingFlagDescriptions()
717717
{
718718
const size_t num_descs = Num_parse_wing_flag_descriptions;
719-
std::vector<std::pair<SCP_string, SCP_string>> descriptions;
719+
SCP_vector<std::pair<SCP_string, SCP_string>> descriptions;
720720
descriptions.reserve(Num_parse_wing_flags);
721721
for (size_t i = 0; i < Num_parse_wing_flags; ++i) {
722722
const auto& flagDef = Parse_wing_flags[i];
@@ -736,7 +736,7 @@ std::vector<std::pair<SCP_string, SCP_string>> WingEditorDialogModel::getWingFla
736736
return descriptions;
737737
}
738738

739-
void WingEditorDialogModel::setWingFlags(const std::vector<std::pair<SCP_string, bool>>& newFlags)
739+
void WingEditorDialogModel::setWingFlags(const SCP_vector<std::pair<SCP_string, bool>>& newFlags)
740740
{
741741
if (!wingIsValid())
742742
return;
@@ -980,7 +980,7 @@ void WingEditorDialogModel::setArrivalDistance(int newDistance)
980980
modify(w->arrival_distance, newDistance);
981981
}
982982

983-
std::vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getArrivalPaths() const
983+
SCP_vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getArrivalPaths() const
984984
{
985985
if (!wingIsValid())
986986
return {};
@@ -992,7 +992,7 @@ std::vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getArrivalPaths(
992992
return getDockBayPathsForWingMask(w->arrival_path_mask, anchor_to_target(w->arrival_anchor));
993993
}
994994

995-
void WingEditorDialogModel::setArrivalPaths(const std::vector<std::pair<SCP_string, bool>>& chosen)
995+
void WingEditorDialogModel::setArrivalPaths(const SCP_vector<std::pair<SCP_string, bool>>& chosen)
996996
{
997997
if (!wingIsValid())
998998
return;
@@ -1220,7 +1220,7 @@ void WingEditorDialogModel::setDepartureTarget(int targetIndex)
12201220
modify(w->departure_path_mask, 0);
12211221
}
12221222

1223-
std::vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getDeparturePaths() const
1223+
SCP_vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getDeparturePaths() const
12241224
{
12251225
if (!wingIsValid())
12261226
return {};
@@ -1232,7 +1232,7 @@ std::vector<std::pair<SCP_string, bool>> WingEditorDialogModel::getDeparturePath
12321232
return getDockBayPathsForWingMask(w->departure_path_mask, anchor_to_target(w->departure_anchor));
12331233
}
12341234

1235-
void WingEditorDialogModel::setDeparturePaths(const std::vector<std::pair<SCP_string, bool>>& chosen)
1235+
void WingEditorDialogModel::setDeparturePaths(const SCP_vector<std::pair<SCP_string, bool>>& chosen)
12361236
{
12371237
if (!wingIsValid())
12381238
return;

0 commit comments

Comments
 (0)