cpp/openttd-patchpack/source Changeset - r23443:d6dcf039fb2e

Changeset - r23443:d6dcf039fb2e

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 5 years ago 2019-03-10 00:12:45
peter1138@openttd.org

Remove: Unnecessary virtual destructors on drop down list items.

3 files changed with 0 insertions and 9 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

@@ @@ -516,14 +516,12 @@ static const LiveryClass _livery_class[L @@
 };
 class DropDownListColourItem : public DropDownListItem {
 public:
 	DropDownListColourItem(int result, bool masked) : DropDownListItem(result, masked) {}
 	virtual ~DropDownListColourItem() {}
 	StringID String() const
+	{
 		return this->result >= COLOUR_END ? STR_COLOUR_DEFAULT : _colour_dropdown[this->result];
+	}
 	uint Height(uint width) const

src/toolbar_gui.cpp

➞

Show inline comments

@@ @@ -94,14 +94,12 @@ public: @@
 	DropDownListCheckedItem(StringID string, int result, bool masked, bool checked) : DropDownListStringItem(string, result, masked), checked(checked)
+	{
 		this->checkmark_width = GetStringBoundingBox(STR_JUST_CHECKMARK).width + 3;
+	}
 	virtual ~DropDownListCheckedItem() {}
 	uint Width() const
+	{
 		return DropDownListStringItem::Width() + this->checkmark_width;
+	}
 	void Draw(int left, int right, int top, int bottom, bool sel, Colours bg_colour) const
@@ @@ -126,14 +124,12 @@ public: @@
 	DropDownListCompanyItem(int result, bool masked, bool greyed) : DropDownListItem(result, masked), greyed(greyed)
+	{
 		this->icon_size = GetSpriteSize(SPR_COMPANY_ICON);
 		this->lock_size = GetSpriteSize(SPR_LOCK);
+	}
 	virtual ~DropDownListCompanyItem() {}
 	bool Selectable() const
+	{
 		return true;
+	}
 	uint Width() const

src/widgets/dropdown_type.h

➞

Show inline comments

@@ @@ -40,13 +40,12 @@ public: @@
  */
 class DropDownListStringItem : public DropDownListItem {
 public:
 	StringID string; ///< String ID of item
 	DropDownListStringItem(StringID string, int result, bool masked) : DropDownListItem(result, masked), string(string) {}
 	virtual ~DropDownListStringItem() {}
 	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;
 	virtual StringID String() const { return this->string; }
@@ @@ -58,13 +57,12 @@ public: @@
  */
 class DropDownListParamStringItem : public DropDownListStringItem {
 public:
 	uint64 decode_params[10]; ///< Parameters of the string
 	DropDownListParamStringItem(StringID string, int result, bool masked) : DropDownListStringItem(string, result, masked) {}
 	virtual ~DropDownListParamStringItem() {}
 	virtual StringID String() const;
 	virtual void SetParam(uint index, uint64 value) { decode_params[index] = value; }
 };
 /**
@@ @@ -72,13 +70,12 @@ public: @@
  */
 class DropDownListCharStringItem : public DropDownListStringItem {
 public:
 	const char *raw_string;
 	DropDownListCharStringItem(const char *raw_string, int result, bool masked) : DropDownListStringItem(STR_JUST_RAW_STRING, result, masked), raw_string(raw_string) {}
 	virtual ~DropDownListCharStringItem() {}
 	virtual StringID String() const;
 };
 /**
  * A drop down list is a collection of drop down list items.

0 comments (0 inline, 0 general)