From 43d57a6b7e2734ba904e37b48773c2ee5ddf5635 Mon Sep 17 00:00:00 2001 From: Peter Nelson Date: Fri, 30 May 2025 08:29:09 +0100 Subject: [PATCH] Codefix 5c45738613: Rename CompanyGraphWindow to BaseCompanyGraphWindow. This makes it clearer that it isn't a final graph window. --- src/graph_gui.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp index fa22545466..0c533a1413 100644 --- a/src/graph_gui.cpp +++ b/src/graph_gui.cpp @@ -692,9 +692,9 @@ public: virtual void UpdateStatistics(bool initialize) = 0; }; -class CompanyGraphWindow : public BaseGraphWindow { +class BaseCompanyGraphWindow : public BaseGraphWindow { public: - CompanyGraphWindow(WindowDesc &desc, StringID format_str_y_axis) : BaseGraphWindow(desc, format_str_y_axis) {} + BaseCompanyGraphWindow(WindowDesc &desc, StringID format_str_y_axis) : BaseGraphWindow(desc, format_str_y_axis) {} void InitializeWindow(WindowNumber number) { @@ -775,9 +775,9 @@ public: /* OPERATING PROFIT */ /********************/ -struct OperatingProfitGraphWindow : CompanyGraphWindow { +struct OperatingProfitGraphWindow : BaseCompanyGraphWindow { OperatingProfitGraphWindow(WindowDesc &desc, WindowNumber window_number) : - CompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT) + BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT) { this->num_on_x_axis = GRAPH_NUM_MONTHS; this->num_vert_lines = GRAPH_NUM_MONTHS; @@ -828,9 +828,9 @@ void ShowOperatingProfitGraph() /* INCOME GRAPH */ /****************/ -struct IncomeGraphWindow : CompanyGraphWindow { +struct IncomeGraphWindow : BaseCompanyGraphWindow { IncomeGraphWindow(WindowDesc &desc, WindowNumber window_number) : - CompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT) + BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT) { this->num_on_x_axis = GRAPH_NUM_MONTHS; this->num_vert_lines = GRAPH_NUM_MONTHS; @@ -879,9 +879,9 @@ void ShowIncomeGraph() /* DELIVERED CARGO */ /*******************/ -struct DeliveredCargoGraphWindow : CompanyGraphWindow { +struct DeliveredCargoGraphWindow : BaseCompanyGraphWindow { DeliveredCargoGraphWindow(WindowDesc &desc, WindowNumber window_number) : - CompanyGraphWindow(desc, STR_JUST_COMMA) + BaseCompanyGraphWindow(desc, STR_JUST_COMMA) { this->num_on_x_axis = GRAPH_NUM_MONTHS; this->num_vert_lines = GRAPH_NUM_MONTHS; @@ -930,9 +930,9 @@ void ShowDeliveredCargoGraph() /* PERFORMANCE HISTORY */ /***********************/ -struct PerformanceHistoryGraphWindow : CompanyGraphWindow { +struct PerformanceHistoryGraphWindow : BaseCompanyGraphWindow { PerformanceHistoryGraphWindow(WindowDesc &desc, WindowNumber window_number) : - CompanyGraphWindow(desc, STR_JUST_COMMA) + BaseCompanyGraphWindow(desc, STR_JUST_COMMA) { this->num_on_x_axis = GRAPH_NUM_MONTHS; this->num_vert_lines = GRAPH_NUM_MONTHS; @@ -988,9 +988,9 @@ void ShowPerformanceHistoryGraph() /* COMPANY VALUE */ /*****************/ -struct CompanyValueGraphWindow : CompanyGraphWindow { +struct CompanyValueGraphWindow : BaseCompanyGraphWindow { CompanyValueGraphWindow(WindowDesc &desc, WindowNumber window_number) : - CompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT) + BaseCompanyGraphWindow(desc, STR_JUST_CURRENCY_SHORT) { this->num_on_x_axis = GRAPH_NUM_MONTHS; this->num_vert_lines = GRAPH_NUM_MONTHS;