cpp/openttd-patchpack/source Changeset - r23498:fcdedd342b36

Changeset - r23498:fcdedd342b36

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 5 years ago 2019-03-04 07:28:52
peter1138@openttd.org

Codechange: Use override specifier for DropDownListItem classes.

3 files changed with 13 insertions and 13 deletions:

src/company_gui.cpp

src/toolbar_gui.cpp

src/widgets/dropdown_type.h

0 comments (0 inline, 0 general)

src/company_gui.cpp

➞

Show inline comments

@@ @@ -524,17 +524,17 @@ public: @@
 		return this->result >= COLOUR_END ? STR_COLOUR_DEFAULT : _colour_dropdown[this->result];
+	}
 	uint Height(uint width) const
+	uint Height(uint width) const override
+	{
 		return max(FONT_HEIGHT_NORMAL, ScaleGUITrad(12) + 2);
+	}
 	bool Selectable() const
+	bool Selectable() const override
+	{
 		return true;
+	}
 	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const override
+	{
 		bool rtl = _current_text_dir == TD_RTL;
 		int height = bottom - top;

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -127,12 +127,12 @@ public: @@
 		this->lock_size = GetSpriteSize(SPR_LOCK);
+	}
 	bool Selectable() const
+	bool Selectable() const override
+	{
 		return true;
+	}
 	uint Width() const
+	uint Width() const override
+	{
 		CompanyID company = (CompanyID)this->result;
 		SetDParam(0, company);
@@ @@ -140,12 +140,12 @@ public: @@
 		return GetStringBoundingBox(STR_COMPANY_NAME_COMPANY_NUM).width + this->icon_size.width + this->lock_size.width + 6;
+	}
 	uint Height(uint width) const
+	uint Height(uint width) const override
+	{
 		return max(max(this->icon_size.height, this->lock_size.height) + 2U, (uint)FONT_HEIGHT_NORMAL);
+	}
 	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
+	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const override
+	{
 		CompanyID company = (CompanyID)this->result;
 		bool rtl = _current_text_dir == TD_RTL;

src/widgets/dropdown_type.h

➞

Show inline comments

@@ @@ -44,9 +44,9 @@ public: @@
 	DropDownListStringItem(StringID string, int result, bool masked) : DropDownListItem(result, masked), string(string) {}
 	virtual bool Selectable() const { return true; }
 	virtual uint Width() const;
 	virtual void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const;
 	bool Selectable() const override { return true; }
 	uint Width() const override;
 	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const override;
 	virtual StringID String() const { return this->string; }
 	static int CDECL NatSortFunc(const DropDownListItem * const *first, const DropDownListItem * const *second);
@@ @@ -61,8 +61,8 @@ public: @@
 	DropDownListParamStringItem(StringID string, int result, bool masked) : DropDownListStringItem(string, result, masked) {}
 	virtual StringID String() const;
 	virtual void SetParam(uint index, uint64 value) { decode_params[index] = value; }
 	StringID String() const override;
 	void SetParam(uint index, uint64 value) { decode_params[index] = value; }
 };
 /**
@@ @@ -74,7 +74,7 @@ public: @@
 	DropDownListCharStringItem(const char *raw_string, int result, bool masked) : DropDownListStringItem(STR_JUST_RAW_STRING, result, masked), raw_string(raw_string) {}
-	virtual StringID String() const;
+	StringID String() const override;
 };
 /**

0 comments (0 inline, 0 general)