Replace usage of MakeVector with initializer lists.

1 files changed, 58 insertions, 58 deletions

diff --git a/src/categories.cpp b/src/categories.cpp
index aea99532..b1e08a3a 100644
--- a/src/categories.cpp
+++ b/src/categories.cpp
@@ -113,7 +113,7 @@ void CategoryFactory::reset()
   // 43 = Savegames (makes no sense to install them through MO)

   // 45 = Videos and trailers

   // 87 = Miscelanous

-  addCategory(0, "None", MakeVector<int>(4, 28, 43, 45, 87), 0);

+  addCategory(0, "None", { 4, 28, 43, 45, 87 }, 0);

 }

 

 

@@ -206,63 +206,63 @@ void CategoryFactory::loadDefaultCategories()
 {

   // the order here is relevant as it defines the order in which the

   // mods appear in the combo box

-  addCategory(1, "Animations", MakeVector<int>(2, 4, 51), 0);

-  addCategory(52, "Poses", MakeVector<int>(1, 29), 1);

-  addCategory(2, "Armour", MakeVector<int>(2, 5, 54), 0);

-  addCategory(53, "Power Armor", MakeVector<int>(1, 53), 2);

-  addCategory(3, "Audio", MakeVector<int>(3, 33, 35, 106), 0);

-  addCategory(38, "Music", MakeVector<int>(2, 34, 61), 0);

-  addCategory(39, "Voice", MakeVector<int>(2, 36, 107), 0);

-  addCategory(5, "Clothing", MakeVector<int>(2, 9, 60), 0);

-  addCategory(41, "Jewelry", MakeVector<int>(1, 102), 5);

-  addCategory(42, "Backpacks", MakeVector<int>(1, 49), 5);

-  addCategory(6, "Collectables", MakeVector<int>(2, 10, 92), 0);

-  addCategory(28, "Companions", MakeVector<int>(3, 11, 66, 96), 0);

-  addCategory(7, "Creatures, Mounts, & Vehicles", MakeVector<int>(4, 12, 65, 83, 101), 0);

-  addCategory(8, "Factions", MakeVector<int>(2, 16, 25), 0);

-  addCategory(9, "Gameplay", MakeVector<int>(2, 15, 24), 0);

-  addCategory(27, "Combat", MakeVector<int>(1, 77), 9);

-  addCategory(43, "Crafting", MakeVector<int>(2, 50, 100), 9);

-  addCategory(48, "Overhauls", MakeVector<int>(2, 24, 79), 9);

-  addCategory(49, "Perks", MakeVector<int>(1, 27), 9);

-  addCategory(54, "Radio", MakeVector<int>(1, 31), 9);

-  addCategory(55, "Shouts", MakeVector<int>(1, 104), 9);

-  addCategory(22, "Skills & Levelling", MakeVector<int>(2, 46, 73), 9);

-  addCategory(58, "Weather & Lighting", MakeVector<int>(1, 56), 9);

-  addCategory(44, "Equipment", MakeVector<int>(1, 44), 43);

-  addCategory(45, "Home/Settlement", MakeVector<int>(1, 45), 43);

-  addCategory(10, "Body, Face, & Hair", MakeVector<int>(2, 17, 26), 0);

-  addCategory(39, "Tattoos", MakeVector<int>(1, 57), 10);

-  addCategory(40, "Character Presets", MakeVector<int>(1, 58), 0);

-  addCategory(11, "Items", MakeVector<int>(2, 27, 85), 0);

-  addCategory(32, "Mercantile", MakeVector<int>(2, 23, 69), 0);

-  addCategory(37, "Ammo", MakeVector<int>(1, 3), 11);

-  addCategory(19, "Weapons", MakeVector<int>(2, 41, 55), 11);

-  addCategory(36, "Weapon & Armour Sets", MakeVector<int>(1, 42), 11);

-  addCategory(23, "Player Homes", MakeVector<int>(2, 28, 67), 0);

-  addCategory(25, "Castles & Mansions", MakeVector<int>(1, 68), 23);

-  addCategory(51, "Settlements", MakeVector<int>(1, 48), 23);

-  addCategory(12, "Locations", MakeVector<int>(10, 20, 21, 22, 30, 47, 70, 88, 89, 90, 91), 0);

-  addCategory(4, "Cities", MakeVector<int>(1, 53), 12);

-  addCategory(31, "Landscape Changes", MakeVector<int>(1, 58), 0);

-  addCategory(29, "Environment", MakeVector<int>(2, 14, 74), 0);

-  addCategory(30, "Immersion", MakeVector<int>(2, 51, 78), 0);

-  addCategory(20, "Magic", MakeVector<int>(3, 75, 93, 94), 0);

-  addCategory(21, "Models & Textures", MakeVector<int>(2, 19, 29), 0);

-  addCategory(33, "Modders resources", MakeVector<int>(2, 18, 82), 0);

-  addCategory(13, "NPCs", MakeVector<int>(3, 22, 33, 99), 0);

-  addCategory(24, "Bugfixes", MakeVector<int>(2, 6, 95), 0);

-  addCategory(14, "Patches", MakeVector<int>(2, 25, 84), 24);

-  addCategory(35, "Utilities", MakeVector<int>(2, 38, 39), 0);

-  addCategory(26, "Cheats", MakeVector<int>(1, 8), 0);

-  addCategory(15, "Quests", MakeVector<int>(2, 30, 35), 0);

-  addCategory(16, "Races & Classes", MakeVector<int>(1, 34), 0);

-  addCategory(34, "Stealth", MakeVector<int>(1, 76), 0);

-  addCategory(17, "UI", MakeVector<int>(2, 37, 42), 0);

-  addCategory(18, "Visuals", MakeVector<int>(2, 40, 62), 0);

-  addCategory(50, "Pip-Boy", MakeVector<int>(1, 52), 18);

-  addCategory(46, "Shader Presets", MakeVector<int>(3, 13, 97, 105), 0);

-  addCategory(47, "Miscellaneous", MakeVector<int>(2, 2, 28), 0);

+  addCategory(1, "Animations", { 2, 4, 51 }, 0);

+  addCategory(52, "Poses", { 1, 29 }, 1);

+  addCategory(2, "Armour", { 2, 5, 54 }, 0);

+  addCategory(53, "Power Armor", { 1, 53 }, 2);

+  addCategory(3, "Audio", { 3, 33, 35, 106 }, 0);

+  addCategory(38, "Music", { 2, 34, 61 }, 0);

+  addCategory(39, "Voice", { 2, 36, 107 }, 0);

+  addCategory(5, "Clothing", { 2, 9, 60 }, 0);

+  addCategory(41, "Jewelry", { 1, 102 }, 5);

+  addCategory(42, "Backpacks", { 1, 49 }, 5);

+  addCategory(6, "Collectables", { 2, 10, 92 }, 0);

+  addCategory(28, "Companions", { 3, 11, 66, 96 }, 0);

+  addCategory(7, "Creatures, Mounts, & Vehicles", { 4, 12, 65, 83, 101 }, 0);

+  addCategory(8, "Factions", { 2, 16, 25 }, 0);

+  addCategory(9, "Gameplay", { 2, 15, 24 }, 0);

+  addCategory(27, "Combat", { 1, 77 }, 9);

+  addCategory(43, "Crafting", { 2, 50, 100 }, 9);

+  addCategory(48, "Overhauls", { 2, 24, 79 }, 9);

+  addCategory(49, "Perks", { 1, 27 }, 9);

+  addCategory(54, "Radio", { 1, 31 }, 9);

+  addCategory(55, "Shouts", { 1, 104 }, 9);

+  addCategory(22, "Skills & Levelling", { 2, 46, 73 }, 9);

+  addCategory(58, "Weather & Lighting", { 1, 56 }, 9);

+  addCategory(44, "Equipment", { 1, 44 }, 43);

+  addCategory(45, "Home/Settlement", { 1, 45 }, 43);

+  addCategory(10, "Body, Face, & Hair", { 2, 17, 26 }, 0);

+  addCategory(39, "Tattoos", { 1, 57 }, 10);

+  addCategory(40, "Character Presets", { 1, 58 }, 0);

+  addCategory(11, "Items", { 2, 27, 85 }, 0);

+  addCategory(32, "Mercantile", { 2, 23, 69 }, 0);

+  addCategory(37, "Ammo", { 1, 3 }, 11);

+  addCategory(19, "Weapons", { 2, 41, 55 }, 11);

+  addCategory(36, "Weapon & Armour Sets", { 1, 42 }, 11);

+  addCategory(23, "Player Homes", { 2, 28, 67 }, 0);

+  addCategory(25, "Castles & Mansions", { 1, 68 }, 23);

+  addCategory(51, "Settlements", { 1, 48 }, 23);

+  addCategory(12, "Locations", { 10, 20, 21, 22, 30, 47, 70, 88, 89, 90, 91 }, 0);

+  addCategory(4, "Cities", { 1, 53 }, 12);

+  addCategory(31, "Landscape Changes", { 1, 58 }, 0);

+  addCategory(29, "Environment", { 2, 14, 74 }, 0);

+  addCategory(30, "Immersion", { 2, 51, 78 }, 0);

+  addCategory(20, "Magic", { 3, 75, 93, 94 }, 0);

+  addCategory(21, "Models & Textures", { 2, 19, 29 }, 0);

+  addCategory(33, "Modders resources", { 2, 18, 82 }, 0);

+  addCategory(13, "NPCs", { 3, 22, 33, 99 }, 0);

+  addCategory(24, "Bugfixes", { 2, 6, 95 }, 0);

+  addCategory(14, "Patches", { 2, 25, 84 }, 24);

+  addCategory(35, "Utilities", { 2, 38, 39 }, 0);

+  addCategory(26, "Cheats", { 1, 8 }, 0);

+  addCategory(15, "Quests", { 2, 30, 35 }, 0);

+  addCategory(16, "Races & Classes", { 1, 34 }, 0);

+  addCategory(34, "Stealth", { 1, 76 }, 0);

+  addCategory(17, "UI", { 2, 37, 42 }, 0);

+  addCategory(18, "Visuals", { 2, 40, 62 }, 0);

+  addCategory(50, "Pip-Boy", { 1, 52 }, 18);

+  addCategory(46, "Shader Presets", { 3, 13, 97, 105 }, 0);

+  addCategory(47, "Miscellaneous", { 2, 2, 28 }, 0);

 }