mirror of https://github.com/OpenTTD/OpenTTD.git
Codechange: use default dtor instead of empty (#10826)
This commit is contained in:
parent
7634553d22
commit
199e41c762
|
@ -29,7 +29,7 @@ struct BaseConsist {
|
||||||
|
|
||||||
uint16 vehicle_flags; ///< Used for gradual loading and other miscellaneous things (@see VehicleFlags enum)
|
uint16 vehicle_flags; ///< Used for gradual loading and other miscellaneous things (@see VehicleFlags enum)
|
||||||
|
|
||||||
virtual ~BaseConsist() {}
|
virtual ~BaseConsist() = default;
|
||||||
|
|
||||||
void CopyConsistPropertiesFrom(const BaseConsist *src);
|
void CopyConsistPropertiesFrom(const BaseConsist *src);
|
||||||
};
|
};
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
/** Base methods for 32bpp SSE blitters. */
|
/** Base methods for 32bpp SSE blitters. */
|
||||||
class Blitter_32bppSSE_Base {
|
class Blitter_32bppSSE_Base {
|
||||||
public:
|
public:
|
||||||
virtual ~Blitter_32bppSSE_Base() {}
|
virtual ~Blitter_32bppSSE_Base() = default;
|
||||||
|
|
||||||
struct MapValue {
|
struct MapValue {
|
||||||
uint8 m;
|
uint8 m;
|
||||||
|
|
|
@ -208,7 +208,7 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void PostResize() { };
|
virtual void PostResize() { };
|
||||||
|
|
||||||
virtual ~Blitter() { }
|
virtual ~Blitter() = default;
|
||||||
|
|
||||||
template <typename SetPixelT> void DrawLineGeneric(int x, int y, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel);
|
template <typename SetPixelT> void DrawLineGeneric(int x, int y, int x2, int y2, int screen_width, int screen_height, int width, int dash, SetPixelT set_pixel);
|
||||||
};
|
};
|
||||||
|
|
|
@ -86,7 +86,7 @@ class ZeroedMemoryAllocator
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ZeroedMemoryAllocator() {}
|
ZeroedMemoryAllocator() {}
|
||||||
virtual ~ZeroedMemoryAllocator() {}
|
virtual ~ZeroedMemoryAllocator() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Memory allocator for a single class instance.
|
* Memory allocator for a single class instance.
|
||||||
|
|
|
@ -81,7 +81,7 @@ protected:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** Stub destructor to silence some compilers. */
|
/** Stub destructor to silence some compilers. */
|
||||||
virtual ~CrashLog() {}
|
virtual ~CrashLog() = default;
|
||||||
|
|
||||||
char *FillCrashLog(char *buffer, const char *last) const;
|
char *FillCrashLog(char *buffer, const char *last) const;
|
||||||
bool WriteCrashLog(const char *buffer, char *filename, const char *filename_last) const;
|
bool WriteCrashLog(const char *buffer, char *filename, const char *filename_last) const;
|
||||||
|
|
|
@ -44,7 +44,7 @@ struct DisasterVehicle FINAL : public SpecializedVehicle<DisasterVehicle, VEH_DI
|
||||||
DisasterVehicle() : SpecializedVehicleBase() {}
|
DisasterVehicle() : SpecializedVehicleBase() {}
|
||||||
DisasterVehicle(int x, int y, Direction direction, DisasterSubType subtype, VehicleID big_ufo_destroyer_target = VEH_INVALID);
|
DisasterVehicle(int x, int y, Direction direction, DisasterSubType subtype, VehicleID big_ufo_destroyer_target = VEH_INVALID);
|
||||||
/** We want to 'destruct' the right class. */
|
/** We want to 'destruct' the right class. */
|
||||||
virtual ~DisasterVehicle() {}
|
virtual ~DisasterVehicle() = default;
|
||||||
|
|
||||||
void UpdatePosition(int x, int y, int z);
|
void UpdatePosition(int x, int y, int z);
|
||||||
void UpdateDeltaXY();
|
void UpdateDeltaXY();
|
||||||
|
|
|
@ -33,7 +33,7 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void Stop() = 0;
|
virtual void Stop() = 0;
|
||||||
|
|
||||||
virtual ~Driver() { }
|
virtual ~Driver() = default;
|
||||||
|
|
||||||
/** The type of driver */
|
/** The type of driver */
|
||||||
enum Type {
|
enum Type {
|
||||||
|
|
|
@ -28,7 +28,7 @@ struct EffectVehicle FINAL : public SpecializedVehicle<EffectVehicle, VEH_EFFECT
|
||||||
/** We don't want GCC to zero our struct! It already is zeroed and has an index! */
|
/** We don't want GCC to zero our struct! It already is zeroed and has an index! */
|
||||||
EffectVehicle() : SpecializedVehicleBase() {}
|
EffectVehicle() : SpecializedVehicleBase() {}
|
||||||
/** We want to 'destruct' the right class. */
|
/** We want to 'destruct' the right class. */
|
||||||
virtual ~EffectVehicle() {}
|
virtual ~EffectVehicle() = default;
|
||||||
|
|
||||||
void UpdateDeltaXY();
|
void UpdateDeltaXY();
|
||||||
bool Tick();
|
bool Tick();
|
||||||
|
|
|
@ -39,7 +39,7 @@ protected:
|
||||||
Subdirectory subdir; ///< The current sub directory we are searching through
|
Subdirectory subdir; ///< The current sub directory we are searching through
|
||||||
public:
|
public:
|
||||||
/** Destruct the proper one... */
|
/** Destruct the proper one... */
|
||||||
virtual ~FileScanner() {}
|
virtual ~FileScanner() = default;
|
||||||
|
|
||||||
uint Scan(const char *extension, Subdirectory sd, bool tars = true, bool recursive = true);
|
uint Scan(const char *extension, Subdirectory sd, bool tars = true, bool recursive = true);
|
||||||
uint Scan(const char *extension, const std::string &directory, bool recursive = true);
|
uint Scan(const char *extension, const std::string &directory, bool recursive = true);
|
||||||
|
|
|
@ -89,12 +89,12 @@ typedef SmallMap<int, Font *> FontMap;
|
||||||
*/
|
*/
|
||||||
class ParagraphLayouter {
|
class ParagraphLayouter {
|
||||||
public:
|
public:
|
||||||
virtual ~ParagraphLayouter() {}
|
virtual ~ParagraphLayouter() = default;
|
||||||
|
|
||||||
/** Visual run contains data about the bit of text with the same font. */
|
/** Visual run contains data about the bit of text with the same font. */
|
||||||
class VisualRun {
|
class VisualRun {
|
||||||
public:
|
public:
|
||||||
virtual ~VisualRun() {}
|
virtual ~VisualRun() = default;
|
||||||
virtual const Font *GetFont() const = 0;
|
virtual const Font *GetFont() const = 0;
|
||||||
virtual int GetGlyphCount() const = 0;
|
virtual int GetGlyphCount() const = 0;
|
||||||
virtual const GlyphID *GetGlyphs() const = 0;
|
virtual const GlyphID *GetGlyphs() const = 0;
|
||||||
|
@ -106,7 +106,7 @@ public:
|
||||||
/** A single line worth of VisualRuns. */
|
/** A single line worth of VisualRuns. */
|
||||||
class Line {
|
class Line {
|
||||||
public:
|
public:
|
||||||
virtual ~Line() {}
|
virtual ~Line() = default;
|
||||||
virtual int GetLeading() const = 0;
|
virtual int GetLeading() const = 0;
|
||||||
virtual int GetWidth() const = 0;
|
virtual int GetWidth() const = 0;
|
||||||
virtual int CountRuns() const = 0;
|
virtual int CountRuns() const = 0;
|
||||||
|
|
|
@ -37,7 +37,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Virtual destructor has to be defined because of virtual Run().
|
* Virtual destructor has to be defined because of virtual Run().
|
||||||
*/
|
*/
|
||||||
virtual ~DemandHandler() {}
|
virtual ~DemandHandler() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* DEMANDS_H */
|
#endif /* DEMANDS_H */
|
||||||
|
|
|
@ -30,10 +30,6 @@ public:
|
||||||
FlowMapper(bool scale) : scale(scale) {}
|
FlowMapper(bool scale) : scale(scale) {}
|
||||||
virtual void Run(LinkGraphJob &job) const;
|
virtual void Run(LinkGraphJob &job) const;
|
||||||
|
|
||||||
/**
|
|
||||||
* Virtual destructor has to be defined because of virtual Run().
|
|
||||||
*/
|
|
||||||
virtual ~FlowMapper() {}
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -17,11 +17,6 @@ public:
|
||||||
* @param job Job to be initialized.
|
* @param job Job to be initialized.
|
||||||
*/
|
*/
|
||||||
virtual void Run(LinkGraphJob &job) const { job.Init(); }
|
virtual void Run(LinkGraphJob &job) const { job.Init(); }
|
||||||
|
|
||||||
/**
|
|
||||||
* Virtual destructor has to be defined because of virtual Run().
|
|
||||||
*/
|
|
||||||
virtual ~InitHandler() {}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* INIT_H */
|
#endif /* INIT_H */
|
||||||
|
|
|
@ -23,7 +23,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Destroy the handler. Must be given due to virtual Run.
|
* 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
|
* Run the handler. A link graph handler must not read or write any data
|
||||||
|
|
|
@ -81,11 +81,6 @@ public:
|
||||||
* @param graph Component to be calculated.
|
* @param graph Component to be calculated.
|
||||||
*/
|
*/
|
||||||
virtual void Run(LinkGraphJob &job) const { Tpass pass(job); }
|
virtual void Run(LinkGraphJob &job) const { Tpass pass(job); }
|
||||||
|
|
||||||
/**
|
|
||||||
* Destructor. Has to be given because of virtual Run().
|
|
||||||
*/
|
|
||||||
virtual ~MCFHandler() {}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* MCF_H */
|
#endif /* MCF_H */
|
||||||
|
|
|
@ -48,7 +48,7 @@ public:
|
||||||
NetworkSocketHandler() { this->has_quit = false; }
|
NetworkSocketHandler() { this->has_quit = false; }
|
||||||
|
|
||||||
/** Close the socket when destructing the socket handler */
|
/** Close the socket when destructing the socket handler */
|
||||||
virtual ~NetworkSocketHandler() {}
|
virtual ~NetworkSocketHandler() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Mark the connection as closed.
|
* Mark the connection as closed.
|
||||||
|
|
|
@ -42,7 +42,7 @@ struct HTTPCallback {
|
||||||
virtual bool IsCancelled() const = 0;
|
virtual bool IsCancelled() const = 0;
|
||||||
|
|
||||||
/** Silentium */
|
/** Silentium */
|
||||||
virtual ~HTTPCallback() {}
|
virtual ~HTTPCallback() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Base socket handler for HTTP traffic. */
|
/** Base socket handler for HTTP traffic. */
|
||||||
|
|
|
@ -518,7 +518,7 @@ public:
|
||||||
* @param status The reason the connection got closed.
|
* @param status The reason the connection got closed.
|
||||||
*/
|
*/
|
||||||
virtual NetworkRecvStatus CloseConnection(NetworkRecvStatus status) = 0;
|
virtual NetworkRecvStatus CloseConnection(NetworkRecvStatus status) = 0;
|
||||||
virtual ~NetworkGameSocketHandler() {}
|
virtual ~NetworkGameSocketHandler() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the client info for this socket handler.
|
* Sets the client info for this socket handler.
|
||||||
|
|
|
@ -57,7 +57,7 @@ struct ContentCallback {
|
||||||
virtual void OnDownloadComplete(ContentID cid) {}
|
virtual void OnDownloadComplete(ContentID cid) {}
|
||||||
|
|
||||||
/** Silentium */
|
/** Silentium */
|
||||||
virtual ~ContentCallback() {}
|
virtual ~ContentCallback() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -1444,7 +1444,7 @@ public:
|
||||||
this->height = d.height + WidgetDimensions::scaled.framerect.Vertical();
|
this->height = d.height + WidgetDimensions::scaled.framerect.Vertical();
|
||||||
this->width = d.width + WidgetDimensions::scaled.framerect.Horizontal();
|
this->width = d.width + WidgetDimensions::scaled.framerect.Horizontal();
|
||||||
}
|
}
|
||||||
virtual ~ButtonCommon() {}
|
virtual ~ButtonCommon() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* OnClick handler for when the button is pressed.
|
* OnClick handler for when the button is pressed.
|
||||||
|
|
|
@ -70,7 +70,7 @@ public:
|
||||||
* @param addresses The addresses to bind on.
|
* @param addresses The addresses to bind on.
|
||||||
*/
|
*/
|
||||||
ServerNetworkUDPSocketHandler(NetworkAddressList *addresses) : NetworkUDPSocketHandler(addresses) {}
|
ServerNetworkUDPSocketHandler(NetworkAddressList *addresses) : NetworkUDPSocketHandler(addresses) {}
|
||||||
virtual ~ServerNetworkUDPSocketHandler() {}
|
virtual ~ServerNetworkUDPSocketHandler() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
void ServerNetworkUDPSocketHandler::Receive_CLIENT_FIND_SERVER(Packet *p, NetworkAddress *client_addr)
|
void ServerNetworkUDPSocketHandler::Receive_CLIENT_FIND_SERVER(Packet *p, NetworkAddress *client_addr)
|
||||||
|
@ -88,7 +88,7 @@ class ClientNetworkUDPSocketHandler : public NetworkUDPSocketHandler {
|
||||||
protected:
|
protected:
|
||||||
void Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr) override;
|
void Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr) override;
|
||||||
public:
|
public:
|
||||||
virtual ~ClientNetworkUDPSocketHandler() {}
|
virtual ~ClientNetworkUDPSocketHandler() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
void ClientNetworkUDPSocketHandler::Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr)
|
void ClientNetworkUDPSocketHandler::Receive_SERVER_RESPONSE(Packet *p, NetworkAddress *client_addr)
|
||||||
|
|
|
@ -204,7 +204,7 @@ public:
|
||||||
std::vector<EntityIDMapping> mappings; ///< mapping of ids from grf files. Public out of convenience
|
std::vector<EntityIDMapping> mappings; ///< mapping of ids from grf files. Public out of convenience
|
||||||
|
|
||||||
OverrideManagerBase(uint16 offset, uint16 maximum, uint16 invalid);
|
OverrideManagerBase(uint16 offset, uint16 maximum, uint16 invalid);
|
||||||
virtual ~OverrideManagerBase() {}
|
virtual ~OverrideManagerBase() = default;
|
||||||
|
|
||||||
void ResetOverride();
|
void ResetOverride();
|
||||||
void ResetMapping();
|
void ResetMapping();
|
||||||
|
|
|
@ -212,7 +212,7 @@ extern uint _missing_extra_graphics; ///< Number of sprites provided by the fal
|
||||||
/** Callback for NewGRF scanning. */
|
/** Callback for NewGRF scanning. */
|
||||||
struct NewGRFScanCallback {
|
struct NewGRFScanCallback {
|
||||||
/** Make sure the right destructor gets called. */
|
/** Make sure the right destructor gets called. */
|
||||||
virtual ~NewGRFScanCallback() {}
|
virtual ~NewGRFScanCallback() = default;
|
||||||
/** Called whenever the NewGRF scan completed. */
|
/** Called whenever the NewGRF scan completed. */
|
||||||
virtual void OnNewGRFsScanned() = 0;
|
virtual void OnNewGRFsScanned() = 0;
|
||||||
};
|
};
|
||||||
|
|
|
@ -116,7 +116,7 @@ struct NIVariable {
|
||||||
class NIHelper {
|
class NIHelper {
|
||||||
public:
|
public:
|
||||||
/** Silence a warning. */
|
/** Silence a warning. */
|
||||||
virtual ~NIHelper() {}
|
virtual ~NIHelper() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Is the item with the given index inspectable?
|
* Is the item with the given index inspectable?
|
||||||
|
|
|
@ -61,7 +61,7 @@ protected:
|
||||||
virtual const SpriteGroup *Resolve(ResolverObject &object) const { return this; };
|
virtual const SpriteGroup *Resolve(ResolverObject &object) const { return this; };
|
||||||
|
|
||||||
public:
|
public:
|
||||||
virtual ~SpriteGroup() {}
|
virtual ~SpriteGroup() = default;
|
||||||
|
|
||||||
uint32 nfo_line;
|
uint32 nfo_line;
|
||||||
SpriteGroupType type;
|
SpriteGroupType type;
|
||||||
|
@ -289,7 +289,7 @@ struct ScopeResolver {
|
||||||
ResolverObject &ro; ///< Surrounding resolver object.
|
ResolverObject &ro; ///< Surrounding resolver object.
|
||||||
|
|
||||||
ScopeResolver(ResolverObject &ro) : ro(ro) {}
|
ScopeResolver(ResolverObject &ro) : ro(ro) {}
|
||||||
virtual ~ScopeResolver() {}
|
virtual ~ScopeResolver() = default;
|
||||||
|
|
||||||
virtual uint32 GetRandomBits() const;
|
virtual uint32 GetRandomBits() const;
|
||||||
virtual uint32 GetTriggers() const;
|
virtual uint32 GetTriggers() const;
|
||||||
|
@ -318,7 +318,7 @@ struct ResolverObject {
|
||||||
this->ResetState();
|
this->ResetState();
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~ResolverObject() {}
|
virtual ~ResolverObject() = default;
|
||||||
|
|
||||||
ScopeResolver default_scope; ///< Default implementation of the grf scope.
|
ScopeResolver default_scope; ///< Default implementation of the grf scope.
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ struct NewsTypeData {
|
||||||
|
|
||||||
/** Container for any custom data that must be deleted after the news item has reached end-of-life. */
|
/** Container for any custom data that must be deleted after the news item has reached end-of-life. */
|
||||||
struct NewsAllocatedData {
|
struct NewsAllocatedData {
|
||||||
virtual ~NewsAllocatedData() {}
|
virtual ~NewsAllocatedData() = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -424,7 +424,7 @@ struct ChunkHandler {
|
||||||
|
|
||||||
ChunkHandler(uint32 id, ChunkType type) : id(id), type(type) {}
|
ChunkHandler(uint32 id, ChunkType type) : id(id), type(type) {}
|
||||||
|
|
||||||
virtual ~ChunkHandler() {}
|
virtual ~ChunkHandler() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save the chunk.
|
* Save the chunk.
|
||||||
|
@ -480,7 +480,7 @@ class SaveLoadHandler {
|
||||||
public:
|
public:
|
||||||
std::optional<std::vector<SaveLoad>> load_description;
|
std::optional<std::vector<SaveLoad>> load_description;
|
||||||
|
|
||||||
virtual ~SaveLoadHandler() {}
|
virtual ~SaveLoadHandler() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Save the object to disk.
|
* Save the object to disk.
|
||||||
|
|
|
@ -28,7 +28,7 @@ public:
|
||||||
/**
|
/**
|
||||||
* Virtual dtor, needed to mute warnings.
|
* Virtual dtor, needed to mute warnings.
|
||||||
*/
|
*/
|
||||||
virtual ~ScriptListSorter() { }
|
virtual ~ScriptListSorter() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the first item of the sorter.
|
* Get the first item of the sorter.
|
||||||
|
|
|
@ -957,7 +957,7 @@ struct BaseSettingEntry {
|
||||||
byte level; ///< Nesting level of this setting entry
|
byte level; ///< Nesting level of this setting entry
|
||||||
|
|
||||||
BaseSettingEntry() : flags(0), level(0) {}
|
BaseSettingEntry() : flags(0), level(0) {}
|
||||||
virtual ~BaseSettingEntry() {}
|
virtual ~BaseSettingEntry() = default;
|
||||||
|
|
||||||
virtual void Init(byte level = 0);
|
virtual void Init(byte level = 0);
|
||||||
virtual void FoldAll() {}
|
virtual void FoldAll() {}
|
||||||
|
|
|
@ -72,7 +72,7 @@ struct IniItem;
|
||||||
struct SettingDesc {
|
struct SettingDesc {
|
||||||
SettingDesc(const SaveLoad &save, SettingFlag flags, bool startup) :
|
SettingDesc(const SaveLoad &save, SettingFlag flags, bool startup) :
|
||||||
flags(flags), startup(startup), save(save) {}
|
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.).
|
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?.
|
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),
|
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),
|
str(str), str_help(str_help), str_val(str_val), cat(cat), pre_check(pre_check),
|
||||||
post_callback(post_callback) {}
|
post_callback(post_callback) {}
|
||||||
virtual ~IntSettingDesc() {}
|
|
||||||
|
|
||||||
int32 def; ///< default value given when none is present
|
int32 def; ///< default value given when none is present
|
||||||
int32 min; ///< minimum values
|
int32 min; ///< minimum values
|
||||||
|
@ -196,7 +195,6 @@ struct BoolSettingDesc : IntSettingDesc {
|
||||||
PreChangeCheck pre_check, PostChangeCallback post_callback) :
|
PreChangeCheck pre_check, PostChangeCallback post_callback) :
|
||||||
IntSettingDesc(save, flags, startup, def, 0, 1, 0, str, str_help, str_val, cat,
|
IntSettingDesc(save, flags, startup, def, 0, 1, 0, str, str_help, str_val, cat,
|
||||||
pre_check, post_callback) {}
|
pre_check, post_callback) {}
|
||||||
virtual ~BoolSettingDesc() {}
|
|
||||||
|
|
||||||
bool IsBoolSetting() const override { return true; }
|
bool IsBoolSetting() const override { return true; }
|
||||||
size_t ParseValue(const char *str) const override;
|
size_t ParseValue(const char *str) const override;
|
||||||
|
@ -217,8 +215,6 @@ struct OneOfManySettingDesc : IntSettingDesc {
|
||||||
for (auto one : many) this->many.push_back(one);
|
for (auto one : many) this->many.push_back(one);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual ~OneOfManySettingDesc() {}
|
|
||||||
|
|
||||||
std::vector<std::string> many; ///< possible values for this type
|
std::vector<std::string> many; ///< possible values for this type
|
||||||
OnConvert *many_cnvt; ///< callback procedure when loading value mechanism fails
|
OnConvert *many_cnvt; ///< callback procedure when loading value mechanism fails
|
||||||
|
|
||||||
|
@ -237,7 +233,6 @@ struct ManyOfManySettingDesc : OneOfManySettingDesc {
|
||||||
std::initializer_list<const char *> many, OnConvert *many_cnvt) :
|
std::initializer_list<const char *> many, OnConvert *many_cnvt) :
|
||||||
OneOfManySettingDesc(save, flags, startup, def, (1 << many.size()) - 1, str, str_help,
|
OneOfManySettingDesc(save, flags, startup, def, (1 << many.size()) - 1, str, str_help,
|
||||||
str_val, cat, pre_check, post_callback, many, many_cnvt) {}
|
str_val, cat, pre_check, post_callback, many, many_cnvt) {}
|
||||||
virtual ~ManyOfManySettingDesc() {}
|
|
||||||
|
|
||||||
size_t ParseValue(const char *str) const override;
|
size_t ParseValue(const char *str) const override;
|
||||||
void FormatValue(char *buf, const char *last, const void *object) 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) :
|
uint32 max_length, PreChangeCheck pre_check, PostChangeCallback post_callback) :
|
||||||
SettingDesc(save, flags, startup), def(def == nullptr ? "" : def), max_length(max_length),
|
SettingDesc(save, flags, startup), def(def == nullptr ? "" : def), max_length(max_length),
|
||||||
pre_check(pre_check), post_callback(post_callback) {}
|
pre_check(pre_check), post_callback(post_callback) {}
|
||||||
virtual ~StringSettingDesc() {}
|
|
||||||
|
|
||||||
std::string def; ///< Default value given when none is present
|
std::string def; ///< Default value given when none is present
|
||||||
uint32 max_length; ///< Maximum length of the string, 0 means no maximum length
|
uint32 max_length; ///< Maximum length of the string, 0 means no maximum length
|
||||||
|
@ -288,7 +282,6 @@ private:
|
||||||
struct ListSettingDesc : SettingDesc {
|
struct ListSettingDesc : SettingDesc {
|
||||||
ListSettingDesc(const SaveLoad &save, SettingFlag flags, bool startup, const char *def) :
|
ListSettingDesc(const SaveLoad &save, SettingFlag flags, bool startup, const char *def) :
|
||||||
SettingDesc(save, flags, startup), def(def) {}
|
SettingDesc(save, flags, startup), def(def) {}
|
||||||
virtual ~ListSettingDesc() {}
|
|
||||||
|
|
||||||
const char *def; ///< default value given when none is present
|
const char *def; ///< default value given when none is present
|
||||||
|
|
||||||
|
@ -301,7 +294,6 @@ struct ListSettingDesc : SettingDesc {
|
||||||
struct NullSettingDesc : SettingDesc {
|
struct NullSettingDesc : SettingDesc {
|
||||||
NullSettingDesc(const SaveLoad &save) :
|
NullSettingDesc(const SaveLoad &save) :
|
||||||
SettingDesc(save, SF_NOT_IN_CONFIG, false) {}
|
SettingDesc(save, SF_NOT_IN_CONFIG, false) {}
|
||||||
virtual ~NullSettingDesc() {}
|
|
||||||
|
|
||||||
void FormatValue(char *buf, const char *last, const void *object) const override { NOT_REACHED(); }
|
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(); }
|
void ParseValue(const IniItem *item, void *object) const override { NOT_REACHED(); }
|
||||||
|
|
|
@ -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 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. */
|
/** Interface for something that can encode a sprite. */
|
||||||
class SpriteEncoder {
|
class SpriteEncoder {
|
||||||
public:
|
public:
|
||||||
|
|
||||||
virtual ~SpriteEncoder() { }
|
virtual ~SpriteEncoder() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Can the sprite encoder make use of RGBA sprites?
|
* Can the sprite encoder make use of RGBA sprites?
|
||||||
|
|
|
@ -104,7 +104,7 @@ struct HeaderWriter {
|
||||||
virtual void Finalise(const StringData &data) = 0;
|
virtual void Finalise(const StringData &data) = 0;
|
||||||
|
|
||||||
/** Especially destroy the subclasses. */
|
/** Especially destroy the subclasses. */
|
||||||
virtual ~HeaderWriter() {};
|
virtual ~HeaderWriter() = default;
|
||||||
|
|
||||||
void WriteHeader(const StringData &data);
|
void WriteHeader(const StringData &data);
|
||||||
};
|
};
|
||||||
|
@ -131,7 +131,7 @@ struct LanguageWriter {
|
||||||
virtual void Finalise() = 0;
|
virtual void Finalise() = 0;
|
||||||
|
|
||||||
/** Especially destroy the subclasses. */
|
/** Especially destroy the subclasses. */
|
||||||
virtual ~LanguageWriter() {}
|
virtual ~LanguageWriter() = default;
|
||||||
|
|
||||||
virtual void WriteLength(uint length);
|
virtual void WriteLength(uint length);
|
||||||
virtual void WriteLang(const StringData &data);
|
virtual void WriteLang(const StringData &data);
|
||||||
|
|
|
@ -28,7 +28,7 @@ public:
|
||||||
*/
|
*/
|
||||||
static std::unique_ptr<StringIterator> Create();
|
static std::unique_ptr<StringIterator> Create();
|
||||||
|
|
||||||
virtual ~StringIterator() {}
|
virtual ~StringIterator() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set a new iteration string. Must also be called if the string contents
|
* Set a new iteration string. Must also be called if the string contents
|
||||||
|
|
|
@ -257,7 +257,7 @@ bool StringIDSorter(const StringID &a, const StringID &b);
|
||||||
class MissingGlyphSearcher {
|
class MissingGlyphSearcher {
|
||||||
public:
|
public:
|
||||||
/** Make sure everything gets destructed right. */
|
/** Make sure everything gets destructed right. */
|
||||||
virtual ~MissingGlyphSearcher() {}
|
virtual ~MissingGlyphSearcher() = default;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the next string to search through.
|
* Get the next string to search through.
|
||||||
|
|
|
@ -25,7 +25,7 @@ public:
|
||||||
bool masked; ///< Masked and unselectable item
|
bool masked; ///< Masked and unselectable item
|
||||||
|
|
||||||
DropDownListItem(int result, bool masked) : result(result), masked(masked) {}
|
DropDownListItem(int result, bool masked) : result(result), masked(masked) {}
|
||||||
virtual ~DropDownListItem() {}
|
virtual ~DropDownListItem() = default;
|
||||||
|
|
||||||
virtual bool Selectable() const { return false; }
|
virtual bool Selectable() const { return false; }
|
||||||
virtual uint Height(uint width) const { return FONT_HEIGHT_NORMAL; }
|
virtual uint Height(uint width) const { return FONT_HEIGHT_NORMAL; }
|
||||||
|
|
Loading…
Reference in New Issue