Use .value() for getting control selection

Author: Flamefire

libs/s25main/desktops/dskCampaignSelection.cpp

@@ -153,7 +153,7 @@ void dskCampaignSelection::showCampaignInfo(const bool show)
 
 void dskCampaignSelection::showCampaignMissionSelectionScreen()
 {
-    const auto& campaign = campaigns_.at(*GetCtrl<ctrlTable>(ID_Table)->GetSelection());
+    const auto& campaign = campaigns_.at(GetCtrl<ctrlTable>(ID_Table)->GetSelection().value());
     WINDOWMANAGER.Switch(std::make_unique<dskCampaignMissionSelection>(csi_, campaign));
 }
 

libs/s25main/desktops/dskGameLobby.cpp

@@ -946,10 +946,10 @@ void dskGameLobby::UpdateGGS()
 
     GlobalGameSettings& ggs = gameLobby_->getSettings();
 
-    ggs.speed = static_cast<GameSpeed>(*GetCtrl<ctrlComboBox>(ID_cbSpeed)->GetSelection());
-    ggs.objective = static_cast<GameObjective>(*GetCtrl<ctrlComboBox>(ID_cbGoals)->GetSelection());
-    ggs.startWares = static_cast<StartWares>(*GetCtrl<ctrlComboBox>(ID_cbGoods)->GetSelection());
-    ggs.exploration = static_cast<Exploration>(*GetCtrl<ctrlComboBox>(ID_cbExploration)->GetSelection());
+    ggs.speed = static_cast<GameSpeed>(GetCtrl<ctrlComboBox>(ID_cbSpeed)->GetSelection().value());
+    ggs.objective = static_cast<GameObjective>(GetCtrl<ctrlComboBox>(ID_cbGoals)->GetSelection().value());
+    ggs.startWares = static_cast<StartWares>(GetCtrl<ctrlComboBox>(ID_cbGoods)->GetSelection().value());
+    ggs.exploration = static_cast<Exploration>(GetCtrl<ctrlComboBox>(ID_cbExploration)->GetSelection().value());
     ggs.lockedTeams = GetCtrl<ctrlCheck>(ID_chkLockTeams)->isChecked();
     ggs.teamView = GetCtrl<ctrlCheck>(ID_chkSharedView)->isChecked();
     ggs.randomStartPosition = GetCtrl<ctrlCheck>(ID_chkRandomSpawn)->isChecked();

libs/s25main/ingameWindows/iwDiplomacy.cpp

@@ -243,7 +243,7 @@ iwSuggestPact::iwSuggestPact(const PactType pt, const GamePlayer& player, GameCo
 void iwSuggestPact::Msg_ButtonClick(const unsigned /*ctrl_id*/)
 {
     /// Dauer auswählen (wenn id == NUM_DURATIONS, dann "für alle Ewigkeit" ausgewählt)
-    const unsigned selected_id = *GetCtrl<ctrlComboBox>(6)->GetSelection();
+    const unsigned selected_id = GetCtrl<ctrlComboBox>(6)->GetSelection().value();
     const unsigned duration = (selected_id == NUM_DURATIONS) ? DURATION_INFINITE : DURATIONS[selected_id];
     if(gcFactory.SuggestPact(player.GetPlayerId(), this->pt, duration))
         Close();

libs/s25main/ingameWindows/iwMapGenerator.cpp

@@ -133,7 +133,7 @@ void iwMapGenerator::Msg_ButtonClick(const unsigned ctrl_id)
 
 void iwMapGenerator::Apply()
 {
-    mapSettings.numPlayers = *GetCtrl<ctrlComboBox>(ID_cbNumPlayers)->GetSelection() + 2;
+    mapSettings.numPlayers = GetCtrl<ctrlComboBox>(ID_cbNumPlayers)->GetSelection().value() + 2;
     mapSettings.ratioGold = GetCtrl<ctrlProgress>(ID_pgGoldRatio)->GetPosition();
     mapSettings.ratioIron = GetCtrl<ctrlProgress>(ID_pgIronRatio)->GetPosition();
     mapSettings.ratioCoal = GetCtrl<ctrlProgress>(ID_pgCoalRatio)->GetPosition();
@@ -142,14 +142,14 @@ void iwMapGenerator::Apply()
     mapSettings.trees = GetCtrl<ctrlProgress>(ID_pgTrees)->GetPosition();
     mapSettings.stonePiles = GetCtrl<ctrlProgress>(ID_pgStonePiles)->GetPosition();
 
-    switch(*GetCtrl<ctrlComboBox>(ID_cbMountainDist)->GetSelection())
+    switch(GetCtrl<ctrlComboBox>(ID_cbMountainDist)->GetSelection().value())
     {
         case 0: mapSettings.mountainDistance = MountainDistance::Close; break;
         case 1: mapSettings.mountainDistance = MountainDistance::Normal; break;
         case 2: mapSettings.mountainDistance = MountainDistance::Far; break;
         case 3: mapSettings.mountainDistance = MountainDistance::VeryFar; break;
     }
-    switch(*GetCtrl<ctrlComboBox>(ID_cbMapStyle)->GetSelection())
+    switch(GetCtrl<ctrlComboBox>(ID_cbMapStyle)->GetSelection().value())
     {
         case 0: mapSettings.style = MapStyle::Water; break;
         case 1: mapSettings.style = MapStyle::Land; break;
@@ -159,7 +159,7 @@ void iwMapGenerator::Apply()
       s25util::fromStringClassic<unsigned>(GetCtrl<ctrlComboBox>(ID_cbMapSizeX)->GetSelectedText().value_or("128"));
     mapSettings.size.y =
       s25util::fromStringClassic<unsigned>(GetCtrl<ctrlComboBox>(ID_cbMapSizeY)->GetSelectedText().value_or("128"));
-    switch(*GetCtrl<ctrlComboBox>(ID_cbIslands)->GetSelection())
+    switch(GetCtrl<ctrlComboBox>(ID_cbIslands)->GetSelection().value())
     {
         case 0: mapSettings.islands = IslandAmount::Few; break;
         case 1: mapSettings.islands = IslandAmount::Normal; break;

libs/s25main/ingameWindows/iwSettings.cpp

@@ -130,13 +130,14 @@ void iwSettings::Msg_ButtonClick(unsigned ctrl_id)
             SETTINGS.global.smartCursor = GetCtrl<ctrlCheck>(ID_cbSmartCursor)->isChecked();
             VIDEODRIVER.SetMouseWarping(SETTINGS.global.smartCursor);
             SETTINGS.ingame.scaleStatistics = GetCtrl<ctrlCheck>(ID_cbStatisticScale)->isChecked();
-            SETTINGS.video.displayMode = DisplayMode(*GetCtrl<ctrlComboBox>(ID_cbDisplayMode)->GetSelection());
+            SETTINGS.video.displayMode = DisplayMode(GetCtrl<ctrlComboBox>(ID_cbDisplayMode)->GetSelection().value());
             SETTINGS.video.displayMode.resizeable = !grpWindowSize.GetCtrl<ctrlCheck>(ID_cbLockWindowSize)->isChecked();
             SETTINGS.interface.mapScrollMode =
-              static_cast<MapScrollMode>(*GetCtrl<ctrlComboBox>(ID_cbMapScrollMode)->GetSelection());
+              static_cast<MapScrollMode>(GetCtrl<ctrlComboBox>(ID_cbMapScrollMode)->GetSelection().value());
             SETTINGS.video.fullscreenSize = supportedResolutions_
-              [*GetCtrl<ctrlGroup>(ID_grpResolution)->GetCtrl<ctrlComboBox>(ID_cbResolution)->GetSelection()];
-            const unsigned windowSizeSelection = *grpWindowSize.GetCtrl<ctrlComboBox>(ID_cbWindowSize)->GetSelection();
+              [GetCtrl<ctrlGroup>(ID_grpResolution)->GetCtrl<ctrlComboBox>(ID_cbResolution)->GetSelection().value()];
+            const unsigned windowSizeSelection =
+              grpWindowSize.GetCtrl<ctrlComboBox>(ID_cbWindowSize)->GetSelection().value();
             if(windowSizeSelection > 0)
                 SETTINGS.video.windowedSize = windowSizes_[windowSizeSelection - 1];
             else if(VIDEODRIVER.GetDisplayMode() == DisplayMode::Windowed)
@@ -220,5 +221,5 @@ void iwSettings::updateResolutionGroups()
 
 DisplayMode iwSettings::getDisplayModeSelection() const
 {
-    return DisplayMode(*GetCtrl<ctrlComboBox>(ID_cbDisplayMode)->GetSelection());
+    return static_cast<DisplayMode>(GetCtrl<ctrlComboBox>(ID_cbDisplayMode)->GetSelection().value());
 }

libs/s25main/ingameWindows/iwTrade.cpp

@@ -77,7 +77,7 @@ iwTrade::iwTrade(const nobBaseWarehouse& wh, const GameWorldViewer& gwv, GameCom
 void iwTrade::Msg_ButtonClick(const unsigned /*ctrl_id*/)
 {
     // pressed the send button
-    const unsigned short ware_figure_selection = *GetCtrl<ctrlComboBox>(4)->GetSelection();
+    const unsigned ware_figure_selection = GetCtrl<ctrlComboBox>(4)->GetSelection().value();
     const bool isJob = this->GetCtrl<ctrlComboBox>(2)->GetSelection() == 1u;
     boost_variant2<GoodType, Job> what;
     if(isJob)