src/industry_gui.cpp

@@ -44,7 +44,6 @@
 #include "stringfilter_type.h"
 #include "timer/timer.h"
 #include "timer/timer_window.h"
-#include "hotkeys.h"
 
 #include "table/strings.h"
 
@@ -1300,10 +1299,7 @@ static bool CDECL CargoFilter(const Industry * const *industry, const std::pair<
 
 static GUIIndustryList::FilterFunction * const _filter_funcs[] = { &CargoFilter };
 
-/** Enum referring to the Hotkeys in the industry directory window */
-enum IndustryDirectoryHotkeys {
-	IDHK_FOCUS_FILTER_BOX, ///< Focus the filter box
-};
+
 /**
  * The list of industries.
  */
@@ -1868,23 +1864,6 @@ public:
 				break;
 		}
 	}
-
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case IDHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_ID_FILTER);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				break;
-			default:
-				return ES_NOT_HANDLED;
-		}
-		return ES_HANDLED;
-	}
-
-	static inline HotkeyList hotkeys {"industrydirectory", {
-		Hotkey('F', "focus_filter_box", IDHK_FOCUS_FILTER_BOX),
-	}};
 };
 
 Listing IndustryDirectoryWindow::last_sorting = {false, 0};
@@ -1914,8 +1893,7 @@ static WindowDesc _industry_directory_desc(__FILE__, __LINE__,
 	WDP_AUTO, "list_industries", 428, 190,
 	WC_INDUSTRY_DIRECTORY, WC_NONE,
 	0,
-	std::begin(_nested_industry_directory_widgets), std::end(_nested_industry_directory_widgets),
-	&IndustryDirectoryWindow::hotkeys
+	std::begin(_nested_industry_directory_widgets), std::end(_nested_industry_directory_widgets)
 );
 
 void ShowIndustryDirectory()

src/script/api/script_basestation.cpp

@@ -15,7 +15,6 @@
 #include "../../strings_func.h"
 #include "../../station_cmd.h"
 #include "../../waypoint_cmd.h"
-#include "../../timer/timer_game_calendar.h"
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/script/api/script_date.hpp

@@ -11,7 +11,7 @@
 #define SCRIPT_DATE_HPP
 
 #include "script_object.hpp"
-#include "../../timer/timer_game_calendar.h"
+#include "timer/timer_game_calendar.h"
 
 /**
  * Class that handles all date related (calculation) functions.

src/script/api/script_engine.cpp

@@ -18,7 +18,6 @@
 #include "../../engine_func.h"
 #include "../../articulated_vehicles.h"
 #include "../../engine_cmd.h"
-#include "../../timer/timer_game_calendar.h"
 #include "table/strings.h"
 
 #include "../../safeguards.h"

src/town_gui.cpp

@@ -38,7 +38,6 @@
 #include "timer/timer_game_calendar.h"
 #include "timer/timer_window.h"
 #include "zoom_func.h"
-#include "hotkeys.h"
 
 #include "widgets/town_widget.h"
 
@@ -695,11 +694,6 @@ static const NWidgetPart _nested_town_directory_widgets[] = {
 	EndContainer(),
 };
 
-/** Enum referring to the Hotkeys in the town directory window */
-enum TownDirectoryHotkeys {
-	TDHK_FOCUS_FILTER_BOX, ///< Focus the filter box
-};
-
 /** Town directory window class. */
 struct TownDirectoryWindow : public Window {
 private:
@@ -1012,23 +1006,6 @@ public:
 				this->towns.ForceResort();
 		}
 	}
-
-	EventState OnHotkey(int hotkey) override
-	{
-		switch (hotkey) {
-			case TDHK_FOCUS_FILTER_BOX:
-				this->SetFocusedWidget(WID_TD_FILTER);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				break;
-			default:
-				return ES_NOT_HANDLED;
-		}
-		return ES_HANDLED;
-	}
-
-	static inline HotkeyList hotkeys {"towndirectory", {
-		Hotkey('F', "focus_filter_box", TDHK_FOCUS_FILTER_BOX),
-	}};
 };
 
 Listing TownDirectoryWindow::last_sorting = {false, 0};
@@ -1052,8 +1029,7 @@ static WindowDesc _town_directory_desc(__FILE__, __LINE__,
 	WDP_AUTO, "list_towns", 208, 202,
 	WC_TOWN_DIRECTORY, WC_NONE,
 	0,
-	std::begin(_nested_town_directory_widgets), std::end(_nested_town_directory_widgets),
-	&TownDirectoryWindow::hotkeys
+	std::begin(_nested_town_directory_widgets), std::end(_nested_town_directory_widgets)
 );
 
 void ShowTownDirectory()