summaryrefslogtreecommitdiff
path: root/src/settings_gui.cpp
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2019-03-04 07:49:37 +0000
committerMichael Lutz <michi@icosahedron.de>2019-03-24 16:10:04 +0100
commit317f69c1520a3e60335c56d358686609d3decf86 (patch)
treea3432e9e5f433043f3e5431892f49580f1965c73 /src/settings_gui.cpp
parentaafce475963e2d2df59de9b02242a04856e78f93 (diff)
downloadopenttd-317f69c1520a3e60335c56d358686609d3decf86.tar.xz
Codechange: Use override specifier in Window-derived classes.
Diffstat (limited to 'src/settings_gui.cpp')
-rw-r--r--src/settings_gui.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index c92701f0d..fda7cfa52 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -339,7 +339,7 @@ struct GameOptionsWindow : Window {
return list;
}
- virtual void SetStringParameters(int widget) const
+ void SetStringParameters(int widget) const override
{
switch (widget) {
case WID_GO_CURRENCY_DROPDOWN: SetDParam(0, _currency_specs[this->opt->locale.currency].name); break;
@@ -358,7 +358,7 @@ struct GameOptionsWindow : Window {
}
}
- virtual void DrawWidget(const Rect &r, int widget) const
+ void DrawWidget(const Rect &r, int widget) const override
{
switch (widget) {
case WID_GO_BASE_GRF_DESCRIPTION:
@@ -378,7 +378,7 @@ struct GameOptionsWindow : Window {
}
}
- virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+ void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{
switch (widget) {
case WID_GO_BASE_GRF_DESCRIPTION:
@@ -445,7 +445,7 @@ struct GameOptionsWindow : Window {
}
}
- virtual void OnClick(Point pt, int widget, int click_count)
+ void OnClick(Point pt, int widget, int click_count) override
{
if (widget >= WID_GO_BASE_GRF_TEXTFILE && widget < WID_GO_BASE_GRF_TEXTFILE + TFT_END) {
if (BaseGraphics::GetUsedSet() == NULL) return;
@@ -508,7 +508,7 @@ struct GameOptionsWindow : Window {
}
}
- virtual void OnDropdownSelect(int widget, int index)
+ void OnDropdownSelect(int widget, int index) override
{
switch (widget) {
case WID_GO_CURRENCY_DROPDOWN: // Currency
@@ -587,7 +587,7 @@ struct GameOptionsWindow : Window {
* @param data Information about the changed data. @see GameOptionsInvalidationData
* @param gui_scope Whether the call is done from GUI scope. You may not do everything when not in GUI scope. See #InvalidateWindowData() for details.
*/
- virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
+ void OnInvalidateData(int data = 0, bool gui_scope = true) override
{
if (!gui_scope) return;
this->SetWidgetLoweredState(WID_GO_FULLSCREEN_BUTTON, _fullscreen);
@@ -1858,7 +1858,7 @@ struct GameSettingsWindow : Window {
this->InvalidateData();
}
- virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+ void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{
switch (widget) {
case WID_GS_OPTIONSPANEL:
@@ -1893,7 +1893,7 @@ struct GameSettingsWindow : Window {
}
}
- virtual void OnPaint()
+ void OnPaint() override
{
if (this->closing_dropdown) {
this->closing_dropdown = false;
@@ -1934,7 +1934,7 @@ struct GameSettingsWindow : Window {
}
}
- virtual void SetStringParameters(int widget) const
+ void SetStringParameters(int widget) const override
{
switch (widget) {
case WID_GS_RESTRICT_DROPDOWN:
@@ -1979,7 +1979,7 @@ struct GameSettingsWindow : Window {
return list;
}
- virtual void DrawWidget(const Rect &r, int widget) const
+ void DrawWidget(const Rect &r, int widget) const override
{
switch (widget) {
case WID_GS_OPTIONSPANEL: {
@@ -2029,7 +2029,7 @@ struct GameSettingsWindow : Window {
this->last_clicked = pe;
}
- virtual void OnClick(Point pt, int widget, int click_count)
+ void OnClick(Point pt, int widget, int click_count) override
{
switch (widget) {
case WID_GS_EXPAND_ALL:
@@ -2212,7 +2212,7 @@ struct GameSettingsWindow : Window {
}
}
- virtual void OnTimeout()
+ void OnTimeout() override
{
if (this->clicked_entry != NULL) { // On timeout, release any depressed buttons
this->clicked_entry->SetButtons(0);
@@ -2221,7 +2221,7 @@ struct GameSettingsWindow : Window {
}
}
- virtual void OnQueryTextFinished(char *str)
+ void OnQueryTextFinished(char *str) override
{
/* The user pressed cancel */
if (str == NULL) return;
@@ -2247,7 +2247,7 @@ struct GameSettingsWindow : Window {
this->SetDirty();
}
- virtual void OnDropdownSelect(int widget, int index)
+ void OnDropdownSelect(int widget, int index) override
{
switch (widget) {
case WID_GS_RESTRICT_DROPDOWN:
@@ -2291,7 +2291,7 @@ struct GameSettingsWindow : Window {
}
}
- virtual void OnDropdownClose(Point pt, int widget, int index, bool instant_close)
+ void OnDropdownClose(Point pt, int widget, int index, bool instant_close) override
{
if (widget >= 0) {
/* Normally the default implementation of OnDropdownClose() takes care of
@@ -2310,7 +2310,7 @@ struct GameSettingsWindow : Window {
}
}
- virtual void OnInvalidateData(int data = 0, bool gui_scope = true)
+ void OnInvalidateData(int data = 0, bool gui_scope = true) override
{
if (!gui_scope) return;
@@ -2340,7 +2340,7 @@ struct GameSettingsWindow : Window {
this->SetWidgetDisabledState(WID_GS_COLLAPSE_ALL, all_folded);
}
- virtual void OnEditboxChanged(int wid)
+ void OnEditboxChanged(int wid) override
{
if (wid == WID_GS_FILTER) {
this->filter.string.SetFilterTerm(this->filter_editbox.text.buf);
@@ -2353,7 +2353,7 @@ struct GameSettingsWindow : Window {
}
}
- virtual void OnResize()
+ void OnResize() override
{
this->vscroll->SetCapacityFromWidget(this, WID_GS_OPTIONSPANEL, SETTINGTREE_TOP_OFFSET + SETTINGTREE_BOTTOM_OFFSET);
}
@@ -2497,7 +2497,7 @@ struct CustomCurrencyWindow : Window {
this->SetWidgetDisabledState(WID_CC_YEAR_UP, _custom_currency.to_euro == MAX_YEAR);
}
- virtual void SetStringParameters(int widget) const
+ void SetStringParameters(int widget) const override
{
switch (widget) {
case WID_CC_RATE: SetDParam(0, 1); SetDParam(1, 1); break;
@@ -2515,7 +2515,7 @@ struct CustomCurrencyWindow : Window {
}
}
- virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
+ void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override
{
switch (widget) {
/* Set the appropriate width for the edit 'buttons' */
@@ -2534,7 +2534,7 @@ struct CustomCurrencyWindow : Window {
}
}
- virtual void OnClick(Point pt, int widget, int click_count)
+ void OnClick(Point pt, int widget, int click_count) override
{
int line = 0;
int len = 0;
@@ -2616,7 +2616,7 @@ struct CustomCurrencyWindow : Window {
this->SetDirty();
}
- virtual void OnQueryTextFinished(char *str)
+ void OnQueryTextFinished(char *str) override
{
if (str == NULL) return;
@@ -2648,7 +2648,7 @@ struct CustomCurrencyWindow : Window {
SetButtonState();
}
- virtual void OnTimeout()
+ void OnTimeout() override
{
this->SetDirty();
}