mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-26 12:48:16 +00:00
NANCY: Formatting fixes
Added spaces after the = operator in every declaration of a pure virtual or defaulted function.
This commit is contained in:
parent
56c005ef2c
commit
0d8d31ffd0
@ -93,7 +93,7 @@ public:
|
||||
_itemRequired(-1) {}
|
||||
virtual ~ActionRecord() {}
|
||||
|
||||
virtual void readData(Common::SeekableReadStream &stream) =0;
|
||||
virtual void readData(Common::SeekableReadStream &stream) = 0;
|
||||
virtual void execute() {}
|
||||
virtual void onPause(bool pause) {}
|
||||
|
||||
@ -104,7 +104,7 @@ protected:
|
||||
void finishExecution();
|
||||
|
||||
// Used for debugging
|
||||
virtual Common::String getRecordTypeName() const =0;
|
||||
virtual Common::String getRecordTypeName() const = 0;
|
||||
|
||||
public:
|
||||
Common::String _description; // 0x00
|
||||
|
@ -37,8 +37,8 @@ class NancyEngine;
|
||||
|
||||
class Font : public Graphics::Font {
|
||||
public:
|
||||
Font() =default;
|
||||
~Font() =default;
|
||||
Font() = default;
|
||||
~Font() = default;
|
||||
|
||||
void read(Common::SeekableReadStream &stream);
|
||||
|
||||
|
@ -75,7 +75,7 @@ public:
|
||||
protected:
|
||||
// Z order and blit type are extracted directly from the corresponding
|
||||
// ZRenderStruct from the original engine
|
||||
virtual uint16 getZOrder() const =0;
|
||||
virtual uint16 getZOrder() const = 0;
|
||||
|
||||
// Needed for proper handling of objects inside the viewport
|
||||
virtual bool isViewportRelative() const { return false; }
|
||||
|
@ -58,7 +58,7 @@ protected:
|
||||
friend class Credits;
|
||||
public:
|
||||
CreditsText(RenderObject &redrawFrom) : RenderObject(redrawFrom) {}
|
||||
virtual ~CreditsText() =default;
|
||||
virtual ~CreditsText() = default;
|
||||
|
||||
protected:
|
||||
virtual uint16 getZOrder() const override { return 1; }
|
||||
|
@ -82,7 +82,7 @@ private:
|
||||
class MapLabel : public Nancy::RenderObject {
|
||||
public:
|
||||
MapLabel(RenderObject &redrawFrom, Map *parent) : Nancy::RenderObject(redrawFrom), _parent(parent) {}
|
||||
virtual ~MapLabel() =default;
|
||||
virtual ~MapLabel() = default;
|
||||
|
||||
virtual void init() override;
|
||||
|
||||
@ -97,7 +97,7 @@ private:
|
||||
class MapButton : public UI::Button {
|
||||
public:
|
||||
MapButton(RenderObject &redrawFrom, Map *parent) : Button(redrawFrom), _parent(parent) {}
|
||||
virtual ~MapButton() =default;
|
||||
virtual ~MapButton() = default;
|
||||
|
||||
virtual void init() override;
|
||||
virtual void onClick() override;
|
||||
|
@ -32,9 +32,9 @@ namespace State {
|
||||
class State {
|
||||
public:
|
||||
State() {}
|
||||
virtual ~State() =default;
|
||||
virtual ~State() = default;
|
||||
|
||||
virtual void process() =0;
|
||||
virtual void process() = 0;
|
||||
virtual void onStateEnter() {}
|
||||
virtual bool onStateExit() { return true; } // Returns whether the object destroyed itself after exit
|
||||
};
|
||||
|
@ -32,8 +32,8 @@ struct Time {
|
||||
public:
|
||||
Time() { _milliseconds = 0; }
|
||||
Time(const uint32 &t) { _milliseconds = t; }
|
||||
Time(const Time &t) =default;
|
||||
~Time() =default;
|
||||
Time(const Time &t) = default;
|
||||
~Time() = default;
|
||||
explicit operator uint32() const { return _milliseconds; }
|
||||
Time &operator=(const Time &t) { if (this != &t) _milliseconds = t._milliseconds; return *this; }
|
||||
Time &operator=(const uint32 &t) { _milliseconds = t; return *this; }
|
||||
|
@ -34,9 +34,9 @@ namespace UI {
|
||||
class Button : public RenderObject {
|
||||
public:
|
||||
Button(RenderObject &redrawFrom) : RenderObject(redrawFrom) {}
|
||||
virtual ~Button() =default;
|
||||
virtual ~Button() = default;
|
||||
|
||||
virtual void onClick() =0;
|
||||
virtual void onClick() = 0;
|
||||
|
||||
void handleInput(NancyInput &input);
|
||||
|
||||
@ -47,7 +47,7 @@ protected:
|
||||
class MenuButton : public Button {
|
||||
public:
|
||||
MenuButton(RenderObject &redrawFrom) : Button(redrawFrom) {}
|
||||
virtual ~MenuButton() =default;
|
||||
virtual ~MenuButton() = default;
|
||||
|
||||
virtual void init() override;
|
||||
virtual void onClick() override;
|
||||
@ -56,7 +56,7 @@ public:
|
||||
class HelpButton : public Button {
|
||||
public:
|
||||
HelpButton(RenderObject &redrawFrom) : Button(redrawFrom) {}
|
||||
virtual ~HelpButton() =default;
|
||||
virtual ~HelpButton() = default;
|
||||
|
||||
virtual void init() override;
|
||||
virtual void onClick() override;
|
||||
|
@ -31,7 +31,7 @@ namespace UI {
|
||||
class FullScreenImage : public RenderObject {
|
||||
public:
|
||||
FullScreenImage() : RenderObject() {}
|
||||
virtual ~FullScreenImage() =default;
|
||||
virtual ~FullScreenImage() = default;
|
||||
|
||||
void init(const Common::String &imageName);
|
||||
|
||||
|
@ -88,7 +88,7 @@ private:
|
||||
InventoryScrollbar(RenderObject &redrawFrom, InventoryBox *parent) :
|
||||
Scrollbar(redrawFrom),
|
||||
_parent(parent) {}
|
||||
virtual ~InventoryScrollbar() =default;
|
||||
virtual ~InventoryScrollbar() = default;
|
||||
|
||||
virtual void init() override;
|
||||
|
||||
@ -104,7 +104,7 @@ private:
|
||||
_soundTriggered(false),
|
||||
_areOpen(false),
|
||||
_curFrame(0) {}
|
||||
virtual ~Shades() =default;
|
||||
virtual ~Shades() = default;
|
||||
|
||||
virtual void init() override;
|
||||
virtual void updateGraphics() override;
|
||||
|
@ -40,7 +40,7 @@ public:
|
||||
_isClicked(false),
|
||||
_currentPosition(0),
|
||||
_maxDist(0) {}
|
||||
virtual ~Scrollbar() =default;
|
||||
virtual ~Scrollbar() = default;
|
||||
|
||||
virtual void init() override;
|
||||
|
||||
|
@ -83,7 +83,7 @@ private:
|
||||
TextboxScrollbar(RenderObject &redrawFrom, Textbox *parent) :
|
||||
Scrollbar(redrawFrom),
|
||||
_parent(parent) {}
|
||||
~TextboxScrollbar() =default;
|
||||
~TextboxScrollbar() = default;
|
||||
|
||||
virtual void init() override;
|
||||
Textbox *_parent;
|
||||
|
Loading…
x
Reference in New Issue
Block a user