From 199e41c762c52c3fff85e52853ef78b7332c7645 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Sun, 14 May 2023 23:31:03 +0200 Subject: [PATCH] Codechange: use default dtor instead of empty (#10826) --- src/base_consist.h | 2 +- src/blitter/32bpp_sse2.hpp | 2 +- src/blitter/base.hpp | 2 +- src/core/alloc_type.hpp | 2 +- src/crashlog.h | 2 +- src/disaster_vehicle.h | 2 +- src/driver.h | 2 +- src/effectvehicle_base.h | 2 +- src/fileio_func.h | 2 +- src/gfx_layout.h | 6 +++--- src/linkgraph/demands.h | 2 +- src/linkgraph/flowmapper.h | 4 ---- src/linkgraph/init.h | 5 ----- src/linkgraph/linkgraphschedule.h | 2 +- src/linkgraph/mcf.h | 5 ----- src/network/core/core.h | 2 +- src/network/core/http.h | 2 +- src/network/core/tcp_game.h | 2 +- src/network/network_content.h | 2 +- src/network/network_gui.cpp | 2 +- src/network/network_udp.cpp | 4 ++-- src/newgrf_commons.h | 2 +- src/newgrf_config.h | 2 +- src/newgrf_debug_gui.cpp | 2 +- src/newgrf_spritegroup.h | 6 +++--- src/news_type.h | 2 +- src/saveload/saveload.h | 4 ++-- src/script/api/script_list.cpp | 2 +- src/settings_gui.cpp | 2 +- src/settings_internal.h | 10 +--------- src/spriteloader/spriteloader.hpp | 4 ++-- src/strgen/strgen.h | 4 ++-- src/string_base.h | 2 +- src/strings_func.h | 2 +- src/widgets/dropdown_type.h | 2 +- 35 files changed, 40 insertions(+), 62 deletions(-) diff --git a/src/base_consist.h b/src/base_consist.h index 0249182dfb..da4b11dbed 100644 --- a/src/base_consist.h +++ b/src/base_consist.h @@ -29,7 +29,7 @@ struct BaseConsist { uint16 vehicle_flags; ///< Used for gradual loading and other miscellaneous things (@see VehicleFlags enum) - virtual ~BaseConsist() {} + virtual ~BaseConsist() = default; void CopyConsistPropertiesFrom(const BaseConsist *src); }; diff --git a/src/blitter/32bpp_sse2.hpp b/src/blitter/32bpp_sse2.hpp index 445fa97eb5..2921955f59 100644 --- a/src/blitter/32bpp_sse2.hpp +++ b/src/blitter/32bpp_sse2.hpp @@ -29,7 +29,7 @@ /** Base methods for 32bpp SSE blitters. */ class Blitter_32bppSSE_Base { public: - virtual ~Blitter_32bppSSE_Base() {} + virtual ~Blitter_32bppSSE_Base() = default; struct MapValue { uint8 m; diff --git a/src/blitter/base.hpp b/src/blitter/base.hpp index f33b99ba2e..0a90f6c661 100644 --- a/src/blitter/base.hpp +++ b/src/blitter/base.hpp @@ -208,7 +208,7 @@ public: */ virtual void PostResize() { }; - virtual ~Blitter() { } + virtual ~Blitter() = default; template void DrawLineGeneric(int x, int y, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel); }; diff --git a/src/core/alloc_type.hpp b/src/core/alloc_type.hpp index 773de58837..173c859f58 100644 --- a/src/core/alloc_type.hpp +++ b/src/core/alloc_type.hpp @@ -86,7 +86,7 @@ class ZeroedMemoryAllocator { public: ZeroedMemoryAllocator() {} - virtual ~ZeroedMemoryAllocator() {} + virtual ~ZeroedMemoryAllocator() = default; /** * Memory allocator for a single class instance. diff --git a/src/crashlog.h b/src/crashlog.h index 90a06310e6..e90b13b499 100644 --- a/src/crashlog.h +++ b/src/crashlog.h @@ -81,7 +81,7 @@ protected: public: /** Stub destructor to silence some compilers. */ - virtual ~CrashLog() {} + virtual ~CrashLog() = default; char *FillCrashLog(char *buffer, const char *last) const; bool WriteCrashLog(const char *buffer, char *filename, const char *filename_last) const; diff --git a/src/disaster_vehicle.h b/src/disaster_vehicle.h index 0df9913e5d..c10bedb7d5 100644 --- a/src/disaster_vehicle.h +++ b/src/disaster_vehicle.h @@ -44,7 +44,7 @@ struct DisasterVehicle FINAL : public SpecializedVehicle FontMap; */ class ParagraphLayouter { public: - virtual ~ParagraphLayouter() {} + virtual ~ParagraphLayouter() = default; /** Visual run contains data about the bit of text with the same font. */ class VisualRun { public: - virtual ~VisualRun() {} + virtual ~VisualRun() = default; virtual const Font *GetFont() const = 0; virtual int GetGlyphCount() const = 0; virtual const GlyphID *GetGlyphs() const = 0; @@ -106,7 +106,7 @@ public: /** A single line worth of VisualRuns. */ class Line { public: - virtual ~Line() {} + virtual ~Line() = default; virtual int GetLeading() const = 0; virtual int GetWidth() const = 0; virtual int CountRuns() const = 0; diff --git a/src/linkgraph/demands.h b/src/linkgraph/demands.h index 6fe3768341..4b2eec12a7 100644 --- a/src/linkgraph/demands.h +++ b/src/linkgraph/demands.h @@ -37,7 +37,7 @@ public: /** * Virtual destructor has to be defined because of virtual Run(). */ - virtual ~DemandHandler() {} + virtual ~DemandHandler() = default; }; #endif /* DEMANDS_H */ diff --git a/src/linkgraph/flowmapper.h b/src/linkgraph/flowmapper.h index 90ccd9fe52..da7375b8a6 100644 --- a/src/linkgraph/flowmapper.h +++ b/src/linkgraph/flowmapper.h @@ -30,10 +30,6 @@ public: FlowMapper(bool scale) : scale(scale) {} virtual void Run(LinkGraphJob &job) const; - /** - * Virtual destructor has to be defined because of virtual Run(). - */ - virtual ~FlowMapper() {} private: /** diff --git a/src/linkgraph/init.h b/src/linkgraph/init.h index 377c886311..a627005162 100644 --- a/src/linkgraph/init.h +++ b/src/linkgraph/init.h @@ -17,11 +17,6 @@ public: * @param job Job to be initialized. */ virtual void Run(LinkGraphJob &job) const { job.Init(); } - - /** - * Virtual destructor has to be defined because of virtual Run(). - */ - virtual ~InitHandler() {} }; #endif /* INIT_H */ diff --git a/src/linkgraph/linkgraphschedule.h b/src/linkgraph/linkgraphschedule.h index fef49e98f2..1e76cda324 100644 --- a/src/linkgraph/linkgraphschedule.h +++ b/src/linkgraph/linkgraphschedule.h @@ -23,7 +23,7 @@ public: /** * Destroy the handler. Must be given due to virtual Run. */ - virtual ~ComponentHandler() {} + virtual ~ComponentHandler() = default; /** * Run the handler. A link graph handler must not read or write any data diff --git a/src/linkgraph/mcf.h b/src/linkgraph/mcf.h index a2e85243d5..a3981877ff 100644 --- a/src/linkgraph/mcf.h +++ b/src/linkgraph/mcf.h @@ -81,11 +81,6 @@ public: * @param graph Component to be calculated. */ virtual void Run(LinkGraphJob &job) const { Tpass pass(job); } - - /** - * Destructor. Has to be given because of virtual Run(). - */ - virtual ~MCFHandler() {} }; #endif /* MCF_H */ diff --git a/src/network/core/core.h b/src/network/core/core.h index 84d5b62013..712687022a 100644 --- a/src/network/core/core.h +++ b/src/network/core/core.h @@ -48,7 +48,7 @@ public: NetworkSocketHandler() { this->has_quit = false; } /** Close the socket when destructing the socket handler */ - virtual ~NetworkSocketHandler() {} + virtual ~NetworkSocketHandler() = default; /** * Mark the connection as closed. diff --git a/src/network/core/http.h b/src/network/core/http.h index d851faf9c6..7bb03bc346 100644 --- a/src/network/core/http.h +++ b/src/network/core/http.h @@ -42,7 +42,7 @@ struct HTTPCallback { virtual bool IsCancelled() const = 0; /** Silentium */ - virtual ~HTTPCallback() {} + virtual ~HTTPCallback() = default; }; /** Base socket handler for HTTP traffic. */ diff --git a/src/network/core/tcp_game.h b/src/network/core/tcp_game.h index cd0facd781..4bcf1fb07d 100644 --- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -518,7 +518,7 @@ public: * @param status The reason the connection got closed. */ virtual NetworkRecvStatus CloseConnection(NetworkRecvStatus status) = 0; - virtual ~NetworkGameSocketHandler() {} + virtual ~NetworkGameSocketHandler() = default; /** * Sets the client info for this socket handler. diff --git a/src/network/network_content.h b/src/network/network_content.h index 8a2877f904..a11d29b991 100644 --- a/src/network/network_content.h +++ b/src/network/network_content.h @@ -57,7 +57,7 @@ struct ContentCallback { virtual void OnDownloadComplete(ContentID cid) {} /** Silentium */ - virtual ~ContentCallback() {} + virtual ~ContentCallback() = default; }; /** diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 6353b899d2..68c00b15b1 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -1444,7 +1444,7 @@ public: this->height = d.height + WidgetDimensions::scaled.framerect.Vertical(); this->width = d.width + WidgetDimensions::scaled.framerect.Horizontal(); } - virtual ~ButtonCommon() {} + virtual ~ButtonCommon() = default; /** * OnClick handler for when the button is pressed. diff --git a/src/network/network_udp.cpp b/src/network/network_udp.cpp index 6aed7d0f10..4f4c1b8b98 100644 --- a/src/network/network_udp.cpp +++ b/src/network/network_udp.cpp @@ -70,7 +70,7 @@ public: * @param addresses The addresses to bind on. */ ServerNetworkUDPSocketHandler(NetworkAddressList *addresses) : NetworkUDPSocketHandler(addresses) {} - virtual ~ServerNetworkUDPSocketHandler() {} + virtual ~ServerNetworkUDPSocketHandler() = default; }; void ServerNetworkUDPSocketHandler::Receive_CLIENT_FIND_SERVER(Packet *p, NetworkAddress *client_addr) @@ -88,7 +88,7 @@ class ClientNetworkUDPSocketHandler : public NetworkUDPSocketHandler { protected: void Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr) override; public: - virtual ~ClientNetworkUDPSocketHandler() {} + virtual ~ClientNetworkUDPSocketHandler() = default; }; void ClientNetworkUDPSocketHandler::Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr) diff --git a/src/newgrf_commons.h b/src/newgrf_commons.h index 06e5fb5f7c..4a4df50707 100644 --- a/src/newgrf_commons.h +++ b/src/newgrf_commons.h @@ -204,7 +204,7 @@ public: std::vector mappings; ///< mapping of ids from grf files. Public out of convenience OverrideManagerBase(uint16 offset, uint16 maximum, uint16 invalid); - virtual ~OverrideManagerBase() {} + virtual ~OverrideManagerBase() = default; void ResetOverride(); void ResetMapping(); diff --git a/src/newgrf_config.h b/src/newgrf_config.h index db4b492a1d..d5d085b702 100644 --- a/src/newgrf_config.h +++ b/src/newgrf_config.h @@ -212,7 +212,7 @@ extern uint _missing_extra_graphics; ///< Number of sprites provided by the fal /** Callback for NewGRF scanning. */ struct NewGRFScanCallback { /** Make sure the right destructor gets called. */ - virtual ~NewGRFScanCallback() {} + virtual ~NewGRFScanCallback() = default; /** Called whenever the NewGRF scan completed. */ virtual void OnNewGRFsScanned() = 0; }; diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp index d656837e6b..f903771303 100644 --- a/src/newgrf_debug_gui.cpp +++ b/src/newgrf_debug_gui.cpp @@ -116,7 +116,7 @@ struct NIVariable { class NIHelper { public: /** Silence a warning. */ - virtual ~NIHelper() {} + virtual ~NIHelper() = default; /** * Is the item with the given index inspectable? diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index af28950a88..edd5af1bab 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -61,7 +61,7 @@ protected: virtual const SpriteGroup *Resolve(ResolverObject &object) const { return this; }; public: - virtual ~SpriteGroup() {} + virtual ~SpriteGroup() = default; uint32 nfo_line; SpriteGroupType type; @@ -289,7 +289,7 @@ struct ScopeResolver { ResolverObject &ro; ///< Surrounding resolver object. ScopeResolver(ResolverObject &ro) : ro(ro) {} - virtual ~ScopeResolver() {} + virtual ~ScopeResolver() = default; virtual uint32 GetRandomBits() const; virtual uint32 GetTriggers() const; @@ -318,7 +318,7 @@ struct ResolverObject { this->ResetState(); } - virtual ~ResolverObject() {} + virtual ~ResolverObject() = default; ScopeResolver default_scope; ///< Default implementation of the grf scope. diff --git a/src/news_type.h b/src/news_type.h index a1111ccaa0..c1e4586004 100644 --- a/src/news_type.h +++ b/src/news_type.h @@ -118,7 +118,7 @@ struct NewsTypeData { /** Container for any custom data that must be deleted after the news item has reached end-of-life. */ struct NewsAllocatedData { - virtual ~NewsAllocatedData() {} + virtual ~NewsAllocatedData() = default; }; diff --git a/src/saveload/saveload.h b/src/saveload/saveload.h index 42729a5fb4..897e4cf367 100644 --- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -424,7 +424,7 @@ struct ChunkHandler { ChunkHandler(uint32 id, ChunkType type) : id(id), type(type) {} - virtual ~ChunkHandler() {} + virtual ~ChunkHandler() = default; /** * Save the chunk. @@ -480,7 +480,7 @@ class SaveLoadHandler { public: std::optional> load_description; - virtual ~SaveLoadHandler() {} + virtual ~SaveLoadHandler() = default; /** * Save the object to disk. diff --git a/src/script/api/script_list.cpp b/src/script/api/script_list.cpp index 14bb9293d5..9df94a4821 100644 --- a/src/script/api/script_list.cpp +++ b/src/script/api/script_list.cpp @@ -28,7 +28,7 @@ public: /** * Virtual dtor, needed to mute warnings. */ - virtual ~ScriptListSorter() { } + virtual ~ScriptListSorter() = default; /** * Get the first item of the sorter. diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 9fe9c3a78a..076b2d088e 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -957,7 +957,7 @@ struct BaseSettingEntry { byte level; ///< Nesting level of this setting entry BaseSettingEntry() : flags(0), level(0) {} - virtual ~BaseSettingEntry() {} + virtual ~BaseSettingEntry() = default; virtual void Init(byte level = 0); virtual void FoldAll() {} diff --git a/src/settings_internal.h b/src/settings_internal.h index 914c8a79fa..645ea24f2c 100644 --- a/src/settings_internal.h +++ b/src/settings_internal.h @@ -72,7 +72,7 @@ struct IniItem; struct SettingDesc { SettingDesc(const SaveLoad &save, SettingFlag flags, bool startup) : flags(flags), startup(startup), save(save) {} - virtual ~SettingDesc() {} + virtual ~SettingDesc() = default; SettingFlag flags; ///< Handles how a setting would show up in the GUI (text/currency, etc.). bool startup; ///< Setting has to be loaded directly at startup?. @@ -155,7 +155,6 @@ struct IntSettingDesc : SettingDesc { SettingDesc(save, flags, startup), def(def), min(min), max(max), interval(interval), str(str), str_help(str_help), str_val(str_val), cat(cat), pre_check(pre_check), post_callback(post_callback) {} - virtual ~IntSettingDesc() {} int32 def; ///< default value given when none is present int32 min; ///< minimum values @@ -196,7 +195,6 @@ struct BoolSettingDesc : IntSettingDesc { PreChangeCheck pre_check, PostChangeCallback post_callback) : IntSettingDesc(save, flags, startup, def, 0, 1, 0, str, str_help, str_val, cat, pre_check, post_callback) {} - virtual ~BoolSettingDesc() {} bool IsBoolSetting() const override { return true; } size_t ParseValue(const char *str) const override; @@ -217,8 +215,6 @@ struct OneOfManySettingDesc : IntSettingDesc { for (auto one : many) this->many.push_back(one); } - virtual ~OneOfManySettingDesc() {} - std::vector many; ///< possible values for this type OnConvert *many_cnvt; ///< callback procedure when loading value mechanism fails @@ -237,7 +233,6 @@ struct ManyOfManySettingDesc : OneOfManySettingDesc { std::initializer_list many, OnConvert *many_cnvt) : OneOfManySettingDesc(save, flags, startup, def, (1 << many.size()) - 1, str, str_help, str_val, cat, pre_check, post_callback, many, many_cnvt) {} - virtual ~ManyOfManySettingDesc() {} size_t ParseValue(const char *str) const override; void FormatValue(char *buf, const char *last, const void *object) const override; @@ -264,7 +259,6 @@ struct StringSettingDesc : SettingDesc { uint32 max_length, PreChangeCheck pre_check, PostChangeCallback post_callback) : SettingDesc(save, flags, startup), def(def == nullptr ? "" : def), max_length(max_length), pre_check(pre_check), post_callback(post_callback) {} - virtual ~StringSettingDesc() {} std::string def; ///< Default value given when none is present uint32 max_length; ///< Maximum length of the string, 0 means no maximum length @@ -288,7 +282,6 @@ private: struct ListSettingDesc : SettingDesc { ListSettingDesc(const SaveLoad &save, SettingFlag flags, bool startup, const char *def) : SettingDesc(save, flags, startup), def(def) {} - virtual ~ListSettingDesc() {} const char *def; ///< default value given when none is present @@ -301,7 +294,6 @@ struct ListSettingDesc : SettingDesc { struct NullSettingDesc : SettingDesc { NullSettingDesc(const SaveLoad &save) : SettingDesc(save, SF_NOT_IN_CONFIG, false) {} - virtual ~NullSettingDesc() {} void FormatValue(char *buf, const char *last, const void *object) const override { NOT_REACHED(); } void ParseValue(const IniItem *item, void *object) const override { NOT_REACHED(); } diff --git a/src/spriteloader/spriteloader.hpp b/src/spriteloader/spriteloader.hpp index fdd8be8612..38b6186eeb 100644 --- a/src/spriteloader/spriteloader.hpp +++ b/src/spriteloader/spriteloader.hpp @@ -77,14 +77,14 @@ public: */ virtual uint8 LoadSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t file_pos, SpriteType sprite_type, bool load_32bpp, byte control_flags) = 0; - virtual ~SpriteLoader() { } + virtual ~SpriteLoader() = default; }; /** Interface for something that can encode a sprite. */ class SpriteEncoder { public: - virtual ~SpriteEncoder() { } + virtual ~SpriteEncoder() = default; /** * Can the sprite encoder make use of RGBA sprites? diff --git a/src/strgen/strgen.h b/src/strgen/strgen.h index cf569fd2bc..4ea9c328d5 100644 --- a/src/strgen/strgen.h +++ b/src/strgen/strgen.h @@ -104,7 +104,7 @@ struct HeaderWriter { virtual void Finalise(const StringData &data) = 0; /** Especially destroy the subclasses. */ - virtual ~HeaderWriter() {}; + virtual ~HeaderWriter() = default; void WriteHeader(const StringData &data); }; @@ -131,7 +131,7 @@ struct LanguageWriter { virtual void Finalise() = 0; /** Especially destroy the subclasses. */ - virtual ~LanguageWriter() {} + virtual ~LanguageWriter() = default; virtual void WriteLength(uint length); virtual void WriteLang(const StringData &data); diff --git a/src/string_base.h b/src/string_base.h index d7414c9156..6546d3cdae 100644 --- a/src/string_base.h +++ b/src/string_base.h @@ -28,7 +28,7 @@ public: */ static std::unique_ptr Create(); - virtual ~StringIterator() {} + virtual ~StringIterator() = default; /** * Set a new iteration string. Must also be called if the string contents diff --git a/src/strings_func.h b/src/strings_func.h index 12f414961a..6ea9e46d47 100644 --- a/src/strings_func.h +++ b/src/strings_func.h @@ -257,7 +257,7 @@ bool StringIDSorter(const StringID &a, const StringID &b); class MissingGlyphSearcher { public: /** Make sure everything gets destructed right. */ - virtual ~MissingGlyphSearcher() {} + virtual ~MissingGlyphSearcher() = default; /** * Get the next string to search through. diff --git a/src/widgets/dropdown_type.h b/src/widgets/dropdown_type.h index 1414a03080..0d8951ef7b 100644 --- a/src/widgets/dropdown_type.h +++ b/src/widgets/dropdown_type.h @@ -25,7 +25,7 @@ public: bool masked; ///< Masked and unselectable item DropDownListItem(int result, bool masked) : result(result), masked(masked) {} - virtual ~DropDownListItem() {} + virtual ~DropDownListItem() = default; virtual bool Selectable() const { return false; } virtual uint Height(uint width) const { return FONT_HEIGHT_NORMAL; }