[Scummvm-git-logs] scummvm master -> d91148177f77c17c86f46c8b8d3c624cd507aaaa
sev-
noreply at scummvm.org
Sat Dec 2 15:23:37 UTC 2023
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d91148177f DIRECTOR: Add missing override keywords, fix const'ness
Commit: d91148177f77c17c86f46c8b8d3c624cd507aaaa
https://github.com/scummvm/scummvm/commit/d91148177f77c17c86f46c8b8d3c624cd507aaaa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-12-02T07:23:00-08:00
Commit Message:
DIRECTOR: Add missing override keywords, fix const'ness
Changed paths:
engines/director/lingo/lingo-object.h
engines/director/window.h
diff --git a/engines/director/lingo/lingo-object.h b/engines/director/lingo/lingo-object.h
index eb4cce874a4..1ab37829ccc 100644
--- a/engines/director/lingo/lingo-object.h
+++ b/engines/director/lingo/lingo-object.h
@@ -42,8 +42,8 @@ public:
virtual ObjectType getObjType() const = 0;
virtual bool isDisposed() const = 0;
virtual int *getRefCount() const = 0;
- virtual void incRefCount() const = 0;
- virtual void decRefCount() const = 0;
+ virtual void incRefCount() = 0;
+ virtual void decRefCount() = 0;
virtual int getInheritanceLevel() const = 0;
virtual void setName(const Common::String &name) = 0;
@@ -119,8 +119,8 @@ public:
ObjectType getObjType() const override { return _objType; };
bool isDisposed() const override { return _disposed; };
int *getRefCount() const override { return _refCount; };
- void incRefCount() const override { *_refCount += 1; };
- virtual void decRefCount() const override {
+ void incRefCount() override { *_refCount += 1; };
+ virtual void decRefCount() override {
*_refCount -= 1;
if (*_refCount <= 0)
delete this;
diff --git a/engines/director/window.h b/engines/director/window.h
index e790956879d..2e6a7179d03 100644
--- a/engines/director/window.h
+++ b/engines/director/window.h
@@ -105,7 +105,7 @@ public:
Window(int id, bool scrollable, bool resizable, bool editable, Graphics::MacWindowManager *wm, DirectorEngine *vm, bool isStage);
~Window();
- void decRefCount();
+ void decRefCount() override;
bool render(bool forceRedraw = false, Graphics::ManagedSurface *blitTo = nullptr);
void invertChannel(Channel *channel, const Common::Rect &destRect);
More information about the Scummvm-git-logs
mailing list