mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add override modifier to getMemSize() in doc::Object's sub-classes

Browse Source
This commit is contained in:
David Capello 2014-11-16 21:32:18 -03:00
parent acfe155b24
commit 9bcc552129
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/doc/cel.h
View File

@ -43,7 +43,7 @@ namespace doc {
void setPosition(int x, int y) { m_x = x; m_y = y; }
void setOpacity(int opacity) { m_opacity = opacity; }
int getMemSize() const {
virtual int getMemSize() const override {
return sizeof(Cel);
}

2
src/doc/image.h
View File

@ -46,7 +46,7 @@ namespace doc {
color_t maskColor() const { return m_maskColor; }
void setMaskColor(color_t c) { m_maskColor = c; }
int getMemSize() const override;
virtual int getMemSize() const override;
int getRowStrideSize() const;
int getRowStrideSize(int pixels_per_row) const;

6
src/doc/layer.h
View File

@ -42,7 +42,7 @@ namespace doc {
public:
virtual ~Layer();
int getMemSize() const;
virtual int getMemSize() const override;
std::string name() const { return m_name; }
void setName(const std::string& name) { m_name = name; }
@ -90,7 +90,7 @@ namespace doc {
explicit LayerImage(Sprite* sprite);
virtual ~LayerImage();
int getMemSize() const;
virtual int getMemSize() const override;
int getBlendMode() const { return BLEND_MODE_NORMAL; }
@ -124,7 +124,7 @@ namespace doc {
explicit LayerFolder(Sprite* sprite);
virtual ~LayerFolder();
int getMemSize() const;
virtual int getMemSize() const override;
const LayerList& getLayersList() { return m_layers; }
LayerIterator getLayerBegin() { return m_layers.begin(); }

2
src/doc/mask.h
View File

@ -25,7 +25,7 @@ namespace doc {
Mask(int x, int y, Image* bitmap);
virtual ~Mask();
int getMemSize() const;
virtual int getMemSize() const override;
void setName(const char *name);
const std::string& name() const { return m_name; }

2
src/doc/sprite.h
View File

@ -65,7 +65,7 @@ namespace doc {
color_t transparentColor() const { return m_transparentColor; }
void setTransparentColor(color_t color);
int getMemSize() const;
virtual int getMemSize() const override;
////////////////////////////////////////
// Layers