From 473e70432a8a420ccee40e56710084acd68c7304 Mon Sep 17 00:00:00 2001 From: Shinya Kitaoka Date: Jun 20 2016 02:34:15 +0000 Subject: add override specifier --- diff --git a/toonz/sources/colorfx/rasterstyles.h b/toonz/sources/colorfx/rasterstyles.h index dee3d28..bb40427 100644 --- a/toonz/sources/colorfx/rasterstyles.h +++ b/toonz/sources/colorfx/rasterstyles.h @@ -27,55 +27,55 @@ public: TAirbrushRasterStyle(const TPixel32 &color, double blur) : m_color(color), m_blur(blur) {} - TColorStyle *clone() const; + TColorStyle *clone() const override; public: // n.b. per un plain color: isRasterStyle() == true, ma getRasterStyleFx() = 0 - TStrokeProp *makeStrokeProp(const TStroke *stroke) { return 0; } - TRegionProp *makeRegionProp(const TRegion *region) { return 0; } - TRasterStyleFx *getRasterStyleFx() { return this; } + TStrokeProp *makeStrokeProp(const TStroke *stroke) override { return 0; } + TRegionProp *makeRegionProp(const TRegion *region) override { return 0; } + TRasterStyleFx *getRasterStyleFx() override { return this; } - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return false; } - bool isRasterStyle() const { return true; } - void getEnlargement(int &borderIn, int &borderOut) const { + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return false; } + bool isRasterStyle() const override { return true; } + void getEnlargement(int &borderIn, int &borderOut) const override { borderIn = tceil(2 * m_blur); borderOut = tceil(m_blur); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getColorParamCount() const { return 1; } - TPixel32 getColorParamValue(int index) const { return m_color; } - void setColorParamValue(int index, const TPixel32 &color) { m_color = color; } + int getColorParamCount() const override { return 1; } + TPixel32 getColorParamValue(int index) const override { return m_color; } + void setColorParamValue(int index, const TPixel32 &color) override { m_color = color; } - virtual QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TAirbrushRasterStyle", "Airbrush"); } - int getParamCount() const { return 1; } - TColorStyle::ParamType getParamType(int index) const { + int getParamCount() const override { return 1; } + TColorStyle::ParamType getParamType(int index) const override { assert(index == 0); return TColorStyle::DOUBLE; } - QString getParamNames(int index) const { + QString getParamNames(int index) const override { assert(index == 0); return QCoreApplication::translate("TAirbrushRasterStyle", "Blur value"); } - void getParamRange(int index, double &min, double &max) const { + void getParamRange(int index, double &min, double &max) const override { assert(index == 0); min = 0; max = 30; } - double getParamValue(TColorStyle::double_tag, int index) const { + double getParamValue(TColorStyle::double_tag, int index) const override { assert(index == 0); return m_blur; } - void setParamValue(int index, double value) { + void setParamValue(int index, double value) override { assert(index == 0); m_blur = value; } @@ -85,25 +85,25 @@ public: // const TRaster32P &getIcon(const TDimension &d) {assert(false);return // (TRaster32P)0;} - TPixel32 getAverageColor() const { return m_color; } + TPixel32 getAverageColor() const override { return m_color; } - int getTagId() const { return 1150; } + int getTagId() const override { return 1150; } - bool isInkStyle() const { return true; } - bool isPaintStyle() const { return false; } + bool isInkStyle() const override { return true; } + bool isPaintStyle() const override { return false; } - bool compute(const Params ¶ms) const; + bool compute(const Params ¶ms) const override; protected: - virtual void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; void arrangeIcon(const TDimension &d, const TRasterP &normalIc); - void loadData(TInputStreamInterface &); - void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; // per la compatibilita' con il passato - void loadData(int oldId, TInputStreamInterface &){}; + void loadData(int oldId, TInputStreamInterface &) override {}; }; //============================================================================= @@ -112,17 +112,17 @@ class TBlendRasterStyle : public TAirbrushRasterStyle { public: TBlendRasterStyle(const TPixel32 &color, double blur) : TAirbrushRasterStyle(color, blur) {} - TColorStyle *clone() const; + TColorStyle *clone() const override; - int getTagId() const { return 1160; } + int getTagId() const override { return 1160; } - virtual QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TBlendRasterStyle", "Blend"); } - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; - bool compute(const TRasterStyleFx::Params ¶ms) const; + bool compute(const TRasterStyleFx::Params ¶ms) const override; private: double computeFactor(const TRasterStyleFx::Params ¶ms) const; @@ -133,19 +133,19 @@ private: class TNoColorRasterStyle : public TColorStyle, TRasterStyleFx { public: TNoColorRasterStyle() {} - TColorStyle *clone() const { return new TNoColorRasterStyle(*this); } + TColorStyle *clone() const override { return new TNoColorRasterStyle(*this); } // n.b. per un plain color: isRasterStyle() == true, ma getRasterStyleFx() = 0 - TStrokeProp *makeStrokeProp(const TStroke *stroke) { return 0; } - TRegionProp *makeRegionProp(const TRegion *region) { return 0; } - TRasterStyleFx *getRasterStyleFx() { return this; } + TStrokeProp *makeStrokeProp(const TStroke *stroke) override { return 0; } + TRegionProp *makeRegionProp(const TRegion *region) override { return 0; } + TRasterStyleFx *getRasterStyleFx() override { return this; } - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return false; } - bool isRasterStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return false; } + bool isRasterStyle() const override { return true; } - virtual QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TNoColorRasterStyle", "Markup"); } @@ -153,28 +153,28 @@ public: // TPixel32 getMainColor() const {return m_color;} // void setMainColor(const TPixel32 &color) {m_color = color;} - int getColorParamCount() const { return 0; } - TPixel32 getColorParamValue(int index) const { + int getColorParamCount() const override { return 0; } + TPixel32 getColorParamValue(int index) const override { assert(false); return TPixel32(); } - void setColorParamValue(int index, const TPixel32 &color) { assert(false); } + void setColorParamValue(int index, const TPixel32 &color) override { assert(false); } - int getTagId() const { return 1151; } + int getTagId() const override { return 1151; } - bool isInkStyle() const { return true; } - bool isPaintStyle() const { return true; } + bool isInkStyle() const override { return true; } + bool isPaintStyle() const override { return true; } - bool compute(const Params ¶ms) const { return false; } + bool compute(const Params ¶ms) const override { return false; } protected: - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; - void loadData(TInputStreamInterface &){}; - void saveData(TOutputStreamInterface &) const {}; + void loadData(TInputStreamInterface &) override {}; + void saveData(TOutputStreamInterface &) const override {}; // per la compatibilita' con il passato - void loadData(int oldId, TInputStreamInterface &){}; + void loadData(int oldId, TInputStreamInterface &) override {}; }; #endif diff --git a/toonz/sources/colorfx/regionstyles.h b/toonz/sources/colorfx/regionstyles.h index 601b03d..3463d35 100644 --- a/toonz/sources/colorfx/regionstyles.h +++ b/toonz/sources/colorfx/regionstyles.h @@ -35,11 +35,11 @@ class MovingModifier : public TOutlineStyle::RegionOutlineModifier { public: MovingModifier(const TPointD &point) : m_move(point) {} - TOutlineStyle::RegionOutlineModifier *clone() const; + TOutlineStyle::RegionOutlineModifier *clone() const override; TPointD getMovePoint() const { return m_move; } - void modify(TRegionOutline &outline) const; + void modify(TRegionOutline &outline) const override; public: void loadData(TInputStreamInterface &is) { is >> m_move.x >> m_move.y; } @@ -55,31 +55,31 @@ class MovingSolidColor : public TSolidColorStyle { public: MovingSolidColor(const TPixel32 &color, const TPointD &move); - TColorStyle *clone() const; + TColorStyle *clone() const override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 1125; }; - QString getDescription() const { + int getTagId() const override { return 1125; }; + QString getDescription() const override { return QCoreApplication::translate("MovingSolidColor", "Offset"); } void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; }; //============================================================ @@ -95,34 +95,34 @@ public: const TPointD &shadowDirection = TPointD(-1, -1), double len = 30.0, double density = 0.4); - TColorStyle *clone() const; + TColorStyle *clone() const override; - void makeIcon(const TDimension &d); - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + void makeIcon(const TDimension &d) override; + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } // TPixel32 getMainColor() const {return m_shadowColor; } // void setMainColor(const TPixel32 &color){ m_shadowColor=color; } - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 1127; }; - QString getDescription() const { + int getTagId() const override { return 1127; }; + QString getDescription() const override { return QCoreApplication::translate("ShadowStyle", "Hatched Shading"); } void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; + TRegionOutline &boundary) const override; // it is too slow and if the region is too complex, some flash readers // (IExplorer) crash. @@ -130,8 +130,8 @@ public: // void drawRegion( TFlash& flash, const TRegion* r) const; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: void drawPolyline(const TColorFunction *cf, std::vector &polyline, @@ -150,38 +150,38 @@ public: const TPointD &shadowDirection = TPointD(-1, -1), double shadowLength = 70.0); - TColorStyle *clone() const; + TColorStyle *clone() const override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } // TPixel32 getMainColor() const {return m_shadowColor; } // void setMainColor(const TPixel32 &color){ m_shadowColor=color; } - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 1135; }; - QString getDescription() const { + int getTagId() const override { return 1135; }; + QString getDescription() const override { return QCoreApplication::translate("ShadowStyle2", "Plain Shadow"); } void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: void drawPolyline(const TColorFunction *cf, @@ -205,9 +205,9 @@ public: double getDeform() { return m_deform; } void setDeform(const double deform) { m_deform = deform; } - void modify(TRegionOutline &outline) const; + void modify(TRegionOutline &outline) const override; - TOutlineStyle::RegionOutlineModifier *clone() const; + TOutlineStyle::RegionOutlineModifier *clone() const override; }; //============================================================ @@ -219,33 +219,33 @@ class DVAPI TRubberFillStyle : public TSolidColorStyle { public: TRubberFillStyle(const TPixel32 &color, double deform); - TColorStyle *clone() const; + TColorStyle *clone() const override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; - int getTagId() const { return 1128; }; - QString getDescription() const { + int getTagId() const override { return 1128; }; + QString getDescription() const override { return QCoreApplication::translate("TRubberFillStyle", "Blob"); } void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: void transformPolylines(); @@ -266,41 +266,41 @@ public: double density = 0.1, double shadowSize = 30.0, double pointSize = 5.0); - TColorStyle *clone() const; + TColorStyle *clone() const override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } /* TPixel32 getMainColor() const {return m_shadowColor; } void setMainColor(const TPixel32 &color){ m_shadowColor=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 1129; }; - QString getDescription() const { + int getTagId() const override { return 1129; }; + QString getDescription() const override { return QCoreApplication::translate("TPointShadowFillStyle", "Sponge Shading"); } void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: double triangleArea(const TPointD &a, const TPointD &b, @@ -330,40 +330,40 @@ public: TDottedFillStyle(const TPixel32 &color); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_pointColor; } void setMainColor(const TPixel32 &color){ m_pointColor=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1130; }; - QString getDescription() const { + int getTagId() const override { return 1130; }; + QString getDescription() const override { return QCoreApplication::translate("TDottedFillStyle", "Polka Dots"); } protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: int nbClip(const double LDotDist, const bool LIsShifted, @@ -384,34 +384,34 @@ public: TCheckedFillStyle(const TPixel32 &color); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_pointColor; } void setMainColor(const TPixel32 &color){ m_pointColor=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1131; }; - QString getDescription() const { + int getTagId() const override { return 1131; }; + QString getDescription() const override { return QCoreApplication::translate("TCheckedFillStyle", "Square"); } @@ -423,8 +423,8 @@ private: int nbClip(const TRectD &bbox) const; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; }; //============================================================ @@ -437,7 +437,7 @@ public: ArtisticModifier(const TPointD &point, double period) : m_move(point), m_period(period) {} - TOutlineStyle::RegionOutlineModifier *clone() const; + TOutlineStyle::RegionOutlineModifier *clone() const override; void loadData(TInputStreamInterface &is) { is >> m_move.x >> m_move.y >> m_period; @@ -449,7 +449,7 @@ public: TPointD getMovePoint() const { return m_move; } double getPeriod() const { return m_period; } - void modify(TRegionOutline &outline) const; + void modify(TRegionOutline &outline) const override; }; //============================================================ @@ -458,31 +458,31 @@ class ArtisticSolidColor : public TSolidColorStyle { public: ArtisticSolidColor(const TPixel32 &color, const TPointD &move, double period); - TColorStyle *clone() const; + TColorStyle *clone() const override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 1132; }; - QString getDescription() const { + int getTagId() const override { return 1132; }; + QString getDescription() const override { return QCoreApplication::translate("ArtisticSolidColor", "Irregular"); } void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; }; //============================================================ @@ -496,42 +496,42 @@ public: const double density, const double size); TChalkFillStyle(const TPixel32 &color0, const TPixel32 &color1); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_color0; } void setMainColor(const TPixel32 &color){ m_color0=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TChalkFillStyle", "Chalk"); } - void loadData(int oldId, TInputStreamInterface &); - void getObsoleteTagIds(std::vector &ids) const { ids.push_back(1133); } - int getTagId() const { return 1143; }; + void loadData(int oldId, TInputStreamInterface &) override; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(1133); } + int getTagId() const override { return 1143; }; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; }; //============================================================ @@ -545,40 +545,40 @@ public: const double HDist, const double VDist, const double Angle); TChessFillStyle(const TPixel32 &color); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_pointColor; } void setMainColor(const TPixel32 &color){ m_pointColor=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1136; }; - QString getDescription() const { + int getTagId() const override { return 1136; }; + QString getDescription() const override { return QCoreApplication::translate("TChessFillStyle", "Chessboard"); } protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: void makeGrid(TRectD &bbox, TRotation &rotM, std::vector &grid, @@ -597,42 +597,42 @@ public: const double Thickness); TStripeFillStyle(const TPixel32 &color); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_pointColor; } void setMainColor(const TPixel32 &color){ m_pointColor=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1137; }; - QString getDescription() const { + int getTagId() const override { return 1137; }; + QString getDescription() const override { return QCoreApplication::translate("TStripeFillStyle", "Banded"); } protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; private: void getThickline(const TPointD &lc, const double ly, TPointD &p0, @@ -653,40 +653,40 @@ public: const double Size); TLinGradFillStyle(const TPixel32 &color); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_pointColor; } void setMainColor(const TPixel32 &color){ m_pointColor=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1138; }; - QString getDescription() const { + int getTagId() const override { return 1138; }; + QString getDescription() const override { return QCoreApplication::translate("TLinGradFillStyle", "Linear Gradient"); } protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: void getRects(const TRectD &bbox, std::vector &r0, @@ -709,38 +709,38 @@ public: const double Smooth); TRadGradFillStyle(const TPixel32 &color); - TColorStyle *clone() const; + TColorStyle *clone() const override; // TPixel32 getMainColor() const {return m_pointColor; } // void setMainColor(const TPixel32 &color){ m_pointColor=color; } - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1139; }; - QString getDescription() const { + int getTagId() const override { return 1139; }; + QString getDescription() const override { return QCoreApplication::translate("TRadGradFillStyle", "Radial Gradient"); } protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; }; //============================================================ @@ -756,40 +756,40 @@ public: const double Dist, const double Thickness); TCircleStripeFillStyle(const TPixel32 &color); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_pointColor; } void setMainColor(const TPixel32 &color){ m_pointColor=color; } */ - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1140; }; - QString getDescription() const { + int getTagId() const override { return 1140; }; + QString getDescription() const override { return QCoreApplication::translate("TCircleStripeFillStyle", "Concentric"); } protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: void getCircleStripeQuads(const TPointD ¢er, const double r1, @@ -813,40 +813,40 @@ public: const double minThickness, const double maxThickness); TMosaicFillStyle(const TPixel32 bgColor); - TColorStyle *clone() const; + TColorStyle *clone() const override; /* TPixel32 getMainColor() const {return m_pointColor[0]; } void setMainColor(const TPixel32 &color){ m_pointColor[0]=color; } */ - int getColorParamCount() const { return 5; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 5; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1141; }; - QString getDescription() const { + int getTagId() const override { return 1141; }; + QString getDescription() const override { return QCoreApplication::translate("TMosaicFillStyle", "Stained Glass"); } protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; private: void preaprePos(const TRectD &box, std::vector &v, int &lX, int &lY, @@ -869,29 +869,29 @@ public: const double thickness); TPatchFillStyle(const TPixel32 &bgColor); - TColorStyle *clone() const; + TColorStyle *clone() const override; - int getColorParamCount() const { return 7; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 7; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return false; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return false; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &boundary) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; - int getTagId() const { return 1142; }; - QString getDescription() const { + int getTagId() const override { return 1142; }; + QString getDescription() const override { return QCoreApplication::translate("TPatchFillStyle", "Beehive"); } @@ -907,8 +907,8 @@ private: const TPointD &p3) const; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; }; #endif // TDERIVEDREGIONSTYLES_H diff --git a/toonz/sources/colorfx/strokestyles.cpp b/toonz/sources/colorfx/strokestyles.cpp index 3a06d78..0914071 100644 --- a/toonz/sources/colorfx/strokestyles.cpp +++ b/toonz/sources/colorfx/strokestyles.cpp @@ -40,11 +40,11 @@ public: TOptimizedStrokeStyleT *style); ~TOptimizedStrokePropT() { m_colorStyle->release(); } - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; - TStrokeProp *clone(const TStroke *stroke) const; - void draw(const TVectorRenderData &rd); - void draw(TFlash &flash) { getColorStyle()->drawStroke(flash, getStroke()); } + TStrokeProp *clone(const TStroke *stroke) const override; + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &flash) override { getColorStyle()->drawStroke(flash, getStroke()); } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/colorfx/strokestyles.h b/toonz/sources/colorfx/strokestyles.h index 38e614d..471aeb6 100644 --- a/toonz/sources/colorfx/strokestyles.h +++ b/toonz/sources/colorfx/strokestyles.h @@ -53,12 +53,12 @@ class TOptimizedStrokeStyleT : public TColorStyle { public: TOptimizedStrokeStyleT() {} - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } - TStrokeProp *makeStrokeProp(const TStroke *stroke); + TStrokeProp *makeStrokeProp(const TStroke *stroke) override; - TRegionProp *makeRegionProp(const TRegion *region) { + TRegionProp *makeRegionProp(const TRegion *region) override { assert(false); return 0; }; @@ -78,43 +78,43 @@ class TFurStrokeStyle : public TOptimizedStrokeStyleT { public: TFurStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void invalidate() {} void computeData(Points &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Points &positions, - const TStroke *stroke) const; - void drawStroke(TFlash &rd, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &rd, const TStroke *stroke) const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TFurStrokeStyle", "Herringbone"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_angle << m_length; } - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_angle >> m_length; m_cs = cos(m_angle); m_sn = sin(m_angle); } - int getTagId() const { return 103; }; + int getTagId() const override { return 103; }; }; //------------------------------------------------------------------- @@ -128,25 +128,25 @@ public: void invalidate() {} - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TChainStrokeStyle", "Chain"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } void computeData(Points &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Points &positions, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - void loadData(TInputStreamInterface &is) { is >> m_color; } - void saveData(TOutputStreamInterface &os) const { os << m_color; } - int getTagId() const { return 104; }; + void loadData(TInputStreamInterface &is) override { is >> m_color; } + void saveData(TOutputStreamInterface &os) const override { os << m_color; } + int getTagId() const override { return 104; }; }; //------------------------------------------------------------------- @@ -160,34 +160,34 @@ public: void invalidate() {} - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TSprayStrokeStyle", "Circlets"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_blend >> m_intensity >> m_radius; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_blend << m_intensity << m_radius; } - int getTagId() const { return 106; }; + int getTagId() const override { return 106; }; }; //------------------------------------------------------------------- @@ -202,35 +202,35 @@ public: void invalidate() {} - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TGraphicPenStrokeStyle", "Dashes"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void computeData(DrawmodePointsMatrix &data, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, DrawmodePointsMatrix &data, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *s) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *s) const override; - void loadData(TInputStreamInterface &is) { is >> m_color >> m_intensity; } - void saveData(TOutputStreamInterface &os) const { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_intensity; } + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_intensity; } - int getTagId() const { return 107; }; + int getTagId() const override { return 107; }; }; //------------------------------------------------------------------- @@ -243,40 +243,40 @@ public: TDottedLineStrokeStyle(); void computeData(Points &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Points &positions, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TDottedLineStrokeStyle", "Vanishing"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_in >> m_line >> m_out >> m_blank; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_in << m_line << m_out << m_blank; } bool isSaveSupported() { return true; } - int getTagId() const { return 111; } + int getTagId() const override { return 111; } }; //------------------------------------------------------------------- @@ -289,36 +289,36 @@ public: TRopeStrokeStyle(); void computeData(Points &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Points &positions, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TRopeStrokeStyle", "Rope"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { is >> m_color >> m_bend; } - void saveData(TOutputStreamInterface &os) const { os << m_color << m_bend; } + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_bend; } + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_bend; } bool isSaveSupported() { return true; } - int getTagId() const { return 108; } + int getTagId() const override { return 108; } }; //------------------------------------------------------------------- @@ -331,40 +331,40 @@ public: TCrystallizeStrokeStyle(); void computeData(Points &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Points &positions, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TCrystallizeStrokeStyle", "Tulle"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_period >> m_opacity; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_period << m_opacity; } bool isSaveSupported() { return true; } - int getTagId() const { return 109; } + int getTagId() const override { return 109; } }; //------------------------------------------------------------------- @@ -376,44 +376,44 @@ class TBraidStrokeStyle : public TSimpleStrokeStyle { public: TBraidStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TBraidStrokeStyle", "Plait"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_colors[0]; } - void setMainColor(const TPixel32 &color) { m_colors[0] = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_colors[0]; } + void setMainColor(const TPixel32 &color) override { m_colors[0] = color; } - int getColorParamCount() const { return 3; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 3; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_colors[0] >> m_colors[1] >> m_colors[2] >> m_period; } - void loadData(int oldId, TInputStreamInterface &); - void saveData(TOutputStreamInterface &os) const { + void loadData(int oldId, TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &os) const override { os << m_colors[0] << m_colors[1] << m_colors[2] << m_period; } bool isSaveSupported() { return true; } - int getTagId() const { return 136; }; - void getObsoleteTagIds(std::vector &ids) const { ids.push_back(112); } + int getTagId() const override { return 136; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(112); } }; //------------------------------------------------------------------- @@ -425,36 +425,36 @@ class TSketchStrokeStyle : public TSimpleStrokeStyle { public: TSketchStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TSketchStrokeStyle", "Fuzz"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &fl, const TStroke *s) const; + void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(TFlash &fl, const TStroke *s) const override; - void loadData(TInputStreamInterface &is) { is >> m_color >> m_density; } - void saveData(TOutputStreamInterface &os) const { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_density; } + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_density; } bool isSaveSupported() { return true; } - int getTagId() const { return 113; } + int getTagId() const override { return 113; } }; //------------------------------------------------------------------- @@ -465,41 +465,41 @@ class TBubbleStrokeStyle : public TSimpleStrokeStyle { public: TBubbleStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TBubbleStrokeStyle", "Bubbles"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color0; } - void setMainColor(const TPixel32 &color) { m_color0 = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color0; } + void setMainColor(const TPixel32 &color) override { m_color0 = color; } - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const { + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override { return index == 0 ? m_color0 : m_color1; } - void setColorParamValue(int index, const TPixel32 &color) { + void setColorParamValue(int index, const TPixel32 &color) override { if (index == 0) m_color0 = color; else m_color1 = color; } - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - void loadData(TInputStreamInterface &is) { is >> m_color0 >> m_color1; } - void loadData(int oldId, TInputStreamInterface &); - void saveData(TOutputStreamInterface &os) const { + void loadData(TInputStreamInterface &is) override { is >> m_color0 >> m_color1; } + void loadData(int oldId, TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &os) const override { os << m_color0 << m_color1; } bool isSaveSupported() { return true; } - int getTagId() const { return 114; }; - void getObsoleteTagIds(std::vector &ids) const { ids.push_back(137); } + int getTagId() const override { return 114; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(137); } }; //------------------------------------------------------------------- @@ -511,40 +511,40 @@ class TTissueStrokeStyle : public TOptimizedStrokeStyleT { public: TTissueStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void computeData(PointMatrix &data, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, PointMatrix &data, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TTissueStrokeStyle", "Gauze"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_density >> m_border; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_density << m_border; } - int getTagId() const { return 117; } + int getTagId() const override { return 117; } }; //------------------------------------------------------------------- @@ -556,45 +556,45 @@ class TBiColorStrokeStyle : public TOutlineStyle { public: TBiColorStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *stroke) const; + const TStroke *stroke) const override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + TRegionOutline &boundary) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TBiColorStrokeStyle", "Shade"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color0; } - void setMainColor(const TPixel32 &color) { m_color0 = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color0; } + void setMainColor(const TPixel32 &color) override { m_color0 = color; } - void loadData(TInputStreamInterface &is); - void loadData(int oldId, TInputStreamInterface &); + void loadData(TInputStreamInterface &is) override; + void loadData(int oldId, TInputStreamInterface &) override; - void saveData(TOutputStreamInterface &os) const; + void saveData(TOutputStreamInterface &os) const override; - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const { + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override { return index == 0 ? m_color0 : m_color1; } - void setColorParamValue(int index, const TPixel32 &color) { + void setColorParamValue(int index, const TPixel32 &color) override { if (index == 0) m_color0 = color; else m_color1 = color; } - int getTagId() const { return 135; }; - void getObsoleteTagIds(std::vector &ids) const { + int getTagId() const override { return 135; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(115); ids.push_back(119); } @@ -609,45 +609,45 @@ class TNormal2StrokeStyle : public TOutlineStyle { public: TNormal2StrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const; + TRegionOutline &boundary) const override; void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TNormal2StrokeStyle", "Bump"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_lightx >> m_lighty >> m_shininess >> m_metal >> m_bend; } - void loadData(int oldId, TInputStreamInterface &); - void saveData(TOutputStreamInterface &os) const { + void loadData(int oldId, TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_lightx << m_lighty << m_shininess << m_metal << m_bend; } - int getTagId() const { return 120; }; - void getObsoleteTagIds(std::vector &ids) const { ids.push_back(121); } + int getTagId() const override { return 120; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(121); } }; //------------------------------------------------------------------- @@ -659,40 +659,40 @@ class TChalkStrokeStyle2 : public TOptimizedStrokeStyleT { public: TChalkStrokeStyle2(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TChalkStrokeStyle2", "Chalk"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void computeData(Doubles &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Doubles &positions, - const TStroke *stroke) const; + const TStroke *stroke) const override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_blend >> m_intensity >> m_in >> m_out >> m_noise; } - void loadData(int oldId, TInputStreamInterface &); - void saveData(TOutputStreamInterface &os) const { + void loadData(int oldId, TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_blend << m_intensity << m_in << m_out << m_noise; } - int getTagId() const { return 123; }; - void getObsoleteTagIds(std::vector &ids) const { ids.push_back(105); } + int getTagId() const override { return 123; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(105); } }; //------------------------------------------------------------------- @@ -704,43 +704,43 @@ class TBlendStrokeStyle2 : public TOptimizedStrokeStyleT { public: TBlendStrokeStyle2(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void computeData(PointsAndDoubles &data, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, PointsAndDoubles &data, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TBlendStrokeStyle2", "Fade"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_blend >> m_in >> m_out; } - void loadData(int oldId, TInputStreamInterface &); - void saveData(TOutputStreamInterface &os) const { + void loadData(int oldId, TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_blend << m_in << m_out; } bool isSaveSupported() { return true; } - int getTagId() const { return 125; }; - void getObsoleteTagIds(std::vector &ids) const { ids.push_back(110); } + int getTagId() const override { return 125; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(110); } }; //------------------------------------------------------------------- @@ -752,42 +752,42 @@ class TTwirlStrokeStyle : public TOptimizedStrokeStyleT { public: TTwirlStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void computeData(Doubles &data, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Doubles &data, - const TStroke *stroke) const; + const TStroke *stroke) const override; // void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TTwirlStrokeStyle", "Ribbon"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_period >> m_blend; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_period << m_blend; } bool isSaveSupported() { return true; } - int getTagId() const { return 126; } + int getTagId() const override { return 126; } }; //------------------------------------------------------------------- @@ -800,41 +800,41 @@ public: TSawToothStrokeStyle(TPixel32 color = TPixel32::Blue, double parameter = 20.0); - TColorStyle *clone() const; + TColorStyle *clone() const override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const {} + TRegionOutline &boundary) const override {} void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } void invalidate() {} void computeOutline(const TStroke *stroke, TStrokeOutline &outline, - TOutlineUtil::OutlineParameter param) const; + TOutlineUtil::OutlineParameter param) const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TSawToothStrokeStyle", "Jagged"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 127; }; - void loadData(TInputStreamInterface &is) { is >> m_color >> m_parameter; } - void saveData(TOutputStreamInterface &os) const { + int getTagId() const override { return 127; }; + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_parameter; } + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_parameter; } }; @@ -848,55 +848,55 @@ class TMultiLineStrokeStyle2 : public TOptimizedStrokeStyleT { public: TMultiLineStrokeStyle2(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void computeData(BlendAndPoints &data, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, BlendAndPoints &data, - const TStroke *stroke) const; + const TStroke *stroke) const override; // void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TMultiLineStrokeStyle2", "Gouache"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color0; } - void setMainColor(const TPixel32 &color) { m_color0 = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color0; } + void setMainColor(const TPixel32 &color) override { m_color0 = color; } - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const { + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override { return index == 0 ? m_color0 : m_color1; } - void setColorParamValue(int index, const TPixel32 &color) { + void setColorParamValue(int index, const TPixel32 &color) override { if (index == 0) m_color0 = color; else m_color1 = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color0 >> m_color1 >> m_intensity >> m_length >> m_thick >> m_noise; } - void loadData(int oldId, TInputStreamInterface &); - void saveData(TOutputStreamInterface &os) const { + void loadData(int oldId, TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &os) const override { os << m_color0 << m_color1 << m_intensity << m_length << m_thick << m_noise; } bool isSaveSupported() { return true; } - int getTagId() const { return 138; }; - void getObsoleteTagIds(std::vector &ids) const { + int getTagId() const override { return 138; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(118); ids.push_back(128); } @@ -919,44 +919,44 @@ class TZigzagStrokeStyle : public TOptimizedStrokeStyleT { public: TZigzagStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void computeData(Points &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Points &positions, - const TStroke *stroke) const; + const TStroke *stroke) const override; // void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TZigzagStrokeStyle", "Zigzag"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_minDist >> m_maxDist >> m_minAngle >> m_maxAngle >> m_thickness; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_minDist << m_maxDist << m_minAngle << m_maxAngle << m_thickness; } bool isSaveSupported() { return true; } - int getTagId() const { return 129; } + int getTagId() const override { return 129; } }; //------------------------------------------------------------------- @@ -968,41 +968,41 @@ class TSinStrokeStyle : public TOptimizedStrokeStyleT { public: TSinStrokeStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void computeData(Points &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, Points &positions, - const TStroke *stroke) const; + const TStroke *stroke) const override; // void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TSinStrokeStyle", "Wave"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_frequency >> m_thick; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_frequency << m_thick; } - int getTagId() const { return 130; } + int getTagId() const override { return 130; } }; //------------------------------------------------------------------- @@ -1014,42 +1014,42 @@ class TFriezeStrokeStyle2 : public TOptimizedStrokeStyleT { public: TFriezeStrokeStyle2(); - TColorStyle *clone() const; + TColorStyle *clone() const override; void invalidate() {} - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TFriezeStrokeStyle2", "Curl"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; void computeData(std::vector &positions, const TStroke *stroke, - const TColorFunction *cf) const; + const TColorFunction *cf) const override; void drawStroke(const TColorFunction *cf, std::vector &positions, - const TStroke *stroke) const; + const TStroke *stroke) const override; // void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - void loadData(TInputStreamInterface &is) { + void loadData(TInputStreamInterface &is) override { is >> m_color >> m_parameter >> m_thick; } - void loadData(int oldId, TInputStreamInterface &); - void saveData(TOutputStreamInterface &os) const { + void loadData(int oldId, TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &os) const override { os << m_color << m_parameter << m_thick; } - int getTagId() const { return 133; }; - void getObsoleteTagIds(std::vector &ids) const { ids.push_back(102); } + int getTagId() const override { return 133; }; + void getObsoleteTagIds(std::vector &ids) const override { ids.push_back(102); } }; //------------------------------------------------------------------- @@ -1063,54 +1063,54 @@ public: TPixel32 color1 = TPixel32::Yellow, double parameter = 20.0); - TColorStyle *clone() const; + TColorStyle *clone() const override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const {} + TRegionOutline &boundary) const override {} void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } void invalidate() {} void computeOutline(const TStroke *stroke, TStrokeOutline &outline, - TOutlineUtil::OutlineParameter param) const; + TOutlineUtil::OutlineParameter param) const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TDualColorStrokeStyle2", "Striped"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color0; } - void setMainColor(const TPixel32 &color) { m_color0 = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color0; } + void setMainColor(const TPixel32 &color) override { m_color0 = color; } - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const { + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override { return (index == 0) ? m_color0 : m_color1; } - void setColorParamValue(int index, const TPixel32 &color) { + void setColorParamValue(int index, const TPixel32 &color) override { if (index == 0) m_color0 = color; else m_color1 = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 132; }; - void loadData(TInputStreamInterface &is) { + int getTagId() const override { return 132; }; + void loadData(TInputStreamInterface &is) override { is >> m_color0 >> m_color1 >> m_parameter; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color0 << m_color1 << m_parameter; } }; @@ -1126,54 +1126,54 @@ public: TPixel32 color1 = TPixel32::Transparent, double parameter = 20.0); - TColorStyle *clone() const; + TColorStyle *clone() const override; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &boundary) const {} + TRegionOutline &boundary) const override {} void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } void invalidate() {} void computeOutline(const TStroke *stroke, TStrokeOutline &outline, - TOutlineUtil::OutlineParameter param) const; + TOutlineUtil::OutlineParameter param) const override; - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TLongBlendStrokeStyle2", "Watercolor"); } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color0; } - void setMainColor(const TPixel32 &color0) { m_color0 = color0; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color0; } + void setMainColor(const TPixel32 &color0) override { m_color0 = color0; } - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const { + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override { return index == 0 ? m_color0 : m_color1; } - void setColorParamValue(int index, const TPixel32 &color) { + void setColorParamValue(int index, const TPixel32 &color) override { if (index == 0) m_color0 = color; else m_color1 = color; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const { return 134; }; - void loadData(TInputStreamInterface &is) { + int getTagId() const override { return 134; }; + void loadData(TInputStreamInterface &is) override { is >> m_color0 >> m_color1 >> m_parameter; } - void saveData(TOutputStreamInterface &os) const { + void saveData(TOutputStreamInterface &os) const override { os << m_color0 << m_color1 << m_parameter; } }; @@ -1191,50 +1191,50 @@ class OutlineViewerStyle : public TSolidColorStyle { TFilePath m_pathPar; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; public: OutlineViewerStyle(TPixel32 color = TPixel32::Black, double parameter0 = 0.0, double parameter1 = 0.0, double parameter2 = 2.0, double parameter3 = 3.0); - TColorStyle *clone() const; + TColorStyle *clone() const override; - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; + QString getParamNames(int index) const override; - bool getParamValue(TColorStyle::bool_tag, int index) const; - void setParamValue(int index, bool value); + bool getParamValue(TColorStyle::bool_tag, int index) const override; + void setParamValue(int index, bool value) override; - void getParamRange(int index, int &min, int &max) const; - int getParamValue(TColorStyle::int_tag, int index) const; - void setParamValue(int index, int value); + void getParamRange(int index, int &min, int &max) const override; + int getParamValue(TColorStyle::int_tag, int index) const override; + void setParamValue(int index, int value) override; - void getParamRange(int index, QStringList &enumItems) const; + void getParamRange(int index, QStringList &enumItems) const override; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - TFilePath getParamValue(TColorStyle::TFilePath_tag, int index) const; - void setParamValue(int index, const TFilePath &path); + TFilePath getParamValue(TColorStyle::TFilePath_tag, int index) const override; + void setParamValue(int index, const TFilePath &path) override; void computeOutline(const TStroke *stroke, TStrokeOutline &outline, - TOutlineUtil::OutlineParameter param) const; + TOutlineUtil::OutlineParameter param) const override; - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *stroke) const; - QString getDescription() const { + const TStroke *stroke) const override; + QString getDescription() const override { return QCoreApplication::translate("OutlineViewerStyle", "OutlineViewer(OnlyDebug)"); } - int getTagId() const { return 99; }; + int getTagId() const override { return 99; }; }; #endif @@ -1256,11 +1256,11 @@ public: TMatrioskaStrokeProp(const TStroke *stroke, TMatrioskaStrokeStyle *style); ~TMatrioskaStrokeProp(); - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; - TStrokeProp *clone(const TStroke *stroke) const; - void draw(const TVectorRenderData &rd); - void draw(TFlash &flash); + TStrokeProp *clone(const TStroke *stroke) const override; + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &flash) override; }; class TMatrioskaStrokeStyle : public TSolidColorStyle { @@ -1268,37 +1268,37 @@ class TMatrioskaStrokeStyle : public TSolidColorStyle { TPixel32 m_color2; protected: - void loadData(TInputStreamInterface &is); - void saveData(TOutputStreamInterface &os) const; + void loadData(TInputStreamInterface &is) override; + void saveData(TOutputStreamInterface &os) const override; public: TMatrioskaStrokeStyle(TPixel32 color1 = TPixel32::Magenta, TPixel32 color2 = TPixel32::Blue, double parameter = 6.0, bool alternate = true); - TColorStyle *clone() const; + TColorStyle *clone() const override; - int getColorParamCount() const { return 2; } - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override { return 2; } + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - TStrokeProp *makeStrokeProp(const TStroke *stroke); + TStrokeProp *makeStrokeProp(const TStroke *stroke) override; - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } - QString getDescription() const { + QString getDescription() const override { return QCoreApplication::translate("TMatrioskaStrokeStyle", "Toothpaste"); } - int getTagId() const { return 141; }; + int getTagId() const override { return 141; }; }; #endif // STROKESTYLES_H diff --git a/toonz/sources/common/expressions/tgrammar.cpp b/toonz/sources/common/expressions/tgrammar.cpp index bc142fc..d8f582f 100644 --- a/toonz/sources/common/expressions/tgrammar.cpp +++ b/toonz/sources/common/expressions/tgrammar.cpp @@ -114,7 +114,7 @@ class Op0Node : public CalculatorNode { public: Op0Node(Calculator *calc) : CalculatorNode(calc) {} - double compute(double vars[3]) const { + double compute(double vars[3]) const override { Op op; return op(); } @@ -130,12 +130,12 @@ protected: public: Op1Node(Calculator *calc, CalculatorNode *a) : CalculatorNode(calc), m_a(a) {} - double compute(double vars[3]) const { + double compute(double vars[3]) const override { Op op; return op(m_a->compute(vars)); } - void accept(CalculatorNodeVisitor &visitor) { m_a->accept(visitor); } + void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor); } }; //------------------------------------------------------------------- @@ -149,12 +149,12 @@ public: Op2Node(Calculator *calc, CalculatorNode *a, CalculatorNode *b) : CalculatorNode(calc), m_a(a), m_b(b) {} - double compute(double vars[3]) const { + double compute(double vars[3]) const override { Op op; return op(m_a->compute(vars), m_b->compute(vars)); } - void accept(CalculatorNodeVisitor &visitor) { + void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor), m_b->accept(visitor); } }; @@ -171,12 +171,12 @@ public: CalculatorNode *c) : CalculatorNode(calc), m_a(a), m_b(b), m_c(c) {} - double compute(double vars[3]) const { + double compute(double vars[3]) const override { Op op; return op(m_a->compute(vars), m_b->compute(vars), m_c->compute(vars)); } - void accept(CalculatorNodeVisitor &visitor) { + void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor), m_b->accept(visitor), m_c->accept(visitor); } }; @@ -189,8 +189,8 @@ class ChsNode : public CalculatorNode { public: ChsNode(Calculator *calc, CalculatorNode *a) : CalculatorNode(calc), m_a(a) {} - double compute(double vars[3]) const { return -m_a->compute(vars); } - void accept(CalculatorNodeVisitor &visitor) { m_a->accept(visitor); } + double compute(double vars[3]) const override { return -m_a->compute(vars); } + void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor); } }; //------------------------------------------------------------------- @@ -203,11 +203,11 @@ public: CalculatorNode *c) : CalculatorNode(calc), m_a(a), m_b(b), m_c(c) {} - double compute(double vars[3]) const { + double compute(double vars[3]) const override { return (m_a->compute(vars) != 0) ? m_b->compute(vars) : m_c->compute(vars); } - void accept(CalculatorNodeVisitor &visitor) { + void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor), m_b->accept(visitor), m_c->accept(visitor); } }; @@ -220,8 +220,8 @@ class NotNode : public CalculatorNode { public: NotNode(Calculator *calc, CalculatorNode *a) : CalculatorNode(calc), m_a(a) {} - double compute(double vars[3]) const { return m_a->compute(vars) == 0; } - void accept(CalculatorNodeVisitor &visitor) { m_a->accept(visitor); } + double compute(double vars[3]) const override { return m_a->compute(vars) == 0; } + void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor); } }; //------------------------------------------------------------------- @@ -232,7 +232,7 @@ public: CycleNode(Calculator *calc, CalculatorNode *a) : CalculatorNode(calc), m_a(a) {} - double compute(double vars[3]) const { + double compute(double vars[3]) const override { struct locals { static inline double compute(const TDoubleParam ¶m, double f) { if (param.getKeyframeCount() >= 2 && @@ -260,7 +260,7 @@ public: return value; } - void accept(CalculatorNodeVisitor &visitor) { m_a->accept(visitor); } + void accept(CalculatorNodeVisitor &visitor) override { m_a->accept(visitor); } }; //------------------------------------------------------------------- @@ -287,7 +287,7 @@ public: m_min.reset(arg); } - double compute(double vars[3]) const { + double compute(double vars[3]) const override { double s = (m_seed.get() != 0) ? m_seed->compute(vars) : 0; double r = RandomManager::instance()->getValue(s, fabs(m_arg->compute(vars))); @@ -300,7 +300,7 @@ public: return (1 - r) * m_min->compute(vars) + r * m_max->compute(vars); } - void accept(CalculatorNodeVisitor &visitor) { + void accept(CalculatorNodeVisitor &visitor) override { m_arg->accept(visitor); if (m_seed.get()) m_seed->accept(visitor); if (m_min.get()) m_min->accept(visitor); @@ -323,19 +323,19 @@ CalculatorNode *Pattern::popNode(std::vector &stack) const { class NumberPattern : public Pattern { public: bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.empty() && token.getType() == Token::Number; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 1; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return Number; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() == 1); assert(tokens[0].getType() == Token::Number); stack.push_back(new NumberNode(calc, tokens[0].getDoubleValue())); @@ -355,22 +355,22 @@ public: setDescription(description); } - std::string getFirstKeyword() const { return m_constantName; } + std::string getFirstKeyword() const override { return m_constantName; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.empty() && token.getText() == m_constantName; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 1; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return Constant; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() == 1); stack.push_back(new NumberNode(calc, m_value)); } @@ -389,22 +389,22 @@ public: setDescription(description); } - std::string getFirstKeyword() const { return m_variableName; } + std::string getFirstKeyword() const override { return m_variableName; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.empty() && token.getText() == m_variableName; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 1; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return Variable; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() == 1); assert(tokens[0].getText() == m_variableName); stack.push_back(new VariableNode(calc, m_varIdx)); @@ -421,25 +421,25 @@ class Op2Pattern : public Pattern { public: Op2Pattern(std::string opName, int priority) : m_opName(opName), m_priority(priority) {} - int getPriority() const { return m_priority; } - std::string getFirstKeyword() const { return m_opName; } - bool expressionExpected(const std::vector &previousTokens) const { + int getPriority() const override { return m_priority; } + std::string getFirstKeyword() const override { return m_opName; } + bool expressionExpected(const std::vector &previousTokens) const override { return previousTokens.empty() || previousTokens.size() == 2; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 1 && token.getText() == m_opName; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 3; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 1 ? Operator : InternalError; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() == 3); assert(tokens[1].getText() == m_opName); CalculatorNode *b = popNode(stack); @@ -453,27 +453,27 @@ public: class UnaryMinusPattern : public Pattern { public: UnaryMinusPattern() {} - int getPriority() const { return 50; } - std::string getFirstKeyword() const { return "-"; } + int getPriority() const override { return 50; } + std::string getFirstKeyword() const override { return "-"; } - bool expressionExpected(const std::vector &previousTokens) const { + bool expressionExpected(const std::vector &previousTokens) const override { return previousTokens.size() == 1; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.empty() && token.getText() == "-"; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 2; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return Operator; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() == 2); assert(tokens[0].getText() == "-"); stack.push_back(new ChsNode(calc, popNode(stack))); @@ -489,26 +489,26 @@ public: NotPattern(std::string prefix, std::string description) : m_prefix(prefix) { setDescription(description); } - int getPriority() const { return 5; } - std::string getFirstKeyword() const { return m_prefix; } + int getPriority() const override { return 5; } + std::string getFirstKeyword() const override { return m_prefix; } - bool expressionExpected(const std::vector &previousTokens) const { + bool expressionExpected(const std::vector &previousTokens) const override { return previousTokens.size() == 1; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.empty() && token.getText() == m_prefix; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 2; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return Operator; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() == 2); assert(tokens[0].getText() == m_prefix); stack.push_back(new NotNode(calc, popNode(stack))); @@ -520,29 +520,29 @@ public: class QuestionTernaryPattern : public Pattern { public: QuestionTernaryPattern() {} - int getPriority() const { return 5; } - std::string getFirstKeyword() const { return "?"; } + int getPriority() const override { return 5; } + std::string getFirstKeyword() const override { return "?"; } - bool expressionExpected(const std::vector &previousTokens) const { + bool expressionExpected(const std::vector &previousTokens) const override { int i = (int)previousTokens.size(); return i == 0 || i == 2 || i == 4; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { int i = (int)previousTokens.size(); return i == 1 && token.getText() == "?" || i == 3 && token.getText() == ":"; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 5; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { int i = (int)previousTokens.size(); return (i == 1 || i == 3) ? Operator : InternalError; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { CalculatorNode *node1 = popNode(stack); CalculatorNode *node2 = popNode(stack); CalculatorNode *node3 = popNode(stack); @@ -554,27 +554,27 @@ public: class BraketPattern : public Pattern { public: BraketPattern() {} - int getPriority() const { return 5; } - std::string getFirstKeyword() const { return "("; } + int getPriority() const override { return 5; } + std::string getFirstKeyword() const override { return "("; } - bool expressionExpected(const std::vector &previousTokens) const { + bool expressionExpected(const std::vector &previousTokens) const override { return previousTokens.size() == 1; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.empty() && token.getText() == "(" || previousTokens.size() == 2 && token.getText() == ")"; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() == 3; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() != 1 ? Parenthesis : InternalError; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() == 3); assert(tokens[0].getText() == "("); assert(tokens[2].getText() == ")"); @@ -603,14 +603,14 @@ public: void allowImplicitArg(bool allowed) { m_implicitArgAllowed = allowed; } void addOptionalArg(double value) { m_optionalArgDefaults.push_back(value); } - std::string getFirstKeyword() const { return m_functionName; } - bool expressionExpected(const std::vector &previousTokens) const { + std::string getFirstKeyword() const override { return m_functionName; } + bool expressionExpected(const std::vector &previousTokens) const override { int n = (int)previousTokens.size(); return 2 <= n && (n & 1) == 0; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { int i = (int)previousTokens.size(); std::string s = toLower(token.getText()); if (i == 0) @@ -635,14 +635,14 @@ public: return false; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { if (previousTokens.empty()) return false; return m_minArgCount == 0 && previousTokens.size() == 1 && token.getText() != "(" || previousTokens.back().getText() == ")"; } TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { int i = (int)previousTokens.size(); if (i == 0) return Function; @@ -698,7 +698,7 @@ class F0Pattern : public FunctionPattern { public: F0Pattern(std::string functionName) : FunctionPattern(functionName, 0) {} void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { stack.push_back(new Op0Node(calc, m_functionName)); } }; @@ -713,7 +713,7 @@ public: setDescription(descr); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { stack.push_back(new Op1Node(calc, popNode(stack))); } }; @@ -728,7 +728,7 @@ public: setDescription(descr); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { CalculatorNode *b = popNode(stack); CalculatorNode *a = popNode(stack); stack.push_back(new Op2Node(calc, a, b)); @@ -745,7 +745,7 @@ public: setDescription(descr); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { CalculatorNode *c = popNode(stack); CalculatorNode *b = popNode(stack); CalculatorNode *a = popNode(stack); @@ -764,7 +764,7 @@ public: setDescription(description); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { std::vector nodes; getArgs(nodes, calc, stack, tokens); stack.push_back(new Op2Node(calc, nodes[0], nodes[1])); @@ -783,7 +783,7 @@ public: setDescription(descr); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { std::vector nodes; getArgs(nodes, calc, stack, tokens); stack.push_back(new Op3Node(calc, nodes[0], nodes[1], nodes[2])); @@ -800,7 +800,7 @@ public: "to the selected range"); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { CalculatorNode *a = popNode(stack); stack.push_back(new CycleNode(calc, a)); } @@ -820,7 +820,7 @@ public: setDescription(description); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { int n = ((int)tokens.size() - 1) / 2; if (m_seed) n--; RandomNode *randomNode = new RandomNode(calc); diff --git a/toonz/sources/common/tapptools/tcli.cpp b/toonz/sources/common/tapptools/tcli.cpp index e7a9ec9..2d4790e 100644 --- a/toonz/sources/common/tapptools/tcli.cpp +++ b/toonz/sources/common/tapptools/tcli.cpp @@ -40,8 +40,8 @@ void printLibRelease(ostream &out) { out << "Tnzcore 1.0 - " __DATE__ << endl; } class SpecialUsageElement : public UsageElement { public: SpecialUsageElement(std::string name) : UsageElement(name, " "){}; - void dumpValue(ostream &) const {}; - void resetValue(){}; + void dumpValue(ostream &) const override {}; + void resetValue() override {}; }; //--------------------------------------------------------- diff --git a/toonz/sources/common/tapptools/tparamundo.cpp b/toonz/sources/common/tapptools/tparamundo.cpp index 1609d85..2533cff 100644 --- a/toonz/sources/common/tapptools/tparamundo.cpp +++ b/toonz/sources/common/tapptools/tparamundo.cpp @@ -8,7 +8,7 @@ class ParamUndoManager : public TParamUndoManager { public: ParamUndoManager() {} ~ParamUndoManager() {} - void onChange(const TParamChange &change); + void onChange(const TParamChange &change) override; }; //------------------------------------------------------------------- diff --git a/toonz/sources/common/tcache/timagecache.cpp b/toonz/sources/common/tcache/timagecache.cpp index 33dc367..975eb8e 100644 --- a/toonz/sources/common/tcache/timagecache.cpp +++ b/toonz/sources/common/tcache/timagecache.cpp @@ -157,7 +157,7 @@ public: void setInfo(const TRasterImageP &ri); - ImageInfo *clone(); + ImageInfo *clone() override; double m_dpix, m_dpiy; std::string m_name; @@ -202,7 +202,7 @@ public: if (m_palette) m_palette->release(); } - ImageInfo *clone() { + ImageInfo *clone() override { ToonzImageInfo *ret = new ToonzImageInfo(*this); if (ret->m_palette) ret->m_palette->addRef(); return ret; @@ -243,9 +243,9 @@ void ToonzImageInfo::setInfo(const TToonzImageP &ti) { class RasterImageBuilder : public ImageBuilder { public: - ImageBuilder *clone() { return new RasterImageBuilder(*this); } + ImageBuilder *clone() override { return new RasterImageBuilder(*this); } - TImageP build(ImageInfo *info, const TRasterP &ras); + TImageP build(ImageInfo *info, const TRasterP &ras) override; }; TImageP RasterImageBuilder::build(ImageInfo *info, const TRasterP &ras) { @@ -269,9 +269,9 @@ TImageP RasterImageBuilder::build(ImageInfo *info, const TRasterP &ras) { class ToonzImageBuilder : public ImageBuilder { public: - ImageBuilder *clone() { return new ToonzImageBuilder(*this); } + ImageBuilder *clone() override { return new ToonzImageBuilder(*this); } - TImageP build(ImageInfo *info, const TRasterP &ras); + TImageP build(ImageInfo *info, const TRasterP &ras) override; }; TImageP ToonzImageBuilder::build(ImageInfo *info, const TRasterP &ras) { @@ -330,8 +330,8 @@ public: if (m_imageInfo) delete m_imageInfo; } - TUINT32 getSize() const; - TImageP getImage() const { return m_image; } + TUINT32 getSize() const override; + TImageP getImage() const override { return m_image; } TImageP m_image; }; @@ -378,8 +378,8 @@ public: ~CompressedOnMemoryCacheItem(); - TUINT32 getSize() const; - TImageP getImage() const; + TUINT32 getSize() const override; + TImageP getImage() const override; TRasterP m_compressedRas; }; @@ -474,8 +474,8 @@ public: ~CompressedOnDiskCacheItem(); - TUINT32 getSize() const { return 0; } - TImageP getImage() const; + TUINT32 getSize() const override { return 0; } + TImageP getImage() const override; TFilePath m_fp; }; @@ -539,8 +539,8 @@ public: ~UncompressedOnDiskCacheItem(); - TUINT32 getSize() const { return 0; } - TImageP getImage() const; + TUINT32 getSize() const override { return 0; } + TImageP getImage() const override; // TRaster32P getRaster32() const; TFilePath m_fp; diff --git a/toonz/sources/common/tcore/tthread.cpp b/toonz/sources/common/tcore/tthread.cpp index 3e99c35..567f2b8 100644 --- a/toonz/sources/common/tcore/tthread.cpp +++ b/toonz/sources/common/tcore/tthread.cpp @@ -193,7 +193,7 @@ public: Worker(); ~Worker(); - void run(); + void run() override; inline void takeTask(); inline bool canAdopt(const RunnableP &task); diff --git a/toonz/sources/common/tcore/tundo.cpp b/toonz/sources/common/tcore/tundo.cpp index dba65f6..3a42578 100644 --- a/toonz/sources/common/tcore/tundo.cpp +++ b/toonz/sources/common/tcore/tundo.cpp @@ -30,7 +30,7 @@ public: m_undos.clear(); } - int getSize() const { + int getSize() const override { int size = sizeof(*this); for (Iterator cit = m_undos.begin(); cit != m_undos.end(); ++cit) size += (*cit)->getSize(); @@ -44,7 +44,7 @@ public: m_undos[0]->m_isLastInBlock = true; } - void undo() const { + void undo() const override { assert(!m_deleted); assert(!m_undoing); m_undoing = true; @@ -54,7 +54,7 @@ public: // for_each(m_undos.begin(), m_undos.end(), callUndo); m_undoing = false; } - void redo() const { + void redo() const override { assert(!m_deleted); // VERSIONE CORRETTA for_each(m_undos.begin(), m_undos.end(), callRedo); @@ -65,7 +65,7 @@ public: // void repeat() const { // for_each(m_undos.begin(), m_undos.end(), callRepeat); //} - void onAdd() {} + void onAdd() override {} void add(TUndo *undo) { undo->m_isLastInBlock = true; m_undos.push_back(undo); @@ -82,7 +82,7 @@ public: } } - virtual QString getHistoryString() { + QString getHistoryString() override { if (m_undos.empty()) return TUndo::getHistoryString(); else if ((int)m_undos.size() == 1) @@ -92,7 +92,7 @@ public: } } - virtual int getHistoryType() { + int getHistoryType() override { if (m_undos.empty()) return TUndo::getHistoryType(); else diff --git a/toonz/sources/common/tfx/binaryFx.cpp b/toonz/sources/common/tfx/binaryFx.cpp index fe58a8e..e3d0995 100644 --- a/toonz/sources/common/tfx/binaryFx.cpp +++ b/toonz/sources/common/tfx/binaryFx.cpp @@ -54,30 +54,30 @@ public: public: // Low-level TRasterFx-related functions - int dynamicPortGroupsCount() const { return 1; } - const TFxPortDG *dynamicPortGroup(int g) const { + int dynamicPortGroupsCount() const override { return 1; } + const TFxPortDG *dynamicPortGroup(int g) const override { return (g == 0) ? &m_group : 0; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { // At max the memory of another tile with the same infos may be allocated // apart from // the externally supplied one. return TRasterFx::memorySize(rect, info.m_bpp); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &info); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; void compatibilityTranslatePort(int majorVersion, int minorVersion, - std::string &portName); + std::string &portName) override; - int getPreferredInputPort() { return 1; } + int getPreferredInputPort() override { return 1; } }; //****************************************************************************************** @@ -253,7 +253,7 @@ class OverFx : public TImageCombinationFx { public: OverFx() { setName(L"OverFx"); } - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::over(down, up); } }; @@ -268,7 +268,7 @@ class AddFx : public TImageCombinationFx { public: AddFx() : m_value(100.0) { bindParam(this, "value", m_value); } - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { double value = m_value->getValue(frame) / 100.0; if (value != 1.0) @@ -277,7 +277,7 @@ public: TRop::add(up, down, down); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -286,11 +286,11 @@ class ColorDodgeFx : public TImageCombinationFx { FX_DECLARATION(AddFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::colordodge(up, down, down); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -299,11 +299,11 @@ class ColorBurnFx : public TImageCombinationFx { FX_DECLARATION(AddFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::colorburn(up, down, down); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -312,13 +312,13 @@ class ScreenFx : public TImageCombinationFx { FX_DECLARATION(AddFx) public: - bool requiresFullRect() { return true; } + bool requiresFullRect() override { return true; } - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::screen(up, down, down); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -331,11 +331,11 @@ class SubFx : public TImageCombinationFx { public: SubFx() : m_matte(false) { bindParam(this, "matte", m_matte); } - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::sub(up, down, down, m_matte->getValue()); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -352,13 +352,13 @@ public: bindParam(this, "matte", m_matte); } - bool requiresFullRect() { return m_matte->getValue(); } + bool requiresFullRect() override { return m_matte->getValue(); } - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::mult(up, down, down, m_value->getValue(frame), m_matte->getValue()); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -371,13 +371,13 @@ class MinFx : public TImageCombinationFx { public: MinFx() : m_matte(true) { bindParam(this, "matte", m_matte); } - bool requiresFullRect() { return true; } + bool requiresFullRect() override { return true; } - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::ropmin(up, down, down, m_matte->getValue()); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -386,11 +386,11 @@ class MaxFx : public TImageCombinationFx { FX_DECLARATION(MaxFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::ropmax(up, down, down); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -399,11 +399,11 @@ class LinearBurnFx : public TImageCombinationFx { FX_DECLARATION(LinearBurnFx) public: - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::linearburn(up, down, down); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== @@ -416,7 +416,7 @@ public: OverlayFx() {} ~OverlayFx() {} - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { TRop::overlay(up, down, down); } }; @@ -434,16 +434,16 @@ public: m_value->setValueRange(0.0, 100.0); } - bool requiresFullRect() { return true; } + bool requiresFullRect() override { return true; } - void process(const TRasterP &up, const TRasterP &down, double frame) { + void process(const TRasterP &up, const TRasterP &down, double frame) override { double value = 0.01 * m_value->getValue(frame); UCHAR matteValue = (UCHAR)(value * 255.0 + 0.5); TRop::crossDissolve(up, down, down, matteValue); } - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //****************************************************************************************** @@ -464,7 +464,7 @@ public: ~InFx() {} - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { if (m_matte.isConnected() && m_source.isConnected()) { bool ret = m_matte->doGetBBox(frame, bbox, info); @@ -477,9 +477,9 @@ public: return false; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { // This fx is not visible if either the source or the matte tiles are empty. // It's because only source is visible, and only where matte is opaque. if (!(m_source.isConnected() && m_matte.isConnected())) return; @@ -494,7 +494,7 @@ public: TRop::ropin(srcTile.getRaster(), tile.getRaster(), tile.getRaster()); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { if (!(m_source.isConnected() && m_matte.isConnected())) return; m_source->dryCompute(rect, frame, info); @@ -502,11 +502,11 @@ public: } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { return TRasterFx::memorySize(rect, info.m_bpp); } - void compute(TFlash &flash, int frame) { + void compute(TFlash &flash, int frame) override { if (m_matte.isConnected()) { flash.pushMatrix(); flash.beginMask(); @@ -541,15 +541,15 @@ public: ~OutFx() {} - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { if (m_source.isConnected()) return m_source->doGetBBox(frame, bbox, info); return false; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { // If there is no source, do nothing if (!m_source.isConnected()) return; @@ -570,7 +570,7 @@ public: TRop::ropout(srcTile.getRaster(), tile.getRaster(), tile.getRaster()); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { if (!m_source.isConnected()) return; if (!m_matte.isConnected()) { @@ -583,7 +583,7 @@ public: } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { return TRasterFx::memorySize(rect, info.m_bpp); } }; @@ -601,9 +601,9 @@ public: addInputPort("Down", m_dn); } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { bBox = TRectD(); { @@ -625,7 +625,7 @@ public: return (bBox.getLx() >= 0) && (bBox.getLy() >= 0); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { // Here it's just like matte in, but the matte is visible under up. if (!m_dn.isConnected()) return; @@ -644,7 +644,7 @@ public: TRop::atop(upTile.getRaster(), tile.getRaster(), tile.getRaster()); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { if (!m_dn.isConnected()) return; if (!m_up.isConnected()) { @@ -657,7 +657,7 @@ public: } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { return TRasterFx::memorySize(rect, info.m_bpp); } }; diff --git a/toonz/sources/common/tfx/tfxcachemanager.cpp b/toonz/sources/common/tfx/tfxcachemanager.cpp index ef567e7..1ba13b1 100644 --- a/toonz/sources/common/tfx/tfxcachemanager.cpp +++ b/toonz/sources/common/tfx/tfxcachemanager.cpp @@ -121,7 +121,7 @@ class TFxCacheManagerGenerator : public TRenderResourceManagerGenerator { public: TFxCacheManagerGenerator() : TRenderResourceManagerGenerator(true) {} - TRenderResourceManager *operator()() { return new TFxCacheManager; } + TRenderResourceManager *operator()() override { return new TFxCacheManager; } }; MANAGER_FILESCOPE_DECLARATION(TFxCacheManager, TFxCacheManagerGenerator); diff --git a/toonz/sources/common/tfx/tpassivecachemanager.cpp b/toonz/sources/common/tfx/tpassivecachemanager.cpp index 6659f27..5db0e0f 100644 --- a/toonz/sources/common/tfx/tpassivecachemanager.cpp +++ b/toonz/sources/common/tfx/tpassivecachemanager.cpp @@ -240,7 +240,7 @@ public: friend class Table; ColIterator(Table *table, const ColKey &c) : Iterator(table), m_colKey(c) {} - void makeConsistent() { + void makeConsistent() override { Iterator::m_rowIt = Iterator::m_rowIt; while (Iterator::m_rowIt != Iterator::m_table->m_table.end()) { Iterator::m_it = Iterator::m_rowIt->second.find(m_colKey); @@ -250,7 +250,7 @@ public: } public: - void operator++() { + void operator++() override { ++Iterator::m_rowIt; makeConsistent(); } @@ -260,7 +260,7 @@ public: friend class Table; RowIterator(Table *table) : Iterator(table) {} - void makeConsistent() {} + void makeConsistent() override {} public: RowIterator(const RowsIterator rowIt) : Iterator(0) { @@ -268,8 +268,8 @@ public: Iterator::m_it = rowIt->second.begin(); } - void operator++() { ++Iterator::m_it; } - operator bool() { + void operator++() override { ++Iterator::m_it; } + operator bool() override { return Iterator::m_it != Iterator::m_rowIt->second.end(); } }; @@ -424,7 +424,7 @@ TPassiveCacheManager::FxData::~FxData() {} //--------------------------------------- class TPassiveCacheManagerGenerator : public TRenderResourceManagerGenerator { - TRenderResourceManager *operator()(void) { + TRenderResourceManager *operator()(void) override { // return new TPassiveCacheManager; return TPassiveCacheManager::instance(); } diff --git a/toonz/sources/common/tfx/tpredictivecachemanager.cpp b/toonz/sources/common/tfx/tpredictivecachemanager.cpp index 89bba9f..288000f 100644 --- a/toonz/sources/common/tfx/tpredictivecachemanager.cpp +++ b/toonz/sources/common/tfx/tpredictivecachemanager.cpp @@ -16,7 +16,7 @@ class TPredictiveCacheManagerGenerator public: TPredictiveCacheManagerGenerator() : TRenderResourceManagerGenerator(true) {} - TRenderResourceManager *operator()(void) { + TRenderResourceManager *operator()(void) override { return new TPredictiveCacheManager; } }; diff --git a/toonz/sources/common/tfx/trenderer.cpp b/toonz/sources/common/tfx/trenderer.cpp index 19c77fd..52f6889 100644 --- a/toonz/sources/common/tfx/trenderer.cpp +++ b/toonz/sources/common/tfx/trenderer.cpp @@ -413,11 +413,11 @@ public: void onFrameFailed(TException &e); void preRun(); - void run(); + void run() override; - int taskLoad() { return 100; } + int taskLoad() override { return 100; } - void onFinished(TThread::RunnableP); + void onFinished(TThread::RunnableP) override; }; //================================================================================ diff --git a/toonz/sources/common/tfx/trenderresourcemanager.cpp b/toonz/sources/common/tfx/trenderresourcemanager.cpp index 5678627..ba4a400 100644 --- a/toonz/sources/common/tfx/trenderresourcemanager.cpp +++ b/toonz/sources/common/tfx/trenderresourcemanager.cpp @@ -30,10 +30,10 @@ public: TRenderResourceManager *getManager(unsigned long renderId, unsigned int idx) const; - void onRenderInstanceStart(unsigned long id); - void onRenderInstanceEnd(unsigned long id); + void onRenderInstanceStart(unsigned long id) override; + void onRenderInstanceEnd(unsigned long id) override; - bool renderHasOwnership() { return false; } + bool renderHasOwnership() override { return false; } }; //=============================================================================================== @@ -41,7 +41,7 @@ public: class RenderInstanceManagersBuilderGenerator : public TRenderResourceManagerGenerator { public: - TRenderResourceManager *operator()(void) { + TRenderResourceManager *operator()(void) override { return RenderInstanceManagersBuilder::instance(); } }; @@ -68,14 +68,14 @@ public: InstanceResourceManagerStub(TRenderResourceManagerGenerator *generator) : m_generator(generator) {} - void onRenderInstanceStart(unsigned long id); - void onRenderInstanceEnd(unsigned long id); + void onRenderInstanceStart(unsigned long id) override; + void onRenderInstanceEnd(unsigned long id) override; - void onRenderFrameStart(double f); - void onRenderFrameEnd(double f); + void onRenderFrameStart(double f) override; + void onRenderFrameEnd(double f) override; - virtual void onRenderStatusStart(int renderStatus); - virtual void onRenderStatusEnd(int renderStatus); + void onRenderStatusStart(int renderStatus) override; + void onRenderStatusEnd(int renderStatus) override; }; //=============================================================================================== @@ -87,7 +87,7 @@ public: StubGenerator(TRenderResourceManagerGenerator *generator) : m_generator(generator) {} - TRenderResourceManager *operator()() { + TRenderResourceManager *operator()() override { return new InstanceResourceManagerStub(m_generator); } }; diff --git a/toonz/sources/common/tfx/unaryFx.cpp b/toonz/sources/common/tfx/unaryFx.cpp index bb6e3b0..c10a31e 100644 --- a/toonz/sources/common/tfx/unaryFx.cpp +++ b/toonz/sources/common/tfx/unaryFx.cpp @@ -191,9 +191,9 @@ public: ~InvertFx(){}; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -203,7 +203,7 @@ public: } }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { if (!m_input.isConnected()) return; m_input->compute(tile, frame, ri); diff --git a/toonz/sources/common/tfx/zeraryFx.cpp b/toonz/sources/common/tfx/zeraryFx.cpp index 3554262..958d622 100644 --- a/toonz/sources/common/tfx/zeraryFx.cpp +++ b/toonz/sources/common/tfx/zeraryFx.cpp @@ -28,14 +28,14 @@ public: setName(L"ColorCardFx"); } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &) { + void doCompute(TTile &tile, double frame, const TRenderSettings &) override { TRaster32P raster32 = tile.getRaster(); if (raster32) raster32->fill(m_color->getPremultipliedValue(frame)); @@ -71,14 +71,14 @@ public: setName(L"CheckBoardFx"); } - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &info) { + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { const TPixel32 &c1 = m_color1->getValue(frame); const TPixel32 &c2 = m_color2->getValue(frame); @@ -91,7 +91,7 @@ public: TRop::checkBoard(tile.getRaster(), c1, c2, dim, tile.m_pos); } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::SIZE; diff --git a/toonz/sources/common/tiio/tiio_bmp.cpp b/toonz/sources/common/tiio/tiio_bmp.cpp index 1c98680..961641b 100644 --- a/toonz/sources/common/tiio/tiio_bmp.cpp +++ b/toonz/sources/common/tiio/tiio_bmp.cpp @@ -103,7 +103,7 @@ public: BmpReader(); ~BmpReader(); - void open(FILE *file); + void open(FILE *file) override; int readNoLine(char *buffer, int x0, int x1, int shrink); @@ -123,8 +123,8 @@ public: int read24Line(char *buffer, int x0, int x1, int shrink); int read32Line(char *buffer, int x0, int x1, int shrink); - void readLine(char *buffer, int x0, int x1, int shrink); - int skipLines(int lineCount) { + void readLine(char *buffer, int x0, int x1, int shrink) override; + int skipLines(int lineCount) override { fseek(m_chan, lineCount * m_lineSize, SEEK_CUR); /* for(int i=0;i void notify(const T &change); - void onChange(const TParamChange &change) {} + void onChange(const TParamChange &change) override {} }; //--------------------------------------------------------- diff --git a/toonz/sources/common/tproperty.cpp b/toonz/sources/common/tproperty.cpp index 2765e40..1a166df 100644 --- a/toonz/sources/common/tproperty.cpp +++ b/toonz/sources/common/tproperty.cpp @@ -81,15 +81,15 @@ class Setter : public TProperty::Visitor { public: Setter(TProperty *src) : m_src(src) {} - void visit(TDoubleProperty *dst) { assign(dst, m_src); } - void visit(TIntProperty *dst) { assign(dst, m_src); } - void visit(TStringProperty *dst) { assign(dst, m_src); } - void visit(TBoolProperty *dst) { assign(dst, m_src); } - void visit(TEnumProperty *dst) { assign(dst, m_src); } - void visit(TDoublePairProperty *dst) { assign(dst, m_src); } - void visit(TIntPairProperty *dst) { assign(dst, m_src); } - void visit(TStyleIndexProperty *dst) { assign(dst, m_src); } - void visit(TPointerProperty *dst) { assign(dst, m_src); } + void visit(TDoubleProperty *dst) override { assign(dst, m_src); } + void visit(TIntProperty *dst) override { assign(dst, m_src); } + void visit(TStringProperty *dst) override { assign(dst, m_src); } + void visit(TBoolProperty *dst) override { assign(dst, m_src); } + void visit(TEnumProperty *dst) override { assign(dst, m_src); } + void visit(TDoublePairProperty *dst) override { assign(dst, m_src); } + void visit(TIntPairProperty *dst) override { assign(dst, m_src); } + void visit(TStyleIndexProperty *dst) override { assign(dst, m_src); } + void visit(TPointerProperty *dst) override { assign(dst, m_src); } }; void TPropertyGroup::setProperties(TPropertyGroup *g) { @@ -117,7 +117,7 @@ class PropertyWriter : public TProperty::Visitor { public: PropertyWriter(TOStream &os) : m_os(os) {} - void visit(TDoubleProperty *p) { + void visit(TDoubleProperty *p) override { std::map attr; attr["type"] = "double"; attr["name"] = p->getName(); @@ -126,7 +126,7 @@ public: attr["value"] = std::to_string(p->getValue()); m_os.openCloseChild("property", attr); } - void visit(TDoublePairProperty *p) { + void visit(TDoublePairProperty *p) override { std::map attr; attr["type"] = "pair"; attr["name"] = p->getName(); @@ -137,7 +137,7 @@ public: std::to_string(value.first) + " " + std::to_string(value.second); m_os.openCloseChild("property", attr); } - void visit(TIntPairProperty *p) { + void visit(TIntPairProperty *p) override { std::map attr; attr["type"] = "pair"; attr["name"] = p->getName(); @@ -148,7 +148,7 @@ public: std::to_string(value.first) + " " + std::to_string(value.second); m_os.openCloseChild("property", attr); } - void visit(TIntProperty *p) { + void visit(TIntProperty *p) override { std::map attr; attr["type"] = "int"; attr["name"] = p->getName(); @@ -157,14 +157,14 @@ public: attr["value"] = std::to_string(p->getValue()); m_os.openCloseChild("property", attr); } - void visit(TBoolProperty *p) { + void visit(TBoolProperty *p) override { std::map attr; attr["type"] = "bool"; attr["name"] = p->getName(); attr["value"] = p->getValue() ? "true" : "false"; m_os.openCloseChild("property", attr); } - void visit(TStringProperty *p) { + void visit(TStringProperty *p) override { std::map attr; attr["type"] = "string"; attr["name"] = p->getName(); @@ -172,7 +172,7 @@ public: m_os.openCloseChild("property", attr); } - void visit(TStyleIndexProperty *p) { + void visit(TStyleIndexProperty *p) override { std::map attr; attr["type"] = "string"; attr["name"] = p->getName(); @@ -180,7 +180,7 @@ public: m_os.openCloseChild("property", attr); } - void visit(TEnumProperty *p) { + void visit(TEnumProperty *p) override { std::map attr; attr["type"] = "enum"; attr["name"] = p->getName(); @@ -197,7 +197,7 @@ public: } else m_os.openCloseChild("property", attr); } - void visit(TPointerProperty *p) { + void visit(TPointerProperty *p) override { std::map attr; attr["type"] = "pointer"; attr["name"] = p->getName(); diff --git a/toonz/sources/common/trop/tdespeckle.cpp b/toonz/sources/common/trop/tdespeckle.cpp index c9c6cb6..a4f0395 100644 --- a/toonz/sources/common/trop/tdespeckle.cpp +++ b/toonz/sources/common/trop/tdespeckle.cpp @@ -317,7 +317,7 @@ public: const typename ReplacePainter::pixel_type &color() const { return m_color; } typename ReplacePainter::pixel_type &color() { return m_color; } - void paintPixel(typename ReplacePainter::pixel_type *pix) const { + void paintPixel(typename ReplacePainter::pixel_type *pix) const override { *pix = m_color; } }; @@ -342,7 +342,7 @@ public: const TUINT32 &keepMask() const { return m_keepMask; } TUINT32 &keepMask() { return m_keepMask; } - void paintPixel(pixel_type *pix) const { + void paintPixel(pixel_type *pix) const override { *pix = TPixelCM32(m_value | (pix->getValue() & m_keepMask)); } }; @@ -366,7 +366,7 @@ public: void openContainer(const RasterEdgeIterator &it); void addElement(const RasterEdgeIterator &it); - void closeContainer(); + void closeContainer() override; }; //--------------------------------------------------------------------------------------------- @@ -523,7 +523,7 @@ public: void openContainer(const RasterEdgeIterator &it); void addElement(const RasterEdgeIterator &it); - void closeContainer(); + void closeContainer() override; RunsMapP &runsMap() { return m_painter.runsMap(); } }; diff --git a/toonz/sources/common/tsound/tsop.cpp b/toonz/sources/common/tsound/tsop.cpp index 8403dfc..0f2b2ad 100644 --- a/toonz/sources/common/tsound/tsop.cpp +++ b/toonz/sources/common/tsound/tsop.cpp @@ -425,14 +425,14 @@ public: ~TSoundTrackResample(){}; - TSoundTrackP compute(const TSoundTrackMono8Signed &src) { + TSoundTrackP compute(const TSoundTrackMono8Signed &src) override { TSoundTrackMono8Signed *dst = resampleT( const_cast(src), m_sampleRate, m_filterType); return TSoundTrackP(dst); } - TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) override { TSoundTrackMono8Unsigned *dst = resampleT(const_cast(src), m_sampleRate, m_filterType); @@ -440,7 +440,7 @@ public: return TSoundTrackP(dst); } - TSoundTrackP compute(const TSoundTrackStereo8Signed &src) { + TSoundTrackP compute(const TSoundTrackStereo8Signed &src) override { TSoundTrackStereo8Signed *dst = resampleT(const_cast(src), m_sampleRate, m_filterType); @@ -448,7 +448,7 @@ public: return TSoundTrackP(dst); } - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) override { TSoundTrackStereo8Unsigned *dst = resampleT(const_cast(src), m_sampleRate, m_filterType); @@ -456,28 +456,28 @@ public: return TSoundTrackP(dst); } - TSoundTrackP compute(const TSoundTrackMono16 &src) { + TSoundTrackP compute(const TSoundTrackMono16 &src) override { TSoundTrackMono16 *dst = resampleT(const_cast(src), m_sampleRate, m_filterType); return TSoundTrackP(dst); } - TSoundTrackP compute(const TSoundTrackStereo16 &src) { + TSoundTrackP compute(const TSoundTrackStereo16 &src) override { TSoundTrackStereo16 *dst = resampleT(const_cast(src), m_sampleRate, m_filterType); return TSoundTrackP(dst); } - TSoundTrackP compute(const TSoundTrackMono24 &src) { + TSoundTrackP compute(const TSoundTrackMono24 &src) override { TSoundTrackMono24 *dst = resampleT(const_cast(src), m_sampleRate, m_filterType); return TSoundTrackP(dst); } - TSoundTrackP compute(const TSoundTrackStereo24 &src) { + TSoundTrackP compute(const TSoundTrackStereo24 &src) override { TSoundTrackStereo24 *dst = resampleT(const_cast(src), m_sampleRate, m_filterType); @@ -573,34 +573,34 @@ public: ~TSoundTrackConverterWithoutResampling(){}; - TSoundTrackP compute(const TSoundTrackMono8Signed &src) { + TSoundTrackP compute(const TSoundTrackMono8Signed &src) override { return doConvertWithoutResamplingT(&src, m_format); } - TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) override { return doConvertWithoutResamplingT(&src, m_format); } - TSoundTrackP compute(const TSoundTrackStereo8Signed &src) { + TSoundTrackP compute(const TSoundTrackStereo8Signed &src) override { return doConvertWithoutResamplingT(&src, m_format); } - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) override { return doConvertWithoutResamplingT(&src, m_format); } - TSoundTrackP compute(const TSoundTrackMono16 &src) { + TSoundTrackP compute(const TSoundTrackMono16 &src) override { return doConvertWithoutResamplingT(&src, m_format); } - TSoundTrackP compute(const TSoundTrackStereo16 &src) { + TSoundTrackP compute(const TSoundTrackStereo16 &src) override { return doConvertWithoutResamplingT(&src, m_format); } - TSoundTrackP compute(const TSoundTrackMono24 &src) { + TSoundTrackP compute(const TSoundTrackMono24 &src) override { return doConvertWithoutResamplingT(&src, m_format); } - TSoundTrackP compute(const TSoundTrackStereo24 &src) { + TSoundTrackP compute(const TSoundTrackStereo24 &src) override { return doConvertWithoutResamplingT(&src, m_format); } }; @@ -805,42 +805,42 @@ public: ~TSoundReverb() {} - virtual TSoundTrackP compute(const TSoundTrackMono8Signed &src) { + TSoundTrackP compute(const TSoundTrackMono8Signed &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } - virtual TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } - virtual TSoundTrackP compute(const TSoundTrackStereo8Signed &src) { + TSoundTrackP compute(const TSoundTrackStereo8Signed &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } - virtual TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } - virtual TSoundTrackP compute(const TSoundTrackMono16 &src) { + TSoundTrackP compute(const TSoundTrackMono16 &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } - virtual TSoundTrackP compute(const TSoundTrackStereo16 &src) { + TSoundTrackP compute(const TSoundTrackStereo16 &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } - virtual TSoundTrackP compute(const TSoundTrackMono24 &src) { + TSoundTrackP compute(const TSoundTrackMono24 &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } - virtual TSoundTrackP compute(const TSoundTrackStereo24 &src) { + TSoundTrackP compute(const TSoundTrackStereo24 &src) override { return doReverb(const_cast(&src), m_delayTime, m_decayFactor, m_extendTime); } @@ -912,42 +912,42 @@ public: ~TSoundGate() {} - TSoundTrackP compute(const TSoundTrackMono8Signed &src) { + TSoundTrackP compute(const TSoundTrackMono8Signed &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } - TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } - TSoundTrackP compute(const TSoundTrackStereo8Signed &src) { + TSoundTrackP compute(const TSoundTrackStereo8Signed &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } - TSoundTrackP compute(const TSoundTrackMono16 &src) { + TSoundTrackP compute(const TSoundTrackMono16 &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } - TSoundTrackP compute(const TSoundTrackStereo16 &src) { + TSoundTrackP compute(const TSoundTrackStereo16 &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } - TSoundTrackP compute(const TSoundTrackMono24 &src) { + TSoundTrackP compute(const TSoundTrackMono24 &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } - TSoundTrackP compute(const TSoundTrackStereo24 &src) { + TSoundTrackP compute(const TSoundTrackStereo24 &src) override { return doGate(const_cast(&src), m_threshold, m_holdTime, m_releaseTime); } @@ -1230,7 +1230,7 @@ public: ~TSoundTrackMixer(){}; - TSoundTrackP compute(const TSoundTrackMono8Signed &src) { + TSoundTrackP compute(const TSoundTrackMono8Signed &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return ( @@ -1239,7 +1239,7 @@ public: m_alpha2)); } - TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackMono8Unsigned &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return ( @@ -1248,7 +1248,7 @@ public: m_alpha2)); } - TSoundTrackP compute(const TSoundTrackStereo8Signed &src) { + TSoundTrackP compute(const TSoundTrackStereo8Signed &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return ( @@ -1257,7 +1257,7 @@ public: m_alpha2)); } - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) { + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return (mixT( @@ -1266,7 +1266,7 @@ public: m_alpha2)); } - TSoundTrackP compute(const TSoundTrackMono16 &src) { + TSoundTrackP compute(const TSoundTrackMono16 &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return (mixT(const_cast(&src), m_alpha1, @@ -1274,7 +1274,7 @@ public: m_alpha2)); } - TSoundTrackP compute(const TSoundTrackStereo16 &src) { + TSoundTrackP compute(const TSoundTrackStereo16 &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return (mixT(const_cast(&src), m_alpha1, @@ -1282,7 +1282,7 @@ public: m_alpha2)); } - TSoundTrackP compute(const TSoundTrackMono24 &src) { + TSoundTrackP compute(const TSoundTrackMono24 &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return (mixT(const_cast(&src), m_alpha1, @@ -1290,7 +1290,7 @@ public: m_alpha2)); } - TSoundTrackP compute(const TSoundTrackStereo24 &src) { + TSoundTrackP compute(const TSoundTrackStereo24 &src) override { assert(src.getFormat() == m_sndtrack->getFormat()); return (mixT(const_cast(&src), m_alpha1, @@ -1365,14 +1365,14 @@ public: TSoundTrackFaderIn(double riseFactor) : TSoundTransform(), m_riseFactor(riseFactor) {} - TSoundTrackP compute(const TSoundTrackMono8Signed &); - TSoundTrackP compute(const TSoundTrackStereo8Signed &); - TSoundTrackP compute(const TSoundTrackMono8Unsigned &); - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &); - TSoundTrackP compute(const TSoundTrackMono16 &); - TSoundTrackP compute(const TSoundTrackStereo16 &); - TSoundTrackP compute(const TSoundTrackMono24 &); - TSoundTrackP compute(const TSoundTrackStereo24 &); + TSoundTrackP compute(const TSoundTrackMono8Signed &) override; + TSoundTrackP compute(const TSoundTrackStereo8Signed &) override; + TSoundTrackP compute(const TSoundTrackMono8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackMono16 &) override; + TSoundTrackP compute(const TSoundTrackStereo16 &) override; + TSoundTrackP compute(const TSoundTrackMono24 &) override; + TSoundTrackP compute(const TSoundTrackStereo24 &) override; double m_riseFactor; }; @@ -1487,14 +1487,14 @@ public: TSoundTrackFaderOut(double decayFactor) : TSoundTransform(), m_decayFactor(decayFactor) {} - TSoundTrackP compute(const TSoundTrackMono8Signed &); - TSoundTrackP compute(const TSoundTrackStereo8Signed &); - TSoundTrackP compute(const TSoundTrackMono8Unsigned &); - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &); - TSoundTrackP compute(const TSoundTrackMono16 &); - TSoundTrackP compute(const TSoundTrackStereo16 &); - TSoundTrackP compute(const TSoundTrackMono24 &); - TSoundTrackP compute(const TSoundTrackStereo24 &); + TSoundTrackP compute(const TSoundTrackMono8Signed &) override; + TSoundTrackP compute(const TSoundTrackStereo8Signed &) override; + TSoundTrackP compute(const TSoundTrackMono8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackMono16 &) override; + TSoundTrackP compute(const TSoundTrackStereo16 &) override; + TSoundTrackP compute(const TSoundTrackMono24 &) override; + TSoundTrackP compute(const TSoundTrackStereo24 &) override; double m_decayFactor; }; @@ -1619,14 +1619,14 @@ public: TSoundTrackCrossFader(TSoundTrackP src, double crossFactor) : TSoundTransform(), m_st(src), m_crossFactor(crossFactor) {} - TSoundTrackP compute(const TSoundTrackMono8Signed &); - TSoundTrackP compute(const TSoundTrackStereo8Signed &); - TSoundTrackP compute(const TSoundTrackMono8Unsigned &); - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &); - TSoundTrackP compute(const TSoundTrackMono16 &); - TSoundTrackP compute(const TSoundTrackStereo16 &); - TSoundTrackP compute(const TSoundTrackMono24 &); - TSoundTrackP compute(const TSoundTrackStereo24 &); + TSoundTrackP compute(const TSoundTrackMono8Signed &) override; + TSoundTrackP compute(const TSoundTrackStereo8Signed &) override; + TSoundTrackP compute(const TSoundTrackMono8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackMono16 &) override; + TSoundTrackP compute(const TSoundTrackStereo16 &) override; + TSoundTrackP compute(const TSoundTrackMono24 &) override; + TSoundTrackP compute(const TSoundTrackStereo24 &) override; TSoundTrackP m_st; double m_crossFactor; @@ -1785,14 +1785,14 @@ public: TSoundTrackCrossFaderOverWrite(TSoundTrackP src, double crossFactor) : TSoundTransform(), m_st(src), m_crossFactor(crossFactor) {} - TSoundTrackP compute(const TSoundTrackMono8Signed &); - TSoundTrackP compute(const TSoundTrackStereo8Signed &); - TSoundTrackP compute(const TSoundTrackMono8Unsigned &); - TSoundTrackP compute(const TSoundTrackStereo8Unsigned &); - TSoundTrackP compute(const TSoundTrackMono16 &); - TSoundTrackP compute(const TSoundTrackStereo16 &); - TSoundTrackP compute(const TSoundTrackMono24 &); - TSoundTrackP compute(const TSoundTrackStereo24 &); + TSoundTrackP compute(const TSoundTrackMono8Signed &) override; + TSoundTrackP compute(const TSoundTrackStereo8Signed &) override; + TSoundTrackP compute(const TSoundTrackMono8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackStereo8Unsigned &) override; + TSoundTrackP compute(const TSoundTrackMono16 &) override; + TSoundTrackP compute(const TSoundTrackStereo16 &) override; + TSoundTrackP compute(const TSoundTrackMono24 &) override; + TSoundTrackP compute(const TSoundTrackStereo24 &) override; TSoundTrackP m_st; double m_crossFactor; diff --git a/toonz/sources/common/tsound/tsound_nt.cpp b/toonz/sources/common/tsound/tsound_nt.cpp index ee03aff..3b48bda 100644 --- a/toonz/sources/common/tsound/tsound_nt.cpp +++ b/toonz/sources/common/tsound/tsound_nt.cpp @@ -53,9 +53,9 @@ class EndPlayMsg : public TThread::Message { public: EndPlayMsg(TSoundOutputDeviceListener *notifier) { m_listener = notifier; } - TThread::Message *clone() const { return new EndPlayMsg(*this); } + TThread::Message *clone() const override { return new EndPlayMsg(*this); } - void onDeliver() { m_listener->onPlayCompleted(); } + void onDeliver() override { m_listener->onPlayCompleted(); } private: TSoundOutputDeviceListener *m_listener; @@ -1019,7 +1019,7 @@ public: ~RecordTask() {} - void run(); + void run() override; std::shared_ptr m_dev; }; diff --git a/toonz/sources/common/tsystem/tlogger.cpp b/toonz/sources/common/tsystem/tlogger.cpp index 204eb0d..bd4e4a0 100644 --- a/toonz/sources/common/tsystem/tlogger.cpp +++ b/toonz/sources/common/tsystem/tlogger.cpp @@ -23,14 +23,14 @@ public: public: ListenerNotifier(Imp *imp) : m_imp(imp) {} - void onDeliver() { + void onDeliver() override { QMutexLocker sl(&m_imp->m_mutex); std::set::iterator it; for (it = m_imp->m_listeners.begin(); it != m_imp->m_listeners.end(); ++it) (*it)->onLogChanged(); } - TThread::Message *clone() const { return new ListenerNotifier(*this); } + TThread::Message *clone() const override { return new ListenerNotifier(*this); } }; void notify() { diff --git a/toonz/sources/common/tunit/tunit.cpp b/toonz/sources/common/tunit/tunit.cpp index a463fa5..5c3af67 100644 --- a/toonz/sources/common/tunit/tunit.cpp +++ b/toonz/sources/common/tunit/tunit.cpp @@ -42,11 +42,11 @@ public: static double m_fieldGuideAspectRatio; VerticalFldUnitConverter(double factor) : m_factor(factor) {} - TUnitConverter *clone() const { return new VerticalFldUnitConverter(*this); } - double convertTo(double v) const { + TUnitConverter *clone() const override { return new VerticalFldUnitConverter(*this); } + double convertTo(double v) const override { return v * m_fieldGuideAspectRatio * m_factor; } - double convertFrom(double v) const { + double convertFrom(double v) const override { return v / (m_fieldGuideAspectRatio * m_factor); } }; @@ -71,9 +71,9 @@ double getFieldGuideAspectRatio() { class TangentConverter : public TUnitConverter { public: TangentConverter() {} - TUnitConverter *clone() const { return new TangentConverter(*this); } - double convertTo(double v) const { return atan(v) * (M_1_PI * 180.0); } - double convertFrom(double v) const { return tan(v * M_PI_180); } + TUnitConverter *clone() const override { return new TangentConverter(*this); } + double convertTo(double v) const override { return atan(v) * (M_1_PI * 180.0); } + double convertFrom(double v) const override { return tan(v * M_PI_180); } }; //=================================================================== @@ -81,11 +81,11 @@ public: class TPixelUnitXConverter : public TUnitConverter { public: TPixelUnitXConverter() {} - TUnitConverter *clone() const { return new TPixelUnitXConverter(*this); } - double convertTo(double v) const { + TUnitConverter *clone() const override { return new TPixelUnitXConverter(*this); } + double convertTo(double v) const override { return v * UnitParameters::currentDpiGetter().first; } - double convertFrom(double v) const { + double convertFrom(double v) const override { return v / UnitParameters::currentDpiGetter().first; } }; @@ -93,11 +93,11 @@ public: class TPixelUnitYConverter : public TUnitConverter { public: TPixelUnitYConverter() {} - TUnitConverter *clone() const { return new TPixelUnitYConverter(*this); } - double convertTo(double v) const { + TUnitConverter *clone() const override { return new TPixelUnitYConverter(*this); } + double convertTo(double v) const override { return v * UnitParameters::currentDpiGetter().second; } - double convertFrom(double v) const { + double convertFrom(double v) const override { return v / UnitParameters::currentDpiGetter().second; } }; @@ -528,12 +528,12 @@ class ZDepthUnitConverter : public TUnitConverter { public: ZDepthUnitConverter(TMeasureManager::CameraSizeProvider *cameraSizeProvider) : m_cameraSizeProvider(cameraSizeProvider) {} - TUnitConverter *clone() const { + TUnitConverter *clone() const override { return new ZDepthUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const { return (1 - v * 0.001) * getCameraSize(); } - double convertFrom(double v) const { + double convertTo(double v) const override { return (1 - v * 0.001) * getCameraSize(); } + double convertFrom(double v) const override { return (1 - v / getCameraSize()) * 1000.0; } }; @@ -547,12 +547,12 @@ public: CameraZDepthUnitConverter( TMeasureManager::CameraSizeProvider *cameraSizeProvider) : m_cameraSizeProvider(cameraSizeProvider) {} - TUnitConverter *clone() const { + TUnitConverter *clone() const override { return new CameraZDepthUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const { return (1 + v * 0.001) * getCameraSize(); } - double convertFrom(double v) const { + double convertTo(double v) const override { return (1 + v * 0.001) * getCameraSize(); } + double convertFrom(double v) const override { return (v / getCameraSize() - 1) * 1000.0; } }; @@ -567,12 +567,12 @@ public: TMeasureManager::CameraSizeProvider *cameraSizeProvider) : m_cameraSizeProvider(cameraSizeProvider) {} - TUnitConverter *clone() const { + TUnitConverter *clone() const override { return new ZDepthHandleUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const { return -v * 0.001 * getCameraSize(); } - double convertFrom(double v) const { return (-v / getCameraSize()) * 1000.0; } + double convertTo(double v) const override { return -v * 0.001 * getCameraSize(); } + double convertFrom(double v) const override { return (-v / getCameraSize()) * 1000.0; } }; class CameraZDepthHandleUnitConverter : public TUnitConverter { @@ -583,12 +583,12 @@ public: TMeasureManager::CameraSizeProvider *cameraSizeProvider) : m_cameraSizeProvider(cameraSizeProvider) {} - TUnitConverter *clone() const { + TUnitConverter *clone() const override { return new CameraZDepthHandleUnitConverter(m_cameraSizeProvider); } inline double getCameraSize() const { return (*m_cameraSizeProvider)(); } - double convertTo(double v) const { return v * 0.001 * getCameraSize(); } - double convertFrom(double v) const { return (v / getCameraSize()) * 1000.0; } + double convertTo(double v) const override { return v * 0.001 * getCameraSize(); } + double convertFrom(double v) const override { return (v / getCameraSize()) * 1000.0; } }; } // namespace diff --git a/toonz/sources/common/tvectorimage/tcomputeregions.cpp b/toonz/sources/common/tvectorimage/tcomputeregions.cpp index bb9a004..758dedd 100644 --- a/toonz/sources/common/tvectorimage/tcomputeregions.cpp +++ b/toonz/sources/common/tvectorimage/tcomputeregions.cpp @@ -2572,11 +2572,11 @@ private: public: TRegionClockWiseFormula() : m_quasiArea(0) {} - void inline update(const TPointD &p1, const TPointD &p2) { + void update(const TPointD &p1, const TPointD &p2) override { m_quasiArea += (p2.y + p1.y) * (p1.x - p2.x); } - bool inline isClockwise() { return m_quasiArea > 0.5; } + bool isClockwise() { return m_quasiArea > 0.5; } }; //---------------------------------------------------------------------------------------------- diff --git a/toonz/sources/common/tvrender/tellipticbrush.cpp b/toonz/sources/common/tvrender/tellipticbrush.cpp index 7d107bc..7b1177d 100644 --- a/toonz/sources/common/tvrender/tellipticbrush.cpp +++ b/toonz/sources/common/tvrender/tellipticbrush.cpp @@ -303,7 +303,7 @@ public: LengthLinearizator(const TStroke *stroke, double lengthStep) : StrokeLinearizator(stroke), m_lengthStep(lengthStep), m_countIdx(0) {} - void linearize(std::vector &cPoints, int chunk); + void linearize(std::vector &cPoints, int chunk) override; }; //-------------------------------------------------------------------------------------------- @@ -359,7 +359,7 @@ public: RecursiveLinearizator(const TStroke *stroke, double pixSize) : StrokeLinearizator(stroke), m_pixSize(pixSize) {} - void linearize(std::vector &cPoints, int chunk); + void linearize(std::vector &cPoints, int chunk) override; void subdivide(std::vector &cPoints, CenterlinePoint &cp0, CenterlinePoint &cp1); }; @@ -455,7 +455,7 @@ class CoverageLinearizator : public tellipticbrush::StrokeLinearizator { public: CoverageLinearizator(const TStroke *stroke) : StrokeLinearizator(stroke) {} - void linearize(std::vector &cPoints, int chunk); + void linearize(std::vector &cPoints, int chunk) override; }; //-------------------------------------------------------------------------------------------- diff --git a/toonz/sources/common/tvrender/tofflinegl.cpp b/toonz/sources/common/tvrender/tofflinegl.cpp index a5354c5..eebc23f 100644 --- a/toonz/sources/common/tvrender/tofflinegl.cpp +++ b/toonz/sources/common/tvrender/tofflinegl.cpp @@ -114,7 +114,7 @@ public: //----------------------------------------------------------------------------- - void makeCurrent() { + void makeCurrent() override { QMutexLocker locker(&win32ImpMutex); int ret = wglMakeCurrent(m_offDC, m_hglRC); @@ -123,7 +123,7 @@ public: //----------------------------------------------------------------------------- - void doneCurrent() { + void doneCurrent() override { QMutexLocker locker(&win32ImpMutex); glFlush(); @@ -153,7 +153,7 @@ public: //----------------------------------------------------------------------------- void createContext(TDimension rasterSize, - std::shared_ptr shared) { + std::shared_ptr shared) override { QMutexLocker locker(&win32ImpMutex); BITMAPINFO info; @@ -281,7 +281,7 @@ public: //----------------------------------------------------------------------------- - void getRaster(TRaster32P raster) { + void getRaster(TRaster32P raster) override { makeCurrent(); glFlush(); @@ -519,9 +519,9 @@ public: std::shared_ptr shared) : m_ogl(ogl), m_size(size), m_shared(std::move(shared)) {} - void onDeliver() { m_ogl->m_imp = currentImpGenerator(m_size, m_shared); } + void onDeliver() override { m_ogl->m_imp = currentImpGenerator(m_size, m_shared); } - TThread::Message *clone() const { return new MessageCreateContext(*this); } + TThread::Message *clone() const override { return new MessageCreateContext(*this); } }; //} // namespace diff --git a/toonz/sources/common/tvrender/tpalette.cpp b/toonz/sources/common/tvrender/tpalette.cpp index 7984f70..76d3c88 100644 --- a/toonz/sources/common/tvrender/tpalette.cpp +++ b/toonz/sources/common/tvrender/tpalette.cpp @@ -425,31 +425,31 @@ public: StyleWriter(TOStream &os, int index) : m_os(os), m_index(index) {} static void setRootDir(const TFilePath &fp) { m_rootDir = fp; } - TOutputStreamInterface &operator<<(double x) { + TOutputStreamInterface &operator<<(double x) override { m_os << x; return *this; }; - TOutputStreamInterface &operator<<(int x) { + TOutputStreamInterface &operator<<(int x) override { m_os << x; return *this; }; - TOutputStreamInterface &operator<<(std::string x) { + TOutputStreamInterface &operator<<(std::string x) override { m_os << x; return *this; }; - TOutputStreamInterface &operator<<(UCHAR x) { + TOutputStreamInterface &operator<<(UCHAR x) override { m_os << (int)x; return *this; }; - TOutputStreamInterface &operator<<(USHORT x) { + TOutputStreamInterface &operator<<(USHORT x) override { m_os << (int)x; return *this; }; - TOutputStreamInterface &operator<<(const TPixel32 &x) { + TOutputStreamInterface &operator<<(const TPixel32 &x) override { m_os << x; return *this; }; - TOutputStreamInterface &operator<<(const TRaster32P &ras) { + TOutputStreamInterface &operator<<(const TRaster32P &ras) override { assert(m_rootDir != TFilePath()); std::string name = "texture_" + std::to_string(m_index); @@ -482,31 +482,36 @@ public: static void setRootDir(const TFilePath &fp) { m_rootDir = fp; } - virtual TInputStreamInterface &operator>>(double &x) { + TInputStreamInterface &operator>>(double &x) override { m_is >> x; return *this; } - virtual TInputStreamInterface &operator>>(int &x) { + + TInputStreamInterface &operator>>(int &x) override { m_is >> x; return *this; } - virtual TInputStreamInterface &operator>>(std::string &x) { + + TInputStreamInterface &operator>>(std::string &x) override { m_is >> x; return *this; } - virtual TInputStreamInterface &operator>>(UCHAR &x) { + + TInputStreamInterface &operator>>(UCHAR &x) override { int v; m_is >> v; x = v; return *this; } - virtual TInputStreamInterface &operator>>(USHORT &x) { + + TInputStreamInterface &operator>>(USHORT &x) override { int v; m_is >> v; x = v; return *this; } - virtual TInputStreamInterface &operator>>(TRaster32P &x) { + + TInputStreamInterface &operator>>(TRaster32P &x) override { assert(m_rootDir != TFilePath()); std::string name; m_is >> name; @@ -517,7 +522,8 @@ public: } return *this; } - virtual TInputStreamInterface &operator>>(TPixel32 &x) { + + TInputStreamInterface &operator>>(TPixel32 &x) override { m_is >> x; return *this; } @@ -527,7 +533,7 @@ public: This is necessary since palettes have their \a own version number, which is \a not the TIStream's file one. */ - virtual VersionNumber versionNumber() const { + VersionNumber versionNumber() const override { return m_version; } //!< Returns the palette's version number. }; diff --git a/toonz/sources/common/tvrender/tvectorbrush.cpp b/toonz/sources/common/tvrender/tvectorbrush.cpp index f0809a4..b525443 100644 --- a/toonz/sources/common/tvrender/tvectorbrush.cpp +++ b/toonz/sources/common/tvrender/tvectorbrush.cpp @@ -380,8 +380,8 @@ public: const StrokeOutlinizationData &data) : ReferenceLinearizator(stroke, path, data) {} - void linearize(std::vector &cPoints, int chunk); - void linearize(std::vector &cPoints, int chunk, double t1); + void linearize(std::vector &cPoints, int chunk) override; + void linearize(std::vector &cPoints, int chunk, double t1) override; void addCenterlinePoints(std::vector &cPoints, int brushChunk, double x0, double x1); @@ -515,8 +515,8 @@ public: SubdivisorFuncPtr m_subdivisor; public: - void linearize(std::vector &cPoints, int chunk); - void linearize(std::vector &cPoints, int chunk, double t1); + void linearize(std::vector &cPoints, int chunk) override; + void linearize(std::vector &cPoints, int chunk, double t1) override; void subdivide(std::vector &cPoints, CenterlinePoint &cp0, CenterlinePoint &cp1); diff --git a/toonz/sources/common/tvrender/tvectorbrushstyle.cpp b/toonz/sources/common/tvrender/tvectorbrushstyle.cpp index dccc26e..5500b11 100644 --- a/toonz/sources/common/tvrender/tvectorbrushstyle.cpp +++ b/toonz/sources/common/tvrender/tvectorbrushstyle.cpp @@ -36,12 +36,12 @@ class VectorBrushProp : public TStrokeProp { public: VectorBrushProp(const TStroke *stroke, TVectorBrushStyle *style); - TStrokeProp *clone(const TStroke *stroke) const; + TStrokeProp *clone(const TStroke *stroke) const override; - void draw(const TVectorRenderData &rd); - void draw(TFlash &flash) {} + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &flash) override {} - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; private: // not implemented diff --git a/toonz/sources/image/3gp/tiio_3gp.h b/toonz/sources/image/3gp/tiio_3gp.h index 889f72c..faf33ab 100644 --- a/toonz/sources/image/3gp/tiio_3gp.h +++ b/toonz/sources/image/3gp/tiio_3gp.h @@ -50,7 +50,7 @@ class TLevelWriter3gp : public TLevelWriter { public: TLevelWriter3gp(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriter3gp(); - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; bool m_initDone; int m_IOError; @@ -80,16 +80,16 @@ public: static TLevelWriter *create(const TFilePath &f, TPropertyGroup *winfo) { return new TLevelWriter3gp(f, winfo); }; - void saveSoundTrack(TSoundTrack *st); + void saveSoundTrack(TSoundTrack *st) override; }; class TLevelReader3gp : public TLevelReader { public: TLevelReader3gp(const TFilePath &path); ~TLevelReader3gp(); - TImageReaderP getFrameReader(TFrameId fid); + TImageReaderP getFrameReader(TFrameId fid) override; // friend class TImageReaderMov; - TLevelP loadInfo(); + TLevelP loadInfo() override; void load(const TRasterP &rasP, int frameIndex, const TPoint &pos, int shrinkX = 1, int shrinkY = 1); diff --git a/toonz/sources/image/3gp/tiio_3gpW.cpp b/toonz/sources/image/3gp/tiio_3gpW.cpp index ebbd05b..8a94186 100644 --- a/toonz/sources/image/3gp/tiio_3gpW.cpp +++ b/toonz/sources/image/3gp/tiio_3gpW.cpp @@ -200,7 +200,7 @@ class TImageWriter3gp : public TImageWriter { public: TImageWriter3gp(const TFilePath &, int frameIndex, TLevelWriter3gp *); ~TImageWriter3gp() { m_lwm->release(); } - bool is64bitOutputSupported() { return false; } + bool is64bitOutputSupported() override { return false; } private: // not implemented @@ -208,7 +208,7 @@ private: TImageWriter3gp &operator=(const TImageWriter3gp &src); public: - void save(const TImageP &); + void save(const TImageP &) override; int m_frameIndex; private: @@ -229,7 +229,7 @@ private: TImageReader3gp &operator=(const TImageReader3gp &src); public: - TImageP load(); + TImageP load() override; void load(const TRasterP &rasP, const TPoint &pos = TPoint(0, 0), int shrinkX = 1, int shrinkY = 1); int m_frameIndex; diff --git a/toonz/sources/image/avi/tiio_avi.cpp b/toonz/sources/image/avi/tiio_avi.cpp index a9642e5..2aa9655 100644 --- a/toonz/sources/image/avi/tiio_avi.cpp +++ b/toonz/sources/image/avi/tiio_avi.cpp @@ -136,8 +136,8 @@ public: } ~TImageWriterAvi() { m_lwa->release(); } - bool is64bitOutputSupported() { return false; } - void save(const TImageP &img) { m_lwa->save(img, m_frameIndex); } + bool is64bitOutputSupported() override { return false; } + void save(const TImageP &img) override { m_lwa->save(img, m_frameIndex); } private: TLevelWriterAvi *m_lwa; @@ -613,7 +613,7 @@ public: } ~TImageReaderAvi() { m_lra->release(); } - TImageP load() { return m_lra->load(m_frameIndex); } + TImageP load() override { return m_lra->load(m_frameIndex); } TDimension getSize() const { return m_lra->getSize(); } TRect getBBox() const { return TRect(); } diff --git a/toonz/sources/image/avi/tiio_avi.h b/toonz/sources/image/avi/tiio_avi.h index 3b70729..963d126 100644 --- a/toonz/sources/image/avi/tiio_avi.h +++ b/toonz/sources/image/avi/tiio_avi.h @@ -24,9 +24,9 @@ class TLevelWriterAvi : public TLevelWriter { public: TLevelWriterAvi(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterAvi(); - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; - void saveSoundTrack(TSoundTrack *st); + void saveSoundTrack(TSoundTrack *st) override; void save(const TImageP &image, int frameIndex); static TLevelWriter *create(const TFilePath &f, TPropertyGroup *winfo) { return new TLevelWriterAvi(f, winfo); @@ -71,12 +71,12 @@ class TLevelReaderAvi : public TLevelReader { public: TLevelReaderAvi(const TFilePath &path); ~TLevelReaderAvi(); - TImageReaderP getFrameReader(TFrameId fid); + TImageReaderP getFrameReader(TFrameId fid) override; static TLevelReader *create(const TFilePath &f) { return new TLevelReaderAvi(f); } - TLevelP loadInfo(); + TLevelP loadInfo() override; TImageP load(int frameIndex); TDimension getSize(); TThread::Mutex m_mutex; diff --git a/toonz/sources/image/mesh/tiio_mesh.cpp b/toonz/sources/image/mesh/tiio_mesh.cpp index 35fd4b4..843fb02 100644 --- a/toonz/sources/image/mesh/tiio_mesh.cpp +++ b/toonz/sources/image/mesh/tiio_mesh.cpp @@ -21,7 +21,7 @@ public: ~TImageWriterMesh() {} public: - void save(const TImageP &); + void save(const TImageP &) override; private: TImageWriterMesh(const TImageWriterMesh &); @@ -84,8 +84,8 @@ public: TImageReaderMesh(const TFilePath &fp, const TFrameId &frameId); ~TImageReaderMesh() {} - const TImageInfo *getImageInfo() const; - TImageP load(); + const TImageInfo *getImageInfo() const override; + TImageP load() override; private: //! Reference to level reader diff --git a/toonz/sources/image/mesh/tiio_mesh.h b/toonz/sources/image/mesh/tiio_mesh.h index 5aa6e97..3fd995a 100644 --- a/toonz/sources/image/mesh/tiio_mesh.h +++ b/toonz/sources/image/mesh/tiio_mesh.h @@ -14,7 +14,7 @@ public: TLevelWriterMesh(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterMesh(); - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; public: static TLevelWriter *create(const TFilePath &f, TPropertyGroup *winfo) { @@ -36,7 +36,7 @@ public: TLevelReaderMesh(const TFilePath &path); ~TLevelReaderMesh(); - TImageReaderP getFrameReader(TFrameId fid); + TImageReaderP getFrameReader(TFrameId fid) override; public: static TLevelReader *create(const TFilePath &f) { diff --git a/toonz/sources/image/mov/tiio_mov.h b/toonz/sources/image/mov/tiio_mov.h index bf20cff..358d232 100644 --- a/toonz/sources/image/mov/tiio_mov.h +++ b/toonz/sources/image/mov/tiio_mov.h @@ -95,10 +95,10 @@ public: TLevelWriterMov(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterMov(); - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; void save(const TImageP &img, int frameIndex); - void saveSoundTrack(TSoundTrack *st); + void saveSoundTrack(TSoundTrack *st) override; public: static TLevelWriter *create(const TFilePath &f, TPropertyGroup *winfo) { @@ -130,20 +130,20 @@ public: TLevelReaderMov(const TFilePath &path); ~TLevelReaderMov(); - TImageReaderP getFrameReader(TFrameId fid); - TLevelP loadInfo(); + TImageReaderP getFrameReader(TFrameId fid) override; + TLevelP loadInfo() override; void load(const TRasterP &rasP, int frameIndex, const TPoint &pos, int shrinkX = 1, int shrinkY = 1); void timecode(int frame, UCHAR &hh, UCHAR &mm, UCHAR &ss, UCHAR &ff); void loadedTimecode(UCHAR &hh, UCHAR &mm, UCHAR &ss, UCHAR &ff); - const TImageInfo *getImageInfo(TFrameId fid) { return m_info; } - const TImageInfo *getImageInfo() { return m_info; } + const TImageInfo *getImageInfo(TFrameId fid) override { return m_info; } + const TImageInfo *getImageInfo() override { return m_info; } void setYMirror(bool enabled); void setLoadTimecode(bool enabled); - void enableRandomAccessRead(bool enable); + void enableRandomAccessRead(bool enable) override; TDimension getSize() const { return TDimension(m_lx, m_ly); } TRect getBBox() const { return TRect(0, 0, m_lx - 1, m_ly - 1); } diff --git a/toonz/sources/image/mov/tiio_movW.cpp b/toonz/sources/image/mov/tiio_movW.cpp index fe28aa4..0e0dc22 100644 --- a/toonz/sources/image/mov/tiio_movW.cpp +++ b/toonz/sources/image/mov/tiio_movW.cpp @@ -217,7 +217,7 @@ class TImageWriterMov : public TImageWriter { public: TImageWriterMov(const TFilePath &, int frameIndex, TLevelWriterMov *); ~TImageWriterMov() { m_lwm->release(); } - bool is64bitOutputSupported() { return false; } + bool is64bitOutputSupported() override { return false; } private: // not implemented @@ -225,7 +225,7 @@ private: TImageWriterMov &operator=(const TImageWriterMov &src); public: - void save(const TImageP &); + void save(const TImageP &) override; int m_frameIndex; private: @@ -1012,14 +1012,14 @@ public: TImageInfo *); ~TImageReaderMov() { m_lrm->release(); } - TImageP load(); + TImageP load() override; void load(const TRasterP &rasP, const TPoint &pos = TPoint(0, 0), int shrinkX = 1, int shrinkY = 1); TDimension getSize() const { return m_lrm->getSize(); } TRect getBBox() const { return m_lrm->getBBox(); } - const TImageInfo *getImageInfo() const { return m_info; } + const TImageInfo *getImageInfo() const override { return m_info; } private: // Not copyable diff --git a/toonz/sources/image/pli/tiio_pli.cpp b/toonz/sources/image/pli/tiio_pli.cpp index 41279ec..732a8ef 100644 --- a/toonz/sources/image/pli/tiio_pli.cpp +++ b/toonz/sources/image/pli/tiio_pli.cpp @@ -30,27 +30,27 @@ class PliOuputStream : public TOutputStreamInterface { public: PliOuputStream(std::vector *stream) : m_stream(stream) {} - TOutputStreamInterface &operator<<(double x) { + TOutputStreamInterface &operator<<(double x) override { m_stream->push_back(TStyleParam(x)); return *this; } - TOutputStreamInterface &operator<<(int x) { + TOutputStreamInterface &operator<<(int x) override { m_stream->push_back(TStyleParam(x)); return *this; } - TOutputStreamInterface &operator<<(std::string x) { + TOutputStreamInterface &operator<<(std::string x) override { m_stream->push_back(TStyleParam(x)); return *this; } - TOutputStreamInterface &operator<<(USHORT x) { + TOutputStreamInterface &operator<<(USHORT x) override { m_stream->push_back(TStyleParam(x)); return *this; } - TOutputStreamInterface &operator<<(BYTE x) { + TOutputStreamInterface &operator<<(BYTE x) override { m_stream->push_back(TStyleParam(x)); return *this; } - TOutputStreamInterface &operator<<(const TRaster32P &x) { + TOutputStreamInterface &operator<<(const TRaster32P &x) override { m_stream->push_back(TStyleParam(x)); return *this; } @@ -68,17 +68,17 @@ public: int minorVersion) : m_stream(stream), m_version(majorVersion, minorVersion), m_count(0) {} - TInputStreamInterface &operator>>(double &x) { + TInputStreamInterface &operator>>(double &x) override { assert((*m_stream)[m_count].m_type == TStyleParam::SP_DOUBLE); x = (*m_stream)[m_count++].m_numericVal; return *this; } - TInputStreamInterface &operator>>(int &x) { + TInputStreamInterface &operator>>(int &x) override { assert((*m_stream)[m_count].m_type == TStyleParam::SP_INT); x = (int)(*m_stream)[m_count++].m_numericVal; return *this; } - TInputStreamInterface &operator>>(std::string &x) { + TInputStreamInterface &operator>>(std::string &x) override { if ((*m_stream)[m_count].m_type == TStyleParam::SP_INT) x = std::to_string(static_cast((*m_stream)[m_count++].m_numericVal)); else { @@ -87,23 +87,23 @@ public: } return *this; } - TInputStreamInterface &operator>>(BYTE &x) { + TInputStreamInterface &operator>>(BYTE &x) override { assert((*m_stream)[m_count].m_type == TStyleParam::SP_BYTE); x = (BYTE)(*m_stream)[m_count++].m_numericVal; return *this; } - TInputStreamInterface &operator>>(USHORT &x) { + TInputStreamInterface &operator>>(USHORT &x) override { assert((*m_stream)[m_count].m_type == TStyleParam::SP_USHORT); x = (USHORT)(*m_stream)[m_count++].m_numericVal; return *this; } - TInputStreamInterface &operator>>(TRaster32P &x) { + TInputStreamInterface &operator>>(TRaster32P &x) override { assert((*m_stream)[m_count].m_type == TStyleParam::SP_RASTER); x = (*m_stream)[m_count++].m_r; return *this; } - VersionNumber versionNumber() const { return m_version; } + VersionNumber versionNumber() const override { return m_version; } }; //--------------------------------------------------------------------------- @@ -254,7 +254,7 @@ private: TImageWriterPli &operator=(const TImageWriterPli &src); public: - void save(const TImageP &); + void save(const TImageP &) override; TFrameId m_frameId; private: diff --git a/toonz/sources/image/pli/tiio_pli.h b/toonz/sources/image/pli/tiio_pli.h index bccec25..f21cf58 100644 --- a/toonz/sources/image/pli/tiio_pli.h +++ b/toonz/sources/image/pli/tiio_pli.h @@ -46,7 +46,7 @@ class TLevelWriterPli : public TLevelWriter { public: TLevelWriterPli(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterPli(); - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; friend class TImageWriterPli; @@ -76,15 +76,15 @@ public: /*! Return info about current pli */ - TLevelP loadInfo(); - void doReadPalette(bool doReadIt); + TLevelP loadInfo() override; + void doReadPalette(bool doReadIt) override; /*! Return an image with Reader information */ - TImageReaderP getFrameReader(TFrameId fid); + TImageReaderP getFrameReader(TFrameId fid) override; - QString getCreator(); + QString getCreator() override; friend class TImageReaderPli; private: @@ -134,7 +134,7 @@ public: TLevelReaderPli *); ~TImageReaderPli() {} - TImageP load(); + TImageP load() override; TImageP doLoad(); TDimension getSize() const; diff --git a/toonz/sources/image/png/tiio_png.cpp b/toonz/sources/image/png/tiio_png.cpp index 7ca6be4..473651b 100644 --- a/toonz/sources/image/png/tiio_png.cpp +++ b/toonz/sources/image/png/tiio_png.cpp @@ -80,8 +80,9 @@ public: } } - virtual bool read16BitIsEnabled() const { return m_is16bitEnabled; } - virtual void enable16BitRead(bool enabled) { m_is16bitEnabled = enabled; } + bool read16BitIsEnabled() const override { return m_is16bitEnabled; } + + void enable16BitRead(bool enabled) override { m_is16bitEnabled = enabled; } void readLineInterlace(char *buffer) { readLineInterlace(buffer, 0, m_info.m_lx - 1, 1); @@ -90,7 +91,7 @@ public: readLineInterlace(buffer, 0, m_info.m_lx - 1, 1); } - void open(FILE *file) { + void open(FILE *file) override { try { m_chan = file; } catch (...) { @@ -206,7 +207,7 @@ public: } } - void readLine(char *buffer, int x0, int x1, int shrink) { + void readLine(char *buffer, int x0, int x1, int shrink) override { int ly = m_info.m_ly; if (!m_tempBuffer) { int lx = m_info.m_lx; @@ -248,7 +249,7 @@ public: } } - void readLine(short *buffer, int x0, int x1, int shrink) { + void readLine(short *buffer, int x0, int x1, int shrink) override { int ly = m_info.m_ly; if (!m_tempBuffer) { int lx = m_info.m_lx; @@ -290,7 +291,7 @@ public: } } - int skipLines(int lineCount) { + int skipLines(int lineCount) override { for (int i = 0; i < lineCount; i++) { if (m_interlace_type == 1 && m_info.m_lx > 4) // pezza. Studiare il codice @@ -308,7 +309,7 @@ public: return lineCount; } - Tiio::RowOrder getRowOrder() const { return Tiio::TOP2BOTTOM; } + Tiio::RowOrder getRowOrder() const override { return Tiio::TOP2BOTTOM; } void writeRow(char *buffer) { if (m_color_type == PNG_COLOR_TYPE_RGB_ALPHA || @@ -717,14 +718,15 @@ public: PngWriter(); ~PngWriter(); - void open(FILE *file, const TImageInfo &info); - void writeLine(char *buffer); - virtual void writeLine(short *buffer); + void open(FILE *file, const TImageInfo &info) override; + void writeLine(char *buffer) override; + void writeLine(short *buffer) override; + + Tiio::RowOrder getRowOrder() const override { return Tiio::TOP2BOTTOM; } - Tiio::RowOrder getRowOrder() const { return Tiio::TOP2BOTTOM; } + void flush() override; - void flush(); - virtual bool write64bitSupported() const { return true; } + bool write64bitSupported() const override { return true; } }; //--------------------------------------------------------- diff --git a/toonz/sources/image/psd/tiio_psd.cpp b/toonz/sources/image/psd/tiio_psd.cpp index e0c9e6b..08e2c51 100644 --- a/toonz/sources/image/psd/tiio_psd.cpp +++ b/toonz/sources/image/psd/tiio_psd.cpp @@ -114,9 +114,9 @@ private: TImageReaderLayerPsd &operator=(const TImageReaderLayerPsd &src); public: - TImageP load(); + TImageP load() override; - const TImageInfo *getImageInfo() const { return m_info; } + const TImageInfo *getImageInfo() const override { return m_info; } private: TPSDReader *m_psdreader; @@ -164,7 +164,7 @@ private: public: // not implemented - void save(const TImageP &); + void save(const TImageP &) override; private: TLevelWriterPsd *m_lwm; diff --git a/toonz/sources/image/psd/tiio_psd.h b/toonz/sources/image/psd/tiio_psd.h index dff6b8b..ff2b650 100644 --- a/toonz/sources/image/psd/tiio_psd.h +++ b/toonz/sources/image/psd/tiio_psd.h @@ -10,11 +10,11 @@ class TLevelReaderPsd : public TLevelReader { public: TLevelReaderPsd(const TFilePath &path); ~TLevelReaderPsd(); - TImageReaderP getFrameReader(TFrameId fid); - TLevelP loadInfo(); + TImageReaderP getFrameReader(TFrameId fid) override; + TLevelP loadInfo() override; - const TImageInfo *getImageInfo(TFrameId fid) { return m_info; } - const TImageInfo *getImageInfo() { return m_info; } + const TImageInfo *getImageInfo(TFrameId fid) override { return m_info; } + const TImageInfo *getImageInfo() override { return m_info; } void load(TRasterImageP &rasP, int shrinkX = 1, int shrinkY = 1, TRect region = TRect()); @@ -40,7 +40,7 @@ class TLevelWriterPsd : public TLevelWriter { public: TLevelWriterPsd(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterPsd(); - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; void save(const TImageP &img, int layerId); diff --git a/toonz/sources/image/sgi/filesgi.cpp b/toonz/sources/image/sgi/filesgi.cpp index 9b534a8..1e31bcc 100644 --- a/toonz/sources/image/sgi/filesgi.cpp +++ b/toonz/sources/image/sgi/filesgi.cpp @@ -851,14 +851,14 @@ public: ~SgiReader(); - void open(FILE *file); + void open(FILE *file) override; - TPropertyGroup *getProperties() const { return 0; } + TPropertyGroup *getProperties() const override { return 0; } - void readLine(char *buffer, int x0, int x1, int shrink); - void readLine(short *buffer, int x0, int x1, int shrink); + void readLine(char *buffer, int x0, int x1, int shrink) override; + void readLine(short *buffer, int x0, int x1, int shrink) override; - int skipLines(int lineCount); + int skipLines(int lineCount) override; }; //------------------------------------------------------------------- @@ -1061,17 +1061,17 @@ public: delete m_properties; } - void open(FILE *file, const TImageInfo &info); + void open(FILE *file, const TImageInfo &info) override; TPropertyGroup *getProperties() { return m_properties; } - void writeLine(char *buffer); - void writeLine(short *buffer); + void writeLine(char *buffer) override; + void writeLine(short *buffer) override; - void flush() {} + void flush() override {} // RowOrder getRowOrder() const { return BOTTOM2TOP; } - bool write64bitSupported() const { return true; } + bool write64bitSupported() const override { return true; } void setProperties(TPropertyGroup *properties); diff --git a/toonz/sources/image/svg/tiio_svg.cpp b/toonz/sources/image/svg/tiio_svg.cpp index 6de5226..d3c533b 100644 --- a/toonz/sources/image/svg/tiio_svg.cpp +++ b/toonz/sources/image/svg/tiio_svg.cpp @@ -1771,7 +1771,7 @@ private: TImageWriterSvg &operator=(const TImageWriterSvg &src); public: - void save(const TImageP &); + void save(const TImageP &) override; }; //----------------------------------------------------------------------------- @@ -1781,7 +1781,8 @@ class TImageReaderSvg : public TImageReader { public: TImageReaderSvg(const TFilePath &path, TLevelP &level) : TImageReader(path), m_level(level) {} - virtual TImageP load(); + + TImageP load() override; }; TImageWriterP TLevelWriterSvg::getFrameWriter(TFrameId fid) { diff --git a/toonz/sources/image/svg/tiio_svg.h b/toonz/sources/image/svg/tiio_svg.h index 5ab4372..cdde827 100644 --- a/toonz/sources/image/svg/tiio_svg.h +++ b/toonz/sources/image/svg/tiio_svg.h @@ -12,8 +12,8 @@ public: TLevelReaderSvg(const TFilePath &path); ~TLevelReaderSvg() {} - TLevelP loadInfo(); - TImageReaderP getFrameReader(TFrameId fid); + TLevelP loadInfo() override; + TImageReaderP getFrameReader(TFrameId fid) override; // QString getCreator(); // friend class TImageReaderPli; @@ -55,7 +55,7 @@ class TLevelWriterSvg : public TLevelWriter { public: TLevelWriterSvg(const TFilePath &path, TPropertyGroup *winfo); - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; friend class TImageWriterSvg; diff --git a/toonz/sources/image/tga/tiio_tga.cpp b/toonz/sources/image/tga/tiio_tga.cpp index 5690898..5377622 100644 --- a/toonz/sources/image/tga/tiio_tga.cpp +++ b/toonz/sources/image/tga/tiio_tga.cpp @@ -125,7 +125,7 @@ public: ~TgaReader(); - void open(FILE *file); + void open(FILE *file) override; int skipLines0(int count) { int lineSize = m_info.m_lx; @@ -179,15 +179,15 @@ public: return pix; } - Tiio::RowOrder getRowOrder() const { + Tiio::RowOrder getRowOrder() const override { return ((m_header.ImageDescriptor >> 5) & 1) == 0 ? Tiio::BOTTOM2TOP : Tiio::TOP2BOTTOM; } - void readLine(char *buffer, int x0, int x1, int shrink) { + void readLine(char *buffer, int x0, int x1, int shrink) override { (this->*m_readLineProc)(buffer, x0, x1, shrink); } - int skipLines(int count) { return (this->*m_skipLineProc)(count); } + int skipLines(int count) override { return (this->*m_skipLineProc)(count); } void readPalette(); void readNoLine(char *buffer, int x0, int x1, int shrink) {} @@ -531,7 +531,7 @@ class TgaWriter : public Tiio::Writer { public: TgaWriter() : m_chan(0), m_writeLineProc(&TgaWriter::writeNoLine) {} - void open(FILE *file, const TImageInfo &info) { + void open(FILE *file, const TImageInfo &info) override { m_info = info; try { m_chan = file; @@ -569,7 +569,7 @@ public: writeTgaHeader(m_header, m_chan); } - void flush() { fflush(m_chan); } + void flush() override { fflush(m_chan); } ~TgaWriter() { delete m_properties; } @@ -600,7 +600,7 @@ public: void writeLine24rle(char *buffer); void writeLine32rle(char *buffer); - void writeLine(char *buffer) { (this->*m_writeLineProc)(buffer); } + void writeLine(char *buffer) override { (this->*m_writeLineProc)(buffer); } }; //------------------------------------------------------------ diff --git a/toonz/sources/image/tif/tiio_tif.cpp b/toonz/sources/image/tif/tiio_tif.cpp index c3fa65e..4418c38 100644 --- a/toonz/sources/image/tif/tiio_tif.cpp +++ b/toonz/sources/image/tif/tiio_tif.cpp @@ -52,16 +52,17 @@ public: TifReader(bool isTzi); ~TifReader(); - void open(FILE *file); + void open(FILE *file) override; - Tiio::RowOrder getRowOrder() const { return m_rowOrder; } + Tiio::RowOrder getRowOrder() const override { return m_rowOrder; } - virtual bool read16BitIsEnabled() const { return false; } - virtual void enable16BitRead(bool enabled) { is16bitEnabled = enabled; } + bool read16BitIsEnabled() const override { return false; } - int skipLines(int lineCount); - void readLine(char *buffer, int x0, int x1, int shrink); - void readLine(short *buffer, int x0, int x1, int shrink); + void enable16BitRead(bool enabled) override { is16bitEnabled = enabled; } + + int skipLines(int lineCount) override; + void readLine(char *buffer, int x0, int x1, int shrink) override; + void readLine(short *buffer, int x0, int x1, int shrink) override; }; //------------------------------------------------------------ @@ -734,13 +735,13 @@ public: TifWriter(); ~TifWriter(); - void open(FILE *file, const TImageInfo &info); - void writeLine(char *buffer); - void writeLine(short *buffer); + void open(FILE *file, const TImageInfo &info) override; + void writeLine(char *buffer) override; + void writeLine(short *buffer) override; - void flush(); + void flush() override; - Tiio::RowOrder getRowOrder() const { return m_rowOrder; } + Tiio::RowOrder getRowOrder() const override { return m_rowOrder; } }; //------------------------------------------------------------ diff --git a/toonz/sources/image/tzl/tiio_tzl.cpp b/toonz/sources/image/tzl/tiio_tzl.cpp index e12d5c8..69de188 100644 --- a/toonz/sources/image/tzl/tiio_tzl.cpp +++ b/toonz/sources/image/tzl/tiio_tzl.cpp @@ -340,12 +340,12 @@ private: public: //! Indice del frame del livello TFrameId m_fid; - TImageP load(); - TImageP loadIcon() { + TImageP load() override; + TImageP loadIcon() override { m_isIcon = true; return load(); } - const TImageInfo *getImageInfo() const; + const TImageInfo *getImageInfo() const override; // TImageP doLoad(); @@ -389,7 +389,7 @@ private: TImageWriterTzl &operator=(const TImageWriterTzl &src); public: - void save(const TImageP &img) { m_lwp->save(img, m_fid); } + void save(const TImageP &img) override { m_lwp->save(img, m_fid); } }; /* //=================================================================== diff --git a/toonz/sources/image/tzl/tiio_tzl.h b/toonz/sources/image/tzl/tiio_tzl.h index 40ccb1e..10a2d71 100644 --- a/toonz/sources/image/tzl/tiio_tzl.h +++ b/toonz/sources/image/tzl/tiio_tzl.h @@ -64,22 +64,22 @@ public: TLevelWriterTzl(const TFilePath &path, TPropertyGroup *winfo); ~TLevelWriterTzl(); - void setPalette(TPalette *palette); + void setPalette(TPalette *palette) override; - void setOverwritePaletteFlag(bool overwrite) { + void setOverwritePaletteFlag(bool overwrite) override { m_overwritePaletteFlag = overwrite; } - void renumberFids(const std::map &renumberTable); + void renumberFids(const std::map &renumberTable) override; /*! Setta le dimensioni dell'iconcina nel file. ATTENZIONE: va necessariamente richiamata prima di renumberFids()! */ - void setIconSize(TDimension iconSize); - TDimension getIconSize() const { return m_iconSize; } + void setIconSize(TDimension iconSize) override; + TDimension getIconSize() const override { return m_iconSize; } - TImageWriterP getFrameWriter(TFrameId fid); + TImageWriterP getFrameWriter(TFrameId fid) override; // friend class TImageWriterTzl; // Save Image and icon @@ -138,18 +138,18 @@ class TLevelReaderTzl : public TLevelReader { public: TLevelReaderTzl(const TFilePath &path); ~TLevelReaderTzl(); - void doReadPalette(bool doReadIt); + void doReadPalette(bool doReadIt) override; /*! Return info about current tzl */ - TLevelP loadInfo(); + TLevelP loadInfo() override; /*! Return an image with Reader information */ - TImageReaderP getFrameReader(TFrameId fid); + TImageReaderP getFrameReader(TFrameId fid) override; - QString getCreator(); + QString getCreator() override; friend class TImageReaderTzl; /*! diff --git a/toonz/sources/image/tzp/tiio_plt.cpp b/toonz/sources/image/tzp/tiio_plt.cpp index 96f3186..33a0f18 100644 --- a/toonz/sources/image/tzp/tiio_plt.cpp +++ b/toonz/sources/image/tzp/tiio_plt.cpp @@ -40,15 +40,15 @@ public: PltReader(); ~PltReader(); - void open(FILE *file); + void open(FILE *file) override; - Tiio::RowOrder getRowOrder() const { return Tiio::BOTTOM2TOP; } + Tiio::RowOrder getRowOrder() const override { return Tiio::BOTTOM2TOP; } - int skipLines(int lineCount); - void readLine(char *buffer, int x0, int x1, int shrink); + int skipLines(int lineCount) override; + void readLine(char *buffer, int x0, int x1, int shrink) override; void getTzpPaletteColorNames( - std::map> &pltColorNames) const; + std::map> &pltColorNames) const override; }; //------------------------------------------------------------ diff --git a/toonz/sources/image/tzp/tiio_tzp.cpp b/toonz/sources/image/tzp/tiio_tzp.cpp index 8e792f9..61ba762 100644 --- a/toonz/sources/image/tzp/tiio_tzp.cpp +++ b/toonz/sources/image/tzp/tiio_tzp.cpp @@ -38,12 +38,12 @@ public: TzpReader(); ~TzpReader(); - void open(FILE *file); + void open(FILE *file) override; - Tiio::RowOrder getRowOrder() const { return Tiio::BOTTOM2TOP; } + Tiio::RowOrder getRowOrder() const override { return Tiio::BOTTOM2TOP; } - int skipLines(int lineCount); - void readLine(char *buffer, int x0, int x1, int shrink); + int skipLines(int lineCount) override; + void readLine(char *buffer, int x0, int x1, int shrink) override; }; //------------------------------------------------------------ diff --git a/toonz/sources/include/ext/CornerDeformation.h b/toonz/sources/include/ext/CornerDeformation.h index f80346d..e1cbd3d 100644 --- a/toonz/sources/include/ext/CornerDeformation.h +++ b/toonz/sources/include/ext/CornerDeformation.h @@ -32,13 +32,13 @@ class DVAPI CornerDeformation : public StrokeDeformationImpl { public: virtual ~CornerDeformation(); - bool check_(const ContextStatus *status); + bool check_(const ContextStatus *status) override; - bool findExtremes_(const ContextStatus *, Interval &); + bool findExtremes_(const ContextStatus *, Interval &) override; - double findActionLength(); + double findActionLength() override; - virtual void draw(Designer *); + void draw(Designer *) override; static CornerDeformation *instance(); }; diff --git a/toonz/sources/include/ext/LinearPotential.h b/toonz/sources/include/ext/LinearPotential.h index b72a5c6..81651c3 100644 --- a/toonz/sources/include/ext/LinearPotential.h +++ b/toonz/sources/include/ext/LinearPotential.h @@ -27,12 +27,12 @@ class DVAPI LinearPotential : public Potential { public: virtual ~LinearPotential(); - virtual double value_(double radiusToTest) const; + double value_(double radiusToTest) const override; - virtual void setParameters_(const TStroke *ref, double w, - double actionLength); + void setParameters_(const TStroke *ref, double w, + double actionLength) override; - Potential *clone(); + Potential *clone() override; private: double compute_shape(double) const; // funzione ausiliaria per diff --git a/toonz/sources/include/ext/NotSimmetricBezierPotential.h b/toonz/sources/include/ext/NotSimmetricBezierPotential.h index c352160..8e495b8 100644 --- a/toonz/sources/include/ext/NotSimmetricBezierPotential.h +++ b/toonz/sources/include/ext/NotSimmetricBezierPotential.h @@ -28,12 +28,12 @@ public: virtual ~NotSimmetricBezierPotential(); // chiama compute_value ma effettua un controllo del parametro - virtual double value_(double radiusToTest) const; + double value_(double radiusToTest) const override; - virtual void setParameters_(const TStroke *ref, double w, - double actionLength); + void setParameters_(const TStroke *ref, double w, + double actionLength) override; - Potential *clone(); + Potential *clone() override; private: double compute_shape(double) const; // funzione ausiliaria per diff --git a/toonz/sources/include/ext/NotSimmetricExpPotential.h b/toonz/sources/include/ext/NotSimmetricExpPotential.h index fe830d7..75b9532 100644 --- a/toonz/sources/include/ext/NotSimmetricExpPotential.h +++ b/toonz/sources/include/ext/NotSimmetricExpPotential.h @@ -51,10 +51,10 @@ public: virtual ~NotSimmetricExpPotential(); // chiama compute_value ma effettua un controllo del parametro - virtual double value_(double radiusToTest) const; + double value_(double radiusToTest) const override; - virtual void setParameters_(const TStroke *ref, double par, double al); - Potential *clone(); + void setParameters_(const TStroke *ref, double par, double al) override; + Potential *clone() override; private: double compute_shape(double) const; // funzione ausiliaria per diff --git a/toonz/sources/include/ext/OverallDesigner.h b/toonz/sources/include/ext/OverallDesigner.h index cb6fed0..2e71db4 100644 --- a/toonz/sources/include/ext/OverallDesigner.h +++ b/toonz/sources/include/ext/OverallDesigner.h @@ -32,11 +32,11 @@ class DVAPI OverallDesigner : public Designer { public: OverallDesigner(int x, int y); virtual ~OverallDesigner(); - void draw(SmoothDeformation *); - void draw(CornerDeformation *); - void draw(StraightCornerDeformation *); - void draw(StrokeDeformation *); - void draw(Selector *); + void draw(SmoothDeformation *) override; + void draw(CornerDeformation *) override; + void draw(StraightCornerDeformation *) override; + void draw(StrokeDeformation *) override; + void draw(Selector *) override; }; } #endif /* OVERALLDESIGNER_H */ diff --git a/toonz/sources/include/ext/SmoothDeformation.h b/toonz/sources/include/ext/SmoothDeformation.h index cd1b465..98d180c 100644 --- a/toonz/sources/include/ext/SmoothDeformation.h +++ b/toonz/sources/include/ext/SmoothDeformation.h @@ -31,12 +31,12 @@ class DVAPI SmoothDeformation : public StrokeDeformationImpl { public: virtual ~SmoothDeformation(); - bool check_(const ContextStatus *status); + bool check_(const ContextStatus *status) override; - bool findExtremes_(const ContextStatus *, Interval &); - double findActionLength(); + bool findExtremes_(const ContextStatus *, Interval &) override; + double findActionLength() override; - virtual void draw(Designer *); + void draw(Designer *) override; static SmoothDeformation *instance(); }; diff --git a/toonz/sources/include/ext/SquarePotential.h b/toonz/sources/include/ext/SquarePotential.h index d8fa6af..59af380 100644 --- a/toonz/sources/include/ext/SquarePotential.h +++ b/toonz/sources/include/ext/SquarePotential.h @@ -28,14 +28,14 @@ public: virtual ~SquarePotential(); // chiama compute_value ma effettua un controllo del parametro - virtual double value_(double radiusToTest) const; + double value_(double radiusToTest) const override; // chiama compute_value ma effettua un controllo del parametro - virtual void setParameters_(const TStroke *ref, double w, - double actionLength); + void setParameters_(const TStroke *ref, double w, + double actionLength) override; private: - Potential *clone(); + Potential *clone() override; double compute_shape(double) const; // funzione ausiliaria per // il calcolo del parametro diff --git a/toonz/sources/include/ext/StraightCornerDeformation.h b/toonz/sources/include/ext/StraightCornerDeformation.h index 6a656b3..39b898b 100644 --- a/toonz/sources/include/ext/StraightCornerDeformation.h +++ b/toonz/sources/include/ext/StraightCornerDeformation.h @@ -32,13 +32,13 @@ class DVAPI StraightCornerDeformation : public StrokeDeformationImpl { public: virtual ~StraightCornerDeformation(); - bool check_(const ContextStatus *status); + bool check_(const ContextStatus *status) override; - bool findExtremes_(const ContextStatus *, Interval &); + bool findExtremes_(const ContextStatus *, Interval &) override; - virtual void draw(Designer *); + void draw(Designer *) override; - double findActionLength(); + double findActionLength() override; static StraightCornerDeformation *instance(); }; diff --git a/toonz/sources/include/ext/StrokeParametricDeformer.h b/toonz/sources/include/ext/StrokeParametricDeformer.h index b3c2758..5b81e39 100644 --- a/toonz/sources/include/ext/StrokeParametricDeformer.h +++ b/toonz/sources/include/ext/StrokeParametricDeformer.h @@ -56,7 +56,7 @@ public: *@return displacement to apply to obtain deformation *@sa increaseControlPoints */ - TThickPoint getDisplacement(const TStroke &stroke, double w) const; + TThickPoint getDisplacement(const TStroke &stroke, double w) const override; /** *@brief Return displacement to use with function modifyControlPoints @@ -66,9 +66,9 @@ public: *@sa modifyControlPoints */ TThickPoint getDisplacementForControlPoint(const TStroke &stroke, - UINT n) const; + UINT n) const override; TThickPoint getDisplacementForControlPointLen(const TStroke &stroke, - double cpLen) const; + double cpLen) const override; /** *@brief This method compute the delta (gradient) referred to stroke in @@ -80,14 +80,14 @@ public: *@param w Stroke parameter *@return the @b gradient in w */ - double getDelta(const TStroke &stroke, double w) const; + double getDelta(const TStroke &stroke, double w) const override; /** *@brief Max diff of delta (This value indicates when it's necessary * to insert control point) *@return max displacement permitted */ - double getMaxDiff() const; + double getMaxDiff() const override; // just for debug const Potential *getPotential() const { return pot_; } diff --git a/toonz/sources/include/ext/plasticskeleton.h b/toonz/sources/include/ext/plasticskeleton.h index 7bf9b6e..cebd537 100644 --- a/toonz/sources/include/ext/plasticskeleton.h +++ b/toonz/sources/include/ext/plasticskeleton.h @@ -92,8 +92,8 @@ public: int parent() const { return m_parent; } - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; }; //************************************************************************************ @@ -143,8 +143,8 @@ public: bool setVertexName(int v, const QString &name); - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; // Utility functions diff --git a/toonz/sources/include/ext/plasticskeletondeformation.h b/toonz/sources/include/ext/plasticskeletondeformation.h index 02ca0c4..0c863bf 100644 --- a/toonz/sources/include/ext/plasticskeletondeformation.h +++ b/toonz/sources/include/ext/plasticskeletondeformation.h @@ -74,8 +74,8 @@ public: bool isFullKeyframe(double frame) const; void deleteKeyframe(double frame); - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; } SkVD; @@ -267,8 +267,8 @@ public: const TPointD &pos); protected: - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; private: friend class PlasticSkeleton; diff --git a/toonz/sources/include/ext/ttexturesstorage.h b/toonz/sources/include/ext/ttexturesstorage.h index f567a11..2ccb0d6 100644 --- a/toonz/sources/include/ext/ttexturesstorage.h +++ b/toonz/sources/include/ext/ttexturesstorage.h @@ -117,7 +117,7 @@ private: TTexturesStorage(); ~TTexturesStorage(); - void onDisplayListDestroyed(int dlSpaceId); + void onDisplayListDestroyed(int dlSpaceId) override; }; #endif // DRAWABLEMESHIMAGE_H diff --git a/toonz/sources/include/qtofflinegl.h b/toonz/sources/include/qtofflinegl.h index e42818d..94e14b5 100644 --- a/toonz/sources/include/qtofflinegl.h +++ b/toonz/sources/include/qtofflinegl.h @@ -24,14 +24,14 @@ public: ~QtOfflineGL(); void createContext(TDimension rasterSize, - std::shared_ptr shared); - void makeCurrent(); - void doneCurrent(); + std::shared_ptr shared) override; + void makeCurrent() override; + void doneCurrent() override; void saveCurrentContext(); void restoreCurrentContext(); - void getRaster(TRaster32P raster); + void getRaster(TRaster32P raster) override; }; //----------------------------------------------------------------------------- @@ -44,10 +44,10 @@ public: ~QtOfflineGLPBuffer(); void createContext(TDimension rasterSize); - void makeCurrent(); - void doneCurrent(); + void makeCurrent() override; + void doneCurrent() override; - void getRaster(TRaster32P raster); + void getRaster(TRaster32P raster) override; }; #endif diff --git a/toonz/sources/include/stdfx/shaderinterface.h b/toonz/sources/include/stdfx/shaderinterface.h index 354662f..4fe7b1e 100644 --- a/toonz/sources/include/stdfx/shaderinterface.h +++ b/toonz/sources/include/stdfx/shaderinterface.h @@ -129,8 +129,8 @@ public: // Sub-classes } protected: - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; }; union ParameterValue { @@ -165,8 +165,8 @@ public: // Sub-classes : m_type(type), m_name(name) {} protected: - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; }; class ShaderData : public TPersist { @@ -181,8 +181,8 @@ public: // Sub-classes bool isValid() const { return !m_path.isEmpty(); } protected: - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; }; public: // Public methods @@ -210,8 +210,8 @@ last modified date of the associated shader file. protected: void clear(); - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; private: PERSIST_DECLARATION(ShaderInterface) diff --git a/toonz/sources/include/t32bitsrv_wrap.h b/toonz/sources/include/t32bitsrv_wrap.h index c4d23a1..06dc74b 100644 --- a/toonz/sources/include/t32bitsrv_wrap.h +++ b/toonz/sources/include/t32bitsrv_wrap.h @@ -69,8 +69,8 @@ public: UCHAR *buffer() const { return m_buf; } - int read(const char *srcBuf, int len); - int write(char *dstBuf, int len); + int read(const char *srcBuf, int len) override; + int write(char *dstBuf, int len) override; }; //************************************************************************************* @@ -94,8 +94,8 @@ public: TRasterP raster() const { return m_ras; } - int read(const char *srcBuf, int len); - int write(char *dstBuf, int len); + int read(const char *srcBuf, int len) override; + int write(char *dstBuf, int len) override; }; } // namespace t32bitsrv diff --git a/toonz/sources/include/tbasefx.h b/toonz/sources/include/tbasefx.h index 9c95ce5..17355f7 100644 --- a/toonz/sources/include/tbasefx.h +++ b/toonz/sources/include/tbasefx.h @@ -24,7 +24,7 @@ //! Defines built-in Toonz fxs. class DVAPI TBaseRasterFx : public TRasterFx { public: - std::string getPluginId() const { return "Base"; } + std::string getPluginId() const override { return "Base"; } }; //************************************************************************ @@ -34,7 +34,7 @@ public: //! Defines built-in Toonz zerary fxs. class DVAPI TBaseZeraryFx : public TZeraryFx { public: - std::string getPluginId() const { return "Base"; } + std::string getPluginId() const override { return "Base"; } }; #endif // TBASEFX_INCLUDED diff --git a/toonz/sources/include/tcachedlevel.h b/toonz/sources/include/tcachedlevel.h index 3b1ffbf..f1f0932 100644 --- a/toonz/sources/include/tcachedlevel.h +++ b/toonz/sources/include/tcachedlevel.h @@ -191,20 +191,20 @@ public: TRamCachePersist(TRasterCodec *codec); ~TRamCachePersist(); - void setFrameSize(int lx, int ly, int bpp) {} + void setFrameSize(int lx, int ly, int bpp) override {} - void onInvalidate(); - void onInvalidate(int startFrame, int endFrame); + void onInvalidate() override; + void onInvalidate(int startFrame, int endFrame) override; - UCHAR *getRawData(int frame, TINT32 &size, int &lx, int &ly); + UCHAR *getRawData(int frame, TINT32 &size, int &lx, int &ly) override; - TUINT64 getUsedSpace(); + TUINT64 getUsedSpace() override; private: - TRasterP doGetRaster(int frame); - bool doGetRaster(int frame, TRaster32P &ras) const; + TRasterP doGetRaster(int frame) override; + bool doGetRaster(int frame, TRaster32P &ras) const override; - bool doPutRaster(int frame, const TRasterP &ras); + bool doPutRaster(int frame, const TRasterP &ras) override; private: class Imp; @@ -218,20 +218,20 @@ public: TDiskCachePersist(TRasterCodec *codec, const TFilePath &fullpath); ~TDiskCachePersist(); - void setFrameSize(int lx, int ly, int bpp); + void setFrameSize(int lx, int ly, int bpp) override; - void onInvalidate(); - void onInvalidate(int startFrame, int endFrame); + void onInvalidate() override; + void onInvalidate(int startFrame, int endFrame) override; - UCHAR *getRawData(int frame, TINT32 &size, int &lx, int &ly); + UCHAR *getRawData(int frame, TINT32 &size, int &lx, int &ly) override; - TUINT64 getUsedSpace(); + TUINT64 getUsedSpace() override; private: - TRasterP doGetRaster(int frame); - bool doGetRaster(int frame, TRaster32P &ras) const; + TRasterP doGetRaster(int frame) override; + bool doGetRaster(int frame, TRaster32P &ras) const override; - bool doPutRaster(int frame, const TRasterP &ras); + bool doPutRaster(int frame, const TRasterP &ras) override; private: class Imp; @@ -246,20 +246,20 @@ public: TDiskCachePersist2(TRasterCodec *codec, const TFilePath &fullpath); ~TDiskCachePersist2(); - void setFrameSize(int lx, int ly, int bpp); + void setFrameSize(int lx, int ly, int bpp) override; - void onInvalidate(); - void onInvalidate(int startFrame, int endFrame); + void onInvalidate() override; + void onInvalidate(int startFrame, int endFrame) override; - UCHAR *getRawData(int frame, TINT32 &size, int &lx, int &ly); + UCHAR *getRawData(int frame, TINT32 &size, int &lx, int &ly) override; - TUINT64 getUsedSpace(); + TUINT64 getUsedSpace() override; private: - TRasterP doGetRaster(int frame); - bool doGetRaster(int frame, TRaster32P &ras) const; + TRasterP doGetRaster(int frame) override; + bool doGetRaster(int frame, TRaster32P &ras) const override; - bool doPutRaster(int frame, const TRasterP &ras); + bool doPutRaster(int frame, const TRasterP &ras) override; private: class Imp; diff --git a/toonz/sources/include/tcli.h b/toonz/sources/include/tcli.h index 221d923..3a429f8 100644 --- a/toonz/sources/include/tcli.h +++ b/toonz/sources/include/tcli.h @@ -106,12 +106,13 @@ public: : UsageElement(name, help), m_switcher(false){}; ~Qualifier(){}; - virtual bool isSwitcher() const { return m_switcher; }; - virtual bool isHidden() const { return m_help == ""; }; + bool isSwitcher() const override { return m_switcher; }; + + bool isHidden() const override { return m_help == ""; }; operator bool() const { return isSelected(); }; virtual void fetch(int index, int &argc, char *argv[]) = 0; - virtual void print(std::ostream &out) const; + void print(std::ostream &out) const override; }; //--------------------------------------------------------- @@ -120,9 +121,9 @@ class DVAPI SimpleQualifier : public Qualifier { public: SimpleQualifier(std::string name, std::string help) : Qualifier(name, help){}; ~SimpleQualifier(){}; - void fetch(int index, int &argc, char *argv[]); - void dumpValue(std::ostream &out) const; - void resetValue(); + void fetch(int index, int &argc, char *argv[]) override; + void dumpValue(std::ostream &out) const override; + void resetValue() override; }; //--------------------------------------------------------- @@ -148,7 +149,7 @@ public: T getValue() const { return m_value; }; - virtual void fetch(int index, int &argc, char *argv[]) { + void fetch(int index, int &argc, char *argv[]) override { if (index + 1 >= argc) throw UsageError("missing argument"); if (!fromStr(m_value, argv[index + 1])) throw UsageError(m_name + ": bad argument type /" + @@ -157,12 +158,12 @@ public: argc -= 2; }; - void dumpValue(std::ostream &out) const { + void dumpValue(std::ostream &out) const override { out << m_name << " = " << (isSelected() ? "on" : "off") << " : " << m_value << "\n"; }; - void resetValue() { + void resetValue() override { m_value = T(); m_selected = false; }; @@ -176,7 +177,7 @@ public: ~Argument(){}; virtual void fetch(int index, int &argc, char *argv[]); virtual bool assign(char *) = 0; - bool isArgument() const { return true; }; + bool isArgument() const override { return true; }; }; //--------------------------------------------------------- @@ -191,11 +192,11 @@ public: operator T() const { return m_value; }; T getValue() const { return m_value; }; - bool assign(char *src) { return fromStr(m_value, src); }; - void dumpValue(std::ostream &out) const { + bool assign(char *src) override { return fromStr(m_value, src); }; + void dumpValue(std::ostream &out) const override { out << m_name << " = " << m_value << "\n"; }; - void resetValue() { + void resetValue() override { m_value = T(); m_selected = false; }; @@ -212,8 +213,9 @@ public: : Argument(name, help), m_count(0), m_index(0){}; ~MultiArgument(){}; int getCount() const { return m_count; }; - virtual void fetch(int index, int &argc, char *argv[]); - bool isMultiArgument() const { return true; }; + + void fetch(int index, int &argc, char *argv[]) override; + bool isMultiArgument() const override { return true; }; virtual void allocate(int count) = 0; }; @@ -230,23 +232,24 @@ public: assert(0 <= index && index < m_count); return m_values[index]; }; - virtual bool assign(char *src) { + + bool assign(char *src) override { assert(0 <= m_index && m_index < m_count); return fromStr(m_values[m_index], src); }; - void dumpValue(std::ostream &out) const { + void dumpValue(std::ostream &out) const override { out << m_name << " = {"; for (int i = 0; i < m_count; i++) out << " " << m_values[i]; out << "}" << std::endl; }; - void resetValue() { + void resetValue() override { m_values.reset(); m_count = m_index = 0; }; - void allocate(int count) { + void allocate(int count) override { m_values.reset((count > 0) ? new T[count] : nullptr); m_count = count; m_index = 0; @@ -353,9 +356,9 @@ public: int getFrom() const { return m_from; }; int getTo() const { return m_to; }; bool contains(int frame) const { return m_from <= frame && frame <= m_to; }; - void fetch(int index, int &argc, char *argv[]); - void dumpValue(std::ostream &out) const; - void resetValue(); + void fetch(int index, int &argc, char *argv[]) override; + void dumpValue(std::ostream &out) const override; + void resetValue() override; }; //========================================================= diff --git a/toonz/sources/include/tcolorfunctions.h b/toonz/sources/include/tcolorfunctions.h index b3c1996..a05a2a4 100644 --- a/toonz/sources/include/tcolorfunctions.h +++ b/toonz/sources/include/tcolorfunctions.h @@ -51,10 +51,10 @@ class DVAPI TGenericColorFunction : public TColorFunction { public: TGenericColorFunction(const double m[4], const double c[4]); - TColorFunction *clone() const { return new TGenericColorFunction(m_m, m_c); } + TColorFunction *clone() const override { return new TGenericColorFunction(m_m, m_c); } - TPixel32 operator()(const TPixel32 &color) const; - bool getParameters(Parameters &p) const; + TPixel32 operator()(const TPixel32 &color) const override; + bool getParameters(Parameters &p) const override; }; //----------------------------------------------------------------------------- @@ -68,10 +68,10 @@ public: TColorFader(const TPixel32 &color, double fade) : m_color(color), m_fade(fade) {} - TColorFunction *clone() const { return new TColorFader(m_color, m_fade); } + TColorFunction *clone() const override { return new TColorFader(m_color, m_fade); } - TPixel32 operator()(const TPixel32 &color) const; - bool getParameters(Parameters &p) const; + TPixel32 operator()(const TPixel32 &color) const override; + bool getParameters(Parameters &p) const override; }; //----------------------------------------------------------------------------- @@ -85,10 +85,10 @@ public: TOnionFader(const TPixel32 &color, double fade) : m_color(color), m_fade(fade) {} - TColorFunction *clone() const { return new TOnionFader(m_color, m_fade); } + TColorFunction *clone() const override { return new TOnionFader(m_color, m_fade); } - TPixel32 operator()(const TPixel32 &color) const; - bool getParameters(Parameters &p) const; + TPixel32 operator()(const TPixel32 &color) const override; + bool getParameters(Parameters &p) const override; }; class DVAPI TTranspFader : public TColorFunction { @@ -98,10 +98,10 @@ public: TTranspFader() : m_transp(0.5) {} TTranspFader(double transp) : m_transp(transp) {} - TColorFunction *clone() const { return new TTranspFader(m_transp); } + TColorFunction *clone() const override { return new TTranspFader(m_transp); } - TPixel32 operator()(const TPixel32 &color) const; - bool getParameters(Parameters &p) const; + TPixel32 operator()(const TPixel32 &color) const override; + bool getParameters(Parameters &p) const override; }; #endif diff --git a/toonz/sources/include/tdata.h b/toonz/sources/include/tdata.h index a16c78e..a4315d9 100644 --- a/toonz/sources/include/tdata.h +++ b/toonz/sources/include/tdata.h @@ -45,7 +45,7 @@ public: TTextData(TString text) : m_text(text) {} TTextData(std::string text); - TDataP clone() const; + TDataP clone() const override; TString getText() const { return m_text; } }; @@ -63,7 +63,7 @@ class DVAPI TFilePathListData : public TData { public: TFilePathListData(const std::vector &filePaths) : m_filePaths(filePaths) {} - TDataP clone() const; + TDataP clone() const override; int getFilePathCount() const { return m_filePaths.size(); } TFilePath getFilePath(int i) const; diff --git a/toonz/sources/include/tdoubleparam.h b/toonz/sources/include/tdoubleparam.h index 21b6acc..fb75f0b 100644 --- a/toonz/sources/include/tdoubleparam.h +++ b/toonz/sources/include/tdoubleparam.h @@ -64,8 +64,8 @@ public: TDoubleParam &operator=(const TDoubleParam &); - TParam *clone() const { return new TDoubleParam(*this); } - void copy(TParam *src); + TParam *clone() const override { return new TDoubleParam(*this); } + void copy(TParam *src) override; std::string getMeasureName() const; void setMeasureName(std::string name); @@ -110,8 +110,8 @@ public: bool isCycleEnabled() const; int getKeyframeCount() const; - void getKeyframes(std::set &frames) const; - double keyframeIndexToFrame(int index) const; + void getKeyframes(std::set &frames) const override; + double keyframeIndexToFrame(int index) const override; const TDoubleKeyframe &getKeyframe(int index) const; const TDoubleKeyframe &getKeyframeAt(double frame) const; @@ -127,33 +127,33 @@ public: //! create a keyframe in k.m_frame (if is needed) and assign k to it void setKeyframe(const TDoubleKeyframe &k); - bool isKeyframe(double frame) const; - bool hasKeyframes() const; - void deleteKeyframe(double frame); - void clearKeyframes(); + bool isKeyframe(double frame) const override; + bool hasKeyframes() const override; + void deleteKeyframe(double frame) override; + void clearKeyframes() override; int getClosestKeyframe(double frame) const; - int getNextKeyframe(double frame) const; - int getPrevKeyframe(double frame) const; + int getNextKeyframe(double frame) const override; + int getPrevKeyframe(double frame) const override; void assignKeyframe(double frame, const TParamP &src, double srcFrame, - bool changedOnly); + bool changedOnly) override; - bool isAnimatable() const { return true; } + bool isAnimatable() const override { return true; } - void addObserver(TParamObserver *observer); - void removeObserver(TParamObserver *observer); + void addObserver(TParamObserver *observer) override; + void removeObserver(TParamObserver *observer) override; const std::set &observers() const; //! no keyframes, default value not changed bool isDefault() const; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; std::string getStreamTag() const; - std::string getValueAlias(double frame, int precision); + std::string getValueAlias(double frame, int precision) override; }; //--------------------------------------------------------- diff --git a/toonz/sources/include/tdoubleparamrelayproperty.h b/toonz/sources/include/tdoubleparamrelayproperty.h index c7f0261..100e75b 100644 --- a/toonz/sources/include/tdoubleparamrelayproperty.h +++ b/toonz/sources/include/tdoubleparamrelayproperty.h @@ -44,8 +44,8 @@ public: TDoubleParamRelayProperty(const TDoubleParamRelayProperty &other); TDoubleParamRelayProperty &operator=(const TDoubleParamRelayProperty &other); - TProperty *clone() const; - std::string getValueAsString(); + TProperty *clone() const override; + std::string getValueAsString() override; void setParam(const TDoubleParamP ¶m); const TDoubleParamP &getParam() const { return m_param; } @@ -56,9 +56,9 @@ public: double frame() const { return m_frame; } double &frame() { return m_frame; } - void accept(TProperty::Visitor &v); + void accept(TProperty::Visitor &v) override; - void onChange(const TParamChange &); + void onChange(const TParamChange &) override; }; #endif // TDOUBLEPARAMRELAYPROPERTY_H diff --git a/toonz/sources/include/texternfx.h b/toonz/sources/include/texternfx.h index ba5995b..9cce758 100644 --- a/toonz/sources/include/texternfx.h +++ b/toonz/sources/include/texternfx.h @@ -56,12 +56,12 @@ public: void initialize(std::string name); - virtual TFx *clone(bool recursive = true) const; + TFx *clone(bool recursive = true) const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } void setExecutable(TFilePath fp, std::string args) { m_executablePath = fp; @@ -71,8 +71,8 @@ public: void addPort(std::string portName, std::string ext, bool isInput); // void addParam(string paramName, const TParamP ¶m); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; void setExternFxName(std::string name) { m_externFxName = name; } std::string getExternFxName() const { return m_externFxName; }; diff --git a/toonz/sources/include/tfarmtask.h b/toonz/sources/include/tfarmtask.h index 811b1f0..9c5a231 100644 --- a/toonz/sources/include/tfarmtask.h +++ b/toonz/sources/include/tfarmtask.h @@ -137,9 +137,9 @@ public: void parseCommandLine(QString commandLine); // TPersist - void loadData(TIStream &is); - void saveData(TOStream &os); - const TPersistDeclaration *getDeclaration() const; + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; + const TPersistDeclaration *getDeclaration() const override; }; //------------------------------------------------------------------------------ @@ -170,14 +170,14 @@ public: void addTask(TFarmTask *task); void removeTask(TFarmTask *task); - int getTaskCount() const; - TFarmTask *getTask(int index); + int getTaskCount() const override; + TFarmTask *getTask(int index) override; bool changeChunkSize(int chunksize); // TPersist - void loadData(TIStream &is); - void saveData(TOStream &os); - const TPersistDeclaration *getDeclaration() const; + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; + const TPersistDeclaration *getDeclaration() const override; private: class Imp; diff --git a/toonz/sources/include/tfx.h b/toonz/sources/include/tfx.h index 6983257..9f38810 100644 --- a/toonz/sources/include/tfx.h +++ b/toonz/sources/include/tfx.h @@ -89,9 +89,9 @@ public: } } - TFx *getFx() const { return m_fx; } + TFx *getFx() const override { return m_fx; } - void setFx(TFx *fx) { + void setFx(TFx *fx) override { if (m_fx) m_fx->removeOutputConnection(this); if (fx == 0) { @@ -459,7 +459,7 @@ public: static TFx *create(std::string name); // TParamObserver-related methods - void onChange(const TParamChange &c); + void onChange(const TParamChange &c) override; void addObserver(TFxObserver *); void removeObserver(TFxObserver *); @@ -469,8 +469,8 @@ public: void notify(const TFxParamAdded &change); void notify(const TFxParamRemoved &change); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; void loadPreset(TIStream &is); // solleva un eccezione se il preset non // corrisponde all'effetto @@ -529,7 +529,7 @@ template class TFxDeclarationT : public TFxDeclaration { public: TFxDeclarationT(const TFxInfo &info) : TFxDeclaration(info) {} - TPersist *create() const { return new T; } + TPersist *create() const override { return new T; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/include/tfxcachemanager.h b/toonz/sources/include/tfxcachemanager.h index 9334afc..f5f40fd 100644 --- a/toonz/sources/include/tfxcachemanager.h +++ b/toonz/sources/include/tfxcachemanager.h @@ -221,8 +221,8 @@ public: void add(const std::string &cacheId, TImageP img); void remove(const std::string &cacheId); - void onRenderStatusStart(int renderStatus); - void onRenderStatusEnd(int renderStatus); + void onRenderStatusStart(int renderStatus) override; + void onRenderStatusEnd(int renderStatus) override; // void install(TFxCacheManagerListener* listener); // void uninstall(TFxCacheManagerListener* listener); @@ -278,7 +278,7 @@ public: const TRenderSettings &rs, ResourceDeclaration *resData) = 0; - virtual void onRenderInstanceStart(unsigned long renderId) { + void onRenderInstanceStart(unsigned long renderId) override { assert(TFxCacheManager::instance()); TFxCacheManager::instance()->install(this); } diff --git a/toonz/sources/include/tgldisplaylistsmanager.h b/toonz/sources/include/tgldisplaylistsmanager.h index 50a15b1..a1db38d 100644 --- a/toonz/sources/include/tgldisplaylistsmanager.h +++ b/toonz/sources/include/tgldisplaylistsmanager.h @@ -64,8 +64,8 @@ public: TGLDisplayListsProxyT(Context *proxy) : m_proxy(proxy) {} ~TGLDisplayListsProxyT() { delete m_proxy; } - void makeCurrent() { m_proxy->makeCurrent(); } - void doneCurrent() { m_proxy->doneCurrent(); } + void makeCurrent() override { m_proxy->makeCurrent(); } + void doneCurrent() override { m_proxy->doneCurrent(); } }; //************************************************************************************************** diff --git a/toonz/sources/include/tgrammar.h b/toonz/sources/include/tgrammar.h index adef49a..172a4c7 100644 --- a/toonz/sources/include/tgrammar.h +++ b/toonz/sources/include/tgrammar.h @@ -114,9 +114,9 @@ public: NumberNode(Calculator *calc, double value) : CalculatorNode(calc), m_value(value) {} - double compute(double vars[3]) const { return m_value; } + double compute(double vars[3]) const override { return m_value; } - void accept(CalculatorNodeVisitor &visitor) {} + void accept(CalculatorNodeVisitor &visitor) override {} }; //------------------------------------------------------------------- @@ -128,9 +128,9 @@ public: VariableNode(Calculator *calc, int varIdx) : CalculatorNode(calc), m_varIdx(varIdx) {} - double compute(double vars[3]) const { return vars[m_varIdx]; } + double compute(double vars[3]) const override { return vars[m_varIdx]; } - void accept(CalculatorNodeVisitor &visitor) {} + void accept(CalculatorNodeVisitor &visitor) override {} }; //------------------------------------------------------------------- diff --git a/toonz/sources/include/tiio_jpg.h b/toonz/sources/include/tiio_jpg.h index ff2d49d..dbb46d9 100644 --- a/toonz/sources/include/tiio_jpg.h +++ b/toonz/sources/include/tiio_jpg.h @@ -37,12 +37,12 @@ public: JpgReader(); ~JpgReader(); - Tiio::RowOrder getRowOrder() const; + Tiio::RowOrder getRowOrder() const override; - void open(FILE *file); + void open(FILE *file) override; - void readLine(char *buffer, int x0, int x1, int shrink); - int skipLines(int lineCount); + void readLine(char *buffer, int x0, int x1, int shrink) override; + int skipLines(int lineCount) override; }; DVAPI Tiio::ReaderMaker makeJpgReader; diff --git a/toonz/sources/include/timage_io.h b/toonz/sources/include/timage_io.h index 843093a..ebf01e1 100644 --- a/toonz/sources/include/timage_io.h +++ b/toonz/sources/include/timage_io.h @@ -41,7 +41,7 @@ public: TImageException(const TFilePath &fp, const std::string &msg); ~TImageException() {} - TString getMessage() const; + TString getMessage() const override; TString getRawMessage() const { return TException::getMessage(); } const TFilePath &getFilePath() const { return m_fp; } }; diff --git a/toonz/sources/include/tipcmsg.h b/toonz/sources/include/tipcmsg.h index 8a7f2d2..0088e78 100644 --- a/toonz/sources/include/tipcmsg.h +++ b/toonz/sources/include/tipcmsg.h @@ -57,8 +57,8 @@ enum DefMsgEnum { template class DVAPI DefaultMessageParser : public MessageParser { public: - QString header() const; - void operator()(Message &msg); + QString header() const override; + void operator()(Message &msg) override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/include/tmacrofx.h b/toonz/sources/include/tmacrofx.h index c2ef825..4cb9a78 100644 --- a/toonz/sources/include/tmacrofx.h +++ b/toonz/sources/include/tmacrofx.h @@ -41,15 +41,15 @@ public: TMacroFx(); ~TMacroFx(); - TFx *clone(bool recursive = true) const; + TFx *clone(bool recursive = true) const override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - TFxTimeRegion getTimeRegion() const; + TFxTimeRegion getTimeRegion() const override; - std::string getPluginId() const; + std::string getPluginId() const override; void setRoot(TFx *root); TFx *getRoot() const; @@ -63,17 +63,17 @@ public: std::string getMacroFxType() const; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; - std::string getAlias(double frame, const TRenderSettings &info) const; + std::string getAlias(double frame, const TRenderSettings &info) const override; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; bool isEditing() { return m_isEditing; } void editMacro(bool edit) { m_isEditing = edit; } void compatibilityTranslatePort(int majorVersion, int minorVersion, - std::string &portName); + std::string &portName) override; private: // non implementati diff --git a/toonz/sources/include/tmathutil.h b/toonz/sources/include/tmathutil.h index c49723c..ca59dc9 100644 --- a/toonz/sources/include/tmathutil.h +++ b/toonz/sources/include/tmathutil.h @@ -34,7 +34,8 @@ class DVAPI TMathException : public TException { public: TMathException(std::string msg); virtual ~TMathException() {} - virtual TString getMessage() const { return m_msg; } + + TString getMessage() const override { return m_msg; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/include/tmeshimage.h b/toonz/sources/include/tmeshimage.h index b062b10..0332c15 100644 --- a/toonz/sources/include/tmeshimage.h +++ b/toonz/sources/include/tmeshimage.h @@ -133,8 +133,8 @@ public: TRectD getBBox() const; - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; }; //----------------------------------------------------------------------------- @@ -176,10 +176,10 @@ public: TMeshImage(const TMeshImage &other); TMeshImage &operator=(TMeshImage other); - TImage::Type getType() const { return TImage::MESH; } + TImage::Type getType() const override { return TImage::MESH; } - TRectD getBBox() const; - TImage *cloneImage() const; + TRectD getBBox() const override; + TImage *cloneImage() const override; void getDpi(double &dpix, double &dpiy) const; void setDpi(double dpix, double dpiy); diff --git a/toonz/sources/include/tnotanimatableparam.h b/toonz/sources/include/tnotanimatableparam.h index 48e9bd4..4a11861 100644 --- a/toonz/sources/include/tnotanimatableparam.h +++ b/toonz/sources/include/tnotanimatableparam.h @@ -62,9 +62,9 @@ public: TNotAnimatableParamChangeUndo(TParam *param, const T &oldValue, const T &newValue); ~TNotAnimatableParamChangeUndo(); - void undo() const; - void redo() const; - int getSize() const; + void undo() const override; + void redo() const override; + int getSize() const override; private: TParam *m_param; @@ -80,7 +80,8 @@ template class TNotAnimatableParamObserver : public TParamObserver { public: TNotAnimatableParamObserver() {} - virtual void onChange(const TParamChange &) = 0; + + void onChange(const TParamChange &) override = 0; void onChange(const TNotAnimatableParamChange &change) { onChange(static_cast(change)); } @@ -130,7 +131,7 @@ public: } void setDefaultValue(T value) { m_defaultValue = value; } - void copy(TParam *src) { + void copy(TParam *src) override { TNotAnimatableParam *p = dynamic_cast *>(src); if (!p) throw TException("invalid source for copy"); setName(src->getName()); @@ -140,7 +141,7 @@ public: void reset(bool undoing = false) { setValue(m_defaultValue, undoing); } - void addObserver(TParamObserver *observer) { + void addObserver(TParamObserver *observer) override { TNotAnimatableParamObserver *obs = dynamic_cast *>(observer); if (obs) @@ -148,7 +149,7 @@ public: else m_paramObservers.insert(observer); } - void removeObserver(TParamObserver *observer) { + void removeObserver(TParamObserver *observer) override { TNotAnimatableParamObserver *obs = dynamic_cast *>(observer); if (obs) @@ -157,20 +158,20 @@ public: m_paramObservers.erase(observer); } - bool isAnimatable() const { return false; } - bool isKeyframe(double) const { return false; } - void deleteKeyframe(double) {} - void clearKeyframes() {} - void assignKeyframe(double, const TSmartPointerT &, double, bool) {} + bool isAnimatable() const override { return false; } + bool isKeyframe(double) const override { return false; } + void deleteKeyframe(double) override {} + void clearKeyframes() override {} + void assignKeyframe(double, const TSmartPointerT &, double, bool) override {} - std::string getValueAlias(double, int) { + std::string getValueAlias(double, int) override { using namespace std; return to_string(getValue()); } - bool hasKeyframes() const { return 0; }; - void getKeyframes(std::set &) const {}; - int getNextKeyframe(double) const { return -1; }; - int getPrevKeyframe(double) const { return -1; }; + bool hasKeyframes() const override { return 0; }; + void getKeyframes(std::set &) const override {}; + int getNextKeyframe(double) const override { return -1; }; + int getPrevKeyframe(double) const override { return -1; }; }; //========================================================= @@ -197,9 +198,9 @@ public: , maxValue((std::numeric_limits::max)()) , m_isWheelEnabled(false) {} TIntParam(const TIntParam &src) : TNotAnimatableParam(src) {} - TParam *clone() const { return new TIntParam(*this); } - void loadData(TIStream &is); - void saveData(TOStream &os); + TParam *clone() const override { return new TIntParam(*this); } + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; void enableWheel(bool on); bool isWheelEnabled() const; @@ -228,10 +229,10 @@ public: TBoolParam(bool v = bool()) : TNotAnimatableParam(v) {} TBoolParam(const TBoolParam &src) : TNotAnimatableParam(src) {} - TParam *clone() const { return new TBoolParam(*this); } + TParam *clone() const override { return new TBoolParam(*this); } - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; }; DEFINE_PARAM_SMARTPOINTER(TBoolParam, bool) @@ -256,9 +257,9 @@ public: : TNotAnimatableParam(v) {} TFilePathParam(const TFilePathParam &src) : TNotAnimatableParam(src) {} - TParam *clone() const { return new TFilePathParam(*this); } - void loadData(TIStream &is); - void saveData(TOStream &os); + TParam *clone() const override { return new TFilePathParam(*this); } + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; }; DEFINE_PARAM_SMARTPOINTER(TFilePathParam, TFilePath) @@ -282,9 +283,9 @@ public: TStringParam(std::wstring v = L"") : TNotAnimatableParam(v) {} TStringParam(const TStringParam &src) : TNotAnimatableParam(src) {} - TParam *clone() const { return new TStringParam(*this); } - void loadData(TIStream &is); - void saveData(TOStream &os); + TParam *clone() const override { return new TStringParam(*this); } + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; }; DEFINE_PARAM_SMARTPOINTER(TStringParam, std::wstring) @@ -308,8 +309,8 @@ public: TEnumParam(const TEnumParam &src); ~TEnumParam(); - TParam *clone() const { return new TEnumParam(*this); } - void copy(TParam *src); + TParam *clone() const override { return new TEnumParam(*this); } + void copy(TParam *src) override; void setValue(int v, bool undoing = false); void setValue(const std::string &caption, bool undoing = false); @@ -320,8 +321,8 @@ public: void getItem(int i, int &item, std::string &caption) const; // TPersist methods - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; private: std::unique_ptr m_imp; @@ -366,7 +367,7 @@ public: : TNotAnimatableParam(v), m_min(0.), m_max(100.) {} TNADoubleParam(const TNADoubleParam &src) : TNotAnimatableParam(src) {} - TParam *clone() const { return new TNADoubleParam(*this); } + TParam *clone() const override { return new TNADoubleParam(*this); } void setValueRange(double min, double max) { m_min = min; m_max = max; @@ -382,8 +383,8 @@ public: return min < max; } - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; private: double m_min, m_max; diff --git a/toonz/sources/include/tools/levelselection.h b/toonz/sources/include/tools/levelselection.h index c989546..eec204c 100644 --- a/toonz/sources/include/tools/levelselection.h +++ b/toonz/sources/include/tools/levelselection.h @@ -68,8 +68,8 @@ public: FramesMode FRAMES_NONE or Filter EMPTY. It is user's responsibility to check whether nontrivial selections are empty or not. */ - bool isEmpty() const; //!< Returns whether the selection is empty. - void selectNone(); //!< Resets the selection to empty. This is functionally + bool isEmpty() const override; //!< Returns whether the selection is empty. + void selectNone() override; //!< Resets the selection to empty. This is functionally //! equivalent to operator=(LevelSelection()); FramesMode framesMode() const { return m_framesMode; } FramesMode &framesMode() //! Returns current frames selection mode. diff --git a/toonz/sources/include/tools/rasterselection.h b/toonz/sources/include/tools/rasterselection.h index 7ed865d..b0465f2 100644 --- a/toonz/sources/include/tools/rasterselection.h +++ b/toonz/sources/include/tools/rasterselection.h @@ -114,15 +114,15 @@ Can be different from getSelectionBound() after a free deform transformation. */ TRectD getSelectionBbox() const; void setSelectionBbox(const TRectD &rect); - void selectNone(); + void selectNone() override; //! Take a rect in world coordinates and put it in the selection. void select(const TRectD &rect); void select(TStroke &stroke); void selectAll(); - bool isEmpty() const; + bool isEmpty() const override; - void enableCommands(); + void enableCommands() override; bool isFloating() const; void transform(const TAffine &affine); diff --git a/toonz/sources/include/tools/screenpicker.h b/toonz/sources/include/tools/screenpicker.h index 6f8080f..52e2d4d 100644 --- a/toonz/sources/include/tools/screenpicker.h +++ b/toonz/sources/include/tools/screenpicker.h @@ -21,15 +21,15 @@ public: ScreenPicker(QWidget *parent = 0); protected: - void event(QWidget *widget, QEvent *e); + void event(QWidget *widget, QEvent *e) override; void mousePressEvent(QWidget *widget, QMouseEvent *me); void mouseMoveEvent(QWidget *widget, QMouseEvent *me); void mouseReleaseEvent(QWidget *widget, QMouseEvent *me); - void paintEvent(QWidget *widget, QPaintEvent *pe); + void paintEvent(QWidget *widget, QPaintEvent *pe) override; - bool acceptScreenEvents(const QRect &screenRect) const; + bool acceptScreenEvents(const QRect &screenRect) const override; public slots: diff --git a/toonz/sources/include/tools/strokeselection.h b/toonz/sources/include/tools/strokeselection.h index 1a2e7d2..fc8d0eb 100644 --- a/toonz/sources/include/tools/strokeselection.h +++ b/toonz/sources/include/tools/strokeselection.h @@ -57,12 +57,12 @@ public: const IndexesContainer &getSelection() const { return m_indexes; } IndexesContainer &getSelection() { return m_indexes; } - bool isEmpty() const { return m_indexes.empty(); } + bool isEmpty() const override { return m_indexes.empty(); } bool updateSelectionBBox() const { return m_updateSelectionBBox; } bool isSelected(int index) const { return (m_indexes.count(index) > 0); } void select(int index, bool on); void toggle(int index); - void selectNone() { m_indexes.clear(); } + void selectNone() override { m_indexes.clear(); } void setSceneHandle(TSceneHandle *tsh) { m_sceneHandle = tsh; } @@ -77,7 +77,7 @@ public: void removeEndpoints(); - void enableCommands(); + void enableCommands() override; private: TVectorImageP m_vi; //!< Selected vector image. diff --git a/toonz/sources/include/tools/toolutils.h b/toonz/sources/include/tools/toolutils.h index 515fcba..4950a15 100644 --- a/toonz/sources/include/tools/toolutils.h +++ b/toonz/sources/include/tools/toolutils.h @@ -172,7 +172,8 @@ public: ~TToolUndo(); virtual QString getToolName() { return QString("Tool"); } - virtual QString getHistoryString() { + + QString getHistoryString() override { return QObject::tr("%1 Level : %2 Frame : %3") .arg(getToolName()) .arg(QString::fromStdWString(m_level->getName())) @@ -194,10 +195,10 @@ public: const TPaletteP &oldPalette); // get tiles ownership ~TRasterUndo(); - int getSize() const; - void undo() const; + int getSize() const override; + void undo() const override; - virtual QString getToolName() { return QString("Raster Tool"); } + QString getToolName() override { return QString("Raster Tool"); } }; //================================================================================================ @@ -215,8 +216,8 @@ public: const TPaletteP &oldPalette); // get tiles ownership ~TFullColorRasterUndo(); - int getSize() const; - void undo() const; + int getSize() const override; + void undo() const override; private: std::vector paste(const TRasterImageP &ti, @@ -240,10 +241,10 @@ public: ~UndoModifyStroke(); - void onAdd(); - void undo() const; - void redo() const; - int getSize() const; + void onAdd() override; + void undo() const override; + void redo() const override; + int getSize() const override; }; //----------------------------------------------------------------------------- @@ -258,11 +259,11 @@ public: ~UndoModifyStrokeAndPaint(); - void onAdd(); - void undo() const; - int getSize() const; + void onAdd() override; + void undo() const override; + int getSize() const override; - QString getToolName() { return QObject::tr("Modify Stroke Tool"); } + QString getToolName() override { return QObject::tr("Modify Stroke Tool"); } }; //----------------------------------------------------------------------------- @@ -280,12 +281,12 @@ public: ~UndoModifyListStroke(); - void onAdd(); - void undo() const; - void redo() const; - int getSize() const; + void onAdd() override; + void undo() const override; + void redo() const override; + int getSize() const override; - QString getToolName() { return QObject::tr("Modify Stroke Tool"); } + QString getToolName() override { return QObject::tr("Modify Stroke Tool"); } }; //----------------------------------------------------------------------------- @@ -304,12 +305,12 @@ public: bool m_createdFrame, bool m_createdLevel, bool autogroup = false, bool autofill = false); ~UndoPencil(); - void undo() const; - void redo() const; - int getSize() const; + void undo() const override; + void redo() const override; + int getSize() const override; - QString getToolName() { return QString("Vector Brush Tool"); } - int getHistoryType() { return HistoryType::BrushTool; } + QString getToolName() override { return QString("Vector Brush Tool"); } + int getHistoryType() override { return HistoryType::BrushTool; } }; //----------------------------------------------------------------------------- @@ -328,14 +329,14 @@ public: bool doAntialias, bool createdFrame, bool createdLevel, std::string primitiveName); ~UndoRasterPencil(); - virtual void redo() const; - int getSize() const; + void redo() const override; + int getSize() const override; - QString getToolName() { + QString getToolName() override { return QString("Geometric Tool : %1") .arg(QString::fromStdString(m_primitiveName)); } - int getHistoryType() { return HistoryType::GeometricTool; } + int getHistoryType() override { return HistoryType::GeometricTool; } }; //----------------------------------------------------------------------------- @@ -351,10 +352,10 @@ public: TStroke *stroke, double opacity, bool doAntialias, bool createdFrame, bool createdLevel); ~UndoFullColorPencil(); - virtual void redo() const; - int getSize() const; - QString getToolName() { return QString("Geometric Tool"); } - int getHistoryType() { return HistoryType::GeometricTool; } + void redo() const override; + int getSize() const override; + QString getToolName() override { return QString("Geometric Tool"); } + int getHistoryType() override { return HistoryType::GeometricTool; } }; //----------------------------------------------------------------------------- @@ -371,12 +372,12 @@ class UndoPath : public TUndo { public: UndoPath(TStageObjectSpline *spline); ~UndoPath(); - void onAdd(); - void undo() const; - void redo() const; - int getSize() const; - QString getHistoryString() { return QObject::tr("Modify Spline"); } - int getHistoryType() { return HistoryType::ControlPointEditorTool; } + void onAdd() override; + void undo() const override; + void redo() const override; + int getSize() const override; + QString getHistoryString() override { return QObject::tr("Modify Spline"); } + int getHistoryType() override { return HistoryType::ControlPointEditorTool; } }; //----------------------------------------------------------------------------- @@ -395,23 +396,24 @@ public: UndoControlPointEditor(TXshSimpleLevel *level, const TFrameId &frameId); ~UndoControlPointEditor(); - void onAdd(); + void onAdd() override; void addOldStroke(int index, VIStroke *vs); void addNewStroke(int index, VIStroke *vs); void isStrokeDelete(bool isStrokeDelete) { m_isStrokeDelete = isStrokeDelete; } - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; - int getSize() const { + int getSize() const override { return sizeof(*this) + /*(m_oldFillInformation.capacity()+m_newFillInformation.capacity())*sizeof(TFilledRegionInf) +*/ 500; } - virtual QString getToolName() { return QString("Control Point Editor"); } - int getHistoryType() { return HistoryType::ControlPointEditorTool; } + + QString getToolName() override { return QString("Control Point Editor"); } + int getHistoryType() override { return HistoryType::ControlPointEditorTool; } }; //----------------------------------------------------------------------------- @@ -425,7 +427,7 @@ public: QAction *exec(const QPoint &p, QAction *action = 0); protected: - void mouseReleaseEvent(QMouseEvent *e); + void mouseReleaseEvent(QMouseEvent *e) override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/include/toonz/cleanupcolorstyles.h b/toonz/sources/include/toonz/cleanupcolorstyles.h index ccd0889..5e2440f 100644 --- a/toonz/sources/include/toonz/cleanupcolorstyles.h +++ b/toonz/sources/include/toonz/cleanupcolorstyles.h @@ -30,17 +30,17 @@ public: TCleanupStyle(const TCleanupStyle &); ~TCleanupStyle(); - void setMainColor(const TPixel32 &color); + void setMainColor(const TPixel32 &color) override; - int getColorParamCount() const; - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override; + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - int getParamCount() const { return 2; } - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + int getParamCount() const override { return 2; } + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; double getBrightness() const { return m_brightness; } double getContrast() const { return m_contrastEnable ? m_contrast : 100; } @@ -52,11 +52,11 @@ public: bool canUpdate() const { return m_canUpdate; } void setCanUpdate(bool state); - void makeIcon(const TDimension &size); + void makeIcon(const TDimension &size) override; protected: - void loadData(TInputStreamInterface &); - void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; private: // not implemented @@ -74,15 +74,15 @@ class DVAPI TColorCleanupStyle : public TCleanupStyle { public: TColorCleanupStyle(const TPixel32 &color = TPixel32::Black); - TColorStyle *clone() const; - QString getDescription() const; - int getTagId() const; + TColorStyle *clone() const override; + QString getDescription() const override; + int getTagId() const override; - int getParamCount() const { return 4; } - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + int getParamCount() const override { return 4; } + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; double getHRange() const { return m_hRange; } void setHRange(double hRange); @@ -91,8 +91,8 @@ public: void setLineWidth(double lineWidth); protected: - void loadData(TInputStreamInterface &); - void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; private: // not implemented @@ -107,15 +107,15 @@ class DVAPI TBlackCleanupStyle : public TCleanupStyle { public: TBlackCleanupStyle(const TPixel32 &color = TPixel32::Black); - TColorStyle *clone() const; - QString getDescription() const; - int getTagId() const; + TColorStyle *clone() const override; + QString getDescription() const override; + int getTagId() const override; - int getParamCount() const { return 4; } - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + int getParamCount() const override { return 4; } + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; double getColorThreshold() const { return m_colorThreshold; } void setColorThreshold(double t); @@ -123,8 +123,8 @@ public: void setWhiteThreshold(double t); protected: - void loadData(TInputStreamInterface &); - void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; private: // not implemented diff --git a/toonz/sources/include/toonz/imagestyles.h b/toonz/sources/include/toonz/imagestyles.h index 1fbe956..4528b66 100644 --- a/toonz/sources/include/toonz/imagestyles.h +++ b/toonz/sources/include/toonz/imagestyles.h @@ -92,10 +92,10 @@ private: TPixel32 m_averageColor; protected: - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; - virtual void loadData(TInputStreamInterface &); - virtual void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; public: // TTextureStyle(); @@ -105,69 +105,69 @@ public: ~TTextureStyle(); - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; - void getParamRange(int index, QStringList &enumItems) const; - bool getParamValue(TColorStyle::bool_tag, int index) const; - int getParamValue(TColorStyle::int_tag, int index) const; - TFilePath getParamValue(TColorStyle::TFilePath_tag, int index) const; + void getParamRange(int index, QStringList &enumItems) const override; + bool getParamValue(TColorStyle::bool_tag, int index) const override; + int getParamValue(TColorStyle::int_tag, int index) const override; + TFilePath getParamValue(TColorStyle::TFilePath_tag, int index) const override; bool isPattern() const { return m_params.m_isPattern; } static void fillCustomTextureIcon(const TRaster32P &r); //------------------------------------------------------------------- - void setParamValue(int index, const TFilePath &value); - void setParamValue(int index, double value); - void setParamValue(int index, bool value); - void setParamValue(int index, int value); + void setParamValue(int index, const TFilePath &value) override; + void setParamValue(int index, double value) override; + void setParamValue(int index, bool value) override; + void setParamValue(int index, int value) override; - int getColorParamCount() const; - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override; + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; - TColorStyle *clone() const; - QString getDescription() const; + TColorStyle *clone() const override; + QString getDescription() const override; - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_averageColor; } - void setMainColor(const TPixel32 &color) { m_params.m_patternColor = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_averageColor; } + void setMainColor(const TPixel32 &color) override { m_params.m_patternColor = color; } // void draw(const TVectorRenderData &rd, TStrokeOutline* outline) const; void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &outline) const; + TRegionOutline &outline) const override; // void drawRegion( const TVectorRenderData &rd, TRegionOutline &boundary ) // const; - void drawRegion(TFlash &flash, const TRegion *r) const; + void drawRegion(TFlash &flash, const TRegion *r) const override; void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *stroke) const; + const TStroke *stroke) const override; // void drawStroke(TFlash& flash, const TStroke* s) const; - TRasterStyleFx *getRasterStyleFx() { return this; } + TRasterStyleFx *getRasterStyleFx() override { return this; } - bool isRasterStyle() const { return true; } + bool isRasterStyle() const override { return true; } void computeOutline(const TStroke *stroke, TStrokeOutline &outline, - TOutlineUtil::OutlineParameter param) const; + TOutlineUtil::OutlineParameter param) const override; void setTexture(const TRasterP &color); TRasterP getTexture() const; - TPixel32 getAverageColor() const; + TPixel32 getAverageColor() const override; - int getTagId() const; + int getTagId() const override; // static TRaster32P loadTexture(const TFilePath &path); - void setFill(TFlash &flash) const; + void setFill(TFlash &flash) const override; - bool isPaintStyle() const { return true; } - bool isInkStyle() const { return true; } - bool inkFxNeedRGBMRaster() const { return true; } + bool isPaintStyle() const override { return true; } + bool isInkStyle() const override { return true; } + bool inkFxNeedRGBMRaster() const override { return true; } - bool compute(const Params ¶ms) const { + bool compute(const Params ¶ms) const override { return doCompute(params); } // faccio questo per compilare su mac! le virtuali pubbliche devono essere // inline diff --git a/toonz/sources/include/toonz/namebuilder.h b/toonz/sources/include/toonz/namebuilder.h index f9300df..0f04081 100644 --- a/toonz/sources/include/toonz/namebuilder.h +++ b/toonz/sources/include/toonz/namebuilder.h @@ -38,7 +38,7 @@ class DVAPI NameCreator : public NameBuilder { public: NameCreator() {} - std::wstring getNext(); + std::wstring getNext() override; }; //------------------------------------------------------------------- @@ -49,7 +49,7 @@ class DVAPI NameModifier : public NameBuilder { public: NameModifier(std::wstring name); - std::wstring getNext(); + std::wstring getNext() override; }; //------------------------------------------------------------------- diff --git a/toonz/sources/include/toonz/observer.h b/toonz/sources/include/toonz/observer.h index 6abc403..1e0a9b4 100644 --- a/toonz/sources/include/toonz/observer.h +++ b/toonz/sources/include/toonz/observer.h @@ -72,11 +72,11 @@ public: ~TObserverListT() {} typedef TChangeObserverT Observer; - void attach(TChangeObserver *observer) { + void attach(TChangeObserver *observer) override { if (Observer *o = dynamic_cast(observer)) m_observers.push_back(o); } - void detach(TChangeObserver *observer) { + void detach(TChangeObserver *observer) override { if (Observer *o = dynamic_cast(observer)) m_observers.erase(std::remove(m_observers.begin(), m_observers.end(), o), m_observers.end()); diff --git a/toonz/sources/include/toonz/plasticdeformerfx.h b/toonz/sources/include/toonz/plasticdeformerfx.h index 85fda8c..1e0521b 100644 --- a/toonz/sources/include/toonz/plasticdeformerfx.h +++ b/toonz/sources/include/toonz/plasticdeformerfx.h @@ -38,17 +38,17 @@ public: public: PlasticDeformerFx(); - TFx *clone(bool recursive = true) const; + TFx *clone(bool recursive = true) const override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; - std::string getAlias(double frame, const TRenderSettings &info) const; - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info); + std::string getAlias(double frame, const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &info); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; - std::string getPluginId() const { return std::string(); } + std::string getPluginId() const override { return std::string(); } private: void buildRenderSettings(double, TRenderSettings &); diff --git a/toonz/sources/include/toonz/sceneresources.h b/toonz/sources/include/toonz/sceneresources.h index 452886d..34f15ab 100644 --- a/toonz/sources/include/toonz/sceneresources.h +++ b/toonz/sources/include/toonz/sceneresources.h @@ -142,20 +142,20 @@ Constructs SceneLevel with \b ToonzScene \b scene and \b TXshPaletteLevel \b pl. /*! Save simple level in right path. */ - void save(); + void save() override; /*! Update simple level path. */ - void updatePath(); + void updatePath() override; /*! Set simple level path to old path. */ - void rollbackPath(); + void rollbackPath() override; - void accept(ResourceProcessor *processor) { processor->process(m_pl); } + void accept(ResourceProcessor *processor) override { processor->process(m_pl); } - bool isDirty(); - QString getResourceName(); + bool isDirty() override; + QString getResourceName() override; }; //============================================================================= @@ -186,20 +186,20 @@ Constructs SceneLevel with \b ToonzScene \b scene and \b TXshSimpleLevel \b sl. /*! Save simple level in right path. */ - void save(); + void save() override; /*! Update simple level path. */ - void updatePath(); + void updatePath() override; /*! Set simple level path to old path. */ - void rollbackPath(); + void rollbackPath() override; - void accept(ResourceProcessor *processor) { processor->process(m_sl); } + void accept(ResourceProcessor *processor) override { processor->process(m_sl); } - bool isDirty(); - QString getResourceName(); + bool isDirty() override; + QString getResourceName() override; }; //============================================================================= @@ -228,20 +228,20 @@ sl. /*! Save sound column in right path. */ - void save(); + void save() override; /*! Update sound track path. */ - void updatePath(); + void updatePath() override; /*! Set sound track path to old path. */ - void rollbackPath(); + void rollbackPath() override; - void accept(ResourceProcessor *processor) { processor->process(m_sl); } + void accept(ResourceProcessor *processor) override { processor->process(m_sl); } - bool isDirty() { return false; } - QString getResourceName() { return QString(); } + bool isDirty() override { return false; } + QString getResourceName() override { return QString(); } }; //============================================================================= @@ -336,11 +336,11 @@ public: TFilePath codePath(const TFilePath &oldCodedPath, const TFilePath &newActualPath); - void process(TXshSimpleLevel *sl); - void process(TXshPaletteLevel *sl); - void process(TXshSoundLevel *sl); + void process(TXshSimpleLevel *sl) override; + void process(TXshPaletteLevel *sl) override; + void process(TXshSoundLevel *sl) override; - bool aborted() const { return m_importStrategy.aborted(); } + bool aborted() const override { return m_importStrategy.aborted(); } static std::string extractPsdSuffix(TFilePath &path); static TFilePath buildPsd(const TFilePath &path, const std::string &suffix); @@ -373,9 +373,9 @@ public: int getCollectedResourceCount() const { return m_count; } - void process(TXshSimpleLevel *sl); - void process(TXshSoundLevel *sl); - void process(TXshPaletteLevel *pl); + void process(TXshSimpleLevel *sl) override; + void process(TXshSoundLevel *sl) override; + void process(TXshPaletteLevel *pl) override; }; #endif diff --git a/toonz/sources/include/toonz/stageobjectutil.h b/toonz/sources/include/toonz/stageobjectutil.h index 710f5a1..b7a1965 100644 --- a/toonz/sources/include/toonz/stageobjectutil.h +++ b/toonz/sources/include/toonz/stageobjectutil.h @@ -124,12 +124,12 @@ public: m_objectHandle = objectHandle; } - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; - int getSize() const; + int getSize() const override; - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Set Keyframe %1 at frame %2") .arg(QString::fromStdString(m_objId.toString())) .arg(m_frame + 1); @@ -168,12 +168,12 @@ public: m_objectHandle = objectHandle; } - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; - int getSize() const; + int getSize() const override; - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Remove Keyframe %1 at frame %2") .arg(QString::fromStdString(m_objId.toString())) .arg(m_frame); @@ -204,16 +204,16 @@ public: m_objectHandle = objectHandle; } - void undo() const; - void redo() const; - int getSize() const { return sizeof(*this); } + void undo() const override; + void redo() const override; + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Move Center %1 Frame %2") .arg(QString::fromStdString(m_pid.toString())) .arg(m_frame + 1); } - int getHistoryType() { return HistoryType::EditTool_Move; } + int getHistoryType() override { return HistoryType::EditTool_Move; } }; //============================================================================= @@ -233,12 +233,12 @@ public: m_objectHandle = objectHandle; } - void undo() const; - void redo() const; - int getSize() const { return sizeof(*this); } + void undo() const override; + void redo() const override; + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return m_before.getStringForHistory(); } - int getHistoryType() { return HistoryType::EditTool_Move; } + QString getHistoryString() override { return m_before.getStringForHistory(); } + int getHistoryType() override { return HistoryType::EditTool_Move; } }; //============================================================================= @@ -265,9 +265,9 @@ public: m_objectHandle = objectHandle; } - void undo() const; - void redo() const; - int getSize() const { return sizeof(*this); } + void undo() const override; + void redo() const override; + int getSize() const override { return sizeof(*this); } }; //============================================================================= diff --git a/toonz/sources/include/toonz/stagevisitor.h b/toonz/sources/include/toonz/stagevisitor.h index c0341b6..b01d57d 100644 --- a/toonz/sources/include/toonz/stagevisitor.h +++ b/toonz/sources/include/toonz/stagevisitor.h @@ -251,15 +251,15 @@ public: const TRect &rect, const ImagePainter::VisualSettings &vs, bool checkFlags); - void onImage(const Stage::Player &data); + void onImage(const Stage::Player &data) override; void onVectorImage(TVectorImage *vi, const Stage::Player &data); void onRasterImage(TRasterImage *ri, const Stage::Player &data); void onToonzImage(TToonzImage *ri, const Stage::Player &data); - void beginMask(); - void endMask(); - void enableMask(); - void disableMask(); + void beginMask() override; + void endMask() override; + void enableMask() override; + void disableMask() override; int getNodesCount(); void clearNodes(); @@ -289,11 +289,11 @@ public: void setDistance(double d); - void onImage(const Stage::Player &data); - void beginMask(); - void endMask(); - void enableMask(); - void disableMask(); + void onImage(const Stage::Player &data) override; + void beginMask() override; + void endMask() override; + void enableMask() override; + void disableMask() override; int getColumnIndex() const; void getColumnIndexes(std::vector &indexes) const; @@ -324,15 +324,15 @@ public: void setPhi(double phi) { m_phi = phi; } void setPaletteHasChanged(bool on) { m_paletteHasChanged = on; } - void onImage(const Stage::Player &data); + void onImage(const Stage::Player &data) override; void onVectorImage(TVectorImage *vi, const Stage::Player &data); void onRasterImage(TRasterImage *ri, const Stage::Player &data); void onToonzImage(TToonzImage *ti, const Stage::Player &data); - void beginMask(); - void endMask(); - void enableMask(); - void disableMask(); + void beginMask() override; + void endMask() override; + void enableMask() override; + void disableMask() override; double getMinZ() const { return m_minZ; } }; diff --git a/toonz/sources/include/toonz/tcolumnfx.h b/toonz/sources/include/toonz/tcolumnfx.h index e5690eb..9c5f306 100644 --- a/toonz/sources/include/toonz/tcolumnfx.h +++ b/toonz/sources/include/toonz/tcolumnfx.h @@ -52,7 +52,7 @@ public: virtual std::wstring getColumnId() const = 0; virtual TXshColumn *getXshColumn() const = 0; - int getReferenceColumnIndex() const { return getColumnIndex(); } + int getReferenceColumnIndex() const override { return getColumnIndex(); } }; //******************************************************************************************* @@ -70,7 +70,7 @@ public: TLevelColumnFx(); ~TLevelColumnFx(); - TFx *clone(bool recursive = true) const; + TFx *clone(bool recursive = true) const override; TPalette *getPalette(int frame) const; TFilePath getPalettePath(int frame) const; @@ -78,32 +78,32 @@ public: void setColumn(TXshLevelColumn *column); TXshLevelColumn *getColumn() const { return m_levelColumn; } - std::wstring getColumnName() const; - std::wstring getColumnId() const; - int getColumnIndex() const; - TXshColumn *getXshColumn() const; + std::wstring getColumnName() const override; + std::wstring getColumnId() const override; + int getColumnIndex() const override; + TXshColumn *getXshColumn() const override; - bool isCachable() const { return m_isCachable; } + bool isCachable() const override { return m_isCachable; } - bool canHandle(const TRenderSettings &info, double frame); - TAffine handledAffine(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; + TAffine handledAffine(const TRenderSettings &info, double frame) override; TAffine getDpiAff(int frame); - TFxTimeRegion getTimeRegion() const; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - std::string getAlias(double frame, const TRenderSettings &info) const; + TFxTimeRegion getTimeRegion() const override; + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + std::string getAlias(double frame, const TRenderSettings &info) const override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &info); - void compute(TFlash &flash, int frame); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + void compute(TFlash &flash, int frame) override; - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; - const TPersistDeclaration *getDeclaration() const; - std::string getPluginId() const; + const TPersistDeclaration *getDeclaration() const override; + std::string getPluginId() const override; private: void getImageInfo(TImageInfo &imageInfo, TXshSimpleLevel *sl, @@ -131,7 +131,7 @@ public: TPaletteColumnFx(); ~TPaletteColumnFx(); - TFx *clone(bool recursive = true) const; + TFx *clone(bool recursive = true) const override; TPalette *getPalette(int frame) const; TFilePath getPalettePath(int frame) const; @@ -139,25 +139,25 @@ public: void setColumn(TXshPaletteColumn *column) { m_paletteColumn = column; } TXshPaletteColumn *getColumn() const { return m_paletteColumn; } - std::wstring getColumnName() const; - std::wstring getColumnId() const; - int getColumnIndex() const; - TXshColumn *getXshColumn() const; + std::wstring getColumnName() const override; + std::wstring getColumnId() const override; + int getColumnIndex() const override; + TXshColumn *getXshColumn() const override; - bool isCachable() const { return false; } + bool isCachable() const override { return false; } - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; - TFxTimeRegion getTimeRegion() const; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - std::string getAlias(double frame, const TRenderSettings &info) const; + TFxTimeRegion getTimeRegion() const override; + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + std::string getAlias(double frame, const TRenderSettings &info) const override; TAffine getDpiAff(int frame); - void doCompute(TTile &tile, double frame, const TRenderSettings &); - void compute(TFlash &flash, int frame); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; + void compute(TFlash &flash, int frame) override; - const TPersistDeclaration *getDeclaration() const; - std::string getPluginId() const; + const TPersistDeclaration *getDeclaration() const override; + std::string getPluginId() const override; private: // not implemented @@ -183,24 +183,24 @@ public: void setColumn(TXshZeraryFxColumn *column); TXshZeraryFxColumn *getColumn() const { return m_zeraryFxColumn; } - std::wstring getColumnName() const; - std::wstring getColumnId() const; - int getColumnIndex() const; - TXshColumn *getXshColumn() const; + std::wstring getColumnName() const override; + std::wstring getColumnId() const override; + int getColumnIndex() const override; + TXshColumn *getXshColumn() const override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - TFxTimeRegion getTimeRegion() const; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - std::string getAlias(double frame, const TRenderSettings &info) const; + TFxTimeRegion getTimeRegion() const override; + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + std::string getAlias(double frame, const TRenderSettings &info) const override; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; - const TPersistDeclaration *getDeclaration() const; - std::string getPluginId() const; + const TPersistDeclaration *getDeclaration() const override; + std::string getPluginId() const override; private: // not implemented @@ -220,15 +220,15 @@ public: FxDag *getFxDag() const { return m_fxDag; } - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } - std::string getAlias(double frame, const TRenderSettings &info) const; + std::string getAlias(double frame, const TRenderSettings &info) const override; - void doCompute(TTile &tile, double frame, const TRenderSettings &); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - const TPersistDeclaration *getDeclaration() const; - std::string getPluginId() const; + const TPersistDeclaration *getDeclaration() const override; + std::string getPluginId() const override; private: friend class FxDag; @@ -249,14 +249,14 @@ class TOutputFx : public TRasterFx { public: TOutputFx(); - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - const TPersistDeclaration *getDeclaration() const; - std::string getPluginId() const; + const TPersistDeclaration *getDeclaration() const override; + std::string getPluginId() const override; private: // not implemented diff --git a/toonz/sources/include/toonz/tdistort.h b/toonz/sources/include/toonz/tdistort.h index c307a8a..575557e 100644 --- a/toonz/sources/include/toonz/tdistort.h +++ b/toonz/sources/include/toonz/tdistort.h @@ -121,9 +121,9 @@ public: const TPointD &p00d, const TPointD &p10d, const TPointD &p01d, const TPointD &p11d); - TPointD map(const TPointD &p) const; - int invMap(const TPointD &p, TPointD *results) const; - int maxInvCount() const { return 2; } + TPointD map(const TPointD &p) const override; + int invMap(const TPointD &p, TPointD *results) const override; + int maxInvCount() const override { return 2; } }; //------------------------------------------------------------------------------------------------ @@ -154,10 +154,10 @@ public: const TPointD &p01d, const TPointD &p11d); ~BilinearDistorter(); - TPointD map(const TPointD &p) const; - int invMap(const TPointD &p, TPointD *results) const; - int maxInvCount() const { return 2; } - TRectD invMap(const TRectD &rect) const; + TPointD map(const TPointD &p) const override; + int invMap(const TPointD &p, TPointD *results) const override; + int maxInvCount() const override { return 2; } + TRectD invMap(const TRectD &rect) const override; }; //================================================================================================ @@ -214,10 +214,10 @@ public: const TPerspect &getMatrix() const { return m_matrix; } - TPointD map(const TPointD &p) const; - int invMap(const TPointD &p, TPointD *results) const; - int maxInvCount() const { return 1; } - TRectD invMap(const TRectD &rect) const; + TPointD map(const TPointD &p) const override; + int invMap(const TPointD &p, TPointD *results) const override; + int maxInvCount() const override { return 1; } + TRectD invMap(const TRectD &rect) const override; private: //! Compute the matrix used to distort image. diff --git a/toonz/sources/include/toonz/tframehandle.h b/toonz/sources/include/toonz/tframehandle.h index 0e42813..259bc73 100644 --- a/toonz/sources/include/toonz/tframehandle.h +++ b/toonz/sources/include/toonz/tframehandle.h @@ -119,7 +119,7 @@ signals: void isPlayingStatusChanged(); protected: - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; }; #endif // TFRAMEHANDLE_H diff --git a/toonz/sources/include/toonz/tstageobject.h b/toonz/sources/include/toonz/tstageobject.h index 87d0fe5..4b3e131 100644 --- a/toonz/sources/include/toonz/tstageobject.h +++ b/toonz/sources/include/toonz/tstageobject.h @@ -570,7 +570,7 @@ private: void invalidate(LazyData &ld) const; void updateKeyframes(LazyData &ld) const; - void onChange(const class TParamChange &c); + void onChange(const class TParamChange &c) override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/include/toonz/tstageobjectspline.h b/toonz/sources/include/toonz/tstageobjectspline.h index de49372..2f995b1 100644 --- a/toonz/sources/include/toonz/tstageobjectspline.h +++ b/toonz/sources/include/toonz/tstageobjectspline.h @@ -73,8 +73,8 @@ Set spline stroke to \b stroke. bool isOpened() const { return m_isOpened; } void setIsOpened(bool value) { m_isOpened = value; } - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; std::string getIconId(); diff --git a/toonz/sources/include/toonz/tstageobjecttree.h b/toonz/sources/include/toonz/tstageobjecttree.h index 041c5a1..34b4eb5 100644 --- a/toonz/sources/include/toonz/tstageobjecttree.h +++ b/toonz/sources/include/toonz/tstageobjecttree.h @@ -141,7 +141,7 @@ TStageObjectId \b \e id. Retrieves object's data from a tagged data stream \b \e is. \sa saveData() */ - void loadData(TIStream &is); + void loadData(TIStream &is) override; /*! Saves object's data (name, center coords, etc ) to a tagged data stream \b \e os saved on a file. @@ -149,7 +149,7 @@ TStageObjectId \b \e id. their data. */ void saveData(TOStream &os, int occupiedColumnCount); - void saveData(TOStream &os){}; // not used + void saveData(TOStream &os) override {}; // not used /*! Returns the numbers of the objects in the tree. */ diff --git a/toonz/sources/include/toonz/ttileset.h b/toonz/sources/include/toonz/ttileset.h index 424bad2..4ff70c1 100644 --- a/toonz/sources/include/toonz/ttileset.h +++ b/toonz/sources/include/toonz/ttileset.h @@ -88,10 +88,10 @@ public: return "TileCM" + QString::number((unsigned long)this); } #else - QString id() const { return "TileCM" + QString::number((UINT)this); } + QString id() const override { return "TileCM" + QString::number((UINT)this); } #endif - Tile *clone() const; + Tile *clone() const override; void getRaster(TRasterCM32P &ras) const; @@ -107,12 +107,12 @@ public: // crea un tile estraendo rect*ras->getBounds() da ras. // Nota: se rect e' completamente fuori non fa nulla // Nota: clona il raster! - void add(const TRasterP &ras, TRect rect); + void add(const TRasterP &ras, TRect rect) override; const Tile *getTile(int index) const; Tile *editTile(int index) const; - TTileSetCM32 *clone() const; + TTileSetCM32 *clone() const override; }; //******************************************************************************** @@ -132,12 +132,12 @@ public: return "TTileSet32::Tile" + QString::number((unsigned long)this); } #else - QString id() const { + QString id() const override { return "TTileSet32::Tile" + QString::number((UINT)this); } #endif - Tile *clone() const; + Tile *clone() const override; void getRaster(TRasterP &ras) const; @@ -153,11 +153,11 @@ public: // crea un tile estraendo rect*ras->getBounds() da ras. // Nota: se rect e' completamente fuori non fa nulla // Nota: clona il raster! - void add(const TRasterP &ras, TRect rect); + void add(const TRasterP &ras, TRect rect) override; const Tile *getTile(int index) const; - TTileSetFullColor *clone() const; + TTileSetFullColor *clone() const override; }; #endif diff --git a/toonz/sources/include/toonz/txshchildlevel.h b/toonz/sources/include/toonz/txshchildlevel.h index b19e025..f88b92b 100644 --- a/toonz/sources/include/toonz/txshchildlevel.h +++ b/toonz/sources/include/toonz/txshchildlevel.h @@ -57,7 +57,7 @@ Destroys the TXshChildLevel object. /*! Return the \b TXshChildLevel child level. */ - TXshChildLevel *getChildLevel() { return this; } + TXshChildLevel *getChildLevel() override { return this; } /*! Return the level \b TXsheet. \sa setXsheet() @@ -69,24 +69,24 @@ Set the level \b TXsheet to \b xsheet. */ void setXsheet(TXsheet *xsheet); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; - void load() {} - void save() {} + void load() override {} + void save() override {} /*! Override. Set level scene to \b scene. */ - void setScene(ToonzScene *scene); + void setScene(ToonzScene *scene) override; /*! Return the frame count. */ - int getFrameCount() const; + int getFrameCount() const override; /*! Set the vector \b fids to the frameId of level. */ - void getFids(std::vector &fids) const; + void getFids(std::vector &fids) const override; private: // not implemented diff --git a/toonz/sources/include/toonz/txshcolumn.h b/toonz/sources/include/toonz/txshcolumn.h index 95379aa..6724e2d 100644 --- a/toonz/sources/include/toonz/txshcolumn.h +++ b/toonz/sources/include/toonz/txshcolumn.h @@ -286,7 +286,7 @@ Destroys the TXshCellColumn object. /*! Return \b TXshCellColumn. */ - TXshCellColumn *getCellColumn() { return this; } + TXshCellColumn *getCellColumn() override { return this; } virtual bool canSetCell(const TXshCell &cell) const = 0; @@ -295,7 +295,7 @@ Return not empty cell range. Set \b r0 and \b r1 to first and last row with not empty cell. \sa isEmpty() and getRowCount() */ - virtual int getRange(int &r0, int &r1) const; + int getRange(int &r0, int &r1) const override; /*! Return row count. \sa isEmpty() and getRange() @@ -305,13 +305,13 @@ Return row count. Return true if row count is null. \sa isCellEmpty(), getRowCount(), getRange() */ - virtual bool isEmpty() const { return getRowCount() == 0; } + bool isEmpty() const override { return getRowCount() == 0; } /*! Return true if cell in \b row is empty. \sa isEmpty() */ - virtual bool isCellEmpty(int row) const; + bool isCellEmpty(int row) const override; /*! Return cell in \b row. @@ -351,7 +351,7 @@ Clear \b rowCount cells from line \b row, without shift. /*! Return last row with not empty cell. */ - virtual int getMaxFrame() const; + int getMaxFrame() const override; /*! Return first not empty row. @@ -364,7 +364,7 @@ Return first not empty row. Return true if cell in row is not empty. Set \b r0 and \b r1 to first and last row with not empty cell of same level. */ - virtual bool getLevelRange(int row, int &r0, int &r1) const; + bool getLevelRange(int row, int &r0, int &r1) const override; // virtual void updateIcon() = 0; }; diff --git a/toonz/sources/include/toonz/txsheet.h b/toonz/sources/include/toonz/txsheet.h index bea5b51..f0ef22f 100644 --- a/toonz/sources/include/toonz/txsheet.h +++ b/toonz/sources/include/toonz/txsheet.h @@ -222,9 +222,9 @@ Return false if cannot set cells. void removeCells(int row, int col, int rowCount = 1); /*! If column identified by index \b \e col is not empty, is a \b TXshCellColumn and is not - locked, clear \b \e rowCount cells starting from \b \e row and it recalls TXshCellColumn::clearCells(). - Clears cells and it shifts remaining cells. Xsheet's frame count is updated. - \sa removeCells(), insertCells() + locked, clear \b \e rowCount cells starting from \b \e row and it recalls TXshCellColumn::clearCells(). + Clears cells and it shifts remaining cells. Xsheet's frame count is updated. + \sa removeCells(), insertCells() */ void clearCells(int row, int col, int rowCount = 1); /*! Clears xsheet. It sets to default values all xsheet elements contained in @@ -433,12 +433,12 @@ frame duplication. in \b TXsheetImp, to information contained in \b TIStream \b \e is. \sa saveData() */ - void loadData(TIStream &is); + void loadData(TIStream &is) override; /*! Save all xsheet elements information, contained in \b TXsheetImp, in \b TOStream \b \e os. \sa loadData() */ - void saveData(TOStream &os); + void saveData(TOStream &os) override; /*! Inserts an empty column in \b \e index calling \b insertColumn(). */ void insertColumn(int index, diff --git a/toonz/sources/include/toonz/txshlevel.h b/toonz/sources/include/toonz/txshlevel.h index adc47d5..820fce5 100644 --- a/toonz/sources/include/toonz/txshlevel.h +++ b/toonz/sources/include/toonz/txshlevel.h @@ -125,9 +125,9 @@ Set scene to which level belongs to \b scene. virtual void getFids(std::vector &fids) const {} //! Load the level data (i.e. name, path, etc. e.g. from the .tnz file) - virtual void loadData(TIStream &is) = 0; + void loadData(TIStream &is) override = 0; //! Save the level data (i.e. name, path, etc. e.g. to the .tnz file) - virtual void saveData(TOStream &os) = 0; + void saveData(TOStream &os) override = 0; //! Load the level content from the associated path virtual void load() = 0; diff --git a/toonz/sources/include/toonz/txshlevelcolumn.h b/toonz/sources/include/toonz/txshlevelcolumn.h index 64ff0b1..741c651 100644 --- a/toonz/sources/include/toonz/txshlevelcolumn.h +++ b/toonz/sources/include/toonz/txshlevelcolumn.h @@ -54,26 +54,26 @@ Destroys the TXshLevelColumn object. */ ~TXshLevelColumn(); - TXshColumn::ColumnType getColumnType() const; + TXshColumn::ColumnType getColumnType() const override; /*! Return true if \b cell is empty or level of \b cell isn't a \b TXshZeraryFxLevel. */ - bool canSetCell(const TXshCell &cell) const; + bool canSetCell(const TXshCell &cell) const override; /*! Return \b TXshLevelColumn. */ - TXshLevelColumn *getLevelColumn() { return this; } + TXshLevelColumn *getLevelColumn() override { return this; } /*! Clone column and return a pointer to the new \b TXshColumn cloned. */ - TXshColumn *clone() const; + TXshColumn *clone() const override; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; /*! Return a pointer to \b TLevelColumnFx \b m_fx. @@ -83,7 +83,7 @@ Return a pointer to \b TLevelColumnFx \b m_fx. /*! Return \b TFx. */ - TFx *getFx() const; + TFx *getFx() const override; private: // not implemented diff --git a/toonz/sources/include/toonz/txshsimplelevel.h b/toonz/sources/include/toonz/txshsimplelevel.h index e48bb7d..75c6c0b 100644 --- a/toonz/sources/include/toonz/txshsimplelevel.h +++ b/toonz/sources/include/toonz/txshsimplelevel.h @@ -89,7 +89,7 @@ public: std::wstring()); //!< Constructs a TXshSimpleLevel with a name ~TXshSimpleLevel(); - TXshSimpleLevel *getSimpleLevel() { + TXshSimpleLevel *getSimpleLevel() override { return this; } //!< Reimplemented for TXshLevel. @@ -117,7 +117,7 @@ public: const; //!< Returns a pointer to the \a shared level palette. void setPalette(TPalette *palette); //!< Assigns a palette to the level. - TFilePath getPath() const { return m_path; } + TFilePath getPath() const override { return m_path; } void setPath(const TFilePath &path, bool retainCachedImages = false); TFilePath getScannedPath() const { return m_scannedPath; } @@ -131,7 +131,7 @@ public: std::vector getFids() const; //!< Returns a copy of the level's frame ids. - void getFids(std::vector &fids) const; //!< Copies fids() into + void getFids(std::vector &fids) const override; //!< Copies fids() into //!fids. \deprecated Use //!the return valued //!variation instead. @@ -143,7 +143,7 @@ public: const; //!< Returns the last level frame's id; roughly equivalent to //! index2fid(getFrameCount()-1). - bool isEmpty() const { + bool isEmpty() const override { return m_frames.empty(); } //!< Returns whether the level is empty. bool isFid(const TFrameId &fid) @@ -154,7 +154,7 @@ public: const TFrameId &getFrameId( int index) const; //!< Returns the frame id at specified index. - int getFrameCount() const { + int getFrameCount() const override { return m_frames.size(); } //!< Returns the level's frames count. @@ -256,23 +256,23 @@ Editable range is contained in \b m_editableRange. TRectD getBBox(const TFrameId &fid) const; - void setDirtyFlag(bool on); + void setDirtyFlag(bool on) override; bool getDirtyFlag() const; //! Updates content history (invokes setDirtyFlag(true)) //! \warning Not what users may expect! void touchFrame(const TFrameId &fid); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; //! Loads the level from disk, translating encoded level paths relative //! to the level's scene path. - void load(); + void load() override; void load(const std::vector &fIds); //! Saves the level to disk, with the same path deduction from load() - void save(); + void save() override; /*! Save the level in the specified fp. diff --git a/toonz/sources/include/toonz/txshsoundcolumn.h b/toonz/sources/include/toonz/txshsoundcolumn.h index 2c59fc3..2ea4182 100644 --- a/toonz/sources/include/toonz/txshsoundcolumn.h +++ b/toonz/sources/include/toonz/txshsoundcolumn.h @@ -52,39 +52,39 @@ public: TXshSoundColumn(); ~TXshSoundColumn(); - TXshColumn::ColumnType getColumnType() const; - TXshSoundColumn *getSoundColumn() { return this; } + TXshColumn::ColumnType getColumnType() const override; + TXshSoundColumn *getSoundColumn() override { return this; } - bool canSetCell(const TXshCell &cell) const; + bool canSetCell(const TXshCell &cell) const override; - TXshColumn *clone() const; + TXshColumn *clone() const override; /*! Clear column and set src level. */ void assignLevels(const TXshSoundColumn *src); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; /*! r0 : min row not empty, r1 : max row not empty. Return row count.*/ - int getRange(int &r0, int &r1) const; + int getRange(int &r0, int &r1) const override; /*! Last not empty row - first not empty row. */ - int getRowCount() const; + int getRowCount() const override; /*! Return max row not empty. */ - int getMaxFrame() const; + int getMaxFrame() const override; /*! Return min row not empty.*/ - int getFirstRow() const; + int getFirstRow() const override; - const TXshCell &getCell(int row) const; - void getCells(int row, int rowCount, TXshCell cells[]); + const TXshCell &getCell(int row) const override; + void getCells(int row, int rowCount, TXshCell cells[]) override; - bool setCell(int row, const TXshCell &cell); + bool setCell(int row, const TXshCell &cell) override; /*! Return false if cannot set cells.*/ - bool setCells(int row, int rowCount, const TXshCell cells[]); + bool setCells(int row, int rowCount, const TXshCell cells[]) override; - void insertEmptyCells(int row, int rowCount); + void insertEmptyCells(int row, int rowCount) override; - void clearCells(int row, int rowCount); - void removeCells(int row, int rowCount); + void clearCells(int row, int rowCount) override; + void removeCells(int row, int rowCount) override; /*! Check if frames from \b row to \b row+rowCount are in sequence and * collapse level if it is true. */ @@ -95,20 +95,20 @@ row. N.B. Row must be the first or last cell of a sound level. */ int modifyCellRange(int row, int delta, bool modifyStartValue); - bool isCellEmpty(int row) const; + bool isCellEmpty(int row) const override; /*! r0 : min row not empty of level in row, r1 : max row not empty of level in row. Return true if level range is not empty.*/ - bool getLevelRange(int row, int &r0, int &r1) const; + bool getLevelRange(int row, int &r0, int &r1) const override; /*! r0 : min possible (without offset) row of level in row, r1 : max possible (without offset) row of level in row. Return true if level range is not empty.*/ bool getLevelRangeWithoutOffset(int row, int &r0, int &r1) const; /*! Only debug. */ - void checkColumn() const; + void checkColumn() const override; - void setXsheet(TXsheet *xsheet); + void setXsheet(TXsheet *xsheet) override; void setFrameRate(double fps); void updateFrameRate(double fps); diff --git a/toonz/sources/include/toonz/txshsoundlevel.h b/toonz/sources/include/toonz/txshsoundlevel.h index e15b230..7380374 100644 --- a/toonz/sources/include/toonz/txshsoundlevel.h +++ b/toonz/sources/include/toonz/txshsoundlevel.h @@ -45,19 +45,19 @@ public: TXshSoundLevel *clone() const; - void setScene(ToonzScene *scene); + void setScene(ToonzScene *scene) override; //! Overridden from TXshLevel - TXshSoundLevel *getSoundLevel() { return this; } + TXshSoundLevel *getSoundLevel() override { return this; } void loadSoundTrack(); void loadSoundTrack(const TFilePath &fileName); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; - void load(); - void save(); + void load() override; + void save() override; void save(const TFilePath &path); void computeValues(int frameHeight = 20); @@ -69,7 +69,7 @@ public: double getFrameRate() const { return m_fps; } void setPath(const TFilePath &path) { m_path = path; } - TFilePath getPath() const { return m_path; } + TFilePath getPath() const override { return m_path; } void setSoundTrack(TSoundTrackP st) { m_soundTrack = st; @@ -82,9 +82,9 @@ public: int getSamplePerFrame() const { return m_samplePerFrame; } - int getFrameCount() const; + int getFrameCount() const override; - void getFids(std::vector &fids) const; + void getFids(std::vector &fids) const override; private: // not implemented diff --git a/toonz/sources/include/toonz/txshsoundtextcolumn.h b/toonz/sources/include/toonz/txshsoundtextcolumn.h index 253a7da..9ecd63c 100644 --- a/toonz/sources/include/toonz/txshsoundtextcolumn.h +++ b/toonz/sources/include/toonz/txshsoundtextcolumn.h @@ -31,17 +31,17 @@ public: TXshSoundTextColumn(); ~TXshSoundTextColumn(); - TXshColumn::ColumnType getColumnType() const; - TXshSoundTextColumn *getSoundTextColumn() { return this; } + TXshColumn::ColumnType getColumnType() const override; + TXshSoundTextColumn *getSoundTextColumn() override { return this; } void createSoundTextLevel(int row, QList textList); - bool canSetCell(const TXshCell &cell) const; + bool canSetCell(const TXshCell &cell) const override; - TXshColumn *clone() const; + TXshColumn *clone() const override; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; }; #ifdef _WIN32 diff --git a/toonz/sources/include/toonz/txshsoundtextlevel.h b/toonz/sources/include/toonz/txshsoundtextlevel.h index 12b5d8f..f37f083 100644 --- a/toonz/sources/include/toonz/txshsoundtextlevel.h +++ b/toonz/sources/include/toonz/txshsoundtextlevel.h @@ -37,16 +37,16 @@ public: TXshSoundTextLevel *clone() const; //! Overridden from TXshLevel - TXshSoundTextLevel *getSoundTextLevel() { return this; } + TXshSoundTextLevel *getSoundTextLevel() override { return this; } void setFrameText(int frameIndex, QString); QString getFrameText(int frameIndex) const; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; - void load(){}; - void save(){}; + void load() override {}; + void save() override {}; private: // not implemented diff --git a/toonz/sources/include/toonz/txshzeraryfxcolumn.h b/toonz/sources/include/toonz/txshzeraryfxcolumn.h index 49e40c7..03f5a1c 100644 --- a/toonz/sources/include/toonz/txshzeraryfxcolumn.h +++ b/toonz/sources/include/toonz/txshzeraryfxcolumn.h @@ -53,31 +53,31 @@ Destroys the TXshZeraryFxColumn object. */ ~TXshZeraryFxColumn(); - TXshColumn::ColumnType getColumnType() const; + TXshColumn::ColumnType getColumnType() const override; /*! Return true if level which cell \b cell belongs is equal to \b * m_zeraryFxLevel. */ - bool canSetCell(const TXshCell &cell) const; + bool canSetCell(const TXshCell &cell) const override; /*! Clone column and return a pointer to the new \b TXshColumn cloned. */ - TXshColumn *clone() const; + TXshColumn *clone() const override; /*! Return \b TZeraryColumnFx. */ TZeraryColumnFx *getZeraryColumnFx() const { return m_zeraryColumnFx; } - TXshZeraryFxColumn *getZeraryFxColumn() { return this; } + TXshZeraryFxColumn *getZeraryFxColumn() override { return this; } - bool setCell(int row, const TXshCell &cell); + bool setCell(int row, const TXshCell &cell) override; /*! Return false if cannot set cells.*/ - bool setCells(int row, int rowCount, const TXshCell cells[]); + bool setCells(int row, int rowCount, const TXshCell cells[]) override; /*! Return a pointer to \b TFx \b m_zeraryColumnFx. */ - TFx *getFx() const; + TFx *getFx() const override; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; /*! Implement method isn't necessary because TXshZeraryFxColumn doesn't have * icon. */ diff --git a/toonz/sources/include/toonz/txshzeraryfxlevel.h b/toonz/sources/include/toonz/txshzeraryfxlevel.h index 2e95861..9ebb8be 100644 --- a/toonz/sources/include/toonz/txshzeraryfxlevel.h +++ b/toonz/sources/include/toonz/txshzeraryfxlevel.h @@ -40,16 +40,16 @@ public: /*! Return the \b TXshZeraryFxLevel zerary fx level. */ - TXshZeraryFxLevel *getZeraryFxLevel() { return this; } + TXshZeraryFxLevel *getZeraryFxLevel() override { return this; } void setColumn(TXshZeraryFxColumn *column); TXshZeraryFxColumn *getColumn() const { return m_zeraryFxColumn; } - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; - void load(); - void save(); + void load() override; + void save() override; private: // not implemented diff --git a/toonz/sources/include/toonz/vectorizerparameters.h b/toonz/sources/include/toonz/vectorizerparameters.h index d2667f1..3b2d455 100644 --- a/toonz/sources/include/toonz/vectorizerparameters.h +++ b/toonz/sources/include/toonz/vectorizerparameters.h @@ -275,8 +275,8 @@ public: getCenterlineConfiguration(weight)); } - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; }; #endif // VECTORIZERPARAMETERS_H diff --git a/toonz/sources/include/toonzqt/camerasettingswidget.h b/toonz/sources/include/toonzqt/camerasettingswidget.h index 1e7e058..0a4f8ae 100644 --- a/toonz/sources/include/toonzqt/camerasettingswidget.h +++ b/toonz/sources/include/toonzqt/camerasettingswidget.h @@ -46,7 +46,7 @@ class CheckBox; class SimpleExpValidator : public QValidator { public: SimpleExpValidator(QObject *parent) : QValidator(parent){}; - State validate(QString &input, int &pos) const; + State validate(QString &input, int &pos) const override; }; //--------------------------------------------------------------- @@ -63,8 +63,8 @@ public: double getValue(); protected: - void focusInEvent(QFocusEvent *event); - void focusOutEvent(QFocusEvent *event); + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; }; //--------------------------------------------------------------- @@ -121,7 +121,7 @@ public: // widget fields => camera void getFields(TCamera *camera); - QSize sizeHint() const { return minimumSize(); } + QSize sizeHint() const override { return minimumSize(); } // The aspect ratio can be expressed as a fraction (e.g. "4/3") // The following methods convert code/decode the value @@ -146,7 +146,7 @@ public: } protected: - bool eventFilter(QObject *obj, QEvent *e); + bool eventFilter(QObject *obj, QEvent *e) override; void hComputeLx(); void hComputeLy(); diff --git a/toonz/sources/include/toonzqt/checkbox.h b/toonz/sources/include/toonzqt/checkbox.h index a307db0..b8e1724 100644 --- a/toonz/sources/include/toonzqt/checkbox.h +++ b/toonz/sources/include/toonzqt/checkbox.h @@ -37,9 +37,9 @@ public: ~CheckBox() {} protected: - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *) override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/include/toonzqt/cleanupcamerasettingswidget.h b/toonz/sources/include/toonzqt/cleanupcamerasettingswidget.h index 9abbdfd..47037a5 100644 --- a/toonz/sources/include/toonzqt/cleanupcamerasettingswidget.h +++ b/toonz/sources/include/toonzqt/cleanupcamerasettingswidget.h @@ -55,7 +55,7 @@ public: CleanupCameraSettingsWidget(); ~CleanupCameraSettingsWidget(); - QSize sizeHint() const { return minimumSize(); } + QSize sizeHint() const override { return minimumSize(); } void setCameraPresetListFile(const TFilePath &fp); diff --git a/toonz/sources/include/toonzqt/colorfield.h b/toonz/sources/include/toonzqt/colorfield.h index 34154d0..0450003 100644 --- a/toonz/sources/include/toonzqt/colorfield.h +++ b/toonz/sources/include/toonzqt/colorfield.h @@ -74,9 +74,9 @@ public: bool isEnable() const { return m_drawEnable; } protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *); - void mouseDoubleClickEvent(QMouseEvent *event); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; signals: void clicked(const TColorStyle &style); @@ -177,9 +177,9 @@ public: protected: void updateChannels(); - void mousePressEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void hideEvent(QHideEvent *); + void mousePressEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void hideEvent(QHideEvent *) override; protected slots: void onRedChannelChanged(int value, bool isDragging); @@ -263,9 +263,9 @@ public: void setContrastEnabled(bool enable); protected: - void mousePressEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void hideEvent(QHideEvent *); + void mousePressEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void hideEvent(QHideEvent *) override; protected slots: diff --git a/toonz/sources/include/toonzqt/combohistogram.h b/toonz/sources/include/toonzqt/combohistogram.h index 81fc025..8df0e97 100644 --- a/toonz/sources/include/toonzqt/combohistogram.h +++ b/toonz/sources/include/toonzqt/combohistogram.h @@ -53,7 +53,7 @@ public: void setColorAndUpdate(QColor color); protected: - void paintEvent(QPaintEvent *pe); + void paintEvent(QPaintEvent *pe) override; }; //----------------------------------------------------------------------------- @@ -76,7 +76,7 @@ public: void showCurrentChannelValue(int val); protected: - virtual void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; //----------------------------------------------------------------------------- @@ -92,10 +92,10 @@ public: RGBHistoGraph(QWidget *parent = 0, int *channelValue = 0); ~RGBHistoGraph(); - void setValues(); + void setValues() override; protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; //----------------------------------------------------------------------------- @@ -108,7 +108,7 @@ public: ~ChannelColorBar() {} protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/include/toonzqt/doublefield.h b/toonz/sources/include/toonzqt/doublefield.h index 42d5a82..d6b98a0 100644 --- a/toonz/sources/include/toonzqt/doublefield.h +++ b/toonz/sources/include/toonzqt/doublefield.h @@ -47,7 +47,7 @@ public: protected: /*! If focus is lost and current value is out of range emit signal \b * lostFocus. */ - void focusOutEvent(QFocusEvent *); + void focusOutEvent(QFocusEvent *) override; signals: /*! To emit when value change. */ @@ -173,21 +173,21 @@ public: ~DoubleLineEdit() {} /*! Set text field value to double value \b value. */ - void setValue(double value); + void setValue(double value) override; /*! Return a double with field value. */ - double getValue(); + double getValue() override; /*! Set the range of field from \b minValue to \b maxValue; set validator value. */ - void setRange(double minValue, double maxValue); + void setRange(double minValue, double maxValue) override; /*! Set \b minValue an \b maxValue to current range; to current validator minimum and maximum value. */ - void getRange(double &minValue, double &maxValue); + void getRange(double &minValue, double &maxValue) override; /*! Set lenght of field value decimal part to \b decimals. */ void setDecimals(int decimals); /*! Return lenght of field value decimal part. */ - int getDecimals(); + int getDecimals() override; }; //============================================================================= @@ -222,16 +222,16 @@ public: MeasuredDoubleLineEdit(QWidget *parent = 0); ~MeasuredDoubleLineEdit(); - void setValue(double value); - double getValue(); + void setValue(double value) override; + double getValue() override; - void setRange(double minValue, double maxValue); - void getRange(double &minValue, double &maxValue); + void setRange(double minValue, double maxValue) override; + void getRange(double &minValue, double &maxValue) override; void setMeasure(std::string measureName); void setDecimals(int decimals); - int getDecimals(); + int getDecimals() override; // called after setText() void postSetText() { onEditingFinished(); } @@ -240,7 +240,7 @@ private: void valueToText(); protected: - void timerEvent(QTimerEvent *e); + void timerEvent(QTimerEvent *e) override; protected slots: diff --git a/toonz/sources/include/toonzqt/doublepairfield.h b/toonz/sources/include/toonzqt/doublepairfield.h index 82db4ee..bf65212 100644 --- a/toonz/sources/include/toonzqt/doublepairfield.h +++ b/toonz/sources/include/toonzqt/doublepairfield.h @@ -156,11 +156,11 @@ protected: grab edited and \b value. */ void setValue(double v); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; protected slots: /*! Set current left value to value in left text field; if necessary, if left diff --git a/toonz/sources/include/toonzqt/dvdialog.h b/toonz/sources/include/toonzqt/dvdialog.h index 6ff012f..fb1bc74 100644 --- a/toonz/sources/include/toonzqt/dvdialog.h +++ b/toonz/sources/include/toonzqt/dvdialog.h @@ -150,7 +150,7 @@ public: bool isHorizontal() { return m_isHorizontal; } protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; //----------------------------------------------------------------------------- @@ -168,8 +168,8 @@ class DVAPI Dialog : public QDialog { protected: QHBoxLayout *m_buttonLayout; QList m_labelList; - void resizeEvent(QResizeEvent *e); - void moveEvent(QMoveEvent *e); + void resizeEvent(QResizeEvent *e) override; + void moveEvent(QMoveEvent *e) override; public: QVBoxLayout *m_topLayout; @@ -230,7 +230,7 @@ public: void addButtonBarWidget(QWidget *first, QWidget *second); void addButtonBarWidget(QWidget *first, QWidget *second, QWidget *third); - virtual void hideEvent(QHideEvent *event); + void hideEvent(QHideEvent *event) override; void clearButtonBar(); signals: diff --git a/toonz/sources/include/toonzqt/dvscrollwidget.h b/toonz/sources/include/toonzqt/dvscrollwidget.h index 047e54c..e38d5bd 100644 --- a/toonz/sources/include/toonzqt/dvscrollwidget.h +++ b/toonz/sources/include/toonzqt/dvscrollwidget.h @@ -105,11 +105,11 @@ public slots: void scrollForward(); protected: - void resizeEvent(QResizeEvent *re); - void mousePressEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); - void showEvent(QShowEvent *se); + void resizeEvent(QResizeEvent *re) override; + void mousePressEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; + void showEvent(QShowEvent *se) override; protected slots: diff --git a/toonz/sources/include/toonzqt/dvtextedit.h b/toonz/sources/include/toonzqt/dvtextedit.h index 1ceb06b..0490f0e 100644 --- a/toonz/sources/include/toonzqt/dvtextedit.h +++ b/toonz/sources/include/toonzqt/dvtextedit.h @@ -48,8 +48,8 @@ public: ~DvMiniToolBar(); protected: - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; }; //----------------------------------------------------------------------------- @@ -62,8 +62,8 @@ public: ~DvTextEditButton(); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; signals: void clicked(); @@ -107,15 +107,15 @@ protected: void showMiniToolBar(const QPoint &pos); void hideMiniToolBar(); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void wheelEvent(QWheelEvent *); + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void wheelEvent(QWheelEvent *) override; - void focusInEvent(QFocusEvent *); - void focusOutEvent(QFocusEvent *); + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; - void dragMoveEvent(QDragMoveEvent *); + void dragMoveEvent(QDragMoveEvent *) override; private: void fontChanged(const QFont &f); diff --git a/toonz/sources/include/toonzqt/expressionfield.h b/toonz/sources/include/toonzqt/expressionfield.h index 966829e..18f8e3b 100644 --- a/toonz/sources/include/toonzqt/expressionfield.h +++ b/toonz/sources/include/toonzqt/expressionfield.h @@ -65,13 +65,13 @@ private: int computeSuggestions(); protected: - bool event(QEvent *e); - void keyPressEvent(QKeyEvent *e); - void focusInEvent(QFocusEvent *e); - void focusOutEvent(QFocusEvent *e); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - bool eventFilter(QObject *obj, QEvent *e); + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + bool eventFilter(QObject *obj, QEvent *e) override; private slots: void onTextChanged(); diff --git a/toonz/sources/include/toonzqt/flipconsole.h b/toonz/sources/include/toonzqt/flipconsole.h index b7937a8..8b2c11b 100644 --- a/toonz/sources/include/toonzqt/flipconsole.h +++ b/toonz/sources/include/toonzqt/flipconsole.h @@ -58,7 +58,7 @@ public: void resetFps(int fps); - void run(); + void run() override; void abort() { m_abort = true; } void emitNextFrame(int fps) { emit nextFrame(fps); } @@ -161,11 +161,11 @@ public: void setFinishedColor(const QColor &color); protected: - void paintEvent(QPaintEvent *ev); + void paintEvent(QPaintEvent *ev) override; - void mousePressEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); + void mousePressEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; private: int sliderPositionFromValue(int min, int max, int pos, int span); diff --git a/toonz/sources/include/toonzqt/framenavigator.h b/toonz/sources/include/toonzqt/framenavigator.h index b005626..d14c09a 100644 --- a/toonz/sources/include/toonzqt/framenavigator.h +++ b/toonz/sources/include/toonzqt/framenavigator.h @@ -83,8 +83,8 @@ public slots: void nextFrame() { setFrame(m_frame + 1, true); } //!< Move to next frame. protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; void updateFrame(int frame); //!< Changes frame without emitting any signal //!and notifying the frameHandle. diff --git a/toonz/sources/include/toonzqt/freelayout.h b/toonz/sources/include/toonzqt/freelayout.h index cb616db..a3b0c17 100644 --- a/toonz/sources/include/toonzqt/freelayout.h +++ b/toonz/sources/include/toonzqt/freelayout.h @@ -44,21 +44,21 @@ public: DummyLayout(); virtual ~DummyLayout(); - QSize sizeHint() const; + QSize sizeHint() const override; - QSize minimumSize() const { return QSize(0, 0); } - QSize maximumSize() const { return QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); } + QSize minimumSize() const override { return QSize(0, 0); } + QSize maximumSize() const override { return QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX); } - int count() const { return m_items.count(); } - void addItem(QLayoutItem *item) { m_items.push_back(item); } - QLayoutItem *itemAt(int index) const { + int count() const override { return m_items.count(); } + void addItem(QLayoutItem *item) override { m_items.push_back(item); } + QLayoutItem *itemAt(int index) const override { return (index < count()) ? m_items.at(index) : 0; } - QLayoutItem *takeAt(int index) { + QLayoutItem *takeAt(int index) override { return (index < count()) ? m_items.takeAt(index) : 0; } - void setGeometry(const QRect &r) {} + void setGeometry(const QRect &r) override {} // Qt::Orientations expandingDirections () const { return // Qt::Orientations(); } @@ -95,7 +95,7 @@ public: FreeLayout() : DummyLayout() {} ~FreeLayout() {} - void setGeometry(const QRect &r); + void setGeometry(const QRect &r) override; }; #endif // FREE_LAYOUT_H diff --git a/toonz/sources/include/toonzqt/functionkeyframenavigator.h b/toonz/sources/include/toonzqt/functionkeyframenavigator.h index 46a1c82..d593209 100644 --- a/toonz/sources/include/toonzqt/functionkeyframenavigator.h +++ b/toonz/sources/include/toonzqt/functionkeyframenavigator.h @@ -21,17 +21,17 @@ public: void setCurve(TDoubleParam *curve); protected: - bool hasNext() const; - bool hasPrev() const; - bool hasKeyframes() const; - bool isKeyframe() const; - bool isFullKeyframe() const { return isKeyframe(); } - void toggle(); - void goNext(); - void goPrev(); - - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + bool hasNext() const override; + bool hasPrev() const override; + bool hasKeyframes() const override; + bool isKeyframe() const override; + bool isFullKeyframe() const override { return isKeyframe(); } + void toggle() override; + void goNext() override; + void goPrev() override; + + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public slots: void onFrameSwitched() { update(); } diff --git a/toonz/sources/include/toonzqt/functionpanel.h b/toonz/sources/include/toonzqt/functionpanel.h index 7bc7bc8..68cd44a 100644 --- a/toonz/sources/include/toonzqt/functionpanel.h +++ b/toonz/sources/include/toonzqt/functionpanel.h @@ -212,19 +212,19 @@ protected: void drawCurrentCurve(QPainter &); void drawGroupKeyframes(QPainter &); - void paintEvent(QPaintEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void wheelEvent(QWheelEvent *e); + void paintEvent(QPaintEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void wheelEvent(QWheelEvent *e) override; void openContextMenu(QMouseEvent *e); - void keyPressEvent(QKeyEvent *e); - void enterEvent(QEvent *); - void leaveEvent(QEvent *); + void keyPressEvent(QKeyEvent *e) override; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public slots: void onFrameSwitched(); diff --git a/toonz/sources/include/toonzqt/functionsegmentviewer.h b/toonz/sources/include/toonzqt/functionsegmentviewer.h index 2a4b0e9..5523182 100644 --- a/toonz/sources/include/toonzqt/functionsegmentviewer.h +++ b/toonz/sources/include/toonzqt/functionsegmentviewer.h @@ -75,7 +75,7 @@ public: void refresh(); // overriden from TDoubleParamObserver - void onChange(const TParamChange &) { refresh(); } + void onChange(const TParamChange &) override { refresh(); } void setXsheetHandle(TXsheetHandle *xshHandle) { m_xshHandle = xshHandle; } @@ -147,11 +147,11 @@ class SpeedInOutSegmentPage : public FunctionSegmentPage { public: SpeedInOutSegmentPage(FunctionSegmentViewer *parent = 0); - void refresh(); - void apply(){}; + void refresh() override; + void apply() override {}; void getGuiValues(TPointD &speedIn, TPointD &speedOut); - void init(int segmentLength); + void init(int segmentLength) override; public slots: void onFirstHandleXChanged(); @@ -173,11 +173,11 @@ class EaseInOutSegmentPage : public FunctionSegmentPage { public: EaseInOutSegmentPage(bool percentage, FunctionSegmentViewer *parent = 0); - void refresh(); - void apply() {} + void refresh() override; + void apply() override {} void getGuiValues(TPointD &easeIn, TPointD &easeOut); - void init(int segmentLength); + void init(int segmentLength) override; public slots: void onEase0Changed(); @@ -194,13 +194,13 @@ class FunctionExpressionSegmentPage : public FunctionSegmentPage { public: FunctionExpressionSegmentPage(FunctionSegmentViewer *parent = 0); - void refresh(); - void apply(); + void refresh() override; + void apply() override; // return false if a circular reference is occured bool getGuiValues(std::string &expressionText, std::string &unitName); - void init(int segmentLength); + void init(int segmentLength) override; }; //----------------------------------------------------------------------------- @@ -214,10 +214,10 @@ class SimilarShapeSegmentPage : public FunctionSegmentPage { public: SimilarShapeSegmentPage(FunctionSegmentViewer *parent = 0); - void refresh(); - void apply(); + void refresh() override; + void apply() override; - void init(int segmentLength); + void init(int segmentLength) override; void getGuiValues(std::string &expressionText, double &similarShapeOffset); }; diff --git a/toonz/sources/include/toonzqt/functionselection.h b/toonz/sources/include/toonzqt/functionselection.h index 42a2b56..e79f79f 100644 --- a/toonz/sources/include/toonzqt/functionselection.h +++ b/toonz/sources/include/toonzqt/functionselection.h @@ -77,8 +77,8 @@ public: void selectCells(const QRect &selectedCells); void deselectAllCells(); - bool isEmpty() const { return m_selectedKeyframes.empty(); } - void selectNone(); + bool isEmpty() const override { return m_selectedKeyframes.empty(); } + void selectNone() override; void select(TDoubleParam *curve, int k); bool isSelected(TDoubleParam *curve, int k) const; void selectSegment(TDoubleParam *, int k, @@ -101,7 +101,7 @@ public: : 0; } - void enableCommands(); + void enableCommands() override; void doCopy(); void doPaste(); @@ -133,7 +133,7 @@ public: const Keyframes &getKeyframes(int columnIndex) const; - DvMimeData *clone() const; + DvMimeData *clone() const override; bool isCircularReferenceFree(int columnIndex, TDoubleParam *curve) const; diff --git a/toonz/sources/include/toonzqt/functionsheet.h b/toonz/sources/include/toonzqt/functionsheet.h index dff11f1..ae3a7a3 100644 --- a/toonz/sources/include/toonzqt/functionsheet.h +++ b/toonz/sources/include/toonzqt/functionsheet.h @@ -34,12 +34,12 @@ public: FunctionSheetRowViewer(FunctionSheet *parent); protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void contextMenuEvent(QContextMenuEvent *); + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void contextMenuEvent(QContextMenuEvent *) override; }; class FunctionSheetColumnHeadViewer : public Spreadsheet::ColumnPanel { @@ -52,12 +52,12 @@ public: FunctionSheetColumnHeadViewer(FunctionSheet *parent); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; // update the tooltip - void mouseMoveEvent(QMouseEvent *); + void mouseMoveEvent(QMouseEvent *) override; - void contextMenuEvent(QContextMenuEvent *); + void contextMenuEvent(QContextMenuEvent *) override; }; class FunctionSheetCellViewer : public Spreadsheet::CellPanel { @@ -69,16 +69,16 @@ class FunctionSheetCellViewer : public Spreadsheet::CellPanel { public: FunctionSheetCellViewer(FunctionSheet *parent); - Spreadsheet::DragTool *createDragTool(QMouseEvent *); + Spreadsheet::DragTool *createDragTool(QMouseEvent *) override; protected: - void drawCells(QPainter &p, int r0, int c0, int r1, int c1); + void drawCells(QPainter &p, int r0, int c0, int r1, int c1) override; - void mouseDoubleClickEvent(QMouseEvent *); + void mouseDoubleClickEvent(QMouseEvent *) override; - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; void openContextMenu(QMouseEvent *); private slots: @@ -105,8 +105,8 @@ public: TDoubleParam *getCurve(int column); FunctionTreeModel::Channel *getChannel(int column); - QRect getSelectedCells() const; - void selectCells(const QRect &selectedCells); + QRect getSelectedCells() const override; + void selectCells(const QRect &selectedCells) override; FunctionSelection *getSelection() const { return m_selection; } void setSelection(FunctionSelection *selection); // does NOT get ownership @@ -116,8 +116,8 @@ public: bool anyWidgetHasFocus(); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; private: FunctionSheetRowViewer *m_rowViewer; diff --git a/toonz/sources/include/toonzqt/functiontoolbar.h b/toonz/sources/include/toonzqt/functiontoolbar.h index e76b371..90a84e1 100644 --- a/toonz/sources/include/toonzqt/functiontoolbar.h +++ b/toonz/sources/include/toonzqt/functiontoolbar.h @@ -82,7 +82,7 @@ public: void setSelection(FunctionSelection *); void setFrameHandle(TFrameHandle *frameHandle); - void onChange(const TParamChange &); + void onChange(const TParamChange &) override; bool anyWidgetHasFocus(); diff --git a/toonz/sources/include/toonzqt/functiontreeviewer.h b/toonz/sources/include/toonzqt/functiontreeviewer.h index 6c4a094..a16d687 100644 --- a/toonz/sources/include/toonzqt/functiontreeviewer.h +++ b/toonz/sources/include/toonzqt/functiontreeviewer.h @@ -102,8 +102,8 @@ to ChannelGroup(const QString &name = ""); ~ChannelGroup(); - bool isActive() const; - bool isAnimated() const; + bool isActive() const override; + bool isAnimated() const override; virtual QString getShortName() const { return m_name; } virtual QString getLongName() const { return m_name; } @@ -115,7 +115,7 @@ to void applyShowFilter(); // call this method when a channel changes // its animation status - QVariant data(int role) const; + QVariant data(int role) const override; // used in FunctionTreeView::onActivated void setChildrenAllActive(bool active); @@ -170,7 +170,7 @@ color, which TDoubleParam *getParam() const { return (TDoubleParam *)m_param.getPointer(); } - void setParam(const TParamP ¶m); + void setParam(const TParamP ¶m) override; QString getShortName() const; QString getLongName() const; @@ -181,21 +181,21 @@ color, which ChannelGroup *getChannelGroup() const { return m_group; } void setChannelGroup(ChannelGroup *group) { m_group = group; } - QVariant data(int role) const; + QVariant data(int role) const override; - bool isActive() const { return m_isActive; } + bool isActive() const override { return m_isActive; } void setIsActive(bool active); - bool isAnimated() const; + bool isAnimated() const override; bool isCurrent() const; void setIsCurrent(bool current); bool isHidden() const; // the channel is hidden if it is filtered out // by its channelgroup - void onChange(const TParamChange &); + void onChange(const TParamChange &) override; - void *getInternalPointer() const; + void *getInternalPointer() const override; }; private: @@ -290,7 +290,7 @@ private: // Observers notification functions - void onChange(const TParamChange &); // Multiple param notifications ... + void onChange(const TParamChange &) override; // Multiple param notifications ... void onParamChange(bool isDragging); // ... that get compressed into one // Update functions @@ -319,16 +319,16 @@ public: FxChannelGroup(TFx *fx); ~FxChannelGroup(); - QString getShortName() const; - QString getLongName() const; + QString getShortName() const override; + QString getLongName() const override; - QString getIdName() const; + QString getIdName() const override; - void *getInternalPointer() const { return static_cast(m_fx); } + void *getInternalPointer() const override { return static_cast(m_fx); } TFx *getFx() const { return m_fx; } - QVariant data(int role) const; + QVariant data(int role) const override; - void refresh(); + void refresh() override; }; //***************************************************************************************** @@ -359,7 +359,7 @@ public: void setCurrentScenePath(TFilePath scenePath) { m_scenePath = scenePath; } - void openContextMenu(TreeModel::Item *item, const QPoint &globalPos); + void openContextMenu(TreeModel::Item *item, const QPoint &globalPos) override; void setTextColor(const QColor &color) { m_textColor = color; } QColor getTextColor() const { return m_textColor; } @@ -367,12 +367,12 @@ public: QColor getCurrentTextColor() const { return m_currentTextColor; } protected: - void onClick(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e); + void onClick(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e) override; - void onMidClick(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e); + void onMidClick(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e) override; - void onDrag(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e); - void onRelease(); + void onDrag(TreeModel::Item *item, const QPoint &itemPos, QMouseEvent *e) override; + void onRelease() override; void openContextMenu(FunctionTreeModel::Channel *channel, const QPoint &globalPos); diff --git a/toonz/sources/include/toonzqt/functionviewer.h b/toonz/sources/include/toonzqt/functionviewer.h index 26ff8db..f2f5b8a 100644 --- a/toonz/sources/include/toonzqt/functionviewer.h +++ b/toonz/sources/include/toonzqt/functionviewer.h @@ -172,8 +172,8 @@ private: FunctionSelection *m_selection; private: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public: // :( void emitCurveChanged() { diff --git a/toonz/sources/include/toonzqt/fxhistogramrender.h b/toonz/sources/include/toonzqt/fxhistogramrender.h index 80aceeb..7bd3fc1 100644 --- a/toonz/sources/include/toonzqt/fxhistogramrender.h +++ b/toonz/sources/include/toonzqt/fxhistogramrender.h @@ -42,8 +42,8 @@ public: FxHistogramRenderPort(); ~FxHistogramRenderPort(); - void onRenderRasterCompleted(const RenderData &renderData); - void onRenderFailure(const RenderData &renderData, TException &e){}; + void onRenderRasterCompleted(const RenderData &renderData) override; + void onRenderFailure(const RenderData &renderData, TException &e) override {}; void onRenderFinished(){}; signals: diff --git a/toonz/sources/include/toonzqt/fxschematicnode.h b/toonz/sources/include/toonzqt/fxschematicnode.h index a7e0ab4..a06dafa 100644 --- a/toonz/sources/include/toonzqt/fxschematicnode.h +++ b/toonz/sources/include/toonzqt/fxschematicnode.h @@ -72,9 +72,9 @@ public: const QString &name); virtual ~FxColumnPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } QLinearGradient getGradientByLevelType(int type); @@ -84,7 +84,7 @@ public slots: void onIconGenerated(); protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //***************************************************** @@ -101,13 +101,13 @@ public: const QString &name); ~FxPalettePainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //***************************************************** @@ -134,13 +134,13 @@ public: const QString &name, eFxType type, std::string fxType); ~FxPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //***************************************************** @@ -159,12 +159,12 @@ public: FxXSheetPainter(FxSchematicXSheetNode *parent, double width, double height); ~FxXSheetPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //***************************************************** @@ -183,12 +183,12 @@ public: FxOutputPainter(FxSchematicOutputNode *parent, double width, double height); ~FxOutputPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //***************************************************** @@ -203,7 +203,7 @@ public: ~FxSchematicLink(); protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //***************************************************** @@ -220,22 +220,22 @@ public: FxSchematicPort(FxSchematicDock *parent, int type); ~FxSchematicPort(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); - bool linkTo(SchematicPort *port, bool checkOnly = false); + QWidget *widget = 0) override; + bool linkTo(SchematicPort *port, bool checkOnly = false) override; FxSchematicDock *getDock() const; - SchematicLink *makeLink(SchematicPort *port); + SchematicLink *makeLink(SchematicPort *port) override; protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); - void mouseMoveEvent(QGraphicsSceneMouseEvent *me); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *me); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *me) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *me) override; TFx *getOwnerFx() const; private: void linkEffects(TFx *inputFx, TFx *fx, int inputId); - SchematicPort *searchPort(const QPointF &scenePos); + SchematicPort *searchPort(const QPointF &scenePos) override; //! Handles hiding of existing link and showing of ghost links for snapping //! after creation link only for fx having @@ -248,8 +248,8 @@ private: void resetSnappedLinksOnDynamicPortFx(); - void hideSnappedLinks(); - void showSnappedLinks(); + void hideSnappedLinks() override; + void showSnappedLinks() override; }; //***************************************************** @@ -266,9 +266,9 @@ public: eFxSchematicPortType type); ~FxSchematicDock(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; FxSchematicNode *getNode(); FxSchematicPort *getPort() { return m_port; } }; @@ -327,7 +327,7 @@ public: void setWidth(const qreal &width) { m_width = width; } void setHeight(const qreal &height) { m_height = height; } - void setSchematicNodePos(const QPointF &pos) const; + void setSchematicNodePos(const QPointF &pos) const override; TFx *getFx() const { return m_fx.getPointer(); } bool isA(eFxType type) { return m_type == type; } @@ -346,12 +346,12 @@ public: } bool isNameEditing() { return m_nameItem->isVisible(); } - void onClicked(); + void onClicked() override; bool isCurrentFxLinked(SchematicNode *comingNode) { return m_isCurrentFxLinked; } void setIsCurrentFxLinked(bool value, FxSchematicNode *comingNode); - void setPosition(const QPointF &newPos); + void setPosition(const QPointF &newPos) override; void updatePortsPosition(); @@ -380,12 +380,12 @@ public: FxSchematicOutputNode(FxSchematicScene *scene, TOutputFx *fx); ~FxSchematicOutputNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; }; //***************************************************** @@ -399,12 +399,12 @@ public: FxSchematicXSheetNode(FxSchematicScene *scene, TXsheetFx *fx); ~FxSchematicXSheetNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; }; //***************************************************** @@ -421,14 +421,14 @@ public: FxSchematicNormalFxNode(FxSchematicScene *scene, TFx *fx); ~FxSchematicNormalFxNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; - void resize(bool maximizeNode); + void resize(bool maximizeNode) override; protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; protected slots: @@ -451,17 +451,17 @@ public: FxSchematicZeraryNode(FxSchematicScene *scene, TZeraryColumnFx *fx); ~FxSchematicZeraryNode(); - QRectF boundingRect() const; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget = 0) override; - void resize(bool maximizeNode); + void resize(bool maximizeNode) override; int getColumnIndex() { return m_columnIndex; } - bool isCached() const; + bool isCached() const override; protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; protected slots: @@ -486,19 +486,19 @@ public: FxSchematicColumnNode(FxSchematicScene *scene, TLevelColumnFx *fx); ~FxSchematicColumnNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; QPixmap getPixmap(); - bool isOpened() { return m_isOpened; } + bool isOpened() override { return m_isOpened; } void getLevelTypeAndName(int &, QString &); - void resize(bool maximizeNode); + void resize(bool maximizeNode) override; int getColumnIndex() { return m_columnIndex; } protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; private: void renameObject(const TStageObjectId &id, std::string name); @@ -526,17 +526,17 @@ public: FxSchematicPaletteNode(FxSchematicScene *scene, TPaletteColumnFx *fx); ~FxSchematicPaletteNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; QPixmap getPixmap(); - bool isOpened() { return false; } + bool isOpened() override { return false; } int getColumnIndex() { return m_columnIndex; } QString getPaletteName(); protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; protected slots: @@ -567,9 +567,9 @@ public: const std::wstring &groupName); ~FxGroupNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; FxSchematicPort *getOutputPort() const { return m_outDock ? m_outDock->getPort() : 0; @@ -584,17 +584,17 @@ public: QList getGroupedFxs() const { return m_groupedFxs; } void updateFxsDagPosition(const TPointD &pos) const; - bool isOpened() { return m_isOpened; } - void resize(bool maximized); + bool isOpened() override { return m_isOpened; } + void resize(bool maximized) override; bool contains(TFxP fx); // returns the number of ports that take the group in input... it consider // also the node xsheet int getOutputConnectionsCount() const; - bool isEnabled() const; - virtual bool isCached() const; + bool isEnabled() const override; + bool isCached() const override; protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; QPointF computePos() const; protected slots: diff --git a/toonz/sources/include/toonzqt/fxschematicscene.h b/toonz/sources/include/toonzqt/fxschematicscene.h index 0a25d8d..a9cdc08 100644 --- a/toonz/sources/include/toonzqt/fxschematicscene.h +++ b/toonz/sources/include/toonzqt/fxschematicscene.h @@ -106,9 +106,9 @@ public: FxSchematicScene(QWidget *parent); ~FxSchematicScene(); - void updateScene(); - QGraphicsItem *getCurrentNode(); - void reorderScene(); + void updateScene() override; + QGraphicsItem *getCurrentNode() override; + void reorderScene() override; TXsheet *getXsheet(); void setApplication(TApplication *app); @@ -148,11 +148,11 @@ public: bool isLargeScaled() { return m_isLargeScaled; } protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); - void mousePressEvent(QGraphicsSceneMouseEvent *me); - void mouseMoveEvent(QGraphicsSceneMouseEvent *me); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *me); - bool event(QEvent *e); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *me) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *me) override; + bool event(QEvent *e) override; private: FxSchematicNode *addFxSchematicNode(TFx *fx); @@ -187,7 +187,7 @@ signals: void editObject(); protected slots: - void onSelectionSwitched(TSelection *oldSel, TSelection *newSel); + void onSelectionSwitched(TSelection *oldSel, TSelection *newSel) override; void onSelectionChanged(); // void onOutputFxAdded(); diff --git a/toonz/sources/include/toonzqt/fxselection.h b/toonz/sources/include/toonzqt/fxselection.h index 7e37df8..9def0ce 100644 --- a/toonz/sources/include/toonzqt/fxselection.h +++ b/toonz/sources/include/toonzqt/fxselection.h @@ -48,16 +48,16 @@ public: void setPastePosition(const TPointD &pos) { m_pastePosition = pos; } - void enableCommands(); + void enableCommands() override; //! Return true if the selection is empty - bool isEmpty() const { + bool isEmpty() const override { return m_selectedFxs.empty() && m_selectedLinks.empty() && m_selectedColIndexes.isEmpty(); } //! Empty the selection - void selectNone() { + void selectNone() override { m_selectedFxs.clear(); m_selectedLinks.clear(); m_selectedColIndexes.clear(); diff --git a/toonz/sources/include/toonzqt/fxsettings.h b/toonz/sources/include/toonzqt/fxsettings.h index a59ca5d..f190a30 100644 --- a/toonz/sources/include/toonzqt/fxsettings.h +++ b/toonz/sources/include/toonzqt/fxsettings.h @@ -284,8 +284,8 @@ protected: void setFx(const TFxP ¤tFx, const TFxP &actualFx); void createToolBar(); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; void setCheckboardColors(const TPixel32 &col1, const TPixel32 &col2); void changeTitleBar(TFx *fx); diff --git a/toonz/sources/include/toonzqt/gutil.h b/toonz/sources/include/toonzqt/gutil.h index d6870d1..483a618 100644 --- a/toonz/sources/include/toonzqt/gutil.h +++ b/toonz/sources/include/toonzqt/gutil.h @@ -159,7 +159,7 @@ public: TabBarContainter(QWidget *parent = 0); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; //----------------------------------------------------------------------------- @@ -171,7 +171,7 @@ public: ToolBarContainer(QWidget *parent = 0); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; QString DVAPI operator+(const QString &a, const TFilePath &fp); diff --git a/toonz/sources/include/toonzqt/histogram.h b/toonz/sources/include/toonzqt/histogram.h index f4ecc7a..8a967a2 100644 --- a/toonz/sources/include/toonzqt/histogram.h +++ b/toonz/sources/include/toonzqt/histogram.h @@ -65,7 +65,7 @@ public: void draw(QPainter *painter, QPoint translation = QPoint(0, 0)); protected: - void paintEvent(QPaintEvent *pe); + void paintEvent(QPaintEvent *pe) override; }; //============================================================================= @@ -94,7 +94,7 @@ public: void draw(QPainter *painter, QPoint translation = QPoint(0, 0)); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; //============================================================================= diff --git a/toonz/sources/include/toonzqt/infoviewer.h b/toonz/sources/include/toonzqt/infoviewer.h index b45aac5..5d42d6f 100644 --- a/toonz/sources/include/toonzqt/infoviewer.h +++ b/toonz/sources/include/toonzqt/infoviewer.h @@ -32,8 +32,8 @@ public: ~InfoViewer(); protected: - void hideEvent(QHideEvent *); - void showEvent(QShowEvent *); + void hideEvent(QHideEvent *) override; + void showEvent(QShowEvent *) override; protected slots: void onSliderChanged(bool); public slots: diff --git a/toonz/sources/include/toonzqt/intfield.h b/toonz/sources/include/toonzqt/intfield.h index 10186b3..f18ae04 100644 --- a/toonz/sources/include/toonzqt/intfield.h +++ b/toonz/sources/include/toonzqt/intfield.h @@ -56,10 +56,10 @@ public: void setStep(double _step) { m_step = _step; } protected: - void paintEvent(QPaintEvent *e); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); + void paintEvent(QPaintEvent *e) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; void addValue(bool isDragging); void removeValue(bool isDragging); @@ -118,7 +118,7 @@ public: protected: /*! If focus is lost and current text value is out of range emit signal \b editingFinished.*/ - void focusOutEvent(QFocusEvent *); + void focusOutEvent(QFocusEvent *) override; }; //============================================================================= diff --git a/toonz/sources/include/toonzqt/intpairfield.h b/toonz/sources/include/toonzqt/intpairfield.h index f9397b6..e73c476 100644 --- a/toonz/sources/include/toonzqt/intpairfield.h +++ b/toonz/sources/include/toonzqt/intpairfield.h @@ -164,11 +164,11 @@ protected: grab edited and \b value. */ void setValue(int v); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; protected slots: /*! Set current left value to value in left text field; if necessary, if left diff --git a/toonz/sources/include/toonzqt/keyframenavigator.h b/toonz/sources/include/toonzqt/keyframenavigator.h index 615079d..cf4c0bd 100644 --- a/toonz/sources/include/toonzqt/keyframenavigator.h +++ b/toonz/sources/include/toonzqt/keyframenavigator.h @@ -87,8 +87,8 @@ protected: virtual void goNext() = 0; virtual void goPrev() = 0; - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; }; //============================================================================= @@ -124,17 +124,17 @@ public slots: protected: TStageObject *getStageObject() const; - bool hasNext() const; - bool hasPrev() const; - bool hasKeyframes() const; - bool isKeyframe() const; - bool isFullKeyframe() const; - void toggle(); - void goNext(); - void goPrev(); - - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + bool hasNext() const override; + bool hasPrev() const override; + bool hasKeyframes() const override; + bool isKeyframe() const override; + bool isFullKeyframe() const override; + void toggle() override; + void goNext() override; + void goPrev() override; + + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; }; //============================================================================= @@ -175,17 +175,17 @@ public slots: } protected: - bool hasNext() const; - bool hasPrev() const; - bool hasKeyframes() const; - bool isKeyframe() const; - bool isFullKeyframe() const { return isKeyframe(); } - void toggle(); - void goNext(); - void goPrev(); - - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + bool hasNext() const override; + bool hasPrev() const override; + bool hasKeyframes() const override; + bool isKeyframe() const override; + bool isFullKeyframe() const override { return isKeyframe(); } + void toggle() override; + void goNext() override; + void goPrev() override; + + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; }; //============================================================================= @@ -220,17 +220,17 @@ public slots: } protected: - bool hasNext() const; - bool hasPrev() const; - bool hasKeyframes() const; - bool isKeyframe() const; - bool isFullKeyframe() const; - void toggle(); - void goNext(); - void goPrev(); - - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + bool hasNext() const override; + bool hasPrev() const override; + bool hasKeyframes() const override; + bool isKeyframe() const override; + bool isFullKeyframe() const override; + void toggle() override; + void goNext() override; + void goPrev() override; + + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; }; #endif diff --git a/toonz/sources/include/toonzqt/lineedit.h b/toonz/sources/include/toonzqt/lineedit.h index 030275b..7351702 100644 --- a/toonz/sources/include/toonzqt/lineedit.h +++ b/toonz/sources/include/toonzqt/lineedit.h @@ -44,8 +44,8 @@ public: ~LineEdit() {} protected: - void focusInEvent(QFocusEvent *event); - void keyPressEvent(QKeyEvent *event); + void focusInEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; signals: void focusIn(); diff --git a/toonz/sources/include/toonzqt/marksbar.h b/toonz/sources/include/toonzqt/marksbar.h index 360274e..9db1ebd 100644 --- a/toonz/sources/include/toonzqt/marksbar.h +++ b/toonz/sources/include/toonzqt/marksbar.h @@ -63,10 +63,10 @@ protected: int valToPos(int val); int posToVal(int pos); - void paintEvent(QPaintEvent *pe); - void mousePressEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); + void paintEvent(QPaintEvent *pe) override; + void mousePressEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; signals: diff --git a/toonz/sources/include/toonzqt/menubarcommand.h b/toonz/sources/include/toonzqt/menubarcommand.h index c39fc52..b60463e 100644 --- a/toonz/sources/include/toonzqt/menubarcommand.h +++ b/toonz/sources/include/toonzqt/menubarcommand.h @@ -188,7 +188,7 @@ class CommandHandlerHelper : public CommandHandlerInterface { public: CommandHandlerHelper(T *target, void (T::*method)()) : m_target(target), m_method(method) {} - void execute() { (m_target->*m_method)(); } + void execute() override { (m_target->*m_method)(); } }; template @@ -200,7 +200,7 @@ class CommandHandlerHelper2 : public CommandHandlerInterface { public: CommandHandlerHelper2(T *target, void (T::*method)(R), R value) : m_target(target), m_method(method), m_value(value) {} - void execute() { (m_target->*m_method)(m_value); } + void execute() override { (m_target->*m_method)(m_value); } }; //----------------------------------------------------------------------------- @@ -230,7 +230,7 @@ public: OpenPopupCommandHandler(CommandId cmdId) : MenuItemHandler(cmdId), m_popup(0) {} - void execute() { + void execute() override { if (!m_popup) m_popup = new T(); m_popup->show(); m_popup->raise(); diff --git a/toonz/sources/include/toonzqt/multipleselection.h b/toonz/sources/include/toonzqt/multipleselection.h index 250b6e1..f2c0330 100644 --- a/toonz/sources/include/toonzqt/multipleselection.h +++ b/toonz/sources/include/toonzqt/multipleselection.h @@ -35,8 +35,8 @@ public: std::sort(m_objects.begin(), m_objects.end()); } - bool isEmpty() const { return m_objects.empty(); } - void selectNone() { + bool isEmpty() const override { return m_objects.empty(); } + void selectNone() override { m_objects.clear(); notifyView(); } diff --git a/toonz/sources/include/toonzqt/paletteviewer.h b/toonz/sources/include/toonzqt/paletteviewer.h index b4c0444..2daf91a 100644 --- a/toonz/sources/include/toonzqt/paletteviewer.h +++ b/toonz/sources/include/toonzqt/paletteviewer.h @@ -126,14 +126,14 @@ protected: void updatePaletteToolBar(); void updateSavePaletteToolBar(); - void resizeEvent(QResizeEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void resizeEvent(QResizeEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; void clearStyleSelection(); diff --git a/toonz/sources/include/toonzqt/paletteviewergui.h b/toonz/sources/include/toonzqt/paletteviewergui.h index e3b4a24..3effbfe 100644 --- a/toonz/sources/include/toonzqt/paletteviewergui.h +++ b/toonz/sources/include/toonzqt/paletteviewergui.h @@ -141,7 +141,7 @@ public: void drop(int indexInPage, const QMimeData *mimeData); void createDropPage(); - void onSelectionChanged() { update(); } + void onSelectionChanged() override { update(); } TStyleSelection *getSelection() const { return m_styleSelection; } void clearSelection(); @@ -170,29 +170,29 @@ protected: void drawToggleLink(QPainter &p, QRect &chipRect, TColorStyle *style); // event handlers - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; - void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *) override; - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; - void mouseDoubleClickEvent(QMouseEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void mouseDoubleClickEvent(QMouseEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; - void keyPressEvent(QKeyEvent *event); - void dragEnterEvent(QDragEnterEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); + void keyPressEvent(QKeyEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; void startDragDrop(); void createMenuAction(QMenu &menu, const char *id, QString name, const char *slot); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; - bool event(QEvent *e); + bool event(QEvent *e) override; void select(int indexInPage, QMouseEvent *event); @@ -255,12 +255,12 @@ signals: void movePage(int srcIndex, int dstIndex); protected: - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void dragEnterEvent(QDragEnterEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; private: DVGui::LineEdit *m_renameTextField; @@ -300,13 +300,13 @@ signals: void startDrag(); //!< Emitted \a once whenever the icon is sensibly dragged //! by the user. protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; - void enterEvent(QEvent *event); - void leaveEvent(QEvent *event); + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; private: QPoint m_mousePressPos; //!< Mouse position at mouse press. diff --git a/toonz/sources/include/toonzqt/paramfield.h b/toonz/sources/include/toonzqt/paramfield.h index 92c96c1..390aac2 100644 --- a/toonz/sources/include/toonzqt/paramfield.h +++ b/toonz/sources/include/toonzqt/paramfield.h @@ -123,10 +123,10 @@ public: void setStatus(bool hasKeyframe, bool isKeyframe, bool hasBeenChanged); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void enterEvent(QEvent *); - void leaveEvent(QEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; signals: void keyToggled(); @@ -157,7 +157,7 @@ public: // void notify(); - void undo() const { + void undo() const override { if (m_wasKeyframe) m_param->setValue(m_frame, m_currentValue); else @@ -166,7 +166,7 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { if (m_wasKeyframe) m_param->deleteKeyframe(m_frame); else @@ -175,9 +175,9 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - int getSize() const { return sizeof(*this); } - int getHistoryType() { return HistoryType::Fx; } - QString getHistoryString() { + int getSize() const override { return sizeof(*this); } + int getHistoryType() override { return HistoryType::Fx; } + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : %1 Key : %2 Frame %3") .arg((m_wasKeyframe) ? QObject::tr("Delete") : QObject::tr("Set")) @@ -208,14 +208,14 @@ public: virtual void updateField(T value) = 0; - void setParam(const TParamP ¤t, const TParamP &actual, int frame) { + void setParam(const TParamP ¤t, const TParamP &actual, int frame) override { m_currentParam = current; m_actualParam = actual; assert(m_currentParam); assert(m_actualParam); update(frame); } - void update(int frame) { + void update(int frame) override { m_frame = frame; if (!m_actualParam || !m_currentParam) return; T value = m_actualParam->getValue(m_frame); @@ -292,9 +292,9 @@ public: MeasuredDoubleParamField(QWidget *parent, QString name, const TDoubleParamP ¶m); - void updateField(double value); + void updateField(double value) override; - QSize getPreferedSize() { return QSize(260, 28); } + QSize getPreferedSize() override { return QSize(260, 28); } protected slots: void onChange(bool); @@ -315,10 +315,10 @@ public: MeasuredRangeParamField(QWidget *parent, QString name, const TRangeParamP ¶m); - void updateField(DoublePair value); + void updateField(DoublePair value) override; - QSize getPreferedSize() { return QSize(300, 20); } - void setPrecision(int precision); + QSize getPreferedSize() override { return QSize(300, 20); } + void setPrecision(int precision) override; protected slots: void onChange(bool); @@ -337,11 +337,11 @@ class DVAPI PointParamField : public AnimatedParamField { public: PointParamField(QWidget *parent, QString name, const TPointParamP ¶m); - void setPointValue(const TPointD &p); + void setPointValue(const TPointD &p) override; - void updateField(TPointD value); + void updateField(TPointD value) override; - QSize getPreferedSize() { return QSize(270, 28); } + QSize getPreferedSize() override { return QSize(270, 28); } protected slots: void onChange(bool); @@ -361,9 +361,9 @@ class DVAPI PixelParamField public: PixelParamField(QWidget *parent, QString name, const TPixelParamP ¶m); - void updateField(TPixel32 value); + void updateField(TPixel32 value) override; - QSize getPreferedSize() { return QSize(360, 40); } + QSize getPreferedSize() override { return QSize(360, 40); } /*-- RgbLinkButtonの実行のため --*/ TPixel32 getColor(); @@ -407,11 +407,11 @@ public: SpectrumParamField(QWidget *parent, QString name, const TSpectrumParamP ¶m); - void updateField(TSpectrum value); + void updateField(TSpectrum value) override; void setParams(); - QSize getPreferedSize() { return QSize(390, 60); } + QSize getPreferedSize() override { return QSize(390, 60); } protected slots: void onKeyToggled(); @@ -433,10 +433,10 @@ class EnumParamField : public ParamField { public: EnumParamField(QWidget *parent, QString name, const TIntEnumParamP ¶m); - void setParam(const TParamP ¤t, const TParamP &actual, int frame); - void update(int frame); + void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void update(int frame) override; - QSize getPreferedSize() { return QSize(150, 20); } + QSize getPreferedSize() override { return QSize(150, 20); } protected slots: void onChange(const QString &str); @@ -455,10 +455,10 @@ class DVAPI BoolParamField : public ParamField { public: BoolParamField(QWidget *parent, QString name, const TBoolParamP ¶m); - void setParam(const TParamP ¤t, const TParamP &actual, int frame); - void update(int frame); + void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void update(int frame) override; - QSize getPreferedSize() { return QSize(20, 10); } + QSize getPreferedSize() override { return QSize(20, 10); } protected slots: void onToggled(bool checked); @@ -483,10 +483,10 @@ public: IntParamField(QWidget *parent = 0, QString name = 0, const TIntParamP ¶m = 0); - void setParam(const TParamP ¤t, const TParamP &actual, int frame); - void update(int frame); + void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void update(int frame) override; - QSize getPreferedSize() { return QSize(50, 28); } + QSize getPreferedSize() override { return QSize(50, 28); } protected slots: void onChange(bool isDragging = false); @@ -505,10 +505,10 @@ class DVAPI StringParamField : public ParamField { public: StringParamField(QWidget *parent, QString name, const TStringParamP ¶m); - void setParam(const TParamP ¤t, const TParamP &actual, int frame); - void update(int frame); + void setParam(const TParamP ¤t, const TParamP &actual, int frame) override; + void update(int frame) override; - QSize getPreferedSize() { return QSize(100, 20); } + QSize getPreferedSize() override { return QSize(100, 20); } protected slots: void onChange(); }; @@ -527,11 +527,11 @@ public: ToneCurveParamField(QWidget *parent, QString name, const TToneCurveParamP ¶m); - void updateField(const QList value); + void updateField(const QList value) override; void setParams(); - QSize getPreferedSize() { return QSize(400, 380); } + QSize getPreferedSize() override { return QSize(400, 380); } protected slots: void onChannelChanged(int); @@ -556,8 +556,8 @@ class DVAPI LineEdit_double : public ParamField { public: LineEdit_double(QWidget *parent, QString name, TDoubleParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(QString const &text); // could not use MACROs for slots @@ -574,8 +574,8 @@ class DVAPI Slider_double : public ParamField { public: Slider_double(QWidget *parent, QString name, TDoubleParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(int); @@ -592,8 +592,8 @@ class DVAPI SpinBox_double : public ParamField { public: SpinBox_double(QWidget *parent, QString name, TDoubleParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(double); @@ -612,8 +612,8 @@ class DVAPI LineEdit_int : public ParamField { public: LineEdit_int(QWidget *parent, QString name, TIntParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(QString const &text); @@ -630,8 +630,8 @@ class DVAPI Slider_int : public ParamField { public: Slider_int(QWidget *parent, QString name, TIntParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(int); @@ -648,8 +648,8 @@ class DVAPI SpinBox_int : public ParamField { public: SpinBox_int(QWidget *parent, QString name, TIntParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(int); @@ -669,8 +669,8 @@ class DVAPI CheckBox_bool : public ParamField { public: CheckBox_bool(QWidget *parent, QString name, TBoolParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(int); @@ -690,8 +690,8 @@ class DVAPI RadioButton_enum : public ParamField { public: RadioButton_enum(QWidget *parent, QString name, TIntEnumParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(int); @@ -708,8 +708,8 @@ class DVAPI ComboBox_enum : public ParamField { public: ComboBox_enum(QWidget *parent, QString name, TIntEnumParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(int); @@ -728,8 +728,8 @@ class DVAPI LineEdit_string : public ParamField { public: LineEdit_string(QWidget *parent, QString name, TStringParamP const ¶m); - void setParam(TParamP const ¤t, TParamP const &actual, int frame); - void update(int frame); + void setParam(TParamP const ¤t, TParamP const &actual, int frame) override; + void update(int frame) override; protected slots: void update_value(QString const &); diff --git a/toonz/sources/include/toonzqt/rasterimagedata.h b/toonz/sources/include/toonzqt/rasterimagedata.h index 2754d49..779de5f 100644 --- a/toonz/sources/include/toonzqt/rasterimagedata.h +++ b/toonz/sources/include/toonzqt/rasterimagedata.h @@ -60,7 +60,8 @@ public: virtual StrokesData *toStrokesData(ToonzScene *scene) const = 0; virtual TPointD getDpi() const = 0; TDimension getDim() const { return m_dim; } - virtual RasterImageData *clone() const = 0; + + RasterImageData *clone() const override = 0; // Necessary for undo purpose!!!! virtual int getMemorySize() const = 0; @@ -86,19 +87,19 @@ public: const std::vector &rects, const std::vector &strokes, const std::vector &originalStrokes, - const TAffine &transformation); + const TAffine &transformation) override; // floating ti <- data; void getData(TRasterP &copiedRaster, double &dpiX, double &dpiY, std::vector &rects, std::vector &strokes, std::vector &originalStrokes, TAffine &transformation, - TPalette *targetPalette) const; + TPalette *targetPalette) const override; - StrokesData *toStrokesData(ToonzScene *scene) const; - TPointD getDpi() const { return TPointD(m_dpiX, m_dpiY); } + StrokesData *toStrokesData(ToonzScene *scene) const override; + TPointD getDpi() const override { return TPointD(m_dpiX, m_dpiY); } - ToonzImageData *clone() const { return new ToonzImageData(*this); } - int getMemorySize() const; + ToonzImageData *clone() const override { return new ToonzImageData(*this); } + int getMemorySize() const override; }; //=================================================================== @@ -120,19 +121,19 @@ public: const std::vector &rects, const std::vector &strokes, const std::vector &originalStrokes, - const TAffine &transformation); + const TAffine &transformation) override; // floating ti <- data; void getData(TRasterP &copiedRaster, double &dpiX, double &dpiY, std::vector &rects, std::vector &strokes, std::vector &originalStrokes, TAffine &transformation, - TPalette *targetPalette) const; + TPalette *targetPalette) const override; - StrokesData *toStrokesData(ToonzScene *scene) const; - TPointD getDpi() const { return TPointD(m_dpiX, m_dpiY); } + StrokesData *toStrokesData(ToonzScene *scene) const override; + TPointD getDpi() const override { return TPointD(m_dpiX, m_dpiY); } - FullColorImageData *clone() const { return new FullColorImageData(*this); } - int getMemorySize() const; + FullColorImageData *clone() const override { return new FullColorImageData(*this); } + int getMemorySize() const override; }; #endif diff --git a/toonz/sources/include/toonzqt/schematicgroupeditor.h b/toonz/sources/include/toonzqt/schematicgroupeditor.h index f4c1d0a..25259d9 100644 --- a/toonz/sources/include/toonzqt/schematicgroupeditor.h +++ b/toonz/sources/include/toonzqt/schematicgroupeditor.h @@ -50,9 +50,9 @@ public: SchematicScene *scene); ~SchematicWindowEditor(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; virtual QRectF boundingSceneRect() const = 0; virtual void setGroupedNodeZValue(int zValue) = 0; bool contains(SchematicNode *node) const { @@ -61,11 +61,11 @@ public: void resizeNodes(bool maximizeNodes); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *e); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *e); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *e); - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e); - void contextMenuEvent(QGraphicsSceneContextMenuEvent *e); + void mousePressEvent(QGraphicsSceneMouseEvent *e) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *e) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *e) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e) override; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *e) override; protected slots: virtual void closeEditor() = 0; @@ -93,16 +93,16 @@ public: SchematicScene *scene); ~FxSchematicGroupEditor(); - QRectF boundingSceneRect() const; - void setGroupedNodeZValue(int zValue); + QRectF boundingSceneRect() const override; + void setGroupedNodeZValue(int zValue) override; protected slots: - void closeEditor(); - void onNameChanged(); + void closeEditor() override; + void onNameChanged() override; private: - void initializeEditor(); - void doResizeNodes(bool maximizeNodes); + void initializeEditor() override; + void doResizeNodes(bool maximizeNodes) override; }; //===================================================== @@ -122,19 +122,19 @@ public: SchematicScene *scene); ~FxSchematicMacroEditor(); - QRectF boundingSceneRect() const; - void setGroupedNodeZValue(int zValue); + QRectF boundingSceneRect() const override; + void setGroupedNodeZValue(int zValue) override; protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent *e); + void mouseMoveEvent(QGraphicsSceneMouseEvent *e) override; protected slots: - void closeEditor(); - void onNameChanged(); + void closeEditor() override; + void onNameChanged() override; private: - void initializeEditor(); - void doResizeNodes(bool maximizeNodes); + void initializeEditor() override; + void doResizeNodes(bool maximizeNodes) override; }; //===================================================== @@ -154,16 +154,16 @@ public: SchematicScene *scene); ~StageSchematicGroupEditor(); - QRectF boundingSceneRect() const; - void setGroupedNodeZValue(int zValue); + QRectF boundingSceneRect() const override; + void setGroupedNodeZValue(int zValue) override; protected slots: - void closeEditor(); - void onNameChanged(); + void closeEditor() override; + void onNameChanged() override; private: - void initializeEditor(); - void doResizeNodes(bool maximizeNodes); + void initializeEditor() override; + void doResizeNodes(bool maximizeNodes) override; }; #endif diff --git a/toonz/sources/include/toonzqt/schematicnode.h b/toonz/sources/include/toonzqt/schematicnode.h index 462e6ae..5ec8e0c 100644 --- a/toonz/sources/include/toonzqt/schematicnode.h +++ b/toonz/sources/include/toonzqt/schematicnode.h @@ -24,15 +24,15 @@ public: SchematicName(QGraphicsItem *parent, double width, double height); ~SchematicName(); - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; void setName(const QString &name); protected: - void focusInEvent(QFocusEvent *fe); - void focusOutEvent(QFocusEvent *fe); + void focusInEvent(QFocusEvent *fe) override; + void focusOutEvent(QFocusEvent *fe) override; - void keyPressEvent(QKeyEvent *ke); + void keyPressEvent(QKeyEvent *ke) override; signals: void focusOut(); @@ -59,13 +59,13 @@ public: SchematicThumbnailToggle(SchematicNode *parent, bool isOpened); ~SchematicThumbnailToggle(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setIsDown(bool value); protected: - void mousePressEvent(QGraphicsSceneMouseEvent *me); + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; signals: void toggled(bool isOpened); @@ -100,10 +100,10 @@ public: ~SchematicToggle(); - QRectF boundingRect() const; + QRectF boundingRect() const override; // reimplemeted in SchematicToggle_SplineOptions - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget = 0) override; //! this is used for a 2-state toggle; void setIsActive(bool value) { m_state = value ? 1 : 0; } @@ -119,8 +119,8 @@ public: protected: // reimplemeted in SchematicToggle_SplineOptions - virtual void mousePressEvent(QGraphicsSceneMouseEvent *me); - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; signals: //! this is triggered for a 2-state toggle; void toggled(bool isChecked); @@ -142,10 +142,10 @@ public: : SchematicToggle(parent, pixmap1, pixmap2, flags) {} void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void mousePressEvent(QGraphicsSceneMouseEvent *me); + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; }; //======================================================== @@ -169,9 +169,9 @@ public: SchematicHandleSpinBox(QGraphicsItem *parent); ~SchematicHandleSpinBox(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; signals: void modifyHandle(int); @@ -180,9 +180,9 @@ signals: void handleReleased(); protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent *me); - void mousePressEvent(QGraphicsSceneMouseEvent *me); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *me); + void mouseMoveEvent(QGraphicsSceneMouseEvent *me) override; + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *me) override; }; //======================================================== @@ -214,12 +214,12 @@ public: ~SchematicLink(); //! Reimplements the pure virtual QGraphicsItem::boundingRect() method. - QRectF boundingRect() const; + QRectF boundingRect() const override; //! Reimplements the virtual QGraphicsItem::shape() method. - QPainterPath shape() const; + QPainterPath shape() const override; //! Reimplements the pure virtual QGraphicsItem::paint() method. void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; /*! Update the link path.\n The link is has a cubic shape starting from \b startPos and ending to \b @@ -261,8 +261,8 @@ public: void setHighlighted(bool value) { m_highlighted = value; } protected: - void mousePressEvent(QGraphicsSceneMouseEvent *me); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *me); + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *me) override; }; //======================================================== @@ -309,9 +309,10 @@ public: SchematicNode *getNode() const { return m_node; } - virtual QRectF boundingRect() const { return QRectF(0, 0, 1, 1); }; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0){}; + QRectF boundingRect() const override { return QRectF(0, 0, 1, 1); }; + + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, + QWidget *widget = 0) override {}; //! Add the \b link to the links container. void addLink(SchematicLink *link) { m_links.push_back(link); } @@ -372,9 +373,9 @@ public: void setType(int type) { m_type = type; } protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent *me); - void mousePressEvent(QGraphicsSceneMouseEvent *me); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *me); + void mouseMoveEvent(QGraphicsSceneMouseEvent *me) override; + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *me) override; private: virtual SchematicPort *searchPort(const QPointF &scenePos) = 0; @@ -410,9 +411,9 @@ public: SchematicNode(SchematicScene *scene); ~SchematicNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; SchematicPort *addPort(int portId, SchematicPort *port); void erasePort(int portId); @@ -427,9 +428,9 @@ public: virtual void onClicked(){}; protected: - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *me); - virtual void mousePressEvent(QGraphicsSceneMouseEvent *me); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *me); + void mouseMoveEvent(QGraphicsSceneMouseEvent *me) override; + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *me) override; signals: void sceneChanged(); diff --git a/toonz/sources/include/toonzqt/schematicviewer.h b/toonz/sources/include/toonzqt/schematicviewer.h index bd88ebd..505f06a 100644 --- a/toonz/sources/include/toonzqt/schematicviewer.h +++ b/toonz/sources/include/toonzqt/schematicviewer.h @@ -109,12 +109,12 @@ public: QPointF getOldScenePos() { return m_oldScenePos; } protected: - void mousePressEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); - void keyPressEvent(QKeyEvent *ke); - void wheelEvent(QWheelEvent *me); - void showEvent(QShowEvent *se); + void mousePressEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; + void keyPressEvent(QKeyEvent *ke) override; + void wheelEvent(QWheelEvent *me) override; + void showEvent(QShowEvent *se) override; protected slots: diff --git a/toonz/sources/include/toonzqt/scriptconsole.h b/toonz/sources/include/toonzqt/scriptconsole.h index 103b450..bc13912 100644 --- a/toonz/sources/include/toonzqt/scriptconsole.h +++ b/toonz/sources/include/toonzqt/scriptconsole.h @@ -36,11 +36,11 @@ public: ScriptEngine *getEngine() const { return m_engine; } protected: - void keyPressEvent(QKeyEvent *e); + void keyPressEvent(QKeyEvent *e) override; void onReturnKeyPress(); - bool canInsertFromMimeData(const QMimeData *source) const; - void insertFromMimeData(const QMimeData *source); + bool canInsertFromMimeData(const QMimeData *source) const override; + void insertFromMimeData(const QMimeData *source) override; public slots: void onEvaluationDone(); diff --git a/toonz/sources/include/toonzqt/spectrumfield.h b/toonz/sources/include/toonzqt/spectrumfield.h index 4e58cae..09ea03f 100644 --- a/toonz/sources/include/toonzqt/spectrumfield.h +++ b/toonz/sources/include/toonzqt/spectrumfield.h @@ -74,11 +74,11 @@ protected: double posToSpectrumValue(int pos); int spectrumValueToPos(double spectrumValue); - void paintEvent(QPaintEvent *e); - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); + void paintEvent(QPaintEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; - void mouseReleaseEvent(QMouseEvent *e); + void mouseReleaseEvent(QMouseEvent *e) override; int getMaxPosKeyIndex(); int getMinPosKeyIndex(); @@ -121,7 +121,7 @@ protected slots: void onColorChanged(const TPixel32 &color, bool isDragging); protected: - void paintEvent(QPaintEvent *e); + void paintEvent(QPaintEvent *e) override; signals: void keyColorChanged(bool); diff --git a/toonz/sources/include/toonzqt/spreadsheetviewer.h b/toonz/sources/include/toonzqt/spreadsheetviewer.h index a6b84d6..a7b9e79 100644 --- a/toonz/sources/include/toonzqt/spreadsheetviewer.h +++ b/toonz/sources/include/toonzqt/spreadsheetviewer.h @@ -69,9 +69,9 @@ class DVAPI SetFrameDragTool : public DragTool { public: SetFrameDragTool(TFrameHandle *frameHandle) : m_frameHandle(frameHandle) {} - void click(int row, int col, QMouseEvent *e); - void drag(int row, int col, QMouseEvent *e); - void release(int row, int col, QMouseEvent *e); + void click(int row, int col, QMouseEvent *e) override; + void drag(int row, int col, QMouseEvent *e) override; + void release(int row, int col, QMouseEvent *e) override; }; //------------------------------------------------------------------- @@ -83,9 +83,9 @@ class DVAPI SelectionDragTool : public DragTool { public: SelectionDragTool(SpreadsheetViewer *viewer); - void click(int row, int col, QMouseEvent *e); - void drag(int row, int col, QMouseEvent *e); - void release(int row, int col, QMouseEvent *e); + void click(int row, int col, QMouseEvent *e) override; + void drag(int row, int col, QMouseEvent *e) override; + void release(int row, int col, QMouseEvent *e) override; }; //------------------------------------------------------------------- @@ -98,9 +98,9 @@ class DVAPI PanTool : public DragTool { public: PanTool(GenericPanel *panel); - void click(int row, int col, QMouseEvent *e); - void drag(int row, int col, QMouseEvent *e); - void release(int row, int col, QMouseEvent *e); + void click(int row, int col, QMouseEvent *e) override; + void drag(int row, int col, QMouseEvent *e) override; + void release(int row, int col, QMouseEvent *e) override; }; //------------------------------------------------------------------- @@ -119,8 +119,8 @@ public: protected: // keyPressEvent and wheelEvent are ignored by the ScrollArea // and therefore they are handled by the parent (Viewer) - void keyPressEvent(QKeyEvent *e); - void wheelEvent(QWheelEvent *e); + void keyPressEvent(QKeyEvent *e) override; + void wheelEvent(QWheelEvent *e) override; }; //------------------------------------------------------------------- @@ -139,10 +139,10 @@ public: virtual DragTool *createDragTool(QMouseEvent *) { return 0; }; protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; }; //------------------------------------------------------------------- @@ -154,10 +154,10 @@ public: RowPanel(SpreadsheetViewer *viewer); virtual ~RowPanel() {} - DragTool *createDragTool(QMouseEvent *); + DragTool *createDragTool(QMouseEvent *) override; protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; void drawRows(QPainter &p, int r0, int r1); void drawCurrentRowGadget(QPainter &p, int r0, int r1); }; @@ -180,10 +180,10 @@ public: CellPanel(SpreadsheetViewer *viewer); virtual ~CellPanel() {} - DragTool *createDragTool(QMouseEvent *); + DragTool *createDragTool(QMouseEvent *) override; protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; virtual void drawCells(QPainter &p, int r0, int c0, int r1, int c1) {} }; } @@ -287,7 +287,7 @@ public: int getRowCount() const { return m_rowCount; } // provvisorio - QScrollArea *getFrameScrollArea() const { return m_cellScrollArea; } + QScrollArea *getFrameScrollArea() const override { return m_cellScrollArea; } // QProperty void setLightLightBGColor(const QColor &color) { @@ -354,7 +354,7 @@ public: } void scroll(QPoint delta); - void onPrepareToScroll(int dy) { refreshContentSize(0, dy); } + void onPrepareToScroll(int dy) override { refreshContentSize(0, dy); } void setAutoPanSpeed(const QPoint &speed); void setAutoPanSpeed(const QRect &widgetBounds, const QPoint &mousePos); @@ -397,12 +397,12 @@ public: void ensureVisibleCol(int col); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void resizeEvent(QResizeEvent *event); - void keyPressEvent(QKeyEvent *event); - void wheelEvent(QWheelEvent *event); - void timerEvent(QTimerEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void resizeEvent(QResizeEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void wheelEvent(QWheelEvent *event) override; + void timerEvent(QTimerEvent *) override; public slots: void setRowCount(int rowCount); diff --git a/toonz/sources/include/toonzqt/stageobjectsdata.h b/toonz/sources/include/toonzqt/stageobjectsdata.h index 27f9765..cc21bba 100644 --- a/toonz/sources/include/toonzqt/stageobjectsdata.h +++ b/toonz/sources/include/toonzqt/stageobjectsdata.h @@ -82,7 +82,7 @@ public: //! Clones this object. //! \note Clones stored fxs, columns, etc. too. - StageObjectsData *clone() const; + StageObjectsData *clone() const override; bool isEmpty() const { return m_elements.isEmpty() && m_splines.isEmpty(); } diff --git a/toonz/sources/include/toonzqt/stageschematicnode.h b/toonz/sources/include/toonzqt/stageschematicnode.h index 288ac5f..850f899 100644 --- a/toonz/sources/include/toonzqt/stageschematicnode.h +++ b/toonz/sources/include/toonzqt/stageschematicnode.h @@ -52,15 +52,15 @@ public: ColumnPainter(StageSchematicColumnNode *parent, double width, double height, const QString &name); ~ColumnPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } QLinearGradient getGradientByLevelType(int type); protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; public slots: void onIconGenerated(); @@ -84,13 +84,13 @@ public: GroupPainter(StageSchematicGroupNode *parent, double width, double height, const QString &name); ~GroupPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //======================================================== @@ -111,13 +111,13 @@ public: PegbarPainter(StageSchematicPegbarNode *parent, double width, double height, const QString &name); ~PegbarPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //======================================================== @@ -139,13 +139,13 @@ public: CameraPainter(StageSchematicCameraNode *parent, double width, double height, const QString &name); ~CameraPainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //======================================================== @@ -164,12 +164,12 @@ class TablePainter : public QObject, public QGraphicsItem { public: TablePainter(StageSchematicTableNode *parent, double width, double height); ~TablePainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //======================================================== @@ -190,13 +190,13 @@ public: SplinePainter(StageSchematicSplineNode *parent, double width, double height, const QString &name); ~SplinePainter(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setName(const QString &name) { m_name = name; } protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; }; //======================================================== @@ -212,18 +212,18 @@ public: StageSchematicNodePort(StageSchematicNodeDock *parent, int type); ~StageSchematicNodePort(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; void setHandle(const QString &value) { m_handle = value; } QString getHandle() { return m_handle; } - bool linkTo(SchematicPort *port, bool checkOnly = false); + bool linkTo(SchematicPort *port, bool checkOnly = false) override; private: - SchematicPort *searchPort(const QPointF &scenePos); - void hideSnappedLinks(); - void showSnappedLinks(); + SchematicPort *searchPort(const QPointF &scenePos) override; + void hideSnappedLinks() override; + void showSnappedLinks() override; }; //======================================================== @@ -240,15 +240,15 @@ public: StageSchematicSplinePort(StageSchematicSplineDock *parent, int type); ~StageSchematicSplinePort(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); - bool linkTo(SchematicPort *port, bool checkOnly = false); + QWidget *widget = 0) override; + bool linkTo(SchematicPort *port, bool checkOnly = false) override; private: - SchematicPort *searchPort(const QPointF &scenePos); - void hideSnappedLinks(); - void showSnappedLinks(); + SchematicPort *searchPort(const QPointF &scenePos) override; + void hideSnappedLinks() override; + void showSnappedLinks() override; }; //======================================================== @@ -267,9 +267,9 @@ public: bool getAim() { return m_aim; } protected: - void mouseMoveEvent(QGraphicsSceneMouseEvent *me); - void mousePressEvent(QGraphicsSceneMouseEvent *me); - void mouseReleaseEvent(QGraphicsSceneMouseEvent *me); + void mouseMoveEvent(QGraphicsSceneMouseEvent *me) override; + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *me) override; }; //======================================================== @@ -296,18 +296,18 @@ public: eStageSchematicPortType type); ~StageSchematicNodeDock(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; StageSchematicNodePort *getPort() { return m_port; } StageSchematicNode *getNode() { return m_parent; } bool isParentPort() { return m_isParentPort; } protected: - void hoverEnterEvent(QGraphicsSceneHoverEvent *he); - void hoverLeaveEvent(QGraphicsSceneHoverEvent *he); - void hoverMoveEvent(QGraphicsSceneHoverEvent *he); + void hoverEnterEvent(QGraphicsSceneHoverEvent *he) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *he) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *he) override; private: // void updateHandle(bool increase); @@ -343,9 +343,9 @@ public: eStageSchematicPortType type); ~StageSchematicSplineDock(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; StageSchematicSplinePort *getPort() { return m_port; } SchematicNode *getNode() { return m_parent; } @@ -381,9 +381,9 @@ public: void setWidth(const qreal &width) { m_width = width; } void setHeight(const qreal &height) { m_height = height; } - void setSchematicNodePos(const QPointF &pos) const; + void setSchematicNodePos(const QPointF &pos) const override; bool isNameEditing() { return m_nameItem->isVisible(); } - void onClicked(); + void onClicked() override; int getChildCount() { return m_childDocks.size(); } StageSchematicNodePort *getChildPort(int i) { @@ -395,7 +395,7 @@ public: StageSchematicNodePort *makeChildPort(const QString &label); StageSchematicNodePort *makeParentPort(const QString &label); virtual void updateChildDockPositions(); // TODO: commento! doxygen - void setPosition(const QPointF &newPos); + void setPosition(const QPointF &newPos) override; signals: void currentObjectChanged(const TStageObjectId &id, bool isSpline); @@ -421,12 +421,12 @@ public: StageSchematicPegbarNode(StageSchematicScene *scene, TStageObject *pegbar); ~StageSchematicPegbarNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; protected slots: void onNameChanged(); @@ -445,9 +445,9 @@ public: StageSchematicTableNode(StageSchematicScene *scene, TStageObject *pegbar); ~StageSchematicTableNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; }; //======================================================== @@ -468,9 +468,9 @@ public: StageSchematicColumnNode(StageSchematicScene *scene, TStageObject *pegbar); ~StageSchematicColumnNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; QPixmap getPixmap(); bool isOpened() { return m_isOpened; } void resize(bool maximized); @@ -481,7 +481,7 @@ private: void updatePortsPosition(); protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; protected slots: void onNameChanged(); @@ -505,12 +505,12 @@ public: StageSchematicCameraNode(StageSchematicScene *scene, TStageObject *pegbar); ~StageSchematicCameraNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; protected slots: void onNameChanged(); @@ -538,22 +538,22 @@ public: TStageObjectSpline *spline); ~StageSchematicSplineNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); - void onClicked(); + QWidget *widget = 0) override; + void onClicked() override; - void setSchematicNodePos(const QPointF &pos) const; + void setSchematicNodePos(const QPointF &pos) const override; TStageObjectSpline *getSpline() { return m_spline; } bool isNameEditing() { return m_nameItem->isVisible(); } bool isOpened() { return m_isOpened; } QPixmap getPixmap(); StageSchematicSplinePort *getParentPort() { return m_dock->getPort(); } - void setPosition(const QPointF &newPos) { setPos(newPos); } + void setPosition(const QPointF &newPos) override { setPos(newPos); } void resize(bool maximized); protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; signals: void currentObjectChanged(const TStageObjectId &id, bool isSpline); @@ -582,9 +582,9 @@ public: const QList groupedObj); ~StageSchematicGroupNode(); - QRectF boundingRect() const; + QRectF boundingRect() const override; void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget = 0); + QWidget *widget = 0) override; QList getGroupedObjects() { return m_groupedObj; } int getGroupId(); TStageObject *getRoot() { return m_root; } @@ -594,7 +594,7 @@ public: void resize(bool maximized); protected: - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me); + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *me) override; protected slots: void onNameChanged(); diff --git a/toonz/sources/include/toonzqt/stageschematicscene.h b/toonz/sources/include/toonzqt/stageschematicscene.h index 13e6298..28df505 100644 --- a/toonz/sources/include/toonzqt/stageschematicscene.h +++ b/toonz/sources/include/toonzqt/stageschematicscene.h @@ -106,13 +106,13 @@ public: ~StageSchematicScene(); //! Clear all item an regenerate the Stage Schematic graph. - void updateScene(); + void updateScene() override; //! Reurns the current node. - QGraphicsItem *getCurrentNode(); + QGraphicsItem *getCurrentNode() override; //! Replace all nodes in the scene. - void reorderScene(); + void reorderScene() override; TXsheet *getXsheet(); TXsheetHandle *getXsheetHandle() { return m_xshHandle; } @@ -181,8 +181,8 @@ private: bool maximizedNode); protected: - void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme); - void mousePressEvent(QGraphicsSceneMouseEvent *me); + void contextMenuEvent(QGraphicsSceneContextMenuEvent *cme) override; + void mousePressEvent(QGraphicsSceneMouseEvent *me) override; signals: void editObject(); @@ -190,7 +190,7 @@ signals: void doExplodeChild(QList); protected slots: - void onSelectionSwitched(TSelection *oldSel, TSelection *newSel); + void onSelectionSwitched(TSelection *oldSel, TSelection *newSel) override; void onPegbarAdded(); void onSplineAdded(); diff --git a/toonz/sources/include/toonzqt/strokesdata.h b/toonz/sources/include/toonzqt/strokesdata.h index 5b09679..1eab72b 100644 --- a/toonz/sources/include/toonzqt/strokesdata.h +++ b/toonz/sources/include/toonzqt/strokesdata.h @@ -35,7 +35,7 @@ public: StrokesData(TVectorImage *image) : m_image(image) {} ~StrokesData() {} - StrokesData *clone() const { + StrokesData *clone() const override { TVectorImage *vi = 0; if (m_image) vi = dynamic_cast(m_image->cloneImage()); return new StrokesData(vi); diff --git a/toonz/sources/include/toonzqt/studiopaletteviewer.h b/toonz/sources/include/toonzqt/studiopaletteviewer.h index f8dea4d..0fb1903 100644 --- a/toonz/sources/include/toonzqt/studiopaletteviewer.h +++ b/toonz/sources/include/toonzqt/studiopaletteviewer.h @@ -78,18 +78,18 @@ public: TPaletteHandle *getStdPaletteHandle() const { return m_studioPaletteHandle; } /*! Overriden from StudioPalette::Listener. */ - void onStudioPaletteTreeChange() { refresh(); } + void onStudioPaletteTreeChange() override { refresh(); } /*! Overriden from StudioPalette::Listener. */ - void onStudioPaletteMove(const TFilePath &dstPath, const TFilePath &srcPath) { + void onStudioPaletteMove(const TFilePath &dstPath, const TFilePath &srcPath) override { refresh(); } /*! Overriden from StudioPalette::Listener. */ - void onStudioPaletteChange(const TFilePath &palette) { refresh(); } + void onStudioPaletteChange(const TFilePath &palette) override { refresh(); } /*! Overriden from TProjectManager::Listener. */ - void onProjectSwitched() { resetProjectPaletteFolder(); } + void onProjectSwitched() override { resetProjectPaletteFolder(); } /*! Overriden from TProjectManager::Listener. */ - void onProjectChanged() { resetProjectPaletteFolder(); } + void onProjectChanged() override { resetProjectPaletteFolder(); } TFilePath getCurrentItemPath() { return getItemPath(currentItem()); } @@ -163,28 +163,28 @@ protected: void resetDropItem(); - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; /*! Open a context menu considering current item data role \b Qt::UserRole. */ - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; /*! Add an action to menu \b menu; the action has text \b name and its \b triggered() signal is connetted with \b slot. */ void createMenuAction(QMenu &menu, const char *id, QString name, const char *slot); /*! If button left is pressed start drag and drop. */ - void mouseMoveEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event) override; /*! If path related to current item exist and is a palette execute drag. */ void startDragDrop(); /*! Verify drag enter data, if it has an url and it's path is a palette or data is a PaletteData accept drag event. */ - void dragEnterEvent(QDragEnterEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; /*! Find item folder nearest to current position. */ - void dragMoveEvent(QDragMoveEvent *event); + void dragMoveEvent(QDragMoveEvent *event) override; /*! Execute drop event. If dropped palette is in studio palette folder move palette, otherwise copy palette in current folder. */ - void dropEvent(QDropEvent *event); + void dropEvent(QDropEvent *event) override; /*! Set dropItem to 0 and update the tree. */ - void dragLeaveEvent(QDragLeaveEvent *event); + void dragLeaveEvent(QDragLeaveEvent *event) override; }; //============================================================================= diff --git a/toonz/sources/include/toonzqt/styleeditor.h b/toonz/sources/include/toonzqt/styleeditor.h index 3d3a1a5..466ab8f 100644 --- a/toonz/sources/include/toonzqt/styleeditor.h +++ b/toonz/sources/include/toonzqt/styleeditor.h @@ -168,14 +168,14 @@ public: QColor getBGColor() const { return m_bgColor; } protected: - void initializeGL(); - void resizeGL(int width, int height); - void paintGL(); + void initializeGL() override; + void resizeGL(int width, int height) override; + void paintGL() override; QSize SizeHint() const { return QSize(300, 200); }; - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; signals: void colorChanged(const ColorModel &color, bool isDragging); @@ -204,12 +204,12 @@ public: void setColor(const ColorModel &color); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; void click(const QPoint &pos); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; public slots: /*! Connect channels to the two square axes: @@ -247,9 +247,9 @@ public: ColorChannel getChannel() const { return m_channel; } protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; // QIcon getFirstArrowIcon(); // QIcon getLastArrowIcon(); @@ -279,7 +279,7 @@ public: protected: void stopTime(int timerId); - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; void notifyChanged(); protected slots: @@ -344,9 +344,9 @@ public: : IntLineEdit(parent, value, minValue, maxValue), m_isEditing(false) {} protected: - void mousePressEvent(QMouseEvent *); - void focusOutEvent(QFocusEvent *); - void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *) override; + void focusOutEvent(QFocusEvent *) override; + void paintEvent(QPaintEvent *) override; }; //============================================================================= @@ -423,8 +423,8 @@ signals: void colorParamChanged(); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; }; //============================================================================= @@ -460,7 +460,7 @@ public: void setColor(const TColorStyle &style, int colorParameterIndex); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *) override; signals: void colorChanged(const ColorModel &, bool isDragging); @@ -512,12 +512,12 @@ protected: int posToIndex(const QPoint &pos) const; - void paintEvent(QPaintEvent *); - void resizeEvent(QResizeEvent *) { computeSize(); } + void paintEvent(QPaintEvent *) override; + void resizeEvent(QResizeEvent *) override { computeSize(); } - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event) {} - void mouseReleaseEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override {} + void mouseReleaseEvent(QMouseEvent *event) override; protected slots: void computeSize(); signals: @@ -675,8 +675,8 @@ protected: bool enabledFirstAndLastTab = false); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; protected slots: diff --git a/toonz/sources/include/toonzqt/styleindexlineedit.h b/toonz/sources/include/toonzqt/styleindexlineedit.h index afbe21e..7dd8438 100644 --- a/toonz/sources/include/toonzqt/styleindexlineedit.h +++ b/toonz/sources/include/toonzqt/styleindexlineedit.h @@ -35,7 +35,7 @@ public: TPaletteHandle *getPaletteHandle() { return m_pltHandle; } protected: - void paintEvent(QPaintEvent *pe); + void paintEvent(QPaintEvent *pe) override; }; } // namspace diff --git a/toonz/sources/include/toonzqt/stylenameeditor.h b/toonz/sources/include/toonzqt/stylenameeditor.h index 8fc197d..3acab4a 100644 --- a/toonz/sources/include/toonzqt/stylenameeditor.h +++ b/toonz/sources/include/toonzqt/stylenameeditor.h @@ -23,9 +23,9 @@ public: void setPaletteHandle(TPaletteHandle *ph); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void enterEvent(QEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void enterEvent(QEvent *) override; protected slots: void onStyleSwitched(); diff --git a/toonz/sources/include/toonzqt/styleselection.h b/toonz/sources/include/toonzqt/styleselection.h index 3602c5f..68f883a 100644 --- a/toonz/sources/include/toonzqt/styleselection.h +++ b/toonz/sources/include/toonzqt/styleselection.h @@ -53,8 +53,8 @@ public: bool isSelected(int pageIndex, int styleIndexInPage) const; bool isPageSelected(int pageIndex) const; bool canHandleStyles(); - void selectNone(); - bool isEmpty() const; + void selectNone() override; + bool isEmpty() const override; int getStyleCount() const; TPaletteHandle *getPaletteHandle() const { return m_paletteHandle; } void setPaletteHandle(TPaletteHandle *paletteHandle) { @@ -90,7 +90,7 @@ public: void toggleLink(); void eraseToggleLink(); - void enableCommands(); + void enableCommands() override; void toggleKeyframe(int frame); diff --git a/toonz/sources/include/toonzqt/swatchviewer.h b/toonz/sources/include/toonzqt/swatchviewer.h index 47cc9be..9148f8e 100644 --- a/toonz/sources/include/toonzqt/swatchviewer.h +++ b/toonz/sources/include/toonzqt/swatchviewer.h @@ -49,7 +49,7 @@ public: SolidColorBgPainter(std::string name, TPixel32 color) : BgPainter(name), m_color(color) {} - void paint(const TRaster32P &ras) { ras->fill(m_color); } + void paint(const TRaster32P &ras) override { ras->fill(m_color); } }; //============================================================================= @@ -61,7 +61,7 @@ public: CheckboardBgPainter(std::string name, TPixel32 c0, TPixel32 c1) : BgPainter(name), m_c0(c0), m_c1(c1) {} - void paint(const TRaster32P &ras) { + void paint(const TRaster32P &ras) override { int n = 4, min = 4; TDimensionD d(std::max(min, ras->getLx() / n), std::max(min, ras->getLy() / n)); @@ -146,12 +146,12 @@ public: SwatchViewer *viewer); ~ContentRender(); - void run(); - int taskLoad(); + void run() override; + int taskLoad() override; - void onStarted(TThread::RunnableP task); - void onFinished(TThread::RunnableP task); - void onCanceled(TThread::RunnableP task); + void onStarted(TThread::RunnableP task) override; + void onFinished(TThread::RunnableP task) override; + void onCanceled(TThread::RunnableP task) override; }; #if QT_VERSION >= 0x050500 @@ -194,14 +194,14 @@ protected: void setAff(const TAffine &aff); - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *); - void keyPressEvent(QKeyEvent *event); - void resizeEvent(QResizeEvent *event); - void hideEvent(QHideEvent *event); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *) override; + void keyPressEvent(QKeyEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void hideEvent(QHideEvent *event) override; signals: void pointPositionChanged(int index, const TPointD &p); diff --git a/toonz/sources/include/toonzqt/tonecurvefield.h b/toonz/sources/include/toonzqt/tonecurvefield.h index 6510e80..705441b 100644 --- a/toonz/sources/include/toonzqt/tonecurvefield.h +++ b/toonz/sources/include/toonzqt/tonecurvefield.h @@ -65,7 +65,7 @@ public: m_currentControlPointIndex = index; }; - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; void setFirstLastXPosition(std::pair values, bool isDragging); @@ -95,16 +95,16 @@ protected: QPainterPath getPainterPath(); - void paintEvent(QPaintEvent *); - void mouseMoveEvent(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void keyPressEvent(QKeyEvent *e); - void enterEvent(QEvent *); - void leaveEvent(QEvent *); + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void keyPressEvent(QKeyEvent *e) override; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; - void focusInEvent(QFocusEvent *fe); - void focusOutEvent(QFocusEvent *fe); + void focusInEvent(QFocusEvent *fe) override; + void focusOutEvent(QFocusEvent *fe) override; signals: void focusOut(); diff --git a/toonz/sources/include/toonzqt/treemodel.h b/toonz/sources/include/toonzqt/treemodel.h index 5aa7504..3c6ffd8 100644 --- a/toonz/sources/include/toonzqt/treemodel.h +++ b/toonz/sources/include/toonzqt/treemodel.h @@ -118,13 +118,13 @@ public slots: // const QList &getItemsToDelete() const {return m_itemsToDelete;} - Qt::ItemFlags flags(const QModelIndex &index) const; + Qt::ItemFlags flags(const QModelIndex &index) const override; QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const; - QModelIndex parent(const QModelIndex &index) const; - int rowCount(const QModelIndex &parent = QModelIndex()) const; - int columnCount(const QModelIndex &parent = QModelIndex()) const; - QVariant data(const QModelIndex &index, int role) const; + const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role) const override; void setRowHidden(int row, const QModelIndex &parent, bool hide); @@ -166,11 +166,11 @@ friend Delegate; // virtual void onClick(TreeModel::Item *item, const QPoint &pos, const // QStyleOptionViewItem &option) {} - void mouseDoubleClickEvent(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void resizeEvent(QResizeEvent *); + void mouseDoubleClickEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; void setModel(TreeModel *model); diff --git a/toonz/sources/include/tpalette.h b/toonz/sources/include/tpalette.h index 75eb02e..fae2568 100644 --- a/toonz/sources/include/tpalette.h +++ b/toonz/sources/include/tpalette.h @@ -303,8 +303,8 @@ between RGBA color components. const; //!< Returns the index of the style whose main color //! is nearest to the requested one. - void loadData(TIStream &is); //!< I/O palette save function. - void saveData(TOStream &os); //!< I/O palette load function. + void loadData(TIStream &is) override; //!< I/O palette save function. + void saveData(TOStream &os) override; //!< I/O palette load function. int getVersion() const { return m_version; diff --git a/toonz/sources/include/tparamcontainer.h b/toonz/sources/include/tparamcontainer.h index 11c1bad..4313a8c 100644 --- a/toonz/sources/include/tparamcontainer.h +++ b/toonz/sources/include/tparamcontainer.h @@ -51,9 +51,10 @@ public: : TParamVar(name, hidden), m_var(var) {} TParamVarT(std::string name, T *var, bool hidden = false) : TParamVar(name, hidden), m_var(var) {} - void setParam(TParam *param) { m_var = TParamP(param); } - virtual TParam *getParam() const { return m_var.getPointer(); } - TParamVar *clone() const { + void setParam(TParam *param) override { m_var = TParamP(param); } + + TParam *getParam() const override { return m_var.getPointer(); } + TParamVar *clone() const override { return new TParamVarT(getName(), m_var, isHidden()); } }; diff --git a/toonz/sources/include/tparamset.h b/toonz/sources/include/tparamset.h index a0f1479..6c0363c 100644 --- a/toonz/sources/include/tparamset.h +++ b/toonz/sources/include/tparamset.h @@ -66,39 +66,39 @@ public: void getAnimatableParams(std::vector ¶ms, bool recursive = true); - void addObserver(TParamObserver *observer); - void removeObserver(TParamObserver *observer); + void addObserver(TParamObserver *observer) override; + void removeObserver(TParamObserver *observer) override; void beginParameterChange(); void endParameterChange(); void enableDragging(bool on); - void enableNotification(bool on); - bool isNotificationEnabled() const; + void enableNotification(bool on) override; + bool isNotificationEnabled() const override; - bool isAnimatable() const { return true; } - bool isKeyframe(double frame) const; - void deleteKeyframe(double frame); - void clearKeyframes(); + bool isAnimatable() const override { return true; } + bool isKeyframe(double frame) const override; + void deleteKeyframe(double frame) override; + void clearKeyframes() override; void assignKeyframe(double frame, const TSmartPointerT &src, - double srcFrame, bool changedOnly = false); + double srcFrame, bool changedOnly = false) override; - void getKeyframes(std::set &frames) const; + void getKeyframes(std::set &frames) const override; int getKeyframeCount() const; - double keyframeIndexToFrame(int index) const; + double keyframeIndexToFrame(int index) const override; - virtual TParam *clone() const; - virtual void copy(TParam *src); - virtual void loadData(TIStream &); - virtual void saveData(TOStream &); + TParam *clone() const override; + void copy(TParam *src) override; + void loadData(TIStream &) override; + void saveData(TOStream &) override; - int getNextKeyframe(double frame) const; - int getPrevKeyframe(double frame) const; + int getNextKeyframe(double frame) const override; + int getPrevKeyframe(double frame) const override; - bool hasKeyframes() const; + bool hasKeyframes() const override; - std::string getValueAlias(double frame, int precision); + std::string getValueAlias(double frame, int precision) override; private: TParamSetImp *m_imp = nullptr; @@ -147,16 +147,16 @@ public: TPointParam(const TPointParam &src); ~TPointParam(); - TParam *clone() const { return new TPointParam(*this); } - void copy(TParam *src); + TParam *clone() const override { return new TPointParam(*this); } + void copy(TParam *src) override; TPointD getDefaultValue() const; TPointD getValue(double frame) const; bool setValue(double frame, const TPointD &p); void setDefaultValue(const TPointD &p); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; TDoubleParamP &getX(); TDoubleParamP &getY(); @@ -193,8 +193,8 @@ public: TPixelParam(const TPixelParam &); ~TPixelParam(); - TParam *clone() const { return new TPixelParam(*this); } - void copy(TParam *src); + TParam *clone() const override { return new TPixelParam(*this); } + void copy(TParam *src) override; TPixel32 getDefaultValue() const; TPixelD getValueD(double frame) const; @@ -210,8 +210,8 @@ public: void enableMatte(bool on); bool isMatteEnabled() const; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; TDoubleParamP &getRed(); TDoubleParamP &getGreen(); @@ -251,16 +251,16 @@ public: TRangeParam(const TRangeParam &src); ~TRangeParam(); - TParam *clone() const { return new TRangeParam(*this); } - void copy(TParam *src); + TParam *clone() const override { return new TRangeParam(*this); } + void copy(TParam *src) override; DoublePair getDefaultValue() const; DoublePair getValue(double frame) const; bool setValue(double frame, const DoublePair &v); void setDefaultValue(const DoublePair &v); - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; int getKeyframeCount() const; TDoubleParamP &getMin(); diff --git a/toonz/sources/include/tpassivecachemanager.h b/toonz/sources/include/tpassivecachemanager.h index f3422f6..2970247 100644 --- a/toonz/sources/include/tpassivecachemanager.h +++ b/toonz/sources/include/tpassivecachemanager.h @@ -105,14 +105,14 @@ public: void getResource(TCacheResourceP &resource, const std::string &alias, const TFxP &fx, double frame, const TRenderSettings &rs, - ResourceDeclaration *resData); + ResourceDeclaration *resData) override; - void onRenderInstanceStart(unsigned long renderId); - void onRenderInstanceEnd(unsigned long renderId); + void onRenderInstanceStart(unsigned long renderId) override; + void onRenderInstanceEnd(unsigned long renderId) override; - void onRenderStatusEnd(int renderStatus); + void onRenderStatusEnd(int renderStatus) override; - bool renderHasOwnership() { return false; } + bool renderHasOwnership() override { return false; } public: void setTreeDescriptor(TreeDescriptor callback); diff --git a/toonz/sources/include/tpersist.h b/toonz/sources/include/tpersist.h index c0958a9..024520c 100644 --- a/toonz/sources/include/tpersist.h +++ b/toonz/sources/include/tpersist.h @@ -128,7 +128,7 @@ public: This template class is called by the macro PERSIST_DECLARATION(T). A class that calls PERSIST_DECLARATION(T) must inherits TPersist. */ - TPersist *create() const { return new T; }; + TPersist *create() const override { return new T; }; }; //------------------------------------------------------------------- diff --git a/toonz/sources/include/tpersistset.h b/toonz/sources/include/tpersistset.h index 4382be9..d88f0a9 100644 --- a/toonz/sources/include/tpersistset.h +++ b/toonz/sources/include/tpersistset.h @@ -41,8 +41,8 @@ public: object); //!< Overwrites an object type instance with //! the supplied one. public: - void saveData(TOStream &os); //!< Saves data to stream - void loadData(TIStream &is); //!< Loads data from stream + void saveData(TOStream &os) override; //!< Saves data to stream + void loadData(TIStream &is) override; //!< Loads data from stream }; #endif // TPERSISTSET_H diff --git a/toonz/sources/include/tpredictivecachemanager.h b/toonz/sources/include/tpredictivecachemanager.h index ae4d605..3232f18 100644 --- a/toonz/sources/include/tpredictivecachemanager.h +++ b/toonz/sources/include/tpredictivecachemanager.h @@ -52,10 +52,10 @@ public: void getResource(TCacheResourceP &resource, const std::string &alias, const TFxP &fx, double frame, const TRenderSettings &rs, - ResourceDeclaration *resData); + ResourceDeclaration *resData) override; - void onRenderStatusStart(int renderStatus); - void onRenderStatusEnd(int renderStatus); + void onRenderStatusStart(int renderStatus) override; + void onRenderStatusEnd(int renderStatus) override; }; #endif // TPREDICTIVECACHEMANAGER_H diff --git a/toonz/sources/include/tproperty.h b/toonz/sources/include/tproperty.h index a1ac4be..c6a53d1 100644 --- a/toonz/sources/include/tproperty.h +++ b/toonz/sources/include/tproperty.h @@ -115,7 +115,7 @@ public: setValue(value); } - TProperty *clone() const { return new TRangeProperty(*this); } + TProperty *clone() const override { return new TRangeProperty(*this); } Range getRange() const { return m_range; } @@ -131,9 +131,9 @@ public: T getValue() const { return m_value; } - std::string getValueAsString() { return std::to_string(m_value); } + std::string getValueAsString() override { return std::to_string(m_value); } - void accept(Visitor &v) { v.visit(this); } + void accept(Visitor &v) override { v.visit(this); } bool isMaxRangeLimited() const { return m_isMaxRangeLimited; } @@ -163,7 +163,7 @@ public: setValue(Value(v0, v1)); } - TProperty *clone() const { return new TDoublePairProperty(*this); } + TProperty *clone() const override { return new TDoublePairProperty(*this); } Range getRange() const { return m_range; } @@ -178,10 +178,10 @@ public: m_value = value; } Value getValue() const { return m_value; } - std::string getValueAsString() { + std::string getValueAsString() override { return std::to_string(m_value.first) + "," + std::to_string(m_value.second); } - void accept(Visitor &v) { v.visit(this); }; + void accept(Visitor &v) override { v.visit(this); }; private: Range m_range; @@ -204,7 +204,7 @@ public: setValue(Value(v0, v1)); } - TProperty *clone() const { return new TIntPairProperty(*this); } + TProperty *clone() const override { return new TIntPairProperty(*this); } Range getRange() const { return m_range; } @@ -219,10 +219,10 @@ public: m_value = value; } Value getValue() const { return m_value; } - std::string getValueAsString() { + std::string getValueAsString() override { return std::to_string(m_value.first) + "," + std::to_string(m_value.second); } - void accept(Visitor &v) { v.visit(this); }; + void accept(Visitor &v) override { v.visit(this); }; private: Range m_range; @@ -237,12 +237,12 @@ public: TBoolProperty(std::string name, bool value) : TProperty(name), m_value(value) {} - TProperty *clone() const { return new TBoolProperty(*this); } + TProperty *clone() const override { return new TBoolProperty(*this); } void setValue(bool v) { m_value = v; } bool getValue() const { return m_value; } - std::string getValueAsString() { return std::to_string(m_value); } - void accept(Visitor &v) { v.visit(this); }; + std::string getValueAsString() override { return std::to_string(m_value); } + void accept(Visitor &v) override { v.visit(this); }; private: bool m_value; @@ -255,12 +255,12 @@ public: TStringProperty(std::string name, std::wstring value) : TProperty(name), m_value(value) {} - TProperty *clone() const { return new TStringProperty(*this); } + TProperty *clone() const override { return new TStringProperty(*this); } void setValue(std::wstring v) { m_value = v; } std::wstring getValue() const { return m_value; } - std::string getValueAsString() { return ::to_string(m_value); } - void accept(Visitor &v) { v.visit(this); }; + std::string getValueAsString() override { return ::to_string(m_value); } + void accept(Visitor &v) override { v.visit(this); }; private: std::wstring m_value; @@ -273,14 +273,14 @@ public: TStyleIndexProperty(std::string name, std::wstring value) : TProperty(name), m_value(value) {} - TProperty *clone() const { return new TStyleIndexProperty(*this); } + TProperty *clone() const override { return new TStyleIndexProperty(*this); } void setValue(std::wstring v) { m_value = v; } std::wstring getValue() const { return m_value; } - std::string getValueAsString() { return ::to_string(m_value); } + std::string getValueAsString() override { return ::to_string(m_value); } - void accept(Visitor &v) { v.visit(this); }; + void accept(Visitor &v) override { v.visit(this); }; private: std::wstring m_value; @@ -293,14 +293,14 @@ public: TPointerProperty(std::string name, void *value) : TProperty(name), m_value(value) {} - TProperty *clone() const { return new TPointerProperty(*this); } + TProperty *clone() const override { return new TPointerProperty(*this); } void setValue(void *v) { m_value = v; } void *getValue() const { return m_value; } - std::string getValueAsString() { return ::to_string(m_value); } + std::string getValueAsString() override { return ::to_string(m_value); } - void accept(Visitor &v) { v.visit(this); }; + void accept(Visitor &v) override { v.visit(this); }; private: void *m_value; @@ -326,7 +326,7 @@ public: if (m_index < 0) throw RangeError(); } - TProperty *clone() const { return new TEnumProperty(*this); } + TProperty *clone() const override { return new TEnumProperty(*this); } int indexOf(const std::wstring &value) { Range::const_iterator it = std::find(m_range.begin(), m_range.end(), value); @@ -364,10 +364,10 @@ public: std::wstring getValue() const { return (m_index < 0) ? L"" : m_range[m_index]; } - std::string getValueAsString() { return ::to_string(m_range[m_index]); } + std::string getValueAsString() override { return ::to_string(m_range[m_index]); } int getIndex() const { return m_index; } - void accept(Visitor &v) { v.visit(this); } + void accept(Visitor &v) override { v.visit(this); } static void enableRangeSaving(bool on); static bool isRangeSavingEnabled(); diff --git a/toonz/sources/include/traster.h b/toonz/sources/include/traster.h index 514e586..9e01396 100644 --- a/toonz/sources/include/traster.h +++ b/toonz/sources/include/traster.h @@ -305,24 +305,24 @@ public: // Derived rasters creation - TRasterP clone() const { + TRasterP clone() const override { TRasterP dst = TRasterPT(m_lx, m_ly); TRasterP src(const_cast((const TRaster *)this)); dst->copy(src); return dst; } - TRasterP create() const { return TRasterPT(m_lx, m_ly); } + TRasterP create() const override { return TRasterPT(m_lx, m_ly); } - virtual TRasterP create(int lx, int ly) const { return TRasterPT(lx, ly); } + TRasterP create(int lx, int ly) const override { return TRasterPT(lx, ly); } //!\include raster_ex2.cpp - TRasterP extract(int x0, int y0, int x1, int y1) { + TRasterP extract(int x0, int y0, int x1, int y1) override { TRect rect(x0, y0, x1, y1); return extract(rect); }; - TRasterP extract(TRect &rect) { + TRasterP extract(TRect &rect) override { if (isEmpty() || getBounds().overlaps(rect) == false) return TRasterP(); rect = getBounds() * rect; // addRef(); diff --git a/toonz/sources/include/trasterfx.h b/toonz/sources/include/trasterfx.h index b0b9f64..4606de7 100644 --- a/toonz/sources/include/trasterfx.h +++ b/toonz/sources/include/trasterfx.h @@ -266,7 +266,7 @@ public: // resituisce una stringa che identifica univocamente il sottoalbero // avente come radice l'effetto - virtual std::string getAlias(double frame, const TRenderSettings &info) const; + std::string getAlias(double frame, const TRenderSettings &info) const override; virtual void dryCompute(TRectD &rect, double frame, const TRenderSettings &info); @@ -331,18 +331,18 @@ public: virtual TAffine getPlacement(double frame) = 0; virtual TAffine getParentPlacement(double frame) = 0; - void doCompute(TTile &tile, double frame, const TRenderSettings &info); - virtual void compute(TFlash &flash, int frame); + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; + void compute(TFlash &flash, int frame) override; - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override; virtual bool checkTimeRegion() const { return false; } - std::string getAlias(double frame, const TRenderSettings &info) const; + std::string getAlias(double frame, const TRenderSettings &info) const override; void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; }; //------------------------------------------------------------------- @@ -388,21 +388,21 @@ public: ~NaAffineFx() {} NaAffineFx(bool isDpiAffine = false); - TFx *clone(bool recursive) const; + TFx *clone(bool recursive) const override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void compute(TFlash &flash, int frame); + void compute(TFlash &flash, int frame) override; - TAffine getPlacement(double frame) { return m_aff; } - TAffine getParentPlacement(double frame) { return TAffine(); } + TAffine getPlacement(double frame) override { return m_aff; } + TAffine getParentPlacement(double frame) override { return TAffine(); } void setAffine(const TAffine &aff) { assert(aff != TAffine()); m_aff = aff; } bool isDpiAffine() const { return m_isDpiAffine; } - std::string getPluginId() const { return std::string(); } + std::string getPluginId() const override { return std::string(); } protected: TRasterFxPort m_port; diff --git a/toonz/sources/include/trasterimage.h b/toonz/sources/include/trasterimage.h index 9099a37..56c4bfa 100644 --- a/toonz/sources/include/trasterimage.h +++ b/toonz/sources/include/trasterimage.h @@ -61,7 +61,7 @@ private: public: //! Return the image type - TImage::Type getType() const { return TImage::RASTER; } + TImage::Type getType() const override { return TImage::RASTER; } // image info //! Return the name of the image @@ -89,7 +89,7 @@ public: void setSavebox(const TRect &rect) { m_savebox = rect; } //! Return the bbox of the image - TRectD getBBox() const { return convert(m_savebox); } + TRectD getBBox() const override { return convert(m_savebox); } //! Return raster image offset \b m_offset TPoint getOffset() const { return m_offset; } @@ -102,14 +102,14 @@ public: // void sethPos(double hPos) {m_hPos= hPos;} //! Return a clone of image - TImage *cloneImage() const; + TImage *cloneImage() const override; //! Return \b TRasterP const TRasterP &getRaster() const { return m_mainRaster; } //! Return \b TRasterP TRasterP &getRaster() { return m_mainRaster; } - TRasterP raster() const { return m_mainRaster; } + TRasterP raster() const override { return m_mainRaster; } //! Set the \b TRasterP \b raster void setRaster(const TRasterP &raster); diff --git a/toonz/sources/include/tregionprop.h b/toonz/sources/include/tregionprop.h index 678925d..f1c5d48 100644 --- a/toonz/sources/include/tregionprop.h +++ b/toonz/sources/include/tregionprop.h @@ -87,12 +87,12 @@ class OutlineRegionProp : public TRegionProp { public: OutlineRegionProp(const TRegion *region, const TOutlineStyleP regionStyle); - void draw(const TVectorRenderData &rd); - void draw(TFlash &rd); + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &rd) override; - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; - TRegionProp *clone(const TRegion *region) const; + TRegionProp *clone(const TRegion *region) const override; }; #endif diff --git a/toonz/sources/include/trop.h b/toonz/sources/include/trop.h index 379b4df..4be07f2 100644 --- a/toonz/sources/include/trop.h +++ b/toonz/sources/include/trop.h @@ -37,7 +37,7 @@ public: TRopException(const std::string &s) : message(s) {} ~TRopException() {} - TString getMessage() const; + TString getMessage() const override; }; //******************************************************************************** diff --git a/toonz/sources/include/tsimplecolorstyles.h b/toonz/sources/include/tsimplecolorstyles.h index 50ff1e8..a37b137 100644 --- a/toonz/sources/include/tsimplecolorstyles.h +++ b/toonz/sources/include/tsimplecolorstyles.h @@ -47,11 +47,12 @@ class TVectorImage; class DVAPI TSimpleStrokeStyle : public TColorStyle { public: - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } - virtual TStrokeProp *makeStrokeProp(const TStroke *stroke); - virtual TRegionProp *makeRegionProp(const TRegion *) { + TStrokeProp *makeStrokeProp(const TStroke *stroke) override; + + TRegionProp *makeRegionProp(const TRegion *) override { assert(false); return 0; } @@ -102,14 +103,14 @@ public: } void setRegionOutlineModifier(RegionOutlineModifier *modifier); - bool isRegionStyle() const { return true; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return true; } + bool isStrokeStyle() const override { return true; } virtual void computeOutline(const TStroke *stroke, TStrokeOutline &outline, TOutlineUtil::OutlineParameter param) const; - TStrokeProp *makeStrokeProp(const TStroke *stroke); - TRegionProp *makeRegionProp(const TRegion *region); + TStrokeProp *makeStrokeProp(const TStroke *stroke) override; + TRegionProp *makeRegionProp(const TRegion *region) override; // virtual void drawRegion( const TVectorRenderData &rd, TRegionOutline // &outline ) const =0 ; @@ -120,7 +121,7 @@ public: virtual void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, const TStroke *stroke) const = 0; - virtual void drawStroke(TFlash &flash, const TStroke *stroke) const { + void drawStroke(TFlash &flash, const TStroke *stroke) const override { TColorStyle::drawStroke(flash, stroke); } virtual void setFill(TFlash &) const {}; @@ -143,34 +144,34 @@ class DVAPI TSolidColorStyle : public TOutlineStyle { TTessellator *m_tessellator; protected: - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; - virtual void loadData(TInputStreamInterface &); - virtual void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; public: TSolidColorStyle(const TPixel32 &color = TPixel32::Black); TSolidColorStyle(const TSolidColorStyle &); ~TSolidColorStyle(); - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const; + QString getDescription() const override; - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } void drawRegion(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &outline) const; - virtual void drawRegion(TFlash &flash, const TRegion *r) const; + TRegionOutline &outline) const override; + void drawRegion(TFlash &flash, const TRegion *r) const override; void drawStroke(const TColorFunction *cf, TStrokeOutline *outline, - const TStroke *s) const; + const TStroke *s) const override; - void setFill(TFlash &flash) const; + void setFill(TFlash &flash) const override; - int getTagId() const; + int getTagId() const override; private: // Not assignable @@ -194,34 +195,34 @@ public: TCenterLineStrokeStyle(const TPixel32 &color = TPixel32(0, 0, 0, 255), USHORT stipple = 0x0, double width = 1.0); - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const; + QString getDescription() const override; TPixel32 getColor() const { return m_color; } USHORT getStipple() const { return m_stipple; } - void drawStroke(const TColorFunction *cf, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *s) const; + void drawStroke(const TColorFunction *cf, const TStroke *stroke) const override; + void drawStroke(TFlash &flash, const TStroke *s) const override; - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const { return m_color; } - void setMainColor(const TPixel32 &color) { m_color = color; } + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override { return m_color; } + void setMainColor(const TPixel32 &color) override { m_color = color; } - int getParamCount() const; + int getParamCount() const override; - TColorStyle::ParamType getParamType(int index) const; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; - int getTagId() const; + int getTagId() const override; protected: - void loadData(TInputStreamInterface &); - void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; private: // Not assignable @@ -246,8 +247,8 @@ public: TRasterImagePatternStrokeStyle(); TRasterImagePatternStrokeStyle(const std::string &patternName); - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } int getLevelFrameCount() { return m_level->getFrameCount(); } @@ -256,26 +257,26 @@ public: void drawStroke(const TVectorRenderData &rd, const std::vector &positions, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate(){}; - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { return "TRasterImagePatternStrokeStyle"; } + QString getDescription() const override { return "TRasterImagePatternStrokeStyle"; } - bool hasMainColor() const { return false; } - TPixel32 getMainColor() const { return TPixel32::Black; } - void setMainColor(const TPixel32 &) {} + bool hasMainColor() const override { return false; } + TPixel32 getMainColor() const override { return TPixel32::Black; } + void setMainColor(const TPixel32 &) override {} - TStrokeProp *makeStrokeProp(const TStroke *stroke); - TRegionProp *makeRegionProp(const TRegion *) { + TStrokeProp *makeStrokeProp(const TStroke *stroke) override; + TRegionProp *makeRegionProp(const TRegion *) override { assert(false); return 0; }; - int getTagId() const { return 2000; }; - void getObsoleteTagIds(std::vector &ids) const; + int getTagId() const override { return 2000; }; + void getObsoleteTagIds(std::vector &ids) const override; void loadLevel(const std::string &patternName); static TFilePath getRootDir(); @@ -283,21 +284,21 @@ public: m_rootDir = path + "custom styles"; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; protected: - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; - void loadData(TInputStreamInterface &); - void loadData(int oldId, TInputStreamInterface &); + void loadData(TInputStreamInterface &) override; + void loadData(int oldId, TInputStreamInterface &) override; - void saveData(TOutputStreamInterface &) const; + void saveData(TOutputStreamInterface &) const override; private: // Not assignable @@ -321,8 +322,8 @@ public: TVectorImagePatternStrokeStyle(); TVectorImagePatternStrokeStyle(const std::string &patternName); - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } int getLevelFrameCount() { return m_level->getFrameCount(); } @@ -331,26 +332,26 @@ public: void drawStroke(const TVectorRenderData &rd, const std::vector &positions, const TStroke *stroke) const; - void drawStroke(TFlash &flash, const TStroke *stroke) const; + void drawStroke(TFlash &flash, const TStroke *stroke) const override; void invalidate(){}; - TColorStyle *clone() const; + TColorStyle *clone() const override; - QString getDescription() const { return "TVectorImagePatternStrokeStyle"; } + QString getDescription() const override { return "TVectorImagePatternStrokeStyle"; } - bool hasMainColor() const { return false; } - TPixel32 getMainColor() const { return TPixel32::Black; } - void setMainColor(const TPixel32 &) {} + bool hasMainColor() const override { return false; } + TPixel32 getMainColor() const override { return TPixel32::Black; } + void setMainColor(const TPixel32 &) override {} - TStrokeProp *makeStrokeProp(const TStroke *stroke); - TRegionProp *makeRegionProp(const TRegion *) { + TStrokeProp *makeStrokeProp(const TStroke *stroke) override; + TRegionProp *makeRegionProp(const TRegion *) override { assert(false); return 0; }; - int getTagId() const { return 2800; }; - void getObsoleteTagIds(std::vector &ids) const; + int getTagId() const override { return 2800; }; + void getObsoleteTagIds(std::vector &ids) const override; void loadLevel(const std::string &patternName); static TFilePath getRootDir(); @@ -358,23 +359,23 @@ public: m_rootDir = path + "custom styles"; } - int getParamCount() const; - TColorStyle::ParamType getParamType(int index) const; + int getParamCount() const override; + TColorStyle::ParamType getParamType(int index) const override; - QString getParamNames(int index) const; - void getParamRange(int index, double &min, double &max) const; - double getParamValue(TColorStyle::double_tag, int index) const; - void setParamValue(int index, double value); + QString getParamNames(int index) const override; + void getParamRange(int index, double &min, double &max) const override; + double getParamValue(TColorStyle::double_tag, int index) const override; + void setParamValue(int index, double value) override; static void clearGlDisplayLists(); protected: - void makeIcon(const TDimension &d); + void makeIcon(const TDimension &d) override; - void loadData(TInputStreamInterface &); - void loadData(int oldId, TInputStreamInterface &); + void loadData(TInputStreamInterface &) override; + void loadData(int oldId, TInputStreamInterface &) override; - void saveData(TOutputStreamInterface &) const; + void saveData(TOutputStreamInterface &) const override; private: // Not assignable diff --git a/toonz/sources/include/tsop.h b/toonz/sources/include/tsop.h index ba1526f..5dc1ddf 100644 --- a/toonz/sources/include/tsop.h +++ b/toonz/sources/include/tsop.h @@ -24,7 +24,7 @@ public: TSopException(const TString &s) : m_message(s) {} ~TSopException() {} - TString getMessage() const { return m_message; }; + TString getMessage() const override { return m_message; }; }; //=================================================================== diff --git a/toonz/sources/include/tsound_t.h b/toonz/sources/include/tsound_t.h index 53a4455..6c2af88 100644 --- a/toonz/sources/include/tsound_t.h +++ b/toonz/sources/include/tsound_t.h @@ -42,7 +42,7 @@ public: //---------------------------------------------------------------------------- - bool isSampleSigned() const { return T::isSampleSigned(); } + bool isSampleSigned() const override { return T::isSampleSigned(); } //---------------------------------------------------------------------------- @@ -57,7 +57,7 @@ public: //---------------------------------------------------------------------------- //! Returns a soundtrack whom is a clone of the object - TSoundTrackP clone() const { + TSoundTrackP clone() const override { TSoundTrackP dst = TSoundTrack::create(getFormat(), m_sampleCount); TSoundTrackP src(const_cast((const TSoundTrack *)this)); dst->copy(src, (TINT32)0); @@ -67,7 +67,7 @@ public: //---------------------------------------------------------------------------- //! Extract the subtrack in the samples range [s0,s1] given in samples - TSoundTrackP extract(TINT32 s0, TINT32 s1) { + TSoundTrackP extract(TINT32 s0, TINT32 s1) override { if (!m_buffer || s0 > s1) return TSoundTrackP(); // addRef(); @@ -89,7 +89,7 @@ Returns a soundtrack whom is a clone of the object for the spicified channel A clone means that it's an object who lives indipendently from the other from which it's created.It hasn't reference to the object. */ - TSoundTrackP clone(TSound::Channel chan) const { + TSoundTrackP clone(TSound::Channel chan) const override { if (getChannelCount() == 1) return clone(); else { @@ -114,7 +114,7 @@ from which it's created.It hasn't reference to the object. //---------------------------------------------------------------------------- //! Copies from sample dst_s0 of object the samples of the soundtrack src - void copy(const TSoundTrackP &src, TINT32 dst_s0) { + void copy(const TSoundTrackP &src, TINT32 dst_s0) override { TSoundTrackT *srcT = dynamic_cast *>(src.getPointer()); if (!srcT) @@ -140,7 +140,7 @@ from which it's created.It hasn't reference to the object. #if defined(MACOSX) || defined(LINUX) TSoundTrackP apply(TSoundTransform *transform); #else // _WIN32 - TSoundTrackP apply(TSoundTransform *transform) { + TSoundTrackP apply(TSoundTransform *transform) override { assert(transform); return transform->compute(*this); } @@ -148,7 +148,7 @@ from which it's created.It hasn't reference to the object. //---------------------------------------------------------------------------- //! Returns the pressure of the sample s about the channel chan - double getPressure(TINT32 s, TSound::Channel chan) const { + double getPressure(TINT32 s, TSound::Channel chan) const override { assert(s >= 0 && s < getSampleCount()); assert(m_buffer); const T *sample = samples() + s; @@ -161,7 +161,7 @@ from which it's created.It hasn't reference to the object. //! Returns the soundtrack pressure max and min values in the given sample //! range and channel void getMinMaxPressure(TINT32 s0, TINT32 s1, TSound::Channel chan, - double &min, double &max) const { + double &min, double &max) const override { TINT32 sampleCount = getSampleCount(); if (sampleCount <= 0) { min = 0; @@ -203,7 +203,7 @@ from which it's created.It hasn't reference to the object. //! Returns the soundtrack pressure max value in the given sample range and //! channel - double getMaxPressure(TINT32 s0, TINT32 s1, TSound::Channel chan) const { + double getMaxPressure(TINT32 s0, TINT32 s1, TSound::Channel chan) const override { TINT32 sampleCount = getSampleCount(); if (sampleCount <= 0) { return -1; @@ -237,7 +237,7 @@ from which it's created.It hasn't reference to the object. //! Returns the soundtrack pressure min value in the given sample range and //! channel - double getMinPressure(TINT32 s0, TINT32 s1, TSound::Channel chan) const { + double getMinPressure(TINT32 s0, TINT32 s1, TSound::Channel chan) const override { TINT32 sampleCount = getSampleCount(); if (sampleCount <= 0) { return 0; @@ -309,7 +309,7 @@ inside the dstChan channel from sample dst_s0 //---------------------------------------------------------------------------- //! Makes blank the samples in the given sample range - void blank(TINT32 s0, TINT32 s1) { + void blank(TINT32 s0, TINT32 s1) override { TINT32 ss0, ss1; // se i valori sono nel range ed uguali => voglio pulire // un solo campione diff --git a/toonz/sources/include/tspectrumparam.h b/toonz/sources/include/tspectrumparam.h index 56ebdc7..3a722f2 100644 --- a/toonz/sources/include/tspectrumparam.h +++ b/toonz/sources/include/tspectrumparam.h @@ -46,11 +46,11 @@ public: TSpectrumParam(const TSpectrumParam &); ~TSpectrumParam(); - TParam *clone() const { return new TSpectrumParam(*this); } - void copy(TParam *src); + TParam *clone() const override { return new TSpectrumParam(*this); } + void copy(TParam *src) override; - void addObserver(TParamObserver *); - void removeObserver(TParamObserver *); + void addObserver(TParamObserver *) override; + void removeObserver(TParamObserver *) override; TSpectrum getValue(double frame) const; TSpectrum64 getValue64(double frame) const; @@ -69,28 +69,28 @@ public: void addKey(double s, const TPixel32 &color); void removeKey(int index); - bool isAnimatable() const { return true; } - bool isKeyframe(double frame) const; - void deleteKeyframe(double frame); - void clearKeyframes(); + bool isAnimatable() const override { return true; } + bool isKeyframe(double frame) const override; + void deleteKeyframe(double frame) override; + void clearKeyframes() override; void assignKeyframe(double frame, const TSmartPointerT &src, - double srcFrame, bool changedOnly = false); + double srcFrame, bool changedOnly = false) override; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; void enableDragging(bool on); - void enableNotification(bool on); - bool isNotificationEnabled() const; + void enableNotification(bool on) override; + bool isNotificationEnabled() const override; void enableMatte(bool on); bool isMatteEnabled() const; - std::string getValueAlias(double frame, int precision); - bool hasKeyframes() const; - void getKeyframes(std::set &frames) const; - int getNextKeyframe(double frame) const; - int getPrevKeyframe(double frame) const; - double keyframeIndexToFrame(int index) const; + std::string getValueAlias(double frame, int precision) override; + bool hasKeyframes() const override; + void getKeyframes(std::set &frames) const override; + int getNextKeyframe(double frame) const override; + int getPrevKeyframe(double frame) const override; + double keyframeIndexToFrame(int index) const override; }; #ifdef _WIN32 diff --git a/toonz/sources/include/tstrokedeformations.h b/toonz/sources/include/tstrokedeformations.h index dfbab37..60b2e67 100644 --- a/toonz/sources/include/tstrokedeformations.h +++ b/toonz/sources/include/tstrokedeformations.h @@ -100,13 +100,13 @@ Use this constructor with modifyControlPoints. virtual ~TStrokePointDeformation(); - TThickPoint getDisplacement(const TStroke &stroke, double s) const; - TThickPoint getDisplacementForControlPoint(const TStroke &s, UINT n) const; + TThickPoint getDisplacement(const TStroke &stroke, double s) const override; + TThickPoint getDisplacementForControlPoint(const TStroke &s, UINT n) const override; TThickPoint getDisplacementForControlPointLen(const TStroke &stroke, - double cpLen) const; + double cpLen) const override; - double getDelta(const TStroke &stroke, double w) const; - double getMaxDiff() const; + double getDelta(const TStroke &stroke, double w) const override; + double getMaxDiff() const override; }; //============================================================================= @@ -143,15 +143,15 @@ Use this constructor with movePoints. virtual ~TStrokeParamDeformation(); - TThickPoint getDisplacement(const TStroke &, double) const; + TThickPoint getDisplacement(const TStroke &, double) const override; TThickPoint getDisplacementForControlPoint(const TStroke &stroke, - UINT n) const; + UINT n) const override; TThickPoint getDisplacementForControlPointLen(const TStroke &stroke, - double cpLen) const; + double cpLen) const override; - double getDelta(const TStroke &, double) const; + double getDelta(const TStroke &, double) const override; - double getMaxDiff() const; + double getMaxDiff() const override; }; //============================================================================= @@ -188,15 +188,15 @@ Use this constructor with movePoints. virtual ~TStrokeThicknessDeformation(); - TThickPoint getDisplacement(const TStroke &, double) const; + TThickPoint getDisplacement(const TStroke &, double) const override; TThickPoint getDisplacementForControlPoint(const TStroke &stroke, - UINT n) const; + UINT n) const override; TThickPoint getDisplacementForControlPointLen(const TStroke &stroke, - double cpLen) const; + double cpLen) const override; - double getDelta(const TStroke &, double) const; + double getDelta(const TStroke &, double) const override; - double getMaxDiff() const; + double getMaxDiff() const override; }; //============================================================================= /*! @@ -234,13 +234,13 @@ Use this constructor with movePoints. virtual ~TStrokeBenderDeformation(); - TThickPoint getDisplacement(const TStroke &, double s) const; - TThickPoint getDisplacementForControlPoint(const TStroke &, UINT n) const; + TThickPoint getDisplacement(const TStroke &, double s) const override; + TThickPoint getDisplacementForControlPoint(const TStroke &, UINT n) const override; TThickPoint getDisplacementForControlPointLen(const TStroke &stroke, - double cpLen) const; + double cpLen) const override; - double getDelta(const TStroke &, double) const; - double getMaxDiff() const; + double getDelta(const TStroke &, double) const override; + double getMaxDiff() const override; }; //============================================================================= @@ -267,9 +267,9 @@ Use this constructor with increasePoints. virtual ~TStrokeTwirlDeformation(); - TThickPoint getDisplacement(const TStroke &, double s) const; - double getDelta(const TStroke &, double) const; - double getMaxDiff() const; + TThickPoint getDisplacement(const TStroke &, double s) const override; + double getDelta(const TStroke &, double) const override; + double getMaxDiff() const override; }; //============================================================================= diff --git a/toonz/sources/include/tstrokeprop.h b/toonz/sources/include/tstrokeprop.h index bceb1e2..44be93d 100644 --- a/toonz/sources/include/tstrokeprop.h +++ b/toonz/sources/include/tstrokeprop.h @@ -39,11 +39,11 @@ public: TSimpleStrokeProp(const TStroke *stroke, TSimpleStrokeStyle *style); ~TSimpleStrokeProp(); - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; - TStrokeProp *clone(const TStroke *stroke) const; - void draw(const TVectorRenderData &rd); - void draw(TFlash &flash); + TStrokeProp *clone(const TStroke *stroke) const override; + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &flash) override; }; //============================================================================= @@ -58,11 +58,11 @@ public: TRasterImagePatternStrokeStyle *style); ~TRasterImagePatternStrokeProp(); - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; - TStrokeProp *clone(const TStroke *stroke) const; - void draw(const TVectorRenderData &rd); - void draw(TFlash &flash); + TStrokeProp *clone(const TStroke *stroke) const override; + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &flash) override; }; //============================================================================= @@ -77,11 +77,11 @@ public: TVectorImagePatternStrokeStyle *style); ~TVectorImagePatternStrokeProp(); - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; - TStrokeProp *clone(const TStroke *stroke) const; - void draw(const TVectorRenderData &rd); - void draw(TFlash &flash); + TStrokeProp *clone(const TStroke *stroke) const override; + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &flash) override; }; //============================================================================= @@ -95,11 +95,11 @@ protected: public: OutlineStrokeProp(const TStroke *stroke, TOutlineStyleP style); - const TColorStyle *getColorStyle() const; + const TColorStyle *getColorStyle() const override; - TStrokeProp *clone(const TStroke *stroke) const; - void draw(const TVectorRenderData &rd); - void draw(TFlash &flash); + TStrokeProp *clone(const TStroke *stroke) const override; + void draw(const TVectorRenderData &rd) override; + void draw(TFlash &flash) override; }; //============================================================================= diff --git a/toonz/sources/include/tsystem.h b/toonz/sources/include/tsystem.h index 6a4080d..f6f0a56 100644 --- a/toonz/sources/include/tsystem.h +++ b/toonz/sources/include/tsystem.h @@ -75,7 +75,7 @@ public: TSystemException(const std::string &); TSystemException(const std::wstring &msg); ~TSystemException() {} - TString getMessage() const; + TString getMessage() const override; }; // DVAPI ostream&operator<<(ostream&out, const TSystemException &e); diff --git a/toonz/sources/include/ttessellator.h b/toonz/sources/include/ttessellator.h index f1158a1..1c74f34 100644 --- a/toonz/sources/include/ttessellator.h +++ b/toonz/sources/include/ttessellator.h @@ -73,9 +73,9 @@ private: public: // void tessellate(const TVectorRenderData &rd, TRegionOutline &outline ); void tessellate(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &outline, TPixel32 color); + TRegionOutline &outline, TPixel32 color) override; void tessellate(const TColorFunction *cf, const bool antiAliasing, - TRegionOutline &outline, TRaster32P texture); + TRegionOutline &outline, TRaster32P texture) override; }; //============================================================================= diff --git a/toonz/sources/include/ttimer.h b/toonz/sources/include/ttimer.h index 66254c3..a208ae1 100644 --- a/toonz/sources/include/ttimer.h +++ b/toonz/sources/include/ttimer.h @@ -32,7 +32,7 @@ class TTimerAction : public TGenericTimerAction { public: typedef void (T::*Method)(TUINT64 tick); TTimerAction(T *target, Method method) : m_target(target), m_method(method) {} - void sendCommand(TUINT64 tick) { (m_target->*m_method)(tick); } + void sendCommand(TUINT64 tick) override { (m_target->*m_method)(tick); } private: T *m_target; diff --git a/toonz/sources/include/ttonecurveparam.h b/toonz/sources/include/ttonecurveparam.h index def803b..d4aecbf 100644 --- a/toonz/sources/include/ttonecurveparam.h +++ b/toonz/sources/include/ttonecurveparam.h @@ -52,11 +52,11 @@ public: void setCurrentChannel(ToneChannel channel); ToneChannel getCurrentChannel() const { return m_toneChannel; } - TParam *clone() const { return new TToneCurveParam(*this); } - void copy(TParam *src); + TParam *clone() const override { return new TToneCurveParam(*this); } + void copy(TParam *src) override; - void addObserver(TParamObserver *); - void removeObserver(TParamObserver *); + void addObserver(TParamObserver *) override; + void removeObserver(TParamObserver *) override; QList getValue(double frame) const; void setValue(double frame, const QList &value, @@ -72,23 +72,23 @@ public: // virtual void enableNotification(bool on) {} // virtual bool isNotificationEnabled() const { return true;} - std::string getValueAlias(double frame, int precision); + std::string getValueAlias(double frame, int precision) override; - bool isAnimatable() const { return true; }; - bool isKeyframe(double frame) const; - void deleteKeyframe(double frame); - void clearKeyframes(); + bool isAnimatable() const override { return true; }; + bool isKeyframe(double frame) const override; + void deleteKeyframe(double frame) override; + void clearKeyframes() override; void assignKeyframe(double frame, const TSmartPointerT &src, - double srcFrame, bool changedOnly = false); + double srcFrame, bool changedOnly = false) override; - void getKeyframes(std::set &frames) const; - bool hasKeyframes() const; - int getNextKeyframe(double frame) const; - int getPrevKeyframe(double frame) const; - double keyframeIndexToFrame(int index) const; + void getKeyframes(std::set &frames) const override; + bool hasKeyframes() const override; + int getNextKeyframe(double frame) const override; + int getPrevKeyframe(double frame) const override; + double keyframeIndexToFrame(int index) const override; - void loadData(TIStream &is); - void saveData(TOStream &os); + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; }; #ifdef _WIN32 diff --git a/toonz/sources/include/ttoonzimage.h b/toonz/sources/include/ttoonzimage.h index decadc9..d8739e1 100644 --- a/toonz/sources/include/ttoonzimage.h +++ b/toonz/sources/include/ttoonzimage.h @@ -52,7 +52,7 @@ private: public: //! Return the type of the image. - TImage::Type getType() const { return TImage::TOONZ_RASTER; } + TImage::Type getType() const override { return TImage::TOONZ_RASTER; } //! Return the size of the Image. TDimension getSize() const { return m_size; } @@ -79,7 +79,7 @@ public: void setSavebox(const TRect &rect); //! Return the boundin box of the image. - TRectD getBBox() const { return convert(m_savebox); } + TRectD getBBox() const override { return convert(m_savebox); } //! Return the offset point of the image. TPoint getOffset() const { return m_offset; } @@ -92,7 +92,7 @@ public: // void sethPos(double hPos) {m_hPos= hPos;} //! Return a clone of the current image - TImage *cloneImage() const; + TImage *cloneImage() const override; //! Return the image's raster TRasterCM32P getCMapped() const; @@ -105,7 +105,7 @@ public: /*! Call the getCMapped() method.*/ TRasterCM32P getRaster() const { return getCMapped(); } - TRasterP raster() const { return (TRasterP)getCMapped(); } + TRasterP raster() const override { return (TRasterP)getCMapped(); } //! Return a clone of the current image. TToonzImageP clone() const; diff --git a/toonz/sources/include/ttzpimagefx.h b/toonz/sources/include/ttzpimagefx.h index 998813d..321046c 100644 --- a/toonz/sources/include/ttzpimagefx.h +++ b/toonz/sources/include/ttzpimagefx.h @@ -40,10 +40,10 @@ public: public: ExternalPaletteFxRenderData(TPaletteP palette, const std::string &name); - float typeIndex() const { return 0.0f; } + float typeIndex() const override { return 0.0f; } - bool operator==(const TRasterFxRenderData &data) const; - std::string toString() const; + bool operator==(const TRasterFxRenderData &data) const override; + std::string toString() const override; }; //********************************************************************************************** @@ -70,12 +70,12 @@ public: public: PaletteFilterFxRenderData(); - float typeIndex() const { + float typeIndex() const override { return (m_type == eApplyToInksAndPaints) ? 0.5f : 1.0f; } - bool operator==(const TRasterFxRenderData &data) const; - std::string toString() const; + bool operator==(const TRasterFxRenderData &data) const override; + std::string toString() const override; }; //------------------------------------------------------------------------------ @@ -189,12 +189,12 @@ public: int shrink, const TRectD &controllerBBox = TRectD(), const TRasterP &controller = TRasterP()); - float typeIndex() const { return (m_type == BlendTz) ? 2.0f : 3.0f; } + float typeIndex() const override { return (m_type == BlendTz) ? 2.0f : 3.0f; } - bool operator==(const TRasterFxRenderData &data) const; - std::string toString() const; + bool operator==(const TRasterFxRenderData &data) const override; + std::string toString() const override; - TRectD getBBoxEnlargement(const TRectD &bbox); + TRectD getBBoxEnlargement(const TRectD &bbox) override; }; #endif diff --git a/toonz/sources/include/tunit.h b/toonz/sources/include/tunit.h index 95de4cf..f23ff8f 100644 --- a/toonz/sources/include/tunit.h +++ b/toonz/sources/include/tunit.h @@ -38,9 +38,9 @@ class DVAPI TSimpleUnitConverter : public TUnitConverter { public: TSimpleUnitConverter(double factor = 1, double offset = 0) : m_factor(factor), m_offset(offset) {} - TUnitConverter *clone() const { return new TSimpleUnitConverter(*this); } - double convertTo(double v) const { return v * m_factor + m_offset; } - double convertFrom(double v) const { return (v - m_offset) / m_factor; } + TUnitConverter *clone() const override { return new TSimpleUnitConverter(*this); } + double convertTo(double v) const override { return v * m_factor + m_offset; } + double convertFrom(double v) const override { return (v - m_offset) / m_factor; } }; //--------------------------- diff --git a/toonz/sources/include/tvectorbrushstyle.h b/toonz/sources/include/tvectorbrushstyle.h index b046b1b..fb15430 100644 --- a/toonz/sources/include/tvectorbrushstyle.h +++ b/toonz/sources/include/tvectorbrushstyle.h @@ -35,8 +35,8 @@ public: TVectorImageP vi = TVectorImageP()); ~TVectorBrushStyle(); - TColorStyle *clone() const; - QString getDescription() const; + TColorStyle *clone() const override; + QString getDescription() const override; static TFilePath getRootDir() { return m_rootDir; } static void setRootDir(const TFilePath &path) { @@ -45,30 +45,30 @@ public: void loadBrush(const std::string &brushName); - int getTagId() const { return 3000; } + int getTagId() const override { return 3000; } TVectorImageP getImage() const { return m_brush; } - bool isRegionStyle() const { return false; } - bool isStrokeStyle() const { return true; } + bool isRegionStyle() const override { return false; } + bool isStrokeStyle() const override { return true; } - TStrokeProp *makeStrokeProp(const TStroke *stroke); - TRegionProp *makeRegionProp(const TRegion *region) { + TStrokeProp *makeStrokeProp(const TStroke *stroke) override; + TRegionProp *makeRegionProp(const TRegion *region) override { assert(false); return 0; } - bool hasMainColor() const { return true; } - TPixel32 getMainColor() const; - void setMainColor(const TPixel32 &color); + bool hasMainColor() const override { return true; } + TPixel32 getMainColor() const override; + void setMainColor(const TPixel32 &color) override; - int getColorParamCount() const; - TPixel32 getColorParamValue(int index) const; - void setColorParamValue(int index, const TPixel32 &color); + int getColorParamCount() const override; + TPixel32 getColorParamValue(int index) const override; + void setColorParamValue(int index, const TPixel32 &color) override; protected: - void loadData(TInputStreamInterface &); - void saveData(TOutputStreamInterface &) const; + void loadData(TInputStreamInterface &) override; + void saveData(TOutputStreamInterface &) const override; private: int getColorStyleId(int index) const; diff --git a/toonz/sources/include/tvectorimage.h b/toonz/sources/include/tvectorimage.h index 23d6772..1e9ee8e 100644 --- a/toonz/sources/include/tvectorimage.h +++ b/toonz/sources/include/tvectorimage.h @@ -74,7 +74,7 @@ public: TVectorImage(bool loaded = false); virtual ~TVectorImage(); - TImage::Type getType() const { return VECTOR; } + TImage::Type getType() const override { return VECTOR; } /*!Set valid regions flags call validateRegions() after region/stroke changes @@ -89,7 +89,7 @@ public: TVectorImageP clone() const; //! Create a new \b TImage - TImage *cloneImage() const; + TImage *cloneImage() const override; //! Transform a stroke using an affine \b TAffine void transform(const TAffine &aff, bool doChangeThickness = false); @@ -278,7 +278,7 @@ get the stroke nearest at point bool isComputedRegionAlmostOnce() const; //! Return the image bounding box in the image coordinate system - TRectD getBBox() const; + TRectD getBBox() const override; //! Call the following method after stroke modification //! \note you must specify, using the second argument, whether the diff --git a/toonz/sources/sound/aiff/tsio_aiff.cpp b/toonz/sources/sound/aiff/tsio_aiff.cpp index 9abb406..70c3f80 100644 --- a/toonz/sources/sound/aiff/tsio_aiff.cpp +++ b/toonz/sources/sound/aiff/tsio_aiff.cpp @@ -79,7 +79,7 @@ public: TCOMMChunk(string name, TINT32 length) : TAIFFChunk(name, length) {} - virtual bool read(ifstream &is) { + bool read(ifstream &is) override { is.read((char *)&m_chans, sizeof(m_chans)); is.read((char *)&m_frames, sizeof(m_frames)); is.read((char *)&m_bitPerSample, sizeof(m_bitPerSample)); @@ -153,7 +153,7 @@ public: TSSNDChunk(string name, TINT32 length) : TAIFFChunk(name, length) {} - bool read(ifstream &is) { + bool read(ifstream &is) override { is.read((char *)&m_offset, sizeof(m_offset)); is.read((char *)&m_blockSize, sizeof(m_blockSize)); diff --git a/toonz/sources/sound/aiff/tsio_aiff.h b/toonz/sources/sound/aiff/tsio_aiff.h index 48af781..d63caea 100644 --- a/toonz/sources/sound/aiff/tsio_aiff.h +++ b/toonz/sources/sound/aiff/tsio_aiff.h @@ -20,7 +20,7 @@ public: Loads the .aiff audio file whose path has been specified in the constructor. It returns a TSoundTrackP created from the audio file */ - TSoundTrackP load(); + TSoundTrackP load() override; /*! Returns a soundtrack reader able to read .aiff audio files @@ -44,7 +44,7 @@ public: Saves the informations of the soundtrack in .aiff audio file whose path has been specified in the constructor. */ - bool save(const TSoundTrackP &); + bool save(const TSoundTrackP &) override; /*! Returns a soundtrack writer able to write .aiff audio files diff --git a/toonz/sources/sound/raw/tsio_raw.h b/toonz/sources/sound/raw/tsio_raw.h index d492a44..a08d293 100644 --- a/toonz/sources/sound/raw/tsio_raw.h +++ b/toonz/sources/sound/raw/tsio_raw.h @@ -20,7 +20,7 @@ public: Loads the .raw audio file whose path has been specified in the constructor. It returns a TSoundTrackP created from the audio file */ - TSoundTrackP load(); + TSoundTrackP load() override; /*! Returns a soundtrack reader able to read .raw audio files @@ -45,7 +45,7 @@ public: Saves the informations of the soundtrack in .raw audio file whose path has been specified in the constructor. */ - bool save(const TSoundTrackP &); + bool save(const TSoundTrackP &) override; /*! Returns a soundtrack writer able to write .raw audio files diff --git a/toonz/sources/sound/wav/tsio_wav.cpp b/toonz/sources/sound/wav/tsio_wav.cpp index 4585c97..005b5fe 100644 --- a/toonz/sources/sound/wav/tsio_wav.cpp +++ b/toonz/sources/sound/wav/tsio_wav.cpp @@ -79,7 +79,7 @@ public: TFMTChunk(TINT32 length) : TWAVChunk("fmt ", length) {} - virtual bool read(Tifstream &is) { + bool read(Tifstream &is) override { is.read((char *)&m_encodingType, sizeof(m_encodingType)); is.read((char *)&m_chans, sizeof(m_chans)); is.read((char *)&m_sampleRate, sizeof(m_sampleRate)); @@ -145,7 +145,7 @@ public: TDATAChunk(TINT32 length) : TWAVChunk("data", length) {} - bool read(Tifstream &is) { + bool read(Tifstream &is) override { // alloca il buffer dei campioni m_samples.reset(new UCHAR[m_length]); if (!m_samples) return false; diff --git a/toonz/sources/sound/wav/tsio_wav.h b/toonz/sources/sound/wav/tsio_wav.h index a279b94..6b7a55b 100644 --- a/toonz/sources/sound/wav/tsio_wav.h +++ b/toonz/sources/sound/wav/tsio_wav.h @@ -19,7 +19,7 @@ public: Loads the .wav audio file whose path has been specified in the constructor. It returns a TSoundTrackP created from the audio file */ - TSoundTrackP load(); + TSoundTrackP load() override; /*! Returns a soundtrack reader able to read .wav audio files @@ -44,7 +44,7 @@ public: Saves the informations of the soundtrack in .wav audio file whose path has been specified in the constructor. */ - bool save(const TSoundTrackP &); + bool save(const TSoundTrackP &) override; /*! Returns a soundtrack writer able to write .wav audio files diff --git a/toonz/sources/stdfx/adjustlevelsfx.cpp b/toonz/sources/stdfx/adjustlevelsfx.cpp index dec1432..35e6751 100644 --- a/toonz/sources/stdfx/adjustlevelsfx.cpp +++ b/toonz/sources/stdfx/adjustlevelsfx.cpp @@ -93,9 +93,9 @@ public: ~AdjustLevelsFx(){}; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -104,7 +104,7 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; }; //------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/artcontourfx.cpp b/toonz/sources/stdfx/artcontourfx.cpp index 170eac1..047a20c 100644 --- a/toonz/sources/stdfx/artcontourfx.cpp +++ b/toonz/sources/stdfx/artcontourfx.cpp @@ -91,7 +91,7 @@ public: //---------------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &ri) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &ri) override { if (m_input.isConnected() && m_controller.isConnected()) { TRectD controlBox, inputBox; @@ -119,19 +119,19 @@ public: //----------------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } //----------------------------------------------------------------------------- - bool allowUserCacheOnPort(int port) { return port != 0; } + bool allowUserCacheOnPort(int port) override { return port != 0; } //----------------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; //----------------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; //----------------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/backlitfx.cpp b/toonz/sources/stdfx/backlitfx.cpp index f235d33..492c86d 100644 --- a/toonz/sources/stdfx/backlitfx.cpp +++ b/toonz/sources/stdfx/backlitfx.cpp @@ -197,7 +197,7 @@ public: addInputPort("Source", m_lighted); } ~BacklitFx() {} - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { if (getActiveTimeRegion().contains(frame)) if (m_light.isConnected()) { if (m_lighted.isConnected()) { @@ -213,7 +213,7 @@ public: return false; } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { if (!m_light.isConnected()) return; if (!m_lighted.isConnected()) { m_light->dryCompute(rect, frame, info); @@ -232,7 +232,7 @@ public: m_light->dryCompute(inRect, frame, info); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { if (!m_light.isConnected()) return; if (!m_lighted.isConnected()) { @@ -272,10 +272,10 @@ public: tile.getRaster()->copy(ctrTile.getRaster(), TPoint(-brad, -brad)); } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { double value = m_value->getValue(frame); double scale = sqrt(fabs(info.m_affine.det())); int brad = tceil(value * scale); diff --git a/toonz/sources/stdfx/blendtzfx.cpp b/toonz/sources/stdfx/blendtzfx.cpp index a98006f..2dc40eb 100644 --- a/toonz/sources/stdfx/blendtzfx.cpp +++ b/toonz/sources/stdfx/blendtzfx.cpp @@ -40,10 +40,10 @@ public: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + TRenderSettings &infoOnInput) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { // Build the render data TRenderSettings info2(info); @@ -58,11 +58,11 @@ public: //----------------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } //----------------------------------------------------------------------------- - bool allowUserCacheOnPort(int port) { return false; } + bool allowUserCacheOnPort(int port) override { return false; } //----------------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/blurfx.cpp b/toonz/sources/stdfx/blurfx.cpp index ce5ae62..961a1e6 100644 --- a/toonz/sources/stdfx/blurfx.cpp +++ b/toonz/sources/stdfx/blurfx.cpp @@ -25,7 +25,7 @@ public: ~BlurFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); @@ -44,14 +44,14 @@ public: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { if (m_value->getValue(frame) == 0) return true; return (isAlmostIsotropic(info.m_affine)); } diff --git a/toonz/sources/stdfx/bodyhighlightfx.cpp b/toonz/sources/stdfx/bodyhighlightfx.cpp index bbcdaee..446c17b 100644 --- a/toonz/sources/stdfx/bodyhighlightfx.cpp +++ b/toonz/sources/stdfx/bodyhighlightfx.cpp @@ -373,7 +373,7 @@ public: ~BodyHighLightFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -382,11 +382,11 @@ public: } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/bright_contfx.cpp b/toonz/sources/stdfx/bright_contfx.cpp index ca56ceb..adf1dd0 100644 --- a/toonz/sources/stdfx/bright_contfx.cpp +++ b/toonz/sources/stdfx/bright_contfx.cpp @@ -22,9 +22,9 @@ public: ~Bright_ContFx(){}; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (!m_input.isConnected()) { bBox = TRectD(); return false; @@ -32,7 +32,7 @@ public: return m_input->doGetBBox(frame, bBox, info); }; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; }; //=================================================================== diff --git a/toonz/sources/stdfx/calligraphicfx.cpp b/toonz/sources/stdfx/calligraphicfx.cpp index 3474c25..5f71da7 100644 --- a/toonz/sources/stdfx/calligraphicfx.cpp +++ b/toonz/sources/stdfx/calligraphicfx.cpp @@ -65,7 +65,7 @@ public: ~CalligraphicFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { TRenderSettings info2(info); @@ -94,9 +94,9 @@ public: } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool allowUserCacheOnPort(int port) { return false; } + bool allowUserCacheOnPort(int port) override { return false; } private: void getValues(const char *argv[], int argc, double frame) { @@ -129,7 +129,7 @@ private: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { if (!m_input.isConnected()) return; int shrink = tround((ri.m_shrinkX + ri.m_shrinkY) / 2.0); @@ -156,7 +156,7 @@ private: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; @@ -225,7 +225,7 @@ public: ~OutBorderFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { TRenderSettings info2(info); @@ -254,7 +254,7 @@ public: } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } private: void getValues(const char *argv[], int argc, double frame) { @@ -287,7 +287,7 @@ private: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { if (!m_input.isConnected()) return; int shrink = tround((ri.m_shrinkX + ri.m_shrinkY) / 2.0); @@ -313,7 +313,7 @@ private: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; diff --git a/toonz/sources/stdfx/changecolorfx.cpp b/toonz/sources/stdfx/changecolorfx.cpp index b82ff1b..2578603 100644 --- a/toonz/sources/stdfx/changecolorfx.cpp +++ b/toonz/sources/stdfx/changecolorfx.cpp @@ -123,7 +123,7 @@ public: } ~ChangeColorFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); { bBox = TRectD(); @@ -131,7 +131,7 @@ public: } }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; }; double normalize_h(double h) { diff --git a/toonz/sources/stdfx/channelmixerfx.cpp b/toonz/sources/stdfx/channelmixerfx.cpp index 508ebf3..22ce156 100644 --- a/toonz/sources/stdfx/channelmixerfx.cpp +++ b/toonz/sources/stdfx/channelmixerfx.cpp @@ -85,7 +85,7 @@ public: } ~ChannelMixerFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -93,8 +93,8 @@ public: return false; } }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; namespace { diff --git a/toonz/sources/stdfx/cloudsfx.cpp b/toonz/sources/stdfx/cloudsfx.cpp index 58ce25b..eaebc4d 100644 --- a/toonz/sources/stdfx/cloudsfx.cpp +++ b/toonz/sources/stdfx/cloudsfx.cpp @@ -40,14 +40,14 @@ public: ~CloudsFx(){}; - bool doGetBBox(double, TRectD &bbox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bbox, const TRenderSettings &info) override { bbox = TConsts::infiniteRectD; return true; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } // TAffine handledAffine(const TRenderSettings& info, double frame) {return // TAffine();} }; diff --git a/toonz/sources/stdfx/cornerpinfx.cpp b/toonz/sources/stdfx/cornerpinfx.cpp index 5ab16e9..8d51afa 100644 --- a/toonz/sources/stdfx/cornerpinfx.cpp +++ b/toonz/sources/stdfx/cornerpinfx.cpp @@ -27,21 +27,21 @@ public: CornerPinFx(); ~CornerPinFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; void onPortConnected(TFxPort *port); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool allowUserCacheOnPort(int port) { return port != 0; } + bool allowUserCacheOnPort(int port) override { return port != 0; } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; void safeTransform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, diff --git a/toonz/sources/stdfx/despecklefx.cpp b/toonz/sources/stdfx/despecklefx.cpp index 9982f95..75830ab 100644 --- a/toonz/sources/stdfx/despecklefx.cpp +++ b/toonz/sources/stdfx/despecklefx.cpp @@ -30,12 +30,12 @@ public: m_size->setValueRange(1, 1000); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/diamondgradientfx.cpp b/toonz/sources/stdfx/diamondgradientfx.cpp index 41f0457..fbc7e3c 100644 --- a/toonz/sources/stdfx/diamondgradientfx.cpp +++ b/toonz/sources/stdfx/diamondgradientfx.cpp @@ -26,14 +26,14 @@ public: } ~DiamondGradientFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return false; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return false; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::RADIUS; diff --git a/toonz/sources/stdfx/dissolvefx.cpp b/toonz/sources/stdfx/dissolvefx.cpp index 4479dfc..0e865ad 100644 --- a/toonz/sources/stdfx/dissolvefx.cpp +++ b/toonz/sources/stdfx/dissolvefx.cpp @@ -23,7 +23,7 @@ public: ~DissolveFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -33,9 +33,9 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; template diff --git a/toonz/sources/stdfx/embossfx.cpp b/toonz/sources/stdfx/embossfx.cpp index 9da5dfd..8f26353 100644 --- a/toonz/sources/stdfx/embossfx.cpp +++ b/toonz/sources/stdfx/embossfx.cpp @@ -31,7 +31,7 @@ public: ~EmbossFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -43,13 +43,13 @@ public: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return (isAlmostIsotropic(info.m_affine)); } }; diff --git a/toonz/sources/stdfx/erodilatefx.cpp b/toonz/sources/stdfx/erodilatefx.cpp index 40c8c9a..f056075 100644 --- a/toonz/sources/stdfx/erodilatefx.cpp +++ b/toonz/sources/stdfx/erodilatefx.cpp @@ -33,14 +33,14 @@ public: bindParam(this, "radius", m_radius); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return isAlmostIsotropic(info.m_affine); } }; diff --git a/toonz/sources/stdfx/externalpalettefx.cpp b/toonz/sources/stdfx/externalpalettefx.cpp index 517e36f..98477a1 100644 --- a/toonz/sources/stdfx/externalpalettefx.cpp +++ b/toonz/sources/stdfx/externalpalettefx.cpp @@ -27,7 +27,7 @@ public: ~ExternalPaletteFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -37,14 +37,14 @@ public: } } - std::string getAlias(double frame, const TRenderSettings &info) const; + std::string getAlias(double frame, const TRenderSettings &info) const override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool allowUserCacheOnPort(int port) { return false; } + bool allowUserCacheOnPort(int port) override { return false; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/fourpointsgradientfx.cpp b/toonz/sources/stdfx/fourpointsgradientfx.cpp index 815e640..1fc9bae 100644 --- a/toonz/sources/stdfx/fourpointsgradientfx.cpp +++ b/toonz/sources/stdfx/fourpointsgradientfx.cpp @@ -67,14 +67,14 @@ bindParam(this,"color_4", m_color4); } ~FourPointsGradientFx(){}; - bool doGetBBox(double, TRectD &bbox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bbox, const TRenderSettings &info) override { bbox = TConsts::infiniteRectD; return true; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 4]; concepts[0].m_type = TParamUIConcept::POINT; diff --git a/toonz/sources/stdfx/freedistortfx.cpp b/toonz/sources/stdfx/freedistortfx.cpp index b2b6e23..9603262 100644 --- a/toonz/sources/stdfx/freedistortfx.cpp +++ b/toonz/sources/stdfx/freedistortfx.cpp @@ -30,24 +30,24 @@ public: FreeDistortBaseFx(bool isCastShadow); ~FreeDistortBaseFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; void onPortConnected(TFxPort *port); - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; void safeTransform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, TRenderSettings &infoOnInput, TRectD &inBBox); - void getParamUIs(TParamUIConcept *&concepts, int &length); + void getParamUIs(TParamUIConcept *&concepts, int &length) override; private: bool m_isCastShadow; diff --git a/toonz/sources/stdfx/gammafx.cpp b/toonz/sources/stdfx/gammafx.cpp index 25bac05..ede3dc6 100644 --- a/toonz/sources/stdfx/gammafx.cpp +++ b/toonz/sources/stdfx/gammafx.cpp @@ -20,7 +20,7 @@ public: ~GammaFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -29,9 +29,9 @@ public: } }; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/glowfx.cpp b/toonz/sources/stdfx/glowfx.cpp index 62f195b..7087aff 100644 --- a/toonz/sources/stdfx/glowfx.cpp +++ b/toonz/sources/stdfx/glowfx.cpp @@ -145,7 +145,7 @@ public: //--------------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { if (getActiveTimeRegion().contains(frame)) if (m_light.isConnected()) { TRectD b0, b1; @@ -184,7 +184,7 @@ public: //--------------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { Status status = getFxStatus(m_light, m_lighted); if (status & NoPortsConnected) @@ -293,8 +293,8 @@ public: //--------------------------------------------------------------------------- - virtual void doDryCompute(TRectD &rect, double frame, - const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, + const TRenderSettings &info) override { Status status = getFxStatus(m_light, m_lighted); if (status & NoPortsConnected) return; @@ -319,7 +319,7 @@ public: //--------------------------------------------------------------------------- // Just like the blur - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { if (m_light.isConnected()) return (m_value->getValue(frame) == 0) ? true : isAlmostIsotropic(info.m_affine); @@ -330,7 +330,7 @@ public: //--------------------------------------------------------------------------- int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { double scale = sqrt(fabs(info.m_affine.det())); double blur = m_value->getValue(frame) * scale; @@ -339,7 +339,7 @@ public: //--------------------------------------------------------------------------- - TFxPort *getXsheetPort() const { return getInputPort(1); } + TFxPort *getXsheetPort() const override { return getInputPort(1); } }; //================================================================== diff --git a/toonz/sources/stdfx/hsvkeyfx.cpp b/toonz/sources/stdfx/hsvkeyfx.cpp index 54f8f69..5998e99 100644 --- a/toonz/sources/stdfx/hsvkeyfx.cpp +++ b/toonz/sources/stdfx/hsvkeyfx.cpp @@ -45,7 +45,7 @@ public: ~HSVKeyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); return true; @@ -54,9 +54,9 @@ public: return false; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/hsvscalefx.cpp b/toonz/sources/stdfx/hsvscalefx.cpp index b076562..67b2da8 100644 --- a/toonz/sources/stdfx/hsvscalefx.cpp +++ b/toonz/sources/stdfx/hsvscalefx.cpp @@ -44,7 +44,7 @@ public: ~HSVScaleFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); return true; @@ -53,9 +53,9 @@ public: return false; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; template diff --git a/toonz/sources/stdfx/igs_fog.cpp b/toonz/sources/stdfx/igs_fog.cpp index 3b11a9b..482fbc3 100644 --- a/toonz/sources/stdfx/igs_fog.cpp +++ b/toonz/sources/stdfx/igs_fog.cpp @@ -615,7 +615,7 @@ public: this->pixe_starts_, this->thre_starts_, this->result_, this->alpha_ref_); } - void run(void) { + void run(void) override { bool rgb_rendering_sw = true; bool alpha_rendering_sw = this->alpha_rendering_sw_; if (this->pixe_tracks_.size() <= 1) { diff --git a/toonz/sources/stdfx/igs_maxmin_multithread.h b/toonz/sources/stdfx/igs_maxmin_multithread.h index d6c457f..98fd34d 100644 --- a/toonz/sources/stdfx/igs_maxmin_multithread.h +++ b/toonz/sources/stdfx/igs_maxmin_multithread.h @@ -67,7 +67,7 @@ public: (ref != 0 || 4 <= channels) ? true : false, this->pixe_tracks_, this->alpha_ref_, this->result_); } - void run(void) { /* threadで実行する部分 */ + void run(void) override { /* threadで実行する部分 */ bool rgb_ren_sw = true; bool alp_ren_sw = this->alpha_rendering_sw_; bool add_ble_sw = this->add_blend_sw_; diff --git a/toonz/sources/stdfx/ino_blend_add.cpp b/toonz/sources/stdfx/ino_blend_add.cpp index 5b84e6c..00d3060 100644 --- a/toonz/sources/stdfx/ino_blend_add.cpp +++ b/toonz/sources/stdfx/ino_blend_add.cpp @@ -20,8 +20,8 @@ public: this->m_opacity->setValueRange(0, 10.0 * ino::param_range()); } ~ino_blend_add() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -45,14 +45,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_color_burn.cpp b/toonz/sources/stdfx/ino_blend_color_burn.cpp index dc44044..4677f87 100644 --- a/toonz/sources/stdfx/ino_blend_color_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_color_burn.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_color_burn() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_color_dodge.cpp b/toonz/sources/stdfx/ino_blend_color_dodge.cpp index ff2d228..a55f008 100644 --- a/toonz/sources/stdfx/ino_blend_color_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_color_dodge.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_color_dodge() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp index edd1943..0543be0 100644 --- a/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp +++ b/toonz/sources/stdfx/ino_blend_cross_dissolve.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_cross_dissolve() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_darken.cpp b/toonz/sources/stdfx/ino_blend_darken.cpp index 4afdc9c..fbabe27 100644 --- a/toonz/sources/stdfx/ino_blend_darken.cpp +++ b/toonz/sources/stdfx/ino_blend_darken.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_darken() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_darker_color.cpp b/toonz/sources/stdfx/ino_blend_darker_color.cpp index 8536363..3ea0d93 100644 --- a/toonz/sources/stdfx/ino_blend_darker_color.cpp +++ b/toonz/sources/stdfx/ino_blend_darker_color.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_darker_color() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_divide.cpp b/toonz/sources/stdfx/ino_blend_divide.cpp index 934c1bb..bdeb34a 100644 --- a/toonz/sources/stdfx/ino_blend_divide.cpp +++ b/toonz/sources/stdfx/ino_blend_divide.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_divide() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_hard_light.cpp b/toonz/sources/stdfx/ino_blend_hard_light.cpp index 59ede48..e8c1034 100644 --- a/toonz/sources/stdfx/ino_blend_hard_light.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_light.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_hard_light() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_hard_mix.cpp b/toonz/sources/stdfx/ino_blend_hard_mix.cpp index 90851b9..3f41a37 100644 --- a/toonz/sources/stdfx/ino_blend_hard_mix.cpp +++ b/toonz/sources/stdfx/ino_blend_hard_mix.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_hard_mix() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_lighten.cpp b/toonz/sources/stdfx/ino_blend_lighten.cpp index 4948764..d986c32 100644 --- a/toonz/sources/stdfx/ino_blend_lighten.cpp +++ b/toonz/sources/stdfx/ino_blend_lighten.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_lighten() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_lighter_color.cpp b/toonz/sources/stdfx/ino_blend_lighter_color.cpp index 7d38cf7..bd5e780 100644 --- a/toonz/sources/stdfx/ino_blend_lighter_color.cpp +++ b/toonz/sources/stdfx/ino_blend_lighter_color.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_lighter_color() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_linear_burn.cpp b/toonz/sources/stdfx/ino_blend_linear_burn.cpp index 753c1c1..79c2a8c 100644 --- a/toonz/sources/stdfx/ino_blend_linear_burn.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_burn.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_linear_burn() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp index 80a031a..ee57d23 100644 --- a/toonz/sources/stdfx/ino_blend_linear_dodge.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_dodge.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_linear_dodge() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_linear_light.cpp b/toonz/sources/stdfx/ino_blend_linear_light.cpp index badebe5..7cb6f98 100644 --- a/toonz/sources/stdfx/ino_blend_linear_light.cpp +++ b/toonz/sources/stdfx/ino_blend_linear_light.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_linear_light() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_multiply.cpp b/toonz/sources/stdfx/ino_blend_multiply.cpp index 5ec4446..fcd11b4 100644 --- a/toonz/sources/stdfx/ino_blend_multiply.cpp +++ b/toonz/sources/stdfx/ino_blend_multiply.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_multiply() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_over.cpp b/toonz/sources/stdfx/ino_blend_over.cpp index 5c7d06c..0f1523c 100644 --- a/toonz/sources/stdfx/ino_blend_over.cpp +++ b/toonz/sources/stdfx/ino_blend_over.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_over() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_overlay.cpp b/toonz/sources/stdfx/ino_blend_overlay.cpp index deb386b..23f35dd 100644 --- a/toonz/sources/stdfx/ino_blend_overlay.cpp +++ b/toonz/sources/stdfx/ino_blend_overlay.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_overlay() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_pin_light.cpp b/toonz/sources/stdfx/ino_blend_pin_light.cpp index c5fed56..d153e5a 100644 --- a/toonz/sources/stdfx/ino_blend_pin_light.cpp +++ b/toonz/sources/stdfx/ino_blend_pin_light.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_pin_light() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_screen.cpp b/toonz/sources/stdfx/ino_blend_screen.cpp index d7fa1e6..3329855 100644 --- a/toonz/sources/stdfx/ino_blend_screen.cpp +++ b/toonz/sources/stdfx/ino_blend_screen.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_screen() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_soft_light.cpp b/toonz/sources/stdfx/ino_blend_soft_light.cpp index 2c66db1..bc86157 100644 --- a/toonz/sources/stdfx/ino_blend_soft_light.cpp +++ b/toonz/sources/stdfx/ino_blend_soft_light.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_soft_light() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_subtract.cpp b/toonz/sources/stdfx/ino_blend_subtract.cpp index 3e5f4fc..9258f14 100644 --- a/toonz/sources/stdfx/ino_blend_subtract.cpp +++ b/toonz/sources/stdfx/ino_blend_subtract.cpp @@ -25,8 +25,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_subtract() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -50,14 +50,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blend_vivid_light.cpp b/toonz/sources/stdfx/ino_blend_vivid_light.cpp index cd561a0..deded4c 100644 --- a/toonz/sources/stdfx/ino_blend_vivid_light.cpp +++ b/toonz/sources/stdfx/ino_blend_vivid_light.cpp @@ -21,8 +21,8 @@ public: this->m_opacity->setValueRange(0, 1.0 * ino::param_range()); } ~ino_blend_vivid_light() {} - bool canHandle(const TRenderSettings &rs, double frame) { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) { + bool canHandle(const TRenderSettings &rs, double frame) override { return true; } + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &rs) override { TRectD up_bx; const bool up_sw = (m_up.isConnected() ? m_up->doGetBBox(frame, up_bx, rs) : false); @@ -46,14 +46,14 @@ public: // TRect getInvalidRect(const TRect &max) {return max;} // void doSetParam(const std::string &name, const TParamP ¶m) {} int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &rs) { + const TRenderSettings &rs) override { return TRasterFx::memorySize(rect, rs.m_bpp); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &rs) override { this->dryComputeUpAndDown(rect, frame, rs, false); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rs); + void doCompute(TTile &tile, double frame, const TRenderSettings &rs) override; void computeUpAndDown(TTile &tile, double frame, const TRenderSettings &rs, TRasterP &dn_ras, TRasterP &up_ras, bool upComputesWholeTile = false); diff --git a/toonz/sources/stdfx/ino_blur.cpp b/toonz/sources/stdfx/ino_blur.cpp index 5635d64..53f0429 100644 --- a/toonz/sources/stdfx/ino_blur.cpp +++ b/toonz/sources/stdfx/ino_blur.cpp @@ -60,7 +60,7 @@ toonz/main/sources/stdfx/motionblurfx.cpp } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -70,26 +70,26 @@ toonz/main/sources/stdfx/motionblurfx.cpp return ret; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD bBox(rect); this->get_render_enlarge(frame, info.m_affine, bBox); return TRasterFx::memorySize(bBox, info.m_bpp); } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { if (0 == this->m_radius->getValue(frame)) { return true; } else { return isAlmostIsotropic(info.m_affine); } } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_blur, "inoBlurFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_channel_selector.cpp b/toonz/sources/stdfx/ino_channel_selector.cpp index 1289d77..56aac12 100644 --- a/toonz/sources/stdfx/ino_channel_selector.cpp +++ b/toonz/sources/stdfx/ino_channel_selector.cpp @@ -66,7 +66,7 @@ public: this->m_alp_channel->addItem(1, "Green"); this->m_alp_channel->addItem(2, "Blue"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { for (int ii = 0; ii < this->getInputPortCount(); ++ii) { std::string nm = this->getInputPortName(ii); TRasterFxPort *tmp_port = (TRasterFxPort *)this->getInputPort(nm); @@ -77,8 +77,8 @@ public: bBox = TRectD(); return false; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; }; FX_PLUGIN_IDENTIFIER(ino_channel_selector, "inoChannelSelectorFx"); //-------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/ino_common.h b/toonz/sources/stdfx/ino_common.h index 754673b..a7a0eab 100644 --- a/toonz/sources/stdfx/ino_common.h +++ b/toonz/sources/stdfx/ino_common.h @@ -42,9 +42,9 @@ inline double pixel_per_mm(void) { return 1.; } class TBlendForeBackRasterFx : public TRasterFx { public: /* FX nodeが無効のときの、表示port番号 */ - int getPreferredInputPort() { return 1; } + int getPreferredInputPort() override { return 1; } - std::string getPluginId() const { return PLUGIN_PREFIX; } + std::string getPluginId() const override { return PLUGIN_PREFIX; } }; #endif /* !ino_common_h */ diff --git a/toonz/sources/stdfx/ino_density.cpp b/toonz/sources/stdfx/ino_density.cpp index 85d6f96..d99452d 100644 --- a/toonz/sources/stdfx/ino_density.cpp +++ b/toonz/sources/stdfx/ino_density.cpp @@ -32,7 +32,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -40,10 +40,10 @@ public: return false; } } - bool canHandle(const TRenderSettings &rend_sets, double frame) { + bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_density, "inoDensityFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_fog.cpp b/toonz/sources/stdfx/ino_fog.cpp index 2a1d4a0..ad4aee2 100644 --- a/toonz/sources/stdfx/ino_fog.cpp +++ b/toonz/sources/stdfx/ino_fog.cpp @@ -60,7 +60,7 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -70,20 +70,20 @@ public: return ret; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD bBox(rect); this->get_render_enlarge(frame, info.m_affine, bBox); return TRasterFx::memorySize(bBox, info.m_bpp); } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_fog, "inoFogFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hls_add.cpp b/toonz/sources/stdfx/ino_hls_add.cpp index 7dc5665..0c8406e 100644 --- a/toonz/sources/stdfx/ino_hls_add.cpp +++ b/toonz/sources/stdfx/ino_hls_add.cpp @@ -66,7 +66,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -74,10 +74,10 @@ public: return false; } } - bool canHandle(const TRenderSettings &rend_sets, double frame) { + bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hls_add, "inohlsAddFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hls_adjust.cpp b/toonz/sources/stdfx/ino_hls_adjust.cpp index 1e16e82..a59b67e 100644 --- a/toonz/sources/stdfx/ino_hls_adjust.cpp +++ b/toonz/sources/stdfx/ino_hls_adjust.cpp @@ -70,7 +70,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -78,10 +78,10 @@ public: return false; } } - bool canHandle(const TRenderSettings &rend_sets, double frame) { + bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hls_adjust, "inohlsAdjustFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hls_noise.cpp b/toonz/sources/stdfx/ino_hls_noise.cpp index 281346a..cd76825 100644 --- a/toonz/sources/stdfx/ino_hls_noise.cpp +++ b/toonz/sources/stdfx/ino_hls_noise.cpp @@ -77,7 +77,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -85,7 +85,7 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // return true; /* trueだと素材がスライドして現れるときノイズパターン が変わってしまう 2013-4-5からtoonz上で変更した */ @@ -101,7 +101,7 @@ public: 2013-11-08 */ return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hls_noise, "inohlsNoiseFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hsv_add.cpp b/toonz/sources/stdfx/ino_hsv_add.cpp index 67afe90..05beaf5 100644 --- a/toonz/sources/stdfx/ino_hsv_add.cpp +++ b/toonz/sources/stdfx/ino_hsv_add.cpp @@ -66,7 +66,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -74,10 +74,10 @@ public: return false; } } - bool canHandle(const TRenderSettings &rend_sets, double frame) { + bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hsv_add, "inohsvAddFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hsv_adjust.cpp b/toonz/sources/stdfx/ino_hsv_adjust.cpp index f907a03..a8d656b 100644 --- a/toonz/sources/stdfx/ino_hsv_adjust.cpp +++ b/toonz/sources/stdfx/ino_hsv_adjust.cpp @@ -70,7 +70,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -78,10 +78,10 @@ public: return false; } } - bool canHandle(const TRenderSettings &rend_sets, double frame) { + bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hsv_adjust, "inohsvAdjustFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_hsv_noise.cpp b/toonz/sources/stdfx/ino_hsv_noise.cpp index 730c68d..9758a82 100644 --- a/toonz/sources/stdfx/ino_hsv_noise.cpp +++ b/toonz/sources/stdfx/ino_hsv_noise.cpp @@ -77,7 +77,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -85,7 +85,7 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // return true; /* trueだと素材がスライドして現れるときノイズパターンが 変わってしまう 2013-4-5からtoonz上で変更した */ @@ -101,7 +101,7 @@ public: 2013-11-08 */ return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_hsv_noise, "inohsvNoiseFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_level_auto.cpp b/toonz/sources/stdfx/ino_level_auto.cpp index 4ae9a70..da9bb79 100644 --- a/toonz/sources/stdfx/ino_level_auto.cpp +++ b/toonz/sources/stdfx/ino_level_auto.cpp @@ -39,7 +39,7 @@ public: this->m_gamma->setValueRange(0.1 * ino::param_range(), 10.0 * ino::param_range()); /* gamma値 */ } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -47,8 +47,8 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_level_auto, "inoLevelAutoFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_level_master.cpp b/toonz/sources/stdfx/ino_level_master.cpp index cef94ee..91d8750 100644 --- a/toonz/sources/stdfx/ino_level_master.cpp +++ b/toonz/sources/stdfx/ino_level_master.cpp @@ -55,7 +55,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -63,8 +63,8 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_level_master, "inoLevelMasterFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_level_rgba.cpp b/toonz/sources/stdfx/ino_level_rgba.cpp index 79254d4..d9c67a5 100644 --- a/toonz/sources/stdfx/ino_level_rgba.cpp +++ b/toonz/sources/stdfx/ino_level_rgba.cpp @@ -113,7 +113,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -121,8 +121,8 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_level_rgba, "inoLevelrgbaFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_maxmin.cpp b/toonz/sources/stdfx/ino_maxmin.cpp index a8ee03e..86d42c1 100644 --- a/toonz/sources/stdfx/ino_maxmin.cpp +++ b/toonz/sources/stdfx/ino_maxmin.cpp @@ -61,7 +61,7 @@ public: this->m_ref_mode->setDefaultValue(0); this->m_ref_mode->setValue(0); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); const double margin = @@ -76,16 +76,16 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { const double radius = (this->m_radius->getValue(frame) + smoothing_edge_) * ino::pixel_per_mm() * sqrt(fabs(info.m_affine.det())) / ((info.m_shrinkX + info.m_shrinkY) / 2.0); return TRasterFx::memorySize(rect.enlarge(ceil(radius) + 0.5), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_maxmin, "inoMaxMinFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_median.cpp b/toonz/sources/stdfx/ino_median.cpp index aa75189..33dc6a9 100644 --- a/toonz/sources/stdfx/ino_median.cpp +++ b/toonz/sources/stdfx/ino_median.cpp @@ -53,7 +53,7 @@ public: this->m_ref_mode->setDefaultValue(0); this->m_ref_mode->setValue(0); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); const double margin = ceil(this->m_radius->getValue(frame)); @@ -66,15 +66,15 @@ public: return false; } } - bool canHandle(const TRenderSettings &rend_sets, double frame) { + bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { const double radius = this->m_radius->getValue(frame); return TRasterFx::memorySize(rect.enlarge(ceil(radius) + 0.5), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_median, "inoMedianFx") //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_median_filter.cpp b/toonz/sources/stdfx/ino_median_filter.cpp index 1b9f70e..897e259 100644 --- a/toonz/sources/stdfx/ino_median_filter.cpp +++ b/toonz/sources/stdfx/ino_median_filter.cpp @@ -38,7 +38,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); const double margin = ceil(this->m_radius->getValue(frame)); @@ -51,15 +51,15 @@ public: return false; } } - bool canHandle(const TRenderSettings &rend_sets, double frame) { + bool canHandle(const TRenderSettings &rend_sets, double frame) override { return true; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { const double radius = this->m_radius->getValue(frame); return TRasterFx::memorySize(rect.enlarge(ceil(radius) + 0.5), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_median_filter, "inoMedianFilterFx") //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_motion_blur.cpp b/toonz/sources/stdfx/ino_motion_blur.cpp index f42b542..460ffcf 100644 --- a/toonz/sources/stdfx/ino_motion_blur.cpp +++ b/toonz/sources/stdfx/ino_motion_blur.cpp @@ -111,7 +111,7 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -121,26 +121,26 @@ public: return ret; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD bBox(rect); this->get_render_enlarge(frame, info.m_affine, bBox); return TRasterFx::memorySize(bBox, info.m_bpp); } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { if (0 == this->m_depend_move->getValue()) { return true; } else { return isAlmostIsotropic(info.m_affine) || m_scale->getValue(frame) == 0; } } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_motion_blur, "inoMotionBlurFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_motion_wind.cpp b/toonz/sources/stdfx/ino_motion_wind.cpp index 53fec93..ccb3e28 100644 --- a/toonz/sources/stdfx/ino_motion_wind.cpp +++ b/toonz/sources/stdfx/ino_motion_wind.cpp @@ -126,7 +126,7 @@ public: this->m_ref_mode->addItem(4, "Luminance"); this->m_ref_mode->addItem(-1, "Nothing"); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { const bool ret = this->m_input->doGetBBox(frame, bBox, info); // if ( this->m_spread->getValue() ) { @@ -144,12 +144,12 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // return true; return false; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { const double mm2scale_shrink_pixel = ino::pixel_per_mm() * sqrt(fabs(info.m_affine.det())) / ((info.m_shrinkX + info.m_shrinkY) / 2.0); @@ -161,7 +161,7 @@ public: (int)(ceil((length_min < length_max) ? length_max : length_min) + 0.5); return TRasterFx::memorySize(rect.enlarge(enlarge_pixel), info.m_bpp); } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_motion_wind, "inoMotionWindFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_negate.cpp b/toonz/sources/stdfx/ino_negate.cpp index 7ad22c2..6514ff0 100644 --- a/toonz/sources/stdfx/ino_negate.cpp +++ b/toonz/sources/stdfx/ino_negate.cpp @@ -20,7 +20,7 @@ public: bindParam(this, "blue", this->m_blue); bindParam(this, "alpha", this->m_alpha); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (this->m_input.isConnected()) { return this->m_input->doGetBBox(frame, bBox, info); } else { @@ -28,8 +28,8 @@ public: return false; } } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_negate, "inoNegateFx"); //------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_pn_clouds.cpp b/toonz/sources/stdfx/ino_pn_clouds.cpp index 0604cc2..7f8aa9c 100644 --- a/toonz/sources/stdfx/ino_pn_clouds.cpp +++ b/toonz/sources/stdfx/ino_pn_clouds.cpp @@ -47,12 +47,12 @@ public: this->m_persistance->setValueRange(0.1 * ino::param_range(), 2.0 * ino::param_range()); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; } - bool canHandle(const TRenderSettings &info, double frame) { return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + bool canHandle(const TRenderSettings &info, double frame) override { return false; } + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_pn_clouds, "inopnCloudsFx"); // ------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ino_radial_blur.cpp b/toonz/sources/stdfx/ino_radial_blur.cpp index 0d55c98..1fd39d1 100644 --- a/toonz/sources/stdfx/ino_radial_blur.cpp +++ b/toonz/sources/stdfx/ino_radial_blur.cpp @@ -108,7 +108,7 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (!this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -118,19 +118,19 @@ public: return ret; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD bBox(rect); this->get_render_enlarge(frame, info.m_affine, bBox); return TRasterFx::memorySize(bBox, info.m_bpp); } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // return false; // toonz has geometry control // return true; /* 2012-11-14: @@ -138,10 +138,10 @@ public: return m_blur->getValue(frame) == 0 ? true : isAlmostIsotropic(info.m_affine); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; // add 20140130 - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 2]; concepts[0].m_type = TParamUIConcept::POINT; diff --git a/toonz/sources/stdfx/ino_spin_blur.cpp b/toonz/sources/stdfx/ino_spin_blur.cpp index daafa0a..1956e5f 100644 --- a/toonz/sources/stdfx/ino_spin_blur.cpp +++ b/toonz/sources/stdfx/ino_spin_blur.cpp @@ -92,7 +92,7 @@ public: } } //------------------------------------------------------------ - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (!this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -102,19 +102,19 @@ public: return ret; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD bBox(rect); this->get_render_enlarge(frame, info.m_affine, bBox); return TRasterFx::memorySize(bBox, info.m_bpp); } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // return false; // toonz has geometry control // return true; /* 2012-11-14: @@ -122,10 +122,10 @@ public: return m_blur->getValue(frame) == 0 ? true : isAlmostIsotropic(info.m_affine); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; // add 20140130 - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 2]; concepts[0].m_type = TParamUIConcept::POINT; diff --git a/toonz/sources/stdfx/ino_warp_hv.cpp b/toonz/sources/stdfx/ino_warp_hv.cpp index 3ac34c8..d15d1f5 100644 --- a/toonz/sources/stdfx/ino_warp_hv.cpp +++ b/toonz/sources/stdfx/ino_warp_hv.cpp @@ -77,7 +77,7 @@ public: bBox = bBox.enlarge(static_cast(margin)); } } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (false == this->m_input.isConnected()) { bBox = TRectD(); return false; @@ -87,23 +87,23 @@ public: return ret; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD bBox(rect); this->get_render_enlarge(frame, info.m_affine, bBox); return TRasterFx::memorySize(bBox, info.m_bpp); } void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput) { + TRenderSettings &infoOnInput) override { rectOnInput = rectOnOutput; infoOnInput = infoOnOutput; this->get_render_enlarge(frame, infoOnOutput.m_affine, rectOnInput); } - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // return true; return false; } - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; }; FX_PLUGIN_IDENTIFIER(ino_warp_hv, "inoWarphvFx"); //-------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/iwa_adjustexposurefx.h b/toonz/sources/stdfx/iwa_adjustexposurefx.h index e62be6b..2a4ed15 100644 --- a/toonz/sources/stdfx/iwa_adjustexposurefx.h +++ b/toonz/sources/stdfx/iwa_adjustexposurefx.h @@ -34,14 +34,14 @@ protected: public: Iwa_AdjustExposureFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings); + void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; void doCompute_CPU(TTile &tile, double frame, const TRenderSettings &settings, TDimensionI &dim, float4 *tile_host); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; }; #endif \ No newline at end of file diff --git a/toonz/sources/stdfx/iwa_directionalblurfx.h b/toonz/sources/stdfx/iwa_directionalblurfx.h index 2b4162d..1a25fea 100644 --- a/toonz/sources/stdfx/iwa_directionalblurfx.h +++ b/toonz/sources/stdfx/iwa_directionalblurfx.h @@ -61,13 +61,13 @@ class Iwa_DirectionalBlurFx : public TStandardRasterFx { public: Iwa_DirectionalBlurFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings); + void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; - void getParamUIs(TParamUIConcept *&concepts, int &length); + void getParamUIs(TParamUIConcept *&concepts, int &length) override; }; #endif \ No newline at end of file diff --git a/toonz/sources/stdfx/iwa_gradientwarpfx.h b/toonz/sources/stdfx/iwa_gradientwarpfx.h index 280212d..cb01332 100644 --- a/toonz/sources/stdfx/iwa_gradientwarpfx.h +++ b/toonz/sources/stdfx/iwa_gradientwarpfx.h @@ -67,11 +67,11 @@ protected: public: Iwa_GradientWarpFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings); + void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; }; #endif \ No newline at end of file diff --git a/toonz/sources/stdfx/iwa_motionblurfx.h b/toonz/sources/stdfx/iwa_motionblurfx.h index d0c9238..4fda0c6 100644 --- a/toonz/sources/stdfx/iwa_motionblurfx.h +++ b/toonz/sources/stdfx/iwa_motionblurfx.h @@ -112,7 +112,7 @@ protected: public: Iwa_MotionBlurCompFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings); + void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; void doCompute_CPU(TTile &tile, double frame, const TRenderSettings &settings, float4 *pointsTable, int pointAmount, double hardness, @@ -124,12 +124,12 @@ public: TDimensionI &dimOut, TDimensionI &filterDim, TTile &back_tile); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; /*- 参考にしているオブジェクトが動いている可能性があるので、 エイリアスは毎フレーム変える -*/ - std::string getAlias(double frame, const TRenderSettings &info) const; + std::string getAlias(double frame, const TRenderSettings &info) const override; }; #endif \ No newline at end of file diff --git a/toonz/sources/stdfx/iwa_particlesfx.h b/toonz/sources/stdfx/iwa_particlesfx.h index c8502a0..929ba24 100644 --- a/toonz/sources/stdfx/iwa_particlesfx.h +++ b/toonz/sources/stdfx/iwa_particlesfx.h @@ -140,30 +140,30 @@ public: Iwa_TiledParticlesFx(); ~Iwa_TiledParticlesFx(); - bool isZerary() const { return true; } + bool isZerary() const override { return true; } - int dynamicPortGroupsCount() const { return 2; } - const TFxPortDG *dynamicPortGroup(int g) const { + int dynamicPortGroupsCount() const override { return 2; } + const TFxPortDG *dynamicPortGroup(int g) const override { return (g == 0) ? &m_source : (g == 1) ? &m_control : 0; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - bool allowUserCacheOnPort(int port); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool allowUserCacheOnPort(int port) override; - std::string getAlias(double frame, const TRenderSettings &info) const; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - TFxTimeRegion getTimeRegion() const { + std::string getAlias(double frame, const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + TFxTimeRegion getTimeRegion() const override { return TFxTimeRegion::createUnlimited(); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - void compute(TFlash &flash, int frame); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + void compute(TFlash &flash, int frame) override; - void getParamUIs(TParamUIConcept *&concepts, int &length); + void getParamUIs(TParamUIConcept *&concepts, int &length) override; void compatibilityTranslatePort(int majorVersion, int minorVersion, - std::string &portName); + std::string &portName) override; }; #endif // IWA_TILEDPARTICLESFX_H diff --git a/toonz/sources/stdfx/iwa_particlesmanager.cpp b/toonz/sources/stdfx/iwa_particlesmanager.cpp index 658b7da..55ec934 100644 --- a/toonz/sources/stdfx/iwa_particlesmanager.cpp +++ b/toonz/sources/stdfx/iwa_particlesmanager.cpp @@ -39,7 +39,7 @@ class Iwa_ParticlesManagerGenerator : public TRenderResourceManagerGenerator { public: Iwa_ParticlesManagerGenerator() : TRenderResourceManagerGenerator(true) {} - TRenderResourceManager *operator()(void) { return new Iwa_ParticlesManager; } + TRenderResourceManager *operator()(void) override { return new Iwa_ParticlesManager; } }; MANAGER_FILESCOPE_DECLARATION(Iwa_ParticlesManager, diff --git a/toonz/sources/stdfx/iwa_particlesmanager.h b/toonz/sources/stdfx/iwa_particlesmanager.h index 0e8058e..a98b5bb 100644 --- a/toonz/sources/stdfx/iwa_particlesmanager.h +++ b/toonz/sources/stdfx/iwa_particlesmanager.h @@ -75,7 +75,7 @@ private: int m_renderStatus; - void onRenderStatusStart(int renderStatus); + void onRenderStatusStart(int renderStatus) override; }; #endif diff --git a/toonz/sources/stdfx/iwa_perspectivedistortfx.h b/toonz/sources/stdfx/iwa_perspectivedistortfx.h index 0c8585d..da7f168 100644 --- a/toonz/sources/stdfx/iwa_perspectivedistortfx.h +++ b/toonz/sources/stdfx/iwa_perspectivedistortfx.h @@ -39,11 +39,11 @@ protected: public: Iwa_PerspectiveDistortFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; void doCompute_CPU(TTile &tile, const double frame, const TRenderSettings &settings, TPointD &vanishingPoint, @@ -52,7 +52,7 @@ public: TDimensionI &resultDim, const double precision, const double offs); - void getParamUIs(TParamUIConcept *&concepts, int &length); + void getParamUIs(TParamUIConcept *&concepts, int &length) override; }; #endif \ No newline at end of file diff --git a/toonz/sources/stdfx/iwa_pnperspectivefx.h b/toonz/sources/stdfx/iwa_pnperspectivefx.h index 9670270..05b9f83 100644 --- a/toonz/sources/stdfx/iwa_pnperspectivefx.h +++ b/toonz/sources/stdfx/iwa_pnperspectivefx.h @@ -106,17 +106,17 @@ class Iwa_PNPerspectiveFx : public TStandardZeraryFx { public: Iwa_PNPerspectiveFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets); + void doCompute(TTile &tile, double frame, const TRenderSettings &rend_sets) override; void doCompute_CPU(TTile &tile, double frame, const TRenderSettings &settings, float4 *out_host, TDimensionI &dimOut, PN_Params &pnParams); - void getParamUIs(TParamUIConcept *&concepts, int &length); + void getParamUIs(TParamUIConcept *&concepts, int &length) override; }; #endif \ No newline at end of file diff --git a/toonz/sources/stdfx/iwa_spectrumfx.h b/toonz/sources/stdfx/iwa_spectrumfx.h index f3d6ed5..aa9a64b 100644 --- a/toonz/sources/stdfx/iwa_spectrumfx.h +++ b/toonz/sources/stdfx/iwa_spectrumfx.h @@ -61,14 +61,14 @@ protected: public: Iwa_SpectrumFx(); - void doCompute(TTile &tile, double frame, const TRenderSettings &settings); + void doCompute(TTile &tile, double frame, const TRenderSettings &settings) override; void doCompute_CUDA(TTile &tile, double frame, const TRenderSettings &settings); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame); + bool canHandle(const TRenderSettings &info, double frame) override; }; #endif diff --git a/toonz/sources/stdfx/iwa_tilefx.cpp b/toonz/sources/stdfx/iwa_tilefx.cpp index 86ef0a1..861ddc2 100644 --- a/toonz/sources/stdfx/iwa_tilefx.cpp +++ b/toonz/sources/stdfx/iwa_tilefx.cpp @@ -33,16 +33,16 @@ public: Iwa_TileFx(); ~Iwa_TileFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override; TRect getInvalidRect(const TRect &max) { return max; } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; bool checkIfThisTileShouldBeComptedOrNot(int horizIndex, int vertIndex); bool isInRange(int quantityMode, int index); diff --git a/toonz/sources/stdfx/kaleido.cpp b/toonz/sources/stdfx/kaleido.cpp index f9a5603..4bb706e 100644 --- a/toonz/sources/stdfx/kaleido.cpp +++ b/toonz/sources/stdfx/kaleido.cpp @@ -21,10 +21,10 @@ public: KaleidoDistorter(double angle, const TAffine &aff, const TPointD shift) : m_angle(angle), m_aff(aff), m_shift(shift) {} - TPointD map(const TPointD &p) const { return TPointD(); } - int maxInvCount() const { return 1; } + TPointD map(const TPointD &p) const override { return TPointD(); } + int maxInvCount() const override { return 1; } - int invMap(const TPointD &p, TPointD *results) const; + int invMap(const TPointD &p, TPointD *results) const override; }; //------------------------------------------------------------------- @@ -88,14 +88,14 @@ public: ~KaleidoFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return isAlmostIsotropic(info.m_affine); } diff --git a/toonz/sources/stdfx/linearwavefx.cpp b/toonz/sources/stdfx/linearwavefx.cpp index 39927f7..85b1590 100644 --- a/toonz/sources/stdfx/linearwavefx.cpp +++ b/toonz/sources/stdfx/linearwavefx.cpp @@ -61,13 +61,13 @@ public: //------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return isAlmostIsotropic(info.m_affine); } //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -88,7 +88,7 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; if (fabs(m_intensity->getValue(frame)) < 0.01) { @@ -119,7 +119,7 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) { + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; @@ -220,7 +220,7 @@ public: } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { // return -1; //Deactivated. This fx is currently very inefficient if // subdivided! diff --git a/toonz/sources/stdfx/localblurfx.cpp b/toonz/sources/stdfx/localblurfx.cpp index 173e027..72f7646 100644 --- a/toonz/sources/stdfx/localblurfx.cpp +++ b/toonz/sources/stdfx/localblurfx.cpp @@ -251,11 +251,11 @@ public: ~LocalBlurFx() {} - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return (isAlmostIsotropic(info.m_affine) || m_value->getValue(frame) == 0); } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_up.isConnected()) { bool ret = m_up->doGetBBox(frame, bBox, info); @@ -272,11 +272,11 @@ public: void enlarge(const TRectD &bbox, TRectD &requestedRect, int blur); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &info); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/localtransparencyfx.cpp b/toonz/sources/stdfx/localtransparencyfx.cpp index 9a16351..08eb95c 100644 --- a/toonz/sources/stdfx/localtransparencyfx.cpp +++ b/toonz/sources/stdfx/localtransparencyfx.cpp @@ -128,7 +128,7 @@ public: } virtual ~LocalTransparencyFx() {} - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_src.isConnected()) return m_src->doGetBBox(frame, bBox, info); else { @@ -137,7 +137,7 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { if (!checkBeforeCompute(tile, frame, ri)) return; TTile srcTile; m_src->allocateAndCompute(srcTile, tile.m_pos, tile.getRaster()->getSize(), @@ -177,10 +177,10 @@ public: return true; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { return TRasterFx::memorySize(rect, info.m_bpp); } }; diff --git a/toonz/sources/stdfx/mosaicfx.cpp b/toonz/sources/stdfx/mosaicfx.cpp index fd71e98..0e6238a 100644 --- a/toonz/sources/stdfx/mosaicfx.cpp +++ b/toonz/sources/stdfx/mosaicfx.cpp @@ -86,7 +86,7 @@ public: : CellBuilder(cellLx, cellLy, radius, wrap) {} void doCell(PIXEL *cellBuffer, const PIXEL &cellColor, const PIXEL &bgColor, - int x0, int y0, int x1, int y1) { + int x0, int y0, int x1, int y1) override { // Apply the mask to the cell. 0 pixels are bgColored, GRAY::maxChannelValue // ones are cellColored. PIXEL *pix, *line = cellBuffer, *lineEnd; @@ -201,21 +201,21 @@ public: ~MosaicFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { // We'll return the handled affine only through handledAffine(). if ((m_size->getValue(frame) + m_distance->getValue(frame)) == 0.0) return true; return false; } - TAffine handledAffine(const TRenderSettings &info, double frame) { + TAffine handledAffine(const TRenderSettings &info, double frame) override { // Return the default implementation: only the scale part of the affine // can be handled. Rotations and other distortions would need us have to // implement diagonal grid lines - and we don't want to! diff --git a/toonz/sources/stdfx/motionblurfx.cpp b/toonz/sources/stdfx/motionblurfx.cpp index 32324a4..6c74385 100644 --- a/toonz/sources/stdfx/motionblurfx.cpp +++ b/toonz/sources/stdfx/motionblurfx.cpp @@ -377,7 +377,7 @@ protected: // TBoolParamP m_useSSE; public: - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; DirectionalBlurBaseFx(bool isMotionBLur) : m_isMotionBlur(isMotionBLur) @@ -403,15 +403,15 @@ public: ~DirectionalBlurBaseFx(){}; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return isAlmostIsotropic(info.m_affine) || m_intensity->getValue(frame) == 0; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; }; class DirectionalBlurFx : public DirectionalBlurBaseFx @@ -426,7 +426,7 @@ public: bindParam(this, "angle", m_angle); } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::POLAR; @@ -443,7 +443,7 @@ class MotionBlurFx : public DirectionalBlurBaseFx public: MotionBlurFx() : DirectionalBlurBaseFx(true) {} - std::string getAlias(double frame, const TRenderSettings &info) const { + std::string getAlias(double frame, const TRenderSettings &info) const override { unsigned long id = getIdentifier(); double value = m_intensity->getValue(frame); return getFxType() + "[" + std::to_string(id) + "," + diff --git a/toonz/sources/stdfx/multitonefx.cpp b/toonz/sources/stdfx/multitonefx.cpp index 318dd6f..b8957ba 100644 --- a/toonz/sources/stdfx/multitonefx.cpp +++ b/toonz/sources/stdfx/multitonefx.cpp @@ -25,7 +25,7 @@ public: ~MultiToneFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -34,9 +34,9 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; template diff --git a/toonz/sources/stdfx/noisefx.cpp b/toonz/sources/stdfx/noisefx.cpp index 4598e40..7ad8a52 100644 --- a/toonz/sources/stdfx/noisefx.cpp +++ b/toonz/sources/stdfx/noisefx.cpp @@ -35,7 +35,7 @@ public: ~NoiseFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -44,10 +44,10 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - std::string getAlias(double frame, const TRenderSettings &info) const; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + std::string getAlias(double frame, const TRenderSettings &info) const override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/palettefilterfx.cpp b/toonz/sources/stdfx/palettefilterfx.cpp index 001a9af..c4e5612 100644 --- a/toonz/sources/stdfx/palettefilterfx.cpp +++ b/toonz/sources/stdfx/palettefilterfx.cpp @@ -36,7 +36,7 @@ public: ~PaletteFilterFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -46,12 +46,12 @@ public: } } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool allowUserCacheOnPort(int port) { return false; } + bool allowUserCacheOnPort(int port) override { return false; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/particlesfx.h b/toonz/sources/stdfx/particlesfx.h index 693edb5..ed37bcf 100644 --- a/toonz/sources/stdfx/particlesfx.h +++ b/toonz/sources/stdfx/particlesfx.h @@ -110,30 +110,30 @@ public: ParticlesFx(); ~ParticlesFx(); - bool isZerary() const { return true; } + bool isZerary() const override { return true; } - int dynamicPortGroupsCount() const { return 2; } - const TFxPortDG *dynamicPortGroup(int g) const { + int dynamicPortGroupsCount() const override { return 2; } + const TFxPortDG *dynamicPortGroup(int g) const override { return (g == 0) ? &m_source : (g == 1) ? &m_control : 0; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } - bool allowUserCacheOnPort(int port); + bool canHandle(const TRenderSettings &info, double frame) override { return true; } + bool allowUserCacheOnPort(int port) override; - std::string getAlias(double frame, const TRenderSettings &info) const; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - TFxTimeRegion getTimeRegion() const { + std::string getAlias(double frame, const TRenderSettings &info) const override; + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + TFxTimeRegion getTimeRegion() const override { return TFxTimeRegion::createUnlimited(); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - void compute(TFlash &flash, int frame); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + void compute(TFlash &flash, int frame) override; - void getParamUIs(TParamUIConcept *&concepts, int &length); + void getParamUIs(TParamUIConcept *&concepts, int &length) override; void compatibilityTranslatePort(int majorVersion, int minorVersion, - std::string &portName); + std::string &portName) override; }; #endif // PARTICLESFX_H diff --git a/toonz/sources/stdfx/particlesmanager.cpp b/toonz/sources/stdfx/particlesmanager.cpp index ffe462d..30400d7 100644 --- a/toonz/sources/stdfx/particlesmanager.cpp +++ b/toonz/sources/stdfx/particlesmanager.cpp @@ -35,7 +35,7 @@ class ParticlesManagerGenerator : public TRenderResourceManagerGenerator { public: ParticlesManagerGenerator() : TRenderResourceManagerGenerator(true) {} - TRenderResourceManager *operator()(void) { return new ParticlesManager; } + TRenderResourceManager *operator()(void) override { return new ParticlesManager; } }; MANAGER_FILESCOPE_DECLARATION(ParticlesManager, ParticlesManagerGenerator); diff --git a/toonz/sources/stdfx/particlesmanager.h b/toonz/sources/stdfx/particlesmanager.h index d5e3bfc..5202c0a 100644 --- a/toonz/sources/stdfx/particlesmanager.h +++ b/toonz/sources/stdfx/particlesmanager.h @@ -63,7 +63,7 @@ private: int m_renderStatus; - void onRenderStatusStart(int renderStatus); + void onRenderStatusStart(int renderStatus) override; }; #endif diff --git a/toonz/sources/stdfx/perlinnoisefx.cpp b/toonz/sources/stdfx/perlinnoisefx.cpp index 2ec6ec8..4668a3e 100644 --- a/toonz/sources/stdfx/perlinnoisefx.cpp +++ b/toonz/sources/stdfx/perlinnoisefx.cpp @@ -52,7 +52,7 @@ public: } ~PerlinNoiseFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); bBox = bBox.enlarge(m_intensity->getValue(frame)); @@ -65,14 +65,14 @@ public: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame) { return false; } + const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override { return false; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::POINT_2; diff --git a/toonz/sources/stdfx/posterizefx.cpp b/toonz/sources/stdfx/posterizefx.cpp index a85491a..7055244 100644 --- a/toonz/sources/stdfx/posterizefx.cpp +++ b/toonz/sources/stdfx/posterizefx.cpp @@ -31,7 +31,7 @@ public: ~PosterizeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -41,9 +41,9 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/premultiplyfx.cpp b/toonz/sources/stdfx/premultiplyfx.cpp index 97953dd..afb9214 100644 --- a/toonz/sources/stdfx/premultiplyfx.cpp +++ b/toonz/sources/stdfx/premultiplyfx.cpp @@ -13,7 +13,7 @@ public: PremultiplyFx() { addInputPort("Source", m_input); } ~PremultiplyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -22,8 +22,8 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/radialblurfx.cpp b/toonz/sources/stdfx/radialblurfx.cpp index a9292c0..d0a0c08 100644 --- a/toonz/sources/stdfx/radialblurfx.cpp +++ b/toonz/sources/stdfx/radialblurfx.cpp @@ -53,7 +53,7 @@ public: void enlarge(const TRectD &bbox, TRectD &requestedGeom, const TRenderSettings &ri, double frame); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); bBox = bBox.enlarge(getMaxBraid(bBox, frame)); @@ -66,20 +66,20 @@ public: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame) { + const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override { if (info.m_isSwatch) return true; return m_blur->getValue(frame) == 0 ? true : isAlmostIsotropic(info.m_affine); } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 2]; concepts[0].m_type = TParamUIConcept::POINT; diff --git a/toonz/sources/stdfx/randomwavefx.cpp b/toonz/sources/stdfx/randomwavefx.cpp index fdb9af7..0de77bc 100644 --- a/toonz/sources/stdfx/randomwavefx.cpp +++ b/toonz/sources/stdfx/randomwavefx.cpp @@ -52,7 +52,7 @@ public: //------------------------------------------------------------------- - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::POINT_2; @@ -63,13 +63,13 @@ public: //------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return isAlmostIsotropic(info.m_affine); } //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -90,7 +90,7 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; if (fabs(m_intensity->getValue(frame)) < 0.01) { @@ -121,7 +121,7 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) { + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; @@ -253,7 +253,7 @@ public: //------------------------------------------------------------------- int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { // return -1; //Deactivated. This fx is currently very inefficient if // subdivided! diff --git a/toonz/sources/stdfx/raylitfx.cpp b/toonz/sources/stdfx/raylitfx.cpp index 723618b..6ee1111 100644 --- a/toonz/sources/stdfx/raylitfx.cpp +++ b/toonz/sources/stdfx/raylitfx.cpp @@ -43,15 +43,15 @@ public: ~BaseRaylitFx() {} - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::POINT; @@ -118,7 +118,7 @@ public: bindParam(this, "invert", m_invert); } - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; }; FX_PLUGIN_IDENTIFIER(RaylitFx, "raylitFx") @@ -180,7 +180,7 @@ class ColorRaylitFx : public BaseRaylitFx { public: ColorRaylitFx() : BaseRaylitFx() {} - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/rgbkeyfx.cpp b/toonz/sources/stdfx/rgbkeyfx.cpp index 426e643..660dd97 100644 --- a/toonz/sources/stdfx/rgbkeyfx.cpp +++ b/toonz/sources/stdfx/rgbkeyfx.cpp @@ -37,7 +37,7 @@ public: ~RGBKeyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); return true; @@ -46,9 +46,9 @@ public: return false; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; namespace { diff --git a/toonz/sources/stdfx/rgbmcutfx.cpp b/toonz/sources/stdfx/rgbmcutfx.cpp index 08f5049..7f90b06 100644 --- a/toonz/sources/stdfx/rgbmcutfx.cpp +++ b/toonz/sources/stdfx/rgbmcutfx.cpp @@ -39,13 +39,13 @@ public: ~RGBMCutFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { return m_input.getFx() && m_input->doGetBBox(frame, bBox, info); }; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; namespace { diff --git a/toonz/sources/stdfx/rgbmfadefx.cpp b/toonz/sources/stdfx/rgbmfadefx.cpp index 77e639f..ee178bb 100644 --- a/toonz/sources/stdfx/rgbmfadefx.cpp +++ b/toonz/sources/stdfx/rgbmfadefx.cpp @@ -24,7 +24,7 @@ public: } ~RGBMFadeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -33,8 +33,8 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; template diff --git a/toonz/sources/stdfx/rgbmscalefx.cpp b/toonz/sources/stdfx/rgbmscalefx.cpp index a928231..fc41742 100644 --- a/toonz/sources/stdfx/rgbmscalefx.cpp +++ b/toonz/sources/stdfx/rgbmscalefx.cpp @@ -29,7 +29,7 @@ public: } ~RGBMScaleFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -38,8 +38,8 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/ripplefx.cpp b/toonz/sources/stdfx/ripplefx.cpp index 53e8717..6ecdbed 100644 --- a/toonz/sources/stdfx/ripplefx.cpp +++ b/toonz/sources/stdfx/ripplefx.cpp @@ -65,13 +65,13 @@ public: //------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return isAlmostIsotropic(info.m_affine); } //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -92,7 +92,7 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; if (fabs(m_intensity->getValue(frame)) < 0.01) { @@ -123,7 +123,7 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) { + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); if (!isWarped) return; @@ -225,7 +225,7 @@ public: //------------------------------------------------------------------- - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 2]; concepts[0].m_type = TParamUIConcept::POINT; @@ -241,7 +241,7 @@ public: //------------------------------------------------------------------- int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { // return -1; //Deactivated. This fx is currently very inefficient if // subdivided! diff --git a/toonz/sources/stdfx/rotationalblurfx.cpp b/toonz/sources/stdfx/rotationalblurfx.cpp index 3338ba9..c377095 100644 --- a/toonz/sources/stdfx/rotationalblurfx.cpp +++ b/toonz/sources/stdfx/rotationalblurfx.cpp @@ -60,7 +60,7 @@ public: void enlarge(const TRectD &bbox, TRectD &requestedGeom, const TRenderSettings &ri, double frame); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { m_input->doGetBBox(frame, bBox, info); bBox = bBox.enlarge(getMaxBraid(bBox, frame)); @@ -73,20 +73,20 @@ public: void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; - void doCompute(TTile &tile, double frame, const TRenderSettings &); + void doCompute(TTile &tile, double frame, const TRenderSettings &) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame) { + const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override { if (info.m_isSwatch) return true; return m_blur->getValue(frame) == 0 ? true : isAlmostIsotropic(info.m_affine); } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 2]; concepts[0].m_type = TParamUIConcept::POINT; diff --git a/toonz/sources/stdfx/saltpeppernoisefx.cpp b/toonz/sources/stdfx/saltpeppernoisefx.cpp index 7712973..e00b81e 100644 --- a/toonz/sources/stdfx/saltpeppernoisefx.cpp +++ b/toonz/sources/stdfx/saltpeppernoisefx.cpp @@ -25,7 +25,7 @@ public: ~SaltPepperNoiseFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -35,10 +35,10 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - std::string getAlias(double frame, const TRenderSettings &info) const; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + std::string getAlias(double frame, const TRenderSettings &info) const override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; template diff --git a/toonz/sources/stdfx/shaderfx.cpp b/toonz/sources/stdfx/shaderfx.cpp index c386f7b..01547cb 100644 --- a/toonz/sources/stdfx/shaderfx.cpp +++ b/toonz/sources/stdfx/shaderfx.cpp @@ -181,12 +181,12 @@ public: // void setShaderInterface(const ShaderInterface& shaderInterface); void initialize(); - void getParamUIs(TParamUIConcept *¶ms, int &length); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame); + void getParamUIs(TParamUIConcept *¶ms, int &length) override; + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override; - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &ri) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; private: QGLShaderProgram *touchShaderProgram(const ShaderInterface::ShaderData &sd, @@ -218,7 +218,7 @@ public: TFxInfo(shaderInterface.mainShader().m_name.toStdString(), false)) , m_shaderInterface(shaderInterface) {} - TPersist *create() const { return new ShaderFx(&m_shaderInterface); } + TPersist *create() const override { return new ShaderFx(&m_shaderInterface); } }; //**************************************************************************** @@ -327,19 +327,19 @@ class MessageCreateContext : public TThread::Message { public: MessageCreateContext(ShadingContextManager *ctx) : man(ctx) {} - void onDeliver() { man->onRenderInstanceEnd(); } + void onDeliver() override { man->onRenderInstanceEnd(); } - TThread::Message *clone() const { return new MessageCreateContext(*this); } + TThread::Message *clone() const override { return new MessageCreateContext(*this); } }; class SCMDelegate : public TRenderResourceManager { T_RENDER_RESOURCE_MANAGER - void onRenderInstanceStart(unsigned long id) { + void onRenderInstanceStart(unsigned long id) override { ShadingContextManager::instance()->onRenderInstanceStart(); } - void onRenderInstanceEnd(unsigned long id) { + void onRenderInstanceEnd(unsigned long id) override { if (!TThread::isMainThread()) { /* tofflinegl のときとは逆で main thread に dispatch する */ MessageCreateContext(ShadingContextManager::instance()).sendBlocking(); @@ -362,13 +362,13 @@ is scheduling a slot to be executed as soon as event processing starts. */ struct InstanceSCM : public TFunctorInvoker::BaseFunctor { - void operator()() { ShadingContextManager::instance(); } + void operator()() override { ShadingContextManager::instance(); } }; TFunctorInvoker::instance()->invokeQueued(new InstanceSCM); } - TRenderResourceManager *operator()() { return new SCMDelegate; } + TRenderResourceManager *operator()() override { return new SCMDelegate; } }; MANAGER_FILESCOPE_DECLARATION(SCMDelegate, SCMDelegateGenerator) diff --git a/toonz/sources/stdfx/sharpenfx.cpp b/toonz/sources/stdfx/sharpenfx.cpp index 2b1951c..c491a38 100644 --- a/toonz/sources/stdfx/sharpenfx.cpp +++ b/toonz/sources/stdfx/sharpenfx.cpp @@ -252,7 +252,7 @@ public: ~SharpenFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -262,9 +262,9 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/solarizefx.cpp b/toonz/sources/stdfx/solarizefx.cpp index f8656a7..1f4fd73 100644 --- a/toonz/sources/stdfx/solarizefx.cpp +++ b/toonz/sources/stdfx/solarizefx.cpp @@ -40,7 +40,7 @@ public: ~SolarizeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -50,9 +50,9 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; namespace { template diff --git a/toonz/sources/stdfx/squaregradientfx.cpp b/toonz/sources/stdfx/squaregradientfx.cpp index 8cd4ab7..cc9404d 100644 --- a/toonz/sources/stdfx/squaregradientfx.cpp +++ b/toonz/sources/stdfx/squaregradientfx.cpp @@ -28,14 +28,14 @@ public: } ~SquareGradientFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::DIAMOND; diff --git a/toonz/sources/stdfx/stdfx.cpp b/toonz/sources/stdfx/stdfx.cpp index a08f3c7..5eff944 100644 --- a/toonz/sources/stdfx/stdfx.cpp +++ b/toonz/sources/stdfx/stdfx.cpp @@ -38,7 +38,7 @@ public: ~FadeFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); // devo scurire bgColor @@ -49,7 +49,7 @@ public: } }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { if (!m_input.isConnected()) return; m_input->compute(tile, frame, ri); @@ -58,7 +58,7 @@ public: TRop::rgbmScale(tile.getRaster(), tile.getRaster(), 1, 1, 1, v); } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //================================================================== @@ -101,14 +101,14 @@ TPixel32 colors[] = { }; ~SpiralFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------ @@ -200,17 +200,17 @@ public: } ~MultiLinearGradientFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; // si potrebbe/dovrebbe fare meglio }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::WIDTH; @@ -252,17 +252,17 @@ public: } ~LinearGradientFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; // si potrebbe/dovrebbe fare meglio }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::WIDTH; @@ -414,16 +414,16 @@ public: } ~RadialGradientFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; // si potrebbe/dovrebbe fare meglio }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 2]; concepts[0].m_type = TParamUIConcept::RADIUS; @@ -470,16 +470,16 @@ public: } ~MultiRadialGradientFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; // si potrebbe/dovrebbe fare meglio }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::RADIUS; @@ -560,16 +560,16 @@ m_color->setDefaultValue(TPixel::Magenta); } ~LightSpotFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; // si potrebbe/dovrebbe fare meglio }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - void getParamUIs(TParamUIConcept *&concepts, int &length) { + void getParamUIs(TParamUIConcept *&concepts, int &length) override { concepts = new TParamUIConcept[length = 1]; concepts[0].m_type = TParamUIConcept::RECT; diff --git a/toonz/sources/stdfx/stdfx.h b/toonz/sources/stdfx/stdfx.h index f287cc6..b4de9f3 100644 --- a/toonz/sources/stdfx/stdfx.h +++ b/toonz/sources/stdfx/stdfx.h @@ -47,14 +47,14 @@ public: \ class TStandardRasterFx : public TRasterFx { public: - std::string getPluginId() const { return PLUGIN_PREFIX; } + std::string getPluginId() const override { return PLUGIN_PREFIX; } }; //------------------------------------------------------------------- class TStandardZeraryFx : public TZeraryFx { public: - std::string getPluginId() const { return PLUGIN_PREFIX; } + std::string getPluginId() const override { return PLUGIN_PREFIX; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/targetspotfx.cpp b/toonz/sources/stdfx/targetspotfx.cpp index b0d1378..38faff1 100644 --- a/toonz/sources/stdfx/targetspotfx.cpp +++ b/toonz/sources/stdfx/targetspotfx.cpp @@ -42,14 +42,14 @@ public: } ~TargetSpotFx(){}; - bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double, TRectD &bBox, const TRenderSettings &info) override { bBox = TConsts::infiniteRectD; return true; // si potrebbe/dovrebbe fare meglio }; - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; - bool canHandle(const TRenderSettings &info, double frame) { return false; } + bool canHandle(const TRenderSettings &info, double frame) override { return false; } }; template diff --git a/toonz/sources/stdfx/texturefx.cpp b/toonz/sources/stdfx/texturefx.cpp index 123607f..7249483 100644 --- a/toonz/sources/stdfx/texturefx.cpp +++ b/toonz/sources/stdfx/texturefx.cpp @@ -47,7 +47,7 @@ public: ~TextureFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) { bool ret = m_input->doGetBBox(frame, bBox, info); return ret; @@ -57,14 +57,14 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override; - bool allowUserCacheOnPort(int port) { return port != 0; } + bool allowUserCacheOnPort(int port) override { return port != 0; } int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/tilefx.cpp b/toonz/sources/stdfx/tilefx.cpp index f7ffb8c..8b34ea4 100644 --- a/toonz/sources/stdfx/tilefx.cpp +++ b/toonz/sources/stdfx/tilefx.cpp @@ -23,15 +23,15 @@ public: TileFx(); ~TileFx(); - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame); - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); + const TRenderSettings &info) override; void transform(double frame, int port, const TRectD &rectOnOutput, const TRenderSettings &infoOnOutput, TRectD &rectOnInput, - TRenderSettings &infoOnInput); + TRenderSettings &infoOnInput) override; private: void makeTile(const TTile &inputTile, const TTile &tile) const; diff --git a/toonz/sources/stdfx/tonecurvefx.cpp b/toonz/sources/stdfx/tonecurvefx.cpp index 79870f0..33bc2af 100644 --- a/toonz/sources/stdfx/tonecurvefx.cpp +++ b/toonz/sources/stdfx/tonecurvefx.cpp @@ -99,9 +99,9 @@ public: ~ToneCurveFx(){}; - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -110,7 +110,7 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; }; //------------------------------------------------------------------- diff --git a/toonz/sources/stdfx/unmultiplyfx.cpp b/toonz/sources/stdfx/unmultiplyfx.cpp index a7fa1e9..5242d60 100644 --- a/toonz/sources/stdfx/unmultiplyfx.cpp +++ b/toonz/sources/stdfx/unmultiplyfx.cpp @@ -23,7 +23,7 @@ public: UnmultiplyFx() { addInputPort("Source", m_input); } ~UnmultiplyFx(){}; - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_input.isConnected()) return m_input->doGetBBox(frame, bBox, info); else { @@ -32,8 +32,8 @@ public: } } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri); - bool canHandle(const TRenderSettings &info, double frame) { return true; } + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override; + bool canHandle(const TRenderSettings &info, double frame) override { return true; } }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/stdfx/warp.cpp b/toonz/sources/stdfx/warp.cpp index ccaaa9e..230d825 100644 --- a/toonz/sources/stdfx/warp.cpp +++ b/toonz/sources/stdfx/warp.cpp @@ -59,9 +59,9 @@ public: void createLattice(); void shepardWarp(); - TPointD map(const TPointD &p) const; - int invMap(const TPointD &p, TPointD *invs) const; - int maxInvCount() const { return 1; } + TPointD map(const TPointD &p) const override; + int invMap(const TPointD &p, TPointD *invs) const override; + int maxInvCount() const override { return 1; } }; /*---------------------------------------------------------------------------*/ diff --git a/toonz/sources/stdfx/warpfx.cpp b/toonz/sources/stdfx/warpfx.cpp index cd5d93f..9b519b4 100644 --- a/toonz/sources/stdfx/warpfx.cpp +++ b/toonz/sources/stdfx/warpfx.cpp @@ -33,13 +33,13 @@ public: //------------------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) { + bool canHandle(const TRenderSettings &info, double frame) override { return isAlmostIsotropic(info.m_affine); } //------------------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { if (m_warped.isConnected()) { int ret = m_warped->doGetBBox(frame, bBox, info); @@ -60,7 +60,7 @@ public: //------------------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); bool isWarper = m_warper.isConnected(); if (!isWarped) return; @@ -108,7 +108,7 @@ public: //------------------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) { + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { bool isWarped = m_warped.isConnected(); bool isWarper = m_warper.isConnected(); @@ -204,7 +204,7 @@ public: //------------------------------------------------------------------- int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { // return 0; //For debug purpose int shrink = (info.m_shrinkX + info.m_shrinkY) / 2; diff --git a/toonz/sources/t32bitsrv/main.cpp b/toonz/sources/t32bitsrv/main.cpp index 19c2cf0..d272ed4 100644 --- a/toonz/sources/t32bitsrv/main.cpp +++ b/toonz/sources/t32bitsrv/main.cpp @@ -29,7 +29,7 @@ class ServerThread : public QThread { public: ServerThread(const QString &srvName) : m_srvName(srvName) {} - void run() { + void run() override { // Start a local server receiving connections on the specified key tipc::Server server; mov_io::addParsers(&server); diff --git a/toonz/sources/t32bitsrv/t323gpmsg.h b/toonz/sources/t32bitsrv/t323gpmsg.h index 5ae6281..c439195 100644 --- a/toonz/sources/t32bitsrv/t323gpmsg.h +++ b/toonz/sources/t32bitsrv/t323gpmsg.h @@ -29,8 +29,8 @@ class InitLW3gpParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$initLW3gp"; } - void operator()(Message &stream); + QString header() const override { return "$initLW3gp"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -40,8 +40,8 @@ class LWSetFrameRateParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LW3gpSetFrameRate"; } - void operator()(Message &stream); + QString header() const override { return "$LW3gpSetFrameRate"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -51,8 +51,8 @@ class LWImageWriteParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LW3gpImageWrite"; } - void operator()(Message &stream); + QString header() const override { return "$LW3gpImageWrite"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -63,8 +63,8 @@ class LWSaveSoundTrackParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LW3gpSaveSoundTrack"; } - void operator()(Message &stream); + QString header() const override { return "$LW3gpSaveSoundTrack"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -74,8 +74,8 @@ class CloseLW3gpParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$closeLW3gp"; } - void operator()(Message &stream); + QString header() const override { return "$closeLW3gp"; } + void operator()(Message &stream) override; }; //************************************************************************************ @@ -87,8 +87,8 @@ class InitLR3gpParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$initLR3gp"; } - void operator()(Message &stream); + QString header() const override { return "$initLR3gp"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -101,8 +101,8 @@ class LRLoadInfoParser : public tipc::MessageParser { // dealt with. public: - QString header() const { return "$LR3gpLoadInfo"; } - void operator()(Message &stream); + QString header() const override { return "$LR3gpLoadInfo"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -112,8 +112,8 @@ class LREnableRandomAccessReadParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LR3gpEnableRandomAccessRead"; } - void operator()(Message &stream); + QString header() const override { return "$LR3gpEnableRandomAccessRead"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -124,8 +124,8 @@ class LRImageReadParser : public tipc::MessageParser { // Reply: [data reader] public: - QString header() const { return "$LR3gpImageRead"; } - void operator()(Message &stream); + QString header() const override { return "$LR3gpImageRead"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -135,8 +135,8 @@ class CloseLR3gpParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$closeLR3gp"; } - void operator()(Message &stream); + QString header() const override { return "$closeLR3gp"; } + void operator()(Message &stream) override; }; } // namespace _3gp_io diff --git a/toonz/sources/t32bitsrv/t32movmsg.h b/toonz/sources/t32bitsrv/t32movmsg.h index 1c30c90..e4c6226 100644 --- a/toonz/sources/t32bitsrv/t32movmsg.h +++ b/toonz/sources/t32bitsrv/t32movmsg.h @@ -29,8 +29,8 @@ class IsQTInstalledParser : public tipc::MessageParser { // Reply: yes | no public: - QString header() const { return "$isQTInstalled"; } - void operator()(Message &stream); + QString header() const override { return "$isQTInstalled"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -40,8 +40,8 @@ class DefaultMovPropsParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$defaultMovProps"; } - void operator()(Message &stream); + QString header() const override { return "$defaultMovProps"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -51,8 +51,8 @@ class OpenMovSettingsPopupParser : public tipc::MessageParser { // Reply: ok public: - QString header() const { return "$openMovSettingsPopup"; } - void operator()(Message &stream); + QString header() const override { return "$openMovSettingsPopup"; } + void operator()(Message &stream) override; }; //************************************************************************************ @@ -64,8 +64,8 @@ class InitLWMovParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$initLWMov"; } - void operator()(Message &stream); + QString header() const override { return "$initLWMov"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -75,8 +75,8 @@ class LWSetFrameRateParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LWMovSetFrameRate"; } - void operator()(Message &stream); + QString header() const override { return "$LWMovSetFrameRate"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -86,8 +86,8 @@ class LWImageWriteParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LWMovImageWrite"; } - void operator()(Message &stream); + QString header() const override { return "$LWMovImageWrite"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -98,8 +98,8 @@ class LWSaveSoundTrackParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LWMovSaveSoundTrack"; } - void operator()(Message &stream); + QString header() const override { return "$LWMovSaveSoundTrack"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -109,8 +109,8 @@ class CloseLWMovParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$closeLWMov"; } - void operator()(Message &stream); + QString header() const override { return "$closeLWMov"; } + void operator()(Message &stream) override; }; //************************************************************************************ @@ -122,8 +122,8 @@ class InitLRMovParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$initLRMov"; } - void operator()(Message &stream); + QString header() const override { return "$initLRMov"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -137,8 +137,8 @@ class LRLoadInfoParser : public tipc::MessageParser { // If the shmem_id is empty, the level infos are not returned. public: - QString header() const { return "$LRMovLoadInfo"; } - void operator()(Message &stream); + QString header() const override { return "$LRMovLoadInfo"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -148,8 +148,8 @@ class LREnableRandomAccessReadParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LRMovEnableRandomAccessRead"; } - void operator()(Message &stream); + QString header() const override { return "$LRMovEnableRandomAccessRead"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -162,8 +162,8 @@ class LRSetYMirrorParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LRMovSetYMirror"; } - void operator()(Message &stream); + QString header() const override { return "$LRMovSetYMirror"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -173,8 +173,8 @@ class LRSetLoadTimecodeParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LRMovSetLoadTimecode"; } - void operator()(Message &stream); + QString header() const override { return "$LRMovSetLoadTimecode"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -184,8 +184,8 @@ class LRTimecodeParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LRMovTimecode"; } - void operator()(Message &stream); + QString header() const override { return "$LRMovTimecode"; } + void operator()(Message &stream) override; }; #endif @@ -198,8 +198,8 @@ class LRImageReadParser : public tipc::MessageParser { // Reply: [data reader] public: - QString header() const { return "$LRMovImageRead"; } - void operator()(Message &stream); + QString header() const override { return "$LRMovImageRead"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -209,8 +209,8 @@ class LRImageReadSHMParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$LRMovImageReadSHM"; } - void operator()(Message &stream); + QString header() const override { return "$LRMovImageReadSHM"; } + void operator()(Message &stream) override; }; //------------------------------------------------------------------------------ @@ -220,8 +220,8 @@ class CloseLRMovParser : public tipc::MessageParser { // Reply: ok | err public: - QString header() const { return "$closeLRMov"; } - void operator()(Message &stream); + QString header() const override { return "$closeLRMov"; } + void operator()(Message &stream) override; }; } // namespace tlevelwriter_mov diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index e0c6701..fd002e7 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -238,9 +238,9 @@ public: , m_renderCompleted(renderCompleted) , m_stereo(stereo) {} - bool onFrameCompleted(int frame); - bool onFrameFailed(int frame, TException &e); - void onSequenceCompleted(const TFilePath &fp); + bool onFrameCompleted(int frame) override; + bool onFrameFailed(int frame, TException &e) override; + void onSequenceCompleted(const TFilePath &fp) override; TFilePath m_fp; int m_frameCount; @@ -332,10 +332,10 @@ public: , m_frameCompletedCount(0) , m_frameFailedCount(0) {} - bool onFrameCompleted(int frame, int column); - bool onFrameFailed(int frame, int column, TException &e); - void onSequenceCompleted(int column) {} - void onRenderCompleted() {} + bool onFrameCompleted(int frame, int column) override; + bool onFrameFailed(int frame, int column, TException &e) override; + void onSequenceCompleted(int column) override {} + void onRenderCompleted() override {} }; //================================================================================== diff --git a/toonz/sources/tnzbase/stringtable.cpp b/toonz/sources/tnzbase/stringtable.cpp index fc72402..72171b1 100644 --- a/toonz/sources/tnzbase/stringtable.cpp +++ b/toonz/sources/tnzbase/stringtable.cpp @@ -32,11 +32,11 @@ public: void loadCoded(const TFilePath &); void saveCoded(const TFilePath &); - const Item *getItem(std::string name) const; - std::pair getDefaultFontNameAndSize() const { + const Item *getItem(std::string name) const override; + std::pair getDefaultFontNameAndSize() const override { return m_defaultFontNameAndSize; } - std::string getDefaultMacFontName() const; + std::string getDefaultMacFontName() const override; }; //------------------------------------------------------------------- diff --git a/toonz/sources/tnzbase/trasterfx.cpp b/toonz/sources/tnzbase/trasterfx.cpp index 8d98e1e..6a74ac0 100644 --- a/toonz/sources/tnzbase/trasterfx.cpp +++ b/toonz/sources/tnzbase/trasterfx.cpp @@ -227,17 +227,17 @@ public: //----------------------------------------------------------- - bool isCachable() const { + bool isCachable() const override { return true; } // Currently cachable as a test. Observe that it was NOT in Toonz 6.1 //----------------------------------------------------------- - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } //----------------------------------------------------------- - std::string getAlias(double frame, const TRenderSettings &info) const { + std::string getAlias(double frame, const TRenderSettings &info) const override { // NOTE: TrFx are not present at this recursive level. Affines dealing is // currently handled by inserting the // rendering affine AFTER a getAlias call. Ever. @@ -247,7 +247,7 @@ public: //----------------------------------------------------------- - bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bBox, const TRenderSettings &info) override { // NOTE: TrFx are not present at this recursive level. Affines dealing is // still handled by TGeometryFxs here.... return m_fx->doGetBBox(frame, bBox, info); @@ -255,7 +255,7 @@ public: //----------------------------------------------------------- - void doCompute(TTile &tile, double frame, const TRenderSettings &info) { + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override { const TRectD &rectOut = myConvert(tile.getRaster()->getBounds()) + tile.m_pos; @@ -280,7 +280,7 @@ public: //----------------------------------------------------------- - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { TRectD rectIn; TRenderSettings infoIn(info); TAffine appliedAff; @@ -293,7 +293,7 @@ public: //----------------------------------------------------------- int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info) { + const TRenderSettings &info) override { TRectD rectIn; TRenderSettings infoIn(info); TAffine appliedAff; @@ -377,17 +377,17 @@ public: inline void build(TTile &tile); protected: - void simCompute(const TRectD &rect) { + void simCompute(const TRectD &rect) override { TRectD rectCpy( rect); // Why the hell dryCompute(..) has non-const TRectD& input ???? m_rfx->doDryCompute(rectCpy, m_frame, *m_rs); } void buildTileToCalculate(const TRectD &tileRect); - void compute(const TRectD &tileRect); + void compute(const TRectD &tileRect) override; - void upload(TCacheResourceP &resource); - bool download(TCacheResourceP &resource); + void upload(TCacheResourceP &resource) override; + bool download(TCacheResourceP &resource) override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h b/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h index f46aa5b..c5b2a8c 100644 --- a/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h +++ b/toonz/sources/tnzbase/tscanner/TScannerIO/TUSBScannerIO.h @@ -12,11 +12,11 @@ class TUSBScannerIO : public TScannerIO { public: TUSBScannerIO(); - bool open(); - void close(); - int receive(unsigned char *buffer, int size); - int send(unsigned char *buffer, int size); - void trace(bool on); + bool open() override; + void close() override; + int receive(unsigned char *buffer, int size) override; + int send(unsigned char *buffer, int size) override; + void trace(bool on) override; ~TUSBScannerIO(); }; diff --git a/toonz/sources/tnzbase/tscanner/tscannerepson.cpp b/toonz/sources/tnzbase/tscanner/tscannerepson.cpp index b13d5f5..5058ebf 100644 --- a/toonz/sources/tnzbase/tscanner/tscannerepson.cpp +++ b/toonz/sources/tnzbase/tscanner/tscannerepson.cpp @@ -87,7 +87,7 @@ public: m_scannerMsg += L"\n" + ::to_wstring(notFatal[i - 1]); log("Exception created: " + ::to_string(m_scannerMsg)); } - TString getMessage() const { return m_scannerMsg; } + TString getMessage() const override { return m_scannerMsg; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/tnzbase/tscanner/tscannerepson.h b/toonz/sources/tnzbase/tscanner/tscannerepson.h index 834a8e9..d2afbbd 100644 --- a/toonz/sources/tnzbase/tscanner/tscannerepson.h +++ b/toonz/sources/tnzbase/tscanner/tscannerepson.h @@ -25,11 +25,11 @@ public: TScannerEpson(); ~TScannerEpson(); - void selectDevice(); - bool isDeviceAvailable(); - bool isDeviceSelected(); - void updateParameters(TScannerParameters ¶m); // vedi TScanner - void acquire(const TScannerParameters ¶ms, int paperCount); + void selectDevice() override; + bool isDeviceAvailable() override; + bool isDeviceSelected() override; + void updateParameters(TScannerParameters ¶m) override; // vedi TScanner + void acquire(const TScannerParameters ¶ms, int paperCount) override; bool isAreaSupported(); void closeIO(); diff --git a/toonz/sources/tnzbase/tscanner/tscannertwain.h b/toonz/sources/tnzbase/tscanner/tscannertwain.h index 54b70d6..b0fa85e 100644 --- a/toonz/sources/tnzbase/tscanner/tscannertwain.h +++ b/toonz/sources/tnzbase/tscanner/tscannertwain.h @@ -10,12 +10,12 @@ public: TScannerTwain(); ~TScannerTwain(); - bool isDeviceAvailable(); - bool isDeviceSelected(); - void selectDevice(); + bool isDeviceAvailable() override; + bool isDeviceSelected() override; + void selectDevice() override; - void updateParameters(TScannerParameters &); // vedi TScanner - void acquire(const TScannerParameters ¶m, int paperCount); + void updateParameters(TScannerParameters &) override; // vedi TScanner + void acquire(const TScannerParameters ¶m, int paperCount) override; bool isAreaSupported(); }; diff --git a/toonz/sources/tnzext/meshbuilder.cpp b/toonz/sources/tnzext/meshbuilder.cpp index 73bb360..ac4751d 100644 --- a/toonz/sources/tnzext/meshbuilder.cpp +++ b/toonz/sources/tnzext/meshbuilder.cpp @@ -229,7 +229,7 @@ public: : ImageMeshesReaderT(PixelSelector(false)) , m_current(0) {} - void openFace(ImageMesh *mesh, int faceIdx, const TPixelGR8 &color) { + void openFace(ImageMesh *mesh, int faceIdx, const TPixelGR8 &color) override { ImageMeshesReader::openFace(mesh, faceIdx); // defines imageIndex if (mesh) { @@ -240,20 +240,20 @@ public: //-------------------------------------------------------------------------- - void openEdge(const raster_edge_iterator &it) { + void openEdge(const raster_edge_iterator &it) override { m_current = new RasterBorder; m_current->push_back(it.pos()); } //-------------------------------------------------------------------------- - void addVertex(const raster_edge_iterator &it) { + void addVertex(const raster_edge_iterator &it) override { m_current->push_back(it.pos()); } //-------------------------------------------------------------------------- - void closeEdge(ImageMesh *mesh, int edgeIdx) { + void closeEdge(ImageMesh *mesh, int edgeIdx) override { ImageMesh::edge_type &ed = mesh->edge(edgeIdx); ed.imageIndex() = m_borders.size(); diff --git a/toonz/sources/tnzext/plasticskeletondeformation.cpp b/toonz/sources/tnzext/plasticskeletondeformation.cpp index 0149979..a4fb34a 100644 --- a/toonz/sources/tnzext/plasticskeletondeformation.cpp +++ b/toonz/sources/tnzext/plasticskeletondeformation.cpp @@ -259,7 +259,7 @@ public: PlasticSkeleton &deformedSkeleton, double frame, int v); - void onChange(const TParamChange &change); // Passes param notifications to + void onChange(const TParamChange &change) override; // Passes param notifications to // external observers private: diff --git a/toonz/sources/tnztools/autofillpli.cpp b/toonz/sources/tnztools/autofillpli.cpp index b6a05dc..3912734 100644 --- a/toonz/sources/tnztools/autofillpli.cpp +++ b/toonz/sources/tnztools/autofillpli.cpp @@ -67,7 +67,7 @@ public: ~AreasAndPerimeterFormula() {} - void update(const TPointD &p1, const TPointD &p2) { + void update(const TPointD &p1, const TPointD &p2) override { m_perimeter += norm(p2 - p1); m_signedArea += ((p1.x * p2.y) - (p2.x * p1.y)) * 0.5; } @@ -88,7 +88,7 @@ public: ~CentroidFormula() {} - void update(const TPointD &p1, const TPointD &p2) { + void update(const TPointD &p1, const TPointD &p2) override { double factor = ((p1.x * p2.y) - (p2.x * p1.y)); m_centroid.x += (p1.x + p2.x) * factor; m_centroid.y += (p1.y + p2.y) * factor; diff --git a/toonz/sources/tnztools/bendertool.cpp b/toonz/sources/tnztools/bendertool.cpp index 6248184..43abd36 100644 --- a/toonz/sources/tnztools/bendertool.cpp +++ b/toonz/sources/tnztools/bendertool.cpp @@ -170,15 +170,15 @@ public: virtual ~BenderTool(); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void draw(); - void leftButtonDown(const TPointD &, const TMouseEvent &); - void leftButtonDrag(const TPointD &, const TMouseEvent &); - void leftButtonUp(const TPointD &, const TMouseEvent &); - void onEnter(); + void draw() override; + void leftButtonDown(const TPointD &, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &, const TMouseEvent &) override; + void leftButtonUp(const TPointD &, const TMouseEvent &) override; + void onEnter() override; - void onActivate() { + void onActivate() override { m_buttonDownCounter = 1; m_prevPoint = TConsts::napd; m_benderSegment.setP0(TConsts::napd); @@ -188,7 +188,7 @@ public: m_hitStrokeCorners.clear(); } - int getCursorId() const { return m_cursor; } + int getCursorId() const override { return m_cursor; } } BenderTool; //----------------------------------------------------------------------------- diff --git a/toonz/sources/tnztools/brushtool.cpp b/toonz/sources/tnztools/brushtool.cpp index 2f9e23f..74757fd 100644 --- a/toonz/sources/tnztools/brushtool.cpp +++ b/toonz/sources/tnztools/brushtool.cpp @@ -424,7 +424,7 @@ public: , m_selective(selective) , m_isPencil(isPencil) {} - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TToonzImageP image = getImage(); TRasterCM32P ras = image->getRaster(); @@ -439,9 +439,9 @@ public: notifyImageChanged(); } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } - QString getToolName() { return QString("Brush Tool"); } - int getHistoryType() { return HistoryType::BrushTool; } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + QString getToolName() override { return QString("Brush Tool"); } + int getHistoryType() override { return HistoryType::BrushTool; } }; //========================================================================================================= @@ -466,7 +466,7 @@ public: , m_maxThick(maxThick) , m_hardness(hardness) {} - void redo() const { + void redo() const override { if (m_points.size() == 0) return; insertLevelAndFrameIfNeeded(); TToonzImageP image = getImage(); @@ -506,10 +506,10 @@ public: notifyImageChanged(); } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } - virtual QString getToolName() { return QString("Brush Tool"); } - int getHistoryType() { return HistoryType::BrushTool; } + QString getToolName() override { return QString("Brush Tool"); } + int getHistoryType() override { return HistoryType::BrushTool; } }; //========================================================================================================= diff --git a/toonz/sources/tnztools/brushtool.h b/toonz/sources/tnztools/brushtool.h index 695ec82..33f0a8b 100644 --- a/toonz/sources/tnztools/brushtool.h +++ b/toonz/sources/tnztools/brushtool.h @@ -44,8 +44,8 @@ struct BrushData : public TPersist { bool operator<(const BrushData &other) const { return m_name < other.m_name; } - void saveData(TOStream &os); - void loadData(TIStream &is); + void saveData(TOStream &os) override; + void loadData(TIStream &is) override; }; //************************************************************************ @@ -79,32 +79,32 @@ class BrushTool : public TTool { public: BrushTool(std::string name, int targetType); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - ToolOptionsBox *createOptionsBox(); + ToolOptionsBox *createOptionsBox() override; - void updateTranslation(); + void updateTranslation() override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; - bool preLeftButtonDown(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - void mouseMove(const TPointD &pos, const TMouseEvent &e); + bool preLeftButtonDown() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; - void draw(); + void draw() override; - void onEnter(); - void onLeave(); + void onEnter() override; + void onLeave() override; - int getCursorId() const { return ToolCursor::PenCursor; } + int getCursorId() const override { return ToolCursor::PenCursor; } - TPropertyGroup *getProperties(int targetType); - bool onPropertyChanged(std::string propertyName); + TPropertyGroup *getProperties(int targetType) override; + bool onPropertyChanged(std::string propertyName) override; - void onImageChanged(); + void onImageChanged() override; void setWorkAndBackupImages(); void updateWorkAndBackupRasters(const TRect &rect); @@ -116,7 +116,7 @@ public: void finishRasterBrush(const TPointD &pos, int pressureVal); // return true if the pencil mode is active in the Brush / PaintBrush / Eraser // Tools. - bool isPencilModeActive(); + bool isPencilModeActive() override; protected: TPropertyGroup m_prop[2]; diff --git a/toonz/sources/tnztools/controlpointeditortool.cpp b/toonz/sources/tnztools/controlpointeditortool.cpp index 9b9b5fe..c895884 100644 --- a/toonz/sources/tnztools/controlpointeditortool.cpp +++ b/toonz/sources/tnztools/controlpointeditortool.cpp @@ -148,11 +148,11 @@ class ControlPointEditorTool : public TTool { public: ControlPointEditorTool(); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void updateTranslation(); + void updateTranslation() override; - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } // da TSelectionOwner: chiamato quando la selezione corrente viene cambiata void onSelectionChanged() { invalidate(); } @@ -171,31 +171,31 @@ public: void drawMovingSegment(); void drawControlPoint(); - void draw(); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void rightButtonDown(const TPointD &pos, const TMouseEvent &); + void draw() override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void rightButtonDown(const TPointD &pos, const TMouseEvent &) override; void moveControlPoints(const TPointD &delta); void moveSpeed(const TPointD &delta, bool isIn); void moveSegment(const TPointD &delta, bool dragging, bool isShiftPressed); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - void addContextMenuItems(QMenu *menu); + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void addContextMenuItems(QMenu *menu) override; void linkSpeedInOut(int index); void unlinkSpeedInOut(int pointIndex); - bool keyDown(int key, TUINT32 flags, const TPoint &pos); - void onEnter(); - void onLeave(); - bool onPropertyChanged(std::string propertyName); + bool keyDown(int key, TUINT32 flags, const TPoint &pos) override; + void onEnter() override; + void onLeave() override; + bool onPropertyChanged(std::string propertyName) override; - void onActivate(); - void onDeactivate(); - void onImageChanged(); - int getCursorId() const; + void onActivate() override; + void onDeactivate() override; + void onImageChanged() override; + int getCursorId() const override; } controlPointEditorTool; diff --git a/toonz/sources/tnztools/controlpointselection.h b/toonz/sources/tnztools/controlpointselection.h index d0709a1..c2e42de 100644 --- a/toonz/sources/tnztools/controlpointselection.h +++ b/toonz/sources/tnztools/controlpointselection.h @@ -149,9 +149,9 @@ public: m_controlPointEditorStroke = controlPointEditorStroke; } - bool isEmpty() const { return m_selectedPoints.empty(); } + bool isEmpty() const override { return m_selectedPoints.empty(); } - void selectNone() { m_selectedPoints.clear(); } + void selectNone() override { m_selectedPoints.clear(); } bool isSelected(int index) const; void select(int index); void unselect(int index); @@ -160,7 +160,7 @@ public: void addMenuItems(QMenu *menu); - void enableCommands(); + void enableCommands() override; protected slots: void setLinear(); diff --git a/toonz/sources/tnztools/cuttertool.cpp b/toonz/sources/tnztools/cuttertool.cpp index a868e78..1810f9c 100644 --- a/toonz/sources/tnztools/cuttertool.cpp +++ b/toonz/sources/tnztools/cuttertool.cpp @@ -69,7 +69,7 @@ public: delete m_fillInformation; } - void undo() const { + void undo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; if (dynamic_cast( @@ -115,7 +115,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; if (app->getCurrentFrame()->isEditingScene()) { @@ -139,12 +139,12 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + m_fillInformation->capacity() * sizeof(TFilledRegionInf) + 500; } - QString getToolName() { return QString("Cutter Tool"); } + QString getToolName() override { return QString("Cutter Tool"); } }; //============================================================================= @@ -169,9 +169,9 @@ public: bind(TTool::VectorImage); } - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void draw() { + void draw() override { // TAffine viewMatrix = getViewer()->getViewMatrix(); // glPushMatrix(); // tglMultMatrix(viewMatrix); @@ -195,7 +195,7 @@ public: // glPopMatrix(); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { TVectorImageP vi = TImageP(getImage(true)); if (!vi) return; QMutexLocker sl(vi->getMutex()); @@ -283,7 +283,7 @@ public: invalidate(); } - void mouseMove(const TPointD &pos, const TMouseEvent &e) { + void mouseMove(const TPointD &pos, const TMouseEvent &e) override { TVectorImageP vi = TImageP(getImage(true)); if (!vi) { m_speed = TPointD(0, 0); @@ -305,17 +305,17 @@ public: invalidate(); } - void onLeave() { m_speed = TPointD(0, 0); } + void onLeave() override { m_speed = TPointD(0, 0); } - void onActivate() {} - void onEnter() { + void onActivate() override {} + void onEnter() override { if ((TVectorImageP)getImage(false)) m_cursorId = ToolCursor::CutterCursor; else m_cursorId = ToolCursor::CURSOR_NO; } - int getCursorId() const { return m_cursorId; } + int getCursorId() const override { return m_cursorId; } } cutterTool; diff --git a/toonz/sources/tnztools/edittool.cpp b/toonz/sources/tnztools/edittool.cpp index 83e0046..2abca32 100644 --- a/toonz/sources/tnztools/edittool.cpp +++ b/toonz/sources/tnztools/edittool.cpp @@ -91,7 +91,7 @@ public: , m_lockCenterX(lockCenterX) , m_lockCenterY(lockCenterY) {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (m_lockCenterX && m_lockCenterY) return; TXsheet *xsh = TTool::getApplication()->getCurrentTool()->getTool()->getXsheet(); @@ -102,7 +102,7 @@ public: m_affine.a13 = m_affine.a23 = 0; } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override { if (m_lockCenterX && m_lockCenterY) return; double factor = 1.0 / Stage::inch; TPointD delta = pos - m_firstPos; @@ -117,7 +117,7 @@ public: ->getXsheet() ->setCenter(m_objId, m_frame, m_center); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override { if ((m_lockCenterX && m_lockCenterY) || m_firstPos == pos) return; UndoStageObjectCenterMove *undo = new UndoStageObjectCenterMove(m_objId, m_frame, m_oldCenter, m_center); @@ -192,7 +192,7 @@ public: m_after = m_before; } - void enableGlobalKeyframes(bool enabled) { + void enableGlobalKeyframes(bool enabled) override { m_globalKeyframesEnabled = enabled; } @@ -223,7 +223,7 @@ public: m_after.applyValues(); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override { if (!m_isStarted || m_firstPos == pos) return; else @@ -253,12 +253,12 @@ public: , m_lockPositionX(lockPositionX) , m_lockPositionY(lockPositionY) {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (m_lockPositionX && m_lockPositionY) return; start(); m_firstPos = pos; } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { if (m_lockPositionX && m_lockPositionY) return; TPointD delta = pos - m_firstPos; if (m_lockPositionX) @@ -318,7 +318,7 @@ else return 0.0; return 0.0; } - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { m_firstPos = pos; start(); assert(m_spline); @@ -358,7 +358,7 @@ else return 0.0; return false; } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override { double len = tcrop(getLengthAtPos(pos) + m_offset, 0.0, m_splineLength); snapLengthToControlPoint(len); setValue(lengthToParamValue(len)); @@ -379,14 +379,14 @@ public: : DragChannelTool(TStageObject::T_Angle, globalKeyframesEnabled) , m_lockRotation(lockRotation) {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (m_lockRotation) return; m_firstPos = pos; m_lastPos = pos; m_center = getCenter(); start(); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override { if (m_lockRotation) return; TPointD a = m_lastPos - m_center; TPointD b = pos - m_center; @@ -424,14 +424,14 @@ public: , m_lockGlobalScale(lockGlobalScale) , m_r0(0) {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (m_lockGlobalScale) return; m_firstPos = pos; m_center = getCenter(); start(); m_r0 = norm(m_firstPos - m_center); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { if (m_lockGlobalScale) return; if (m_r0 < 0.001) return; @@ -462,13 +462,13 @@ public: , m_lockScaleH(lockScaleH) , m_lockScaleV(lockScaleV) {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (m_lockScaleH && m_lockScaleV) return; m_firstPos = pos; m_center = getCenter(); start(); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { if (m_lockScaleH && m_lockScaleV) return; TPointD center = m_center + TPointD(40, 40); TPointD a = m_firstPos - center; @@ -533,13 +533,13 @@ public: , m_lockShearH(lockShearH) , m_lockShearV(lockShearV) {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (m_lockShearH && m_lockShearV) return; m_firstPos = pos; m_center = getCenter(); start(); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { if (m_lockShearH && m_lockShearV) return; TPointD a = m_firstPos - m_center; TPointD b = pos - m_center; @@ -575,13 +575,13 @@ public: : DragChannelTool(TStageObject::T_Z, globalKeyframesEnabled) , m_viewer(viewer) {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { m_lastPos = e.m_pos; m_firstPos = pos; m_dz = 0; start(); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { double dz = m_viewer->projectToZ(e.m_pos - m_lastPos); m_lastPos = e.m_pos; if (dz != 0.0) { @@ -668,7 +668,7 @@ public: EditTool(); ~EditTool(); - ToolType getToolType() const { return TTool::ColumnTool; } + ToolType getToolType() const override { return TTool::ColumnTool; } bool doesApply() const; // ritorna vero se posso deformare l'oggetto corrente void saveOldValues(); @@ -683,29 +683,29 @@ public: void squeeze(); void shear(const TPointD &pos, bool single); - void updateTranslation(); + void updateTranslation() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; - void mouseMove(const TPointD &, const TMouseEvent &e); + void mouseMove(const TPointD &, const TMouseEvent &e) override; - void draw(); + void draw() override; void transform(const TAffine &aff); - void onActivate(); - void onDeactivate(); - bool onPropertyChanged(std::string propertyName); + void onActivate() override; + void onDeactivate() override; + bool onPropertyChanged(std::string propertyName) override; void computeBBox(); - int getCursorId() const; + int getCursorId() const override; - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - void updateMatrix() { + void updateMatrix() override { setMatrix( getCurrentObjectParentMatrix2()); // getCurrentObjectParentMatrix()); } diff --git a/toonz/sources/tnztools/edittoolgadgets.cpp b/toonz/sources/tnztools/edittoolgadgets.cpp index c405d27..28e50e8 100644 --- a/toonz/sources/tnztools/edittoolgadgets.cpp +++ b/toonz/sources/tnztools/edittoolgadgets.cpp @@ -50,13 +50,13 @@ public: } } - void onAdd() { + void onAdd() override { for (int i = 0; i < (int)m_params.size(); i++) { m_params[i].m_newValue = m_params[i].m_param->getValue(m_frame); } } - void undo() const { + void undo() const override { for (int i = 0; i < (int)m_params.size(); i++) { if (!m_params[i].m_wasKeyframe) m_params[i].m_param->deleteKeyframe(m_frame); @@ -65,17 +65,17 @@ public: } } - void redo() const { + void redo() const override { for (int i = 0; i < (int)m_params.size(); i++) { m_params[i].m_param->setValue(m_frame, m_params[i].m_newValue); } } - int getSize() const { + int getSize() const override { return sizeof(*this) + m_params.size() * sizeof(ParamData); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Gadget "); for (int i = 0; i < (int)m_params.size(); i++) { str += QString::fromStdString(m_params[i].m_param->getName()); @@ -86,7 +86,7 @@ public: return str; } - int getHistoryType() { return HistoryType::Fx; } + int getHistoryType() override { return HistoryType::Fx; } }; //************************************************************************************* @@ -103,16 +103,16 @@ public: TAffine getMatrix() const { return m_controller->getMatrix().inv(); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { m_gadget->createUndo(); m_gadget->leftButtonDown(getMatrix() * pos, e); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { m_gadget->leftButtonDrag(getMatrix() * pos, e); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &e) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override { m_gadget->leftButtonUp(getMatrix() * pos, e); m_gadget->commitUndo(); } @@ -237,15 +237,15 @@ public: addParam(m_yParam); } - void draw(bool picking); + void draw(bool picking) override; TPointD getPoint() const { return TPointD(getValue(m_xParam), getValue(m_yParam)); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; }; //--------------------------------------------------------------------------- @@ -312,11 +312,11 @@ public: TPointD getCenter() const; - void draw(bool picking); + void draw(bool picking) override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; }; //--------------------------------------------------------------------------- @@ -389,11 +389,11 @@ public: return TPointD(cos(angle), sin(angle)); } - void draw(bool picking); + void draw(bool picking) override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; }; //--------------------------------------------------------------------------- @@ -459,11 +459,11 @@ public: AngleFxGadget(FxGadgetController *controller, const TDoubleParamP ¶m, const TPointD &pos); - void draw(bool picking); + void draw(bool picking) override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; }; //--------------------------------------------------------------------------- @@ -533,11 +533,11 @@ public: addParam(param); } - void draw(bool picking); + void draw(bool picking) override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &) {} - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &) {} + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override {} + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override {} }; //--------------------------------------------------------------------------- @@ -599,11 +599,11 @@ public: if (ly) addParam(ly); } - void draw(bool picking); + void draw(bool picking) override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &) {} - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &) {} + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override {} + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override {} }; //--------------------------------------------------------------------------- @@ -678,11 +678,11 @@ public: return m_center ? getValue(m_center) : TPointD(); } - void draw(bool picking); + void draw(bool picking) override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &) {} + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override {} }; //--------------------------------------------------------------------------- @@ -771,7 +771,7 @@ public: addParam(lengthParam); } - void draw(bool picking) { + void draw(bool picking) override { setPixelSize(); if (isSelected()) glColor3dv(m_selectedColor); @@ -815,15 +815,15 @@ public: } } - void leftButtonDown(const TPointD &pos, const TMouseEvent &) {} - void leftButtonDrag(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override {} + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override { TPointD d = pos - m_pos; double phi = atan2(d.y, d.x); double length = norm(d); setValue(m_phiParam, phi * M_180_PI); setValue(m_lengthParam, length); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &) {} + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override {} }; //============================================================================= @@ -842,7 +842,7 @@ public: addParam(pb->getY()); } - void draw(bool picking) { + void draw(bool picking) override { setPixelSize(); if (isSelected()) glColor3dv(m_selectedColor); @@ -878,9 +878,9 @@ public: glPopName(); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &) {} - void leftButtonDrag(const TPointD &pos, const TMouseEvent &) {} - void leftButtonUp(const TPointD &pos, const TMouseEvent &) {} + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override {} + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override {} + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override {} }; //============================================================================= @@ -903,7 +903,7 @@ public: addParam(pd->getY()); } - void draw(bool picking) { + void draw(bool picking) override { setPixelSize(); if (isSelected()) glColor3dv(m_selectedColor); @@ -928,9 +928,9 @@ public: // glPopName(); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &) {} - void leftButtonDrag(const TPointD &pos, const TMouseEvent &) {} - void leftButtonUp(const TPointD &pos, const TMouseEvent &) {} + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override {} + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override {} + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override {} }; //************************************************************************************* diff --git a/toonz/sources/tnztools/edittoolgadgets.h b/toonz/sources/tnztools/edittoolgadgets.h index 988ceec..4179e6b 100644 --- a/toonz/sources/tnztools/edittoolgadgets.h +++ b/toonz/sources/tnztools/edittoolgadgets.h @@ -82,7 +82,7 @@ public: virtual void leftButtonDrag(const TPointD &pos, const TMouseEvent &) {} virtual void leftButtonUp(const TPointD &pos, const TMouseEvent &) {} - void onChange(const TParamChange &); + void onChange(const TParamChange &) override; void createUndo(); void commitUndo(); diff --git a/toonz/sources/tnztools/filltool.cpp b/toonz/sources/tnztools/filltool.cpp index 66bd2c9..6c9818f 100644 --- a/toonz/sources/tnztools/filltool.cpp +++ b/toonz/sources/tnztools/filltool.cpp @@ -111,7 +111,7 @@ public: } } - void undo() const { + void undo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -132,7 +132,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -153,14 +153,14 @@ public: notifyImageChanged(); } - void onAdd() {} + void onAdd() override {} - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - virtual QString getToolName() { + QString getToolName() override { return QString("Fill Tool : %1").arg(QString::fromStdWString(m_type)); } - int getHistoryType() { return HistoryType::FillTool; } + int getHistoryType() override { return HistoryType::FillTool; } }; //============================================================================= @@ -197,7 +197,7 @@ public: if (stroke) m_stroke = new TStroke(*stroke); } - void undo() const { + void undo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -221,7 +221,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -235,9 +235,9 @@ public: notifyImageChanged(); } - void onAdd() {} + void onAdd() override {} - int getSize() const { + int getSize() const override { int size1 = m_regionFillInformation ? m_regionFillInformation->capacity() * sizeof(m_regionFillInformation) @@ -249,8 +249,8 @@ public: return sizeof(*this) + size1 + size2 + 500; } - virtual QString getToolName() { return QString("Fill Tool : "); } - int getHistoryType() { return HistoryType::FillTool; } + QString getToolName() override { return QString("Fill Tool : "); } + int getHistoryType() override { return HistoryType::FillTool; } }; //============================================================================= @@ -277,7 +277,7 @@ public: , m_params(params) , m_saveboxOnly(saveboxOnly) {} - void redo() const { + void redo() const override { TToonzImageP image = getImage(); if (!image) return; bool recomputeSavebox = false; @@ -312,13 +312,13 @@ public: } } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } - virtual QString getToolName() { + QString getToolName() override { return QString("Fill Tool : %1") .arg(QString::fromStdWString(m_params.m_fillType)); } - int getHistoryType() { return HistoryType::FillTool; } + int getHistoryType() override { return HistoryType::FillTool; } }; //============================================================================= @@ -351,7 +351,7 @@ public: m_s = s ? new TStroke(*s) : 0; } - void redo() const { + void redo() const override { TToonzImageP image = getImage(); if (!image) return; TRasterCM32P ras = image->getRaster(); @@ -382,16 +382,16 @@ public: } } - int getSize() const { + int getSize() const override { int size = m_s ? m_s->getControlPointCount() * sizeof(TThickPoint) + 100 : 0; return sizeof(*this) + TRasterUndo::getSize() + size; } - virtual QString getToolName() { + QString getToolName() override { return QString("Fill Tool : %1").arg(QString::fromStdWString(m_colorType)); } - int getHistoryType() { return HistoryType::FillTool; } + int getHistoryType() override { return HistoryType::FillTool; } }; //============================================================================= @@ -414,7 +414,7 @@ public: , m_onlyUnfilled(onlyUnfilled) , m_fidToLearn(fidToLearn) {} - void redo() const { + void redo() const override { TToonzImageP image = getImage(); TToonzImageP imageToLearn = m_level->getFrame(m_fidToLearn, false); if (!image || !imageToLearn) return; @@ -433,7 +433,7 @@ public: } } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } }; //============================================================================= @@ -455,7 +455,7 @@ public: void setTileSet(TTileSetCM32 *tileSet) { m_tileSet = tileSet; } - void redo() const { + void redo() const override { TToonzImageP image = getImage(); if (!image) return; @@ -469,7 +469,7 @@ public: } } - int getSize() const { + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize() + m_tileSet->getMemorySize(); } }; @@ -505,7 +505,7 @@ public: m_selectingStroke = selectingStroke ? new TStroke(*selectingStroke) : 0; } - void undo() const { + void undo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; TVectorImageP img = m_level->getFrame(m_frameId, true); @@ -523,7 +523,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -546,7 +546,7 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { int size = m_selectingStroke ? m_selectingStroke->getControlPointCount() * sizeof(TThickPoint) + @@ -1007,7 +1007,7 @@ public: } void process(TImageP img, double t, TXshSimpleLevel *sl, - const TFrameId &fid) { + const TFrameId &fid) override { if (!m_firstImage) { TPointD p0 = m_firstRect.getP00() * (1 - t) + m_lastRect.getP00() * t; TPointD p1 = m_firstRect.getP11() * (1 - t) + m_lastRect.getP11() * t; @@ -1052,7 +1052,7 @@ public: const FillParameters ¶ms) : m_firstPoint(firstPoint), m_lastPoint(lastPoint), m_params(params) {} void process(TImageP img, double t, TXshSimpleLevel *sl, - const TFrameId &fid) { + const TFrameId &fid) override { TPointD p = m_firstPoint * (1 - t) + m_lastPoint * t; doFill(img, p, m_params, false, sl, fid); } @@ -1691,35 +1691,35 @@ class FillTool : public TTool { public: FillTool(int targetType); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void updateTranslation(); + void updateTranslation() override; - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } FillParameters getFillParameters() const; - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) override; void resetMulti(); - bool onPropertyChanged(std::string propertyName); - void onImageChanged(); + bool onPropertyChanged(std::string propertyName) override; + void onImageChanged() override; - void draw(); + void draw() override; int pick(const TImageP &image, const TPointD &pos); int pickOnionColor(const TPointD &pos); - void onEnter(); + void onEnter() override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; - int getCursorId() const; + int getCursorId() const override; int getColorClass() const { return 2; } }; diff --git a/toonz/sources/tnztools/fingertool.cpp b/toonz/sources/tnztools/fingertool.cpp index b567c67..1567ea4 100644 --- a/toonz/sources/tnztools/fingertool.cpp +++ b/toonz/sources/tnztools/fingertool.cpp @@ -71,7 +71,7 @@ public: , m_styleId(styleId) , m_invert(invert) {} - void redo() const { + void redo() const override { TToonzImageP image = m_level->getFrame(m_frameId, true); TRasterCM32P ras = image->getRaster(); RasterStrokeGenerator m_rasterTrack(ras, FINGER, INK, m_styleId, @@ -87,10 +87,10 @@ public: notifyImageChanged(); } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } - virtual QString getToolName() { return QString("Finger Tool"); } - int getHistoryType() { return HistoryType::FingerTool; } + QString getToolName() override { return QString("Finger Tool"); } + int getHistoryType() override { return HistoryType::FingerTool; } }; //------------------------------------------------------------------------------------------- @@ -269,24 +269,24 @@ class FingerTool : public TTool { public: FingerTool(); - void draw(); + void draw() override; void update(TToonzImageP ti, TRectD area); - void updateTranslation(); - - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void onEnter(); - void onLeave(); - void onActivate(); - void onDeactivate(); - bool onPropertyChanged(std::string propertyName); - - TPropertyGroup *getProperties(int targetType) { return &m_prop; } - ToolType getToolType() const { return TTool::LevelWriteTool; } - int getCursorId() const { return m_cursor; } + void updateTranslation() override; + + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void onEnter() override; + void onLeave() override; + void onActivate() override; + void onDeactivate() override; + bool onPropertyChanged(std::string propertyName) override; + + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } + int getCursorId() const override { return m_cursor; } int getColorClass() const { return 2; } diff --git a/toonz/sources/tnztools/fullcolorbrushtool.cpp b/toonz/sources/tnztools/fullcolorbrushtool.cpp index 7febb9b..45dce24 100644 --- a/toonz/sources/tnztools/fullcolorbrushtool.cpp +++ b/toonz/sources/tnztools/fullcolorbrushtool.cpp @@ -100,7 +100,7 @@ public: ~FullColorBrushUndo() { TImageCache::instance()->remove(m_id); } - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TRasterImageP image = getImage(); @@ -114,12 +114,12 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + ToolUtils::TFullColorRasterUndo::getSize(); } - virtual QString getToolName() { return QString("Raster Brush Tool"); } - int getHistoryType() { return HistoryType::BrushTool; } + QString getToolName() override { return QString("Raster Brush Tool"); } + int getHistoryType() override { return HistoryType::BrushTool; } }; } // namespace diff --git a/toonz/sources/tnztools/fullcolorbrushtool.h b/toonz/sources/tnztools/fullcolorbrushtool.h index c2531c5..ca836d8 100644 --- a/toonz/sources/tnztools/fullcolorbrushtool.h +++ b/toonz/sources/tnztools/fullcolorbrushtool.h @@ -26,32 +26,32 @@ class FullColorBrushTool : public TTool { public: FullColorBrushTool(std::string name); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - ToolOptionsBox *createOptionsBox(); + ToolOptionsBox *createOptionsBox() override; - void updateTranslation(); + void updateTranslation() override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; - bool preLeftButtonDown(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - void mouseMove(const TPointD &pos, const TMouseEvent &e); + bool preLeftButtonDown() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; - void draw(); + void draw() override; - void onEnter(); - void onLeave(); + void onEnter() override; + void onLeave() override; - int getCursorId() const { return ToolCursor::PenCursor; } + int getCursorId() const override { return ToolCursor::PenCursor; } - TPropertyGroup *getProperties(int targetType); - bool onPropertyChanged(std::string propertyName); + TPropertyGroup *getProperties(int targetType) override; + bool onPropertyChanged(std::string propertyName) override; - void onImageChanged(); + void onImageChanged() override; void setWorkAndBackupImages(); void updateWorkAndBackupRasters(const TRect &rect); diff --git a/toonz/sources/tnztools/fullcolorerasertool.cpp b/toonz/sources/tnztools/fullcolorerasertool.cpp index bd737d6..ef84116 100644 --- a/toonz/sources/tnztools/fullcolorerasertool.cpp +++ b/toonz/sources/tnztools/fullcolorerasertool.cpp @@ -145,7 +145,7 @@ public: ~RectFullColorUndo() { delete m_stroke; } - void redo() const { + void redo() const override { TRasterImageP ri = getImage(); if (!ri) return; @@ -165,15 +165,15 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { return TFullColorRasterUndo::getSize() + m_stroke->getControlPointCount() * sizeof(TThickPoint) + 100 + sizeof(this); } - virtual QString getToolName() { return QString("Raster Eraser Tool (Rect)"); } + QString getToolName() override { return QString("Raster Eraser Tool (Rect)"); } - int getHistoryType() { return HistoryType::EraserTool; } + int getHistoryType() override { return HistoryType::EraserTool; } }; //---------------------------------------------------------------------------------- @@ -195,7 +195,7 @@ public: , m_hardness(hardness) , m_opacity(opacity) {} - void redo() const { + void redo() const override { if (m_points.size() == 0) return; TRasterImageP image = getImage(); TRasterP ras = image->getRaster(); @@ -234,12 +234,12 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + TFullColorRasterUndo::getSize(); } - virtual QString getToolName() { return QString("Raster Eraser Tool"); } - int getHistoryType() { return HistoryType::EraserTool; } + QString getToolName() override { return QString("Raster Eraser Tool"); } + int getHistoryType() override { return HistoryType::EraserTool; } }; //---------------------------------------------------------------------------------- @@ -284,28 +284,28 @@ public: FullColorEraserTool(std::string name); ~FullColorEraserTool(); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void updateTranslation(); + void updateTranslation() override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e); - void mouseMove(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; - void draw(); + void draw() override; - int getCursorId() const { return ToolCursor::PenCursor; } + int getCursorId() const override { return ToolCursor::PenCursor; } - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - bool onPropertyChanged(std::string propertyName); - void onImageChanged(); - void onEnter(); + bool onPropertyChanged(std::string propertyName) override; + void onImageChanged() override; + void onEnter() override; void update(const TRasterImageP &ri, TRectD selArea, const TXshSimpleLevelP &level, bool multi = false, diff --git a/toonz/sources/tnztools/geometrictool.cpp b/toonz/sources/tnztools/geometrictool.cpp index ef6de07..d989e9c 100644 --- a/toonz/sources/tnztools/geometrictool.cpp +++ b/toonz/sources/tnztools/geometrictool.cpp @@ -189,16 +189,16 @@ public: ~MultilinePrimitiveUndo() {} - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; void setNewVertex(const std::vector &vertex) { m_newVertex = vertex; } - int getSize() const { return sizeof(this); } + int getSize() const override { return sizeof(this); } QString getToolName(); - int getHistoryType() { return HistoryType::GeometricTool; } + int getHistoryType() override { return HistoryType::GeometricTool; } }; //----------------------------------------------------------------------------- @@ -227,7 +227,7 @@ public: ~FullColorBluredPrimitiveUndo() {} - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TRasterImageP ri = getImage(); if (!ri) return; @@ -236,7 +236,7 @@ public: notifyImageChanged(); } - int getSize() const { return UndoFullColorPencil::getSize() + sizeof(this); } + int getSize() const override { return UndoFullColorPencil::getSize() + sizeof(this); } }; //----------------------------------------------------------------------------- @@ -267,7 +267,7 @@ public: ~CMBluredPrimitiveUndo() {} - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TToonzImageP ti = getImage(); if (!ti) return; @@ -276,7 +276,7 @@ public: notifyImageChanged(); } - int getSize() const { return UndoRasterPencil::getSize() + sizeof(this); } + int getSize() const override { return UndoRasterPencil::getSize() + sizeof(this); } }; //----------------------------------------------------------------------------- @@ -441,17 +441,17 @@ public: bool reasterTool) : Primitive(param, tool, reasterTool) {} - virtual std::string getName() const { + std::string getName() const override { return "Rectangle"; } // W_ToolOptions_ShapeRect"; } - TStroke *makeStroke() const; - void draw(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &realPos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void onEnter(); + TStroke *makeStroke() const override; + void draw() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &realPos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void onEnter() override; }; //============================================================================= @@ -468,17 +468,17 @@ public: CirclePrimitive(PrimitiveParam *param, GeometricTool *tool, bool reasterTool) : Primitive(param, tool, reasterTool) {} - virtual std::string getName() const { + std::string getName() const override { return "Circle"; } // W_ToolOptions_ShapeCircle";} - void draw(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - TStroke *makeStroke() const; - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void onEnter(); + void draw() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + TStroke *makeStroke() const override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void onEnter() override; }; //============================================================================= @@ -508,29 +508,29 @@ public: , m_beforeSpeedMoved(false) , m_ctrlDown(false) {} - virtual std::string getName() const { + std::string getName() const override { return "Polyline"; } // W_ToolOptions_ShapePolyline";} void addVertex(const TPointD &pos); void moveSpeed(const TPointD &delta); - virtual void draw(); - virtual void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - virtual void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - bool keyDown(int key, const TPoint &point); - TStroke *makeStroke() const; + void draw() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + bool keyDown(int key, const TPoint &point) override; + TStroke *makeStroke() const override; void endLine(); - void onActivate(); - void onDeactivate() { + void onActivate() override; + void onDeactivate() override { m_vertex.clear(); m_speedMoved = false; m_beforeSpeedMoved = false; } - void onEnter(); - void onImageChanged(); + void onEnter() override; + void onImageChanged() override; void setVertexes(const std::vector &vertex) { m_vertex = vertex; }; void setSpeedMoved(bool speedMoved) { m_speedMoved = speedMoved; }; }; @@ -573,15 +573,15 @@ public: m_isSingleLine = true; } - std::string getName() const { + std::string getName() const override { return "Line"; } // W_ToolOptions_ShapePolyline";} - void draw(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) {} + void draw() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) override {} }; //============================================================================= @@ -598,17 +598,17 @@ public: EllipsePrimitive(PrimitiveParam *param, GeometricTool *tool, bool reasterTool) : Primitive(param, tool, reasterTool) {} - virtual std::string getName() const { + std::string getName() const override { return "Ellipse"; } // W_ToolOptions_ShapeEllipse";} - void draw(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &realPos, const TMouseEvent &e); - TStroke *makeStroke() const; - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void onEnter(); + void draw() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &realPos, const TMouseEvent &e) override; + TStroke *makeStroke() const override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void onEnter() override; }; //============================================================================= @@ -629,15 +629,15 @@ public: if (m_stroke) delete m_stroke; } - virtual std::string getName() const { + std::string getName() const override { return "Arc"; } // _ToolOptions_ShapeArc";} - TStroke *makeStroke() const; - void draw(); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void onEnter(); + TStroke *makeStroke() const override; + void draw() override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void onEnter() override; }; //============================================================================= @@ -653,15 +653,15 @@ public: PolygonPrimitive(PrimitiveParam *param, GeometricTool *tool, bool reasterTool) : Primitive(param, tool, reasterTool) {} - virtual std::string getName() const { + std::string getName() const override { return "Polygon"; } // W_ToolOptions_ShapePolygon";} - TStroke *makeStroke() const; - void draw(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + TStroke *makeStroke() const override; + void draw() override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; }; //============================================================================= @@ -712,9 +712,9 @@ public: delete it->second; } - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void updateTranslation() { m_param.updateTranslation(); } + void updateTranslation() override { m_param.updateTranslation(); } void addPrimitive(Primitive *p) { // TODO: aggiungere il controllo per evitare nomi ripetuti @@ -731,7 +731,7 @@ public: if (it != m_primitiveTable.end()) m_primitive = it->second; } - void leftButtonDown(const TPointD &p, const TMouseEvent &e) { + void leftButtonDown(const TPointD &p, const TMouseEvent &e) override { /* m_active = getApplication()->getCurrentObject()->isSpline() || (bool) getImage(true);*/ @@ -742,41 +742,41 @@ public: if (m_primitive) m_primitive->leftButtonDown(p, e); invalidate(); } - void leftButtonDrag(const TPointD &p, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &p, const TMouseEvent &e) override { if (!m_active) return; if (m_primitive) m_primitive->leftButtonDrag(p, e); invalidate(); } - void leftButtonUp(const TPointD &p, const TMouseEvent &e) { + void leftButtonUp(const TPointD &p, const TMouseEvent &e) override { if (!m_active) return; if (m_primitive) m_primitive->leftButtonUp(p, e); invalidate(); } - void leftButtonDoubleClick(const TPointD &p, const TMouseEvent &e) { + void leftButtonDoubleClick(const TPointD &p, const TMouseEvent &e) override { if (!m_active) return; if (m_primitive) m_primitive->leftButtonDoubleClick(p, e); invalidate(); } - bool keyDown(int key, TUINT32 b, const TPoint &point) { + bool keyDown(int key, TUINT32 b, const TPoint &point) override { return m_primitive->keyDown(key, point); } - void onImageChanged() { + void onImageChanged() override { if (m_primitive) m_primitive->onImageChanged(); invalidate(); } - void rightButtonDown(const TPointD &p, const TMouseEvent &e) { + void rightButtonDown(const TPointD &p, const TMouseEvent &e) override { if (m_primitive) m_primitive->rightButtonDown(p, e); invalidate(); } - void mouseMove(const TPointD &p, const TMouseEvent &e) { + void mouseMove(const TPointD &p, const TMouseEvent &e) override { if (m_primitive) m_primitive->mouseMove(p, e); } - void onActivate() { + void onActivate() override { if (m_firstTime) { m_param.m_toolSize.setValue(GeometricSize); m_param.m_rasterToolSize.setValue(GeometricRasterSize); @@ -806,26 +806,26 @@ public: if (m_primitive) m_primitive->onActivate(); } - void onDeactivate() { + void onDeactivate() override { if (m_primitive) m_primitive->onDeactivate(); } - void onEnter() { + void onEnter() override { m_active = getImage(false) != 0; if (m_active && m_primitive) m_primitive->onEnter(); } - void draw() { + void draw() override { if (m_primitive) m_primitive->draw(); } - int getCursorId() const { return ToolCursor::PenCursor; } + int getCursorId() const override { return ToolCursor::PenCursor; } int getColorClass() const { return 1; } - TPropertyGroup *getProperties(int idx) { return &m_param.m_prop[idx]; } + TPropertyGroup *getProperties(int idx) override { return &m_param.m_prop[idx]; } - bool onPropertyChanged(std::string propertyName) { + bool onPropertyChanged(std::string propertyName) override { /*--- 変更されたPropertyごとに処理を分ける。 注意：m_toolSizeとm_rasterToolSizeは同じName(="Size:")なので、 扱っている画像がラスタかどうかで区別する ---*/ diff --git a/toonz/sources/tnztools/hookselection.h b/toonz/sources/tnztools/hookselection.h index 0a706cf..55f766b 100644 --- a/toonz/sources/tnztools/hookselection.h +++ b/toonz/sources/tnztools/hookselection.h @@ -23,13 +23,13 @@ public: HookUndo(const TXshLevelP &level); ~HookUndo(); - void onAdd(); + void onAdd() override; void assignHookSet(const HookSet &src) const; - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; - int getSize() const; + int getSize() const override; }; //============================================================================= @@ -52,7 +52,7 @@ public: HooksData(const TXshLevelP &level); ~HooksData(); - HooksData *clone() const; + HooksData *clone() const override; void storeHookPositions(const std::vector &ids); void restoreHookPositions() const; }; @@ -80,11 +80,11 @@ public: void unselect(int id, int side); bool isSelected(int id, int side) const; void invertSelection(int id, int side); - bool isEmpty() const; - void selectNone() { m_hooks.clear(); } + bool isEmpty() const override; + void selectNone() override { m_hooks.clear(); } HookSet *getHookSet() const; bool select(const TSelection *s); - void enableCommands(); + void enableCommands() override; // commands void deleteSelectedHooks(); diff --git a/toonz/sources/tnztools/hooktool.cpp b/toonz/sources/tnztools/hooktool.cpp index 3c4ab77..eea70cd 100644 --- a/toonz/sources/tnztools/hooktool.cpp +++ b/toonz/sources/tnztools/hooktool.cpp @@ -93,23 +93,23 @@ class HookTool : public TTool { public: HookTool(); - ToolType getToolType() const { return TTool::LevelReadTool; } + ToolType getToolType() const override { return TTool::LevelReadTool; } HookSet *getHookSet() const; - void updateTranslation(); + void updateTranslation() override; - void draw(); + void draw() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; - void onActivate(); - void onDeactivate(); - void onEnter(); - void onImageChanged() { + void onActivate() override; + void onDeactivate() override; + void onEnter() override; + void onImageChanged() override { m_selection.selectNone(); m_hookId = -1; m_otherHooks.clear(); @@ -117,9 +117,9 @@ public: invalidate(); } - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - int getCursorId() const { return ToolCursor::MoveCursor; } + int getCursorId() const override { return ToolCursor::MoveCursor; } void onSelectionChanged() { invalidate(); } bool select(const TSelection *) { return false; } @@ -149,7 +149,7 @@ public: // when the current matrix changes (e.g. because of a parent change or a // handle change) // we must recompute the hooks positions - void updateMatrix() { + void updateMatrix() override { TTool::updateMatrix(); m_otherHooks.clear(); getOtherHooks(m_otherHooks); diff --git a/toonz/sources/tnztools/imagegrouping.cpp b/toonz/sources/tnztools/imagegrouping.cpp index 25fd7cd..0b477a9 100644 --- a/toonz/sources/tnztools/imagegrouping.cpp +++ b/toonz/sources/tnztools/imagegrouping.cpp @@ -83,19 +83,19 @@ public: StrokeSelection *selection) : ToolUtils::TToolUndo(level, frameId), m_selection(selection) {} - void undo() const { + void undo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); if (image) ungroupWithoutUndo(image.getPointer(), m_selection.get()); } - void redo() const { + void redo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); if (image) groupWithoutUndo(image.getPointer(), m_selection.get()); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getToolName() { return QObject::tr("Group"); } + QString getToolName() override { return QObject::tr("Group"); } }; //============================================================================= @@ -110,19 +110,19 @@ public: StrokeSelection *selection) : ToolUtils::TToolUndo(level, frameId), m_selection(selection) {} - void undo() const { + void undo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); if (image) groupWithoutUndo(image.getPointer(), m_selection.get()); } - void redo() const { + void redo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); if (image) ungroupWithoutUndo(image.getPointer(), m_selection.get()); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getToolName() { return QObject::tr("Ungroup"); } + QString getToolName() override { return QObject::tr("Ungroup"); } }; //============================================================================= @@ -147,7 +147,7 @@ public: ~MoveGroupUndo() {} - void undo() const { + void undo() const override { int refStroke; int moveBefore; switch (m_moveType) { @@ -192,7 +192,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); if (!image) return; QMutexLocker lock(image->getMutex()); @@ -214,9 +214,9 @@ public: notifyImageChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getToolName() { return QObject::tr("Move Group"); } + QString getToolName() override { return QObject::tr("Move Group"); } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/tnztools/irontool.cpp b/toonz/sources/tnztools/irontool.cpp index 8f8122f..6b58e07 100644 --- a/toonz/sources/tnztools/irontool.cpp +++ b/toonz/sources/tnztools/irontool.cpp @@ -76,9 +76,9 @@ public: bind(TTool::Vectors); } - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void draw() { + void draw() override { if (m_draw && (TVectorImageP)getImage(false)) { glColor3d(1, 0, 1); if (m_cursor.thick > 0) tglDrawCircle(m_cursor, m_cursor.thick); @@ -86,7 +86,7 @@ public: } } - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (m_active) return; assert(m_undo == 0); m_active = false; @@ -130,7 +130,7 @@ public: invalidate(); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { TVectorImageP vi(getImage(true)); if (!m_active || !vi || !m_strokeRef) { delete m_undo; @@ -330,7 +330,7 @@ public: notifyImageChanged(); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override { if (!m_active) return; m_active = false; @@ -475,7 +475,7 @@ Altrimenti non si fa altro che aumentarli i punti di controllo invalidate(TRectD(m_cursor - d, m_cursor + d)); } - void mouseMove(const TPointD &pos, const TMouseEvent &e) { + void mouseMove(const TPointD &pos, const TMouseEvent &e) override { TVectorImageP vi = TImageP(getImage(true)); if (!vi) { m_draw = false; @@ -499,14 +499,14 @@ Altrimenti non si fa altro che aumentarli i punti di controllo bool moveCursor(const TPointD &pos) { return false; } - void onActivate() { + void onActivate() override { // getApplication()->editImageOrSpline(); } - void onLeave() { m_draw = false; } + void onLeave() override { m_draw = false; } - int getCursorId() const { return m_cursorId; } - void onEnter() { + int getCursorId() const override { return m_cursorId; } + void onEnter() override { m_draw = true; if ((TVectorImageP)getImage(false)) m_cursorId = ToolCursor::IronCursor; diff --git a/toonz/sources/tnztools/magnettool.cpp b/toonz/sources/tnztools/magnettool.cpp index 4005c8c..eea903c 100644 --- a/toonz/sources/tnztools/magnettool.cpp +++ b/toonz/sources/tnztools/magnettool.cpp @@ -150,11 +150,11 @@ public: m_prop.bind(m_toolSize); } - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void updateTranslation() { m_toolSize.setQStringName(tr("Size:")); } + void updateTranslation() override { m_toolSize.setQStringName(tr("Size:")); } - void onEnter() { + void onEnter() override { if ((TVectorImageP)getImage(false)) m_cursorId = ToolCursor::MagnetCursor; else @@ -172,9 +172,9 @@ public: (x - minRange) / (maxRange - minRange) * (maxSize - minSize) + minSize; } - void onLeave() { m_pointSize = -1; } + void onLeave() override { m_pointSize = -1; } - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { TPointD p(pos); m_oldPos = pos; @@ -274,7 +274,7 @@ public: // vi->validateRegionEdges(ref, true); }; - void leftButtonDrag(const TPointD &p, const TMouseEvent &) { + void leftButtonDrag(const TPointD &p, const TMouseEvent &) override { if (!m_active) return; // double dx = p.x - m_pointAtMouseDown.x; @@ -317,7 +317,7 @@ lefrightButtonDown(p); invalidate(); }; - void mouseMove(const TPointD &p, const TMouseEvent &e) { + void mouseMove(const TPointD &p, const TMouseEvent &e) override { m_pointAtMove = p; double pixelSize = getPixelSize(); if (tdistance2(p, m_oldPos) < 9.0 * pixelSize * pixelSize) return; @@ -326,7 +326,7 @@ lefrightButtonDown(p); invalidate(); } - void leftButtonUp(const TPointD &, const TMouseEvent &) { + void leftButtonUp(const TPointD &, const TMouseEvent &) override { if (!m_active) return; m_active = false; @@ -400,7 +400,7 @@ lefrightButtonDown(p); invalidate(); }; - void draw() { + void draw() override { TVectorImageP vi = TImageP(getImage(true)); if (!vi) return; @@ -440,13 +440,13 @@ lefrightButtonDown(p); // glPopMatrix(); } - void onActivate() { + void onActivate() override { // getApplication()->editImageOrSpline(); } - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - int getCursorId() const { return m_cursorId; } + int getCursorId() const override { return m_cursorId; } } magnetTool; diff --git a/toonz/sources/tnztools/paintbrushtool.cpp b/toonz/sources/tnztools/paintbrushtool.cpp index a2ef048..d071930 100644 --- a/toonz/sources/tnztools/paintbrushtool.cpp +++ b/toonz/sources/tnztools/paintbrushtool.cpp @@ -77,7 +77,7 @@ public: , m_selective(selective) , m_colorType(colorType) {} - void redo() const { + void redo() const override { TToonzImageP image = m_level->getFrame(m_frameId, true); TRasterCM32P ras = image->getRaster(); RasterStrokeGenerator m_rasterTrack(ras, PAINTBRUSH, m_colorType, m_styleId, @@ -91,9 +91,10 @@ public: notifyImageChanged(); } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } - virtual QString getToolName() { return QString("Paint Brush Tool"); } - int getHistoryType() { return HistoryType::PaintBrushTool; } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } + + QString getToolName() override { return QString("Paint Brush Tool"); } + int getHistoryType() override { return HistoryType::PaintBrushTool; } }; //------------------------------------------------------------------------------------------- @@ -271,26 +272,26 @@ class PaintBrushTool : public TTool { public: PaintBrushTool(); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void draw(); + void draw() override; void update(TToonzImageP ti, TRectD area); - void updateTranslation(); + void updateTranslation() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void onEnter(); - void onLeave(); - void onActivate(); - void onDeactivate(); - bool onPropertyChanged(std::string propertyName); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void onEnter() override; + void onLeave() override; + void onActivate() override; + void onDeactivate() override; + bool onPropertyChanged(std::string propertyName) override; - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - int getCursorId() const { return m_cursor; } + int getCursorId() const override { return m_cursor; } int getColorClass() const { return 2; } @@ -301,7 +302,7 @@ public: /*--- Brush、PaintBrush、EraserToolがPencilModeのときにTrueを返す。 　　　PaintBrushはピクセルのStyleIndexを入れ替えるツールのため、 　 アンチエイリアスは存在しない、いわば常にPencilMode ---*/ - bool isPencilModeActive() { return true; } + bool isPencilModeActive() override { return true; } }; PaintBrushTool paintBrushTool; diff --git a/toonz/sources/tnztools/plastictool.cpp b/toonz/sources/tnztools/plastictool.cpp index 2c41050..8fbb2c0 100644 --- a/toonz/sources/tnztools/plastictool.cpp +++ b/toonz/sources/tnztools/plastictool.cpp @@ -201,10 +201,11 @@ public: PlasticSkeletonPMime(const PlasticSkeletonP &skeleton) : m_skeleton(skeleton) {} - virtual DvMimeData *clone() const { + DvMimeData *clone() const override { return new PlasticSkeletonPMime(m_skeleton); } - virtual void releaseData() { m_skeleton = PlasticSkeletonP(); } + + void releaseData() override { m_skeleton = PlasticSkeletonP(); } }; struct SkDPMime : public DvMimeData { @@ -213,8 +214,9 @@ struct SkDPMime : public DvMimeData { public: SkDPMime(const SkDP &sd) : m_sd(sd) {} - virtual DvMimeData *clone() const { return new SkDPMime(m_sd); } - virtual void releaseData() { m_sd = SkDP(); } + DvMimeData *clone() const override { return new SkDPMime(m_sd); } + + void releaseData() override { m_sd = SkDP(); } }; //**************************************************************************************** @@ -249,9 +251,9 @@ public: m_oldName = vx.name(); } - int getSize() const { return sizeof(*this); } // sizeof this is roughly ok + int getSize() const override { return sizeof(*this); } // sizeof this is roughly ok - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); // Store the vertex deformation before it's released (possibly destroyed) @@ -272,7 +274,7 @@ public: ::invalidateXsheet(); } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const SkDP &sd = l_plasticTool.deformation(); @@ -304,15 +306,15 @@ public: , m_oldSd(stageObject()->getPlasticSkeletonDeformation()) , m_newSd(newSd) {} - int getSize() const { return 1 << 20; } + int getSize() const override { return 1 << 20; } - void redo() const { + void redo() const override { TTool::getApplication()->getCurrentColumn()->setColumnIndex(m_col); stageObject()->setPlasticSkeletonDeformation(m_newSd); ::invalidateXsheet(); } - void undo() const { + void undo() const override { TTool::getApplication()->getCurrentColumn()->setColumnIndex(m_col); stageObject()->setPlasticSkeletonDeformation(m_oldSd); ::invalidateXsheet(); @@ -876,7 +878,7 @@ void PlasticTool::onChange() { struct locals { struct RefreshFunctor : public TFunctorInvoker::BaseFunctor { - void operator()() { + void operator()() override { refresh = false; l_plasticTool.storeSkeletonId(); // Calls ::sdFrame() diff --git a/toonz/sources/tnztools/plastictool.h b/toonz/sources/tnztools/plastictool.h index 0efabf7..0663671 100644 --- a/toonz/sources/tnztools/plastictool.h +++ b/toonz/sources/tnztools/plastictool.h @@ -183,37 +183,37 @@ public: PlasticTool(); ~PlasticTool(); - ToolType getToolType() const; - int getCursorId() const { return ToolCursor::SplineEditorCursor; } + ToolType getToolType() const override; + int getCursorId() const override { return ToolCursor::SplineEditorCursor; } - ToolOptionsBox *createOptionsBox(); + ToolOptionsBox *createOptionsBox() override; - TPropertyGroup *getProperties(int idx) { return &m_propGroup[idx]; } + TPropertyGroup *getProperties(int idx) override { return &m_propGroup[idx]; } - void updateTranslation(); + void updateTranslation() override; - void onSetViewer(); + void onSetViewer() override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; - void onEnter(); - void onLeave(); + void onEnter() override; + void onLeave() override; - void addContextMenuItems(QMenu *menu); + void addContextMenuItems(QMenu *menu) override; - void reset(); + void reset() override; - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; public: // Methods reimplemented in each interaction mode - void mouseMove(const TPointD &pos, const TMouseEvent &me); - void leftButtonDown(const TPointD &pos, const TMouseEvent &me); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &me); - void leftButtonUp(const TPointD &pos, const TMouseEvent &me); + void mouseMove(const TPointD &pos, const TMouseEvent &me) override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &me) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &me) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &me) override; - void draw(); + void draw() override; public: // Skeleton methods @@ -374,16 +374,16 @@ private: void toggleMeshSelection(MeshSelection &target, const MeshSelection &addedSel); - void onSelectionChanged(); - void enableCommands(); + void onSelectionChanged() override; + void enableCommands() override; // Parameter Observation methods - void onChange(const TParamChange &); + void onChange(const TParamChange &) override; private slots: - void onFrameSwitched(); + void onFrameSwitched() override; void onColumnSwitched(); void onXsheetChanged(); @@ -416,10 +416,10 @@ private: QPushButton *m_addSkelButton, *m_removeSkelButton; private: - void showEvent(QShowEvent *se); - void hideEvent(QHideEvent *he); + void showEvent(QShowEvent *se) override; + void hideEvent(QHideEvent *he) override; - void onPropertyChanged(); + void onPropertyChanged() override; private slots: diff --git a/toonz/sources/tnztools/plastictool_animate.cpp b/toonz/sources/tnztools/plastictool_animate.cpp index 80acdac..7bbe862 100644 --- a/toonz/sources/tnztools/plastictool_animate.cpp +++ b/toonz/sources/tnztools/plastictool_animate.cpp @@ -28,9 +28,9 @@ public: // Again, not accurate. We should get in the details of SkDF... So, let's say // around 10 kB - max 10k instances in the standard undos pool. - int getSize() const { return 10 << 10; } + int getSize() const override { return 10 << 10; } - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); if (m_v >= 0) l_plasticTool.setSkeletonSelection(m_v); @@ -45,7 +45,7 @@ public: l_plasticTool.onChange(); } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); if (m_v >= 0) l_plasticTool.setSkeletonSelection(m_v); diff --git a/toonz/sources/tnztools/plastictool_build.cpp b/toonz/sources/tnztools/plastictool_build.cpp index be94c7c..d3c9ebf 100644 --- a/toonz/sources/tnztools/plastictool_build.cpp +++ b/toonz/sources/tnztools/plastictool_build.cpp @@ -105,7 +105,7 @@ protected: public: VertexUndo() : m_row(::row()), m_col(::column()), m_v(-1), m_vParent(-1) {} - int getSize() const { return sizeof(*this); } // sizeof this is roughly ok + int getSize() const override { return sizeof(*this); } // sizeof this is roughly ok void storeChildren(const PlasticSkeleton &skeleton, const PlasticSkeletonVertex &vx) { @@ -198,10 +198,10 @@ public: assert(m_vx.edges().empty()); } - void redo() const { + void redo() const override { const_cast(*this).VertexUndo::addVertex(); } - void undo() const { + void undo() const override { const_cast(*this).VertexUndo::removeVertex(); } }; @@ -215,10 +215,10 @@ public: m_v = v; } - void redo() const { + void redo() const override { const_cast(*this).VertexUndo::removeVertex(); } - void undo() const { + void undo() const override { const_cast(*this).VertexUndo::insertVertex(); } }; @@ -235,11 +235,11 @@ public: std::vector(1, ed.vertex(1)).swap(m_children); } - void redo() const { + void redo() const override { const_cast(*this).VertexUndo::insertVertex(); } - void undo() const { + void undo() const override { TCG_ASSERT(!m_children.empty(), return ); const_cast(*this).VertexUndo::removeVertex(); @@ -267,16 +267,16 @@ public: // cleared deformation! So, I guess 1 MB (100 of these in the standard undos // pool) // is a reasonable estimate... - int getSize() const { return 1 << 20; } + int getSize() const override { return 1 << 20; } - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); l_plasticTool.addSkeleton(m_skelId, new PlasticSkeleton(*m_skeleton)); ::invalidateXsheet(); } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); l_plasticTool.removeSkeleton(m_skelId); @@ -290,8 +290,8 @@ public: RemoveSkeletonUndo(int skelId) : AddSkeletonUndo(skelId, l_plasticTool.skeleton()) {} - void redo() const { AddSkeletonUndo::undo(); } - void undo() const { AddSkeletonUndo::redo(); } + void redo() const override { AddSkeletonUndo::undo(); } + void undo() const override { AddSkeletonUndo::redo(); } }; //------------------------------------------------------------------------ @@ -303,7 +303,7 @@ class RemoveSkeletonUndo_WithKeyframes : public RemoveSkeletonUndo { public: RemoveSkeletonUndo_WithKeyframes(int skelId) : RemoveSkeletonUndo(skelId) {} - void redo() const { + void redo() const override { // Erase all keyframes corresponding to m_skelId from sd's skeleton ids // curve const SkDP &sd = l_plasticTool.deformation(); @@ -327,7 +327,7 @@ public: RemoveSkeletonUndo::redo(); // Invalidates the xsheet } - void undo() const { + void undo() const override { l_plasticTool .touchDeformation(); // Skeleton removal could have destroyed the sd @@ -362,9 +362,9 @@ public: SetSkeletonIdUndo(int skelId) : m_row(::row()), m_col(::column()), m_skelId(skelId) {} - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const SkDP &sd = l_plasticTool.deformation(); @@ -396,7 +396,7 @@ public: // onChange() } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const SkDP &sd = l_plasticTool.deformation(); @@ -440,12 +440,12 @@ public: assert(m_vIdxs.size() == m_origVxsPos.size()); } - int getSize() const { + int getSize() const override { return int(sizeof(*this) + m_vIdxs.size() * (sizeof(int) + 2 * sizeof(TPointD))); } - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); l_plasticTool.setSkeletonSelection(m_vIdxs); @@ -456,7 +456,7 @@ public: l_plasticTool.invalidate(); } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); l_plasticTool.setSkeletonSelection(m_vIdxs); diff --git a/toonz/sources/tnztools/plastictool_meshedit.cpp b/toonz/sources/tnztools/plastictool_meshedit.cpp index fe170b4..8c8e7db 100644 --- a/toonz/sources/tnztools/plastictool_meshedit.cpp +++ b/toonz/sources/tnztools/plastictool_meshedit.cpp @@ -659,12 +659,12 @@ public: assert(m_vIdxs.size() == m_origVxsPos.size()); } - int getSize() const { + int getSize() const override { return int(sizeof(*this) + m_vIdxs.size() * (sizeof(int) + 2 * sizeof(TPointD))); } - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); l_plasticTool.setMeshVertexesSelection(m_vIdxs); @@ -675,7 +675,7 @@ public: .notifyImageChanged(); // IMPORTANT: In particular, sets the level's } // dirty flag, so Toonz knows it has // to be saved! - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); l_plasticTool.setMeshVertexesSelection(m_vIdxs); @@ -696,9 +696,9 @@ public: SwapEdgeUndo(const MeshIndex &edgeIdx) : m_row(::row()), m_col(::column()), m_edgeIdx(edgeIdx) {} - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const TMeshImageP &mi = TMeshImageP(TTool::getImage(true)); @@ -720,7 +720,7 @@ public: l_plasticTool.notifyImageChanged(); } - void undo() const { redo(); } // Operation is idempotent (indices + void undo() const override { redo(); } // Operation is idempotent (indices // are perfectly restored, too) }; @@ -738,7 +738,7 @@ public: : m_row(::row()), m_col(::column()), m_meshIdx(meshIdx) {} // Let's say 1MB each - storing the mesh is costly - int getSize() const { return 1 << 20; } + int getSize() const override { return 1 << 20; } TMeshImageP getMeshImage() const { const TMeshImageP &mi = TMeshImageP(TTool::getImage(true)); @@ -757,7 +757,7 @@ public: CollapseEdgeUndo(const MeshIndex &edgeIdx) : TTextureMeshUndo(edgeIdx.m_meshIdx), m_eIdx(edgeIdx.m_idx) {} - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const TMeshImageP &mi = getMeshImage(); @@ -780,7 +780,7 @@ public: l_plasticTool.notifyImageChanged(); } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const TMeshImageP &mi = getMeshImage(); @@ -808,7 +808,7 @@ public: SplitEdgeUndo(const MeshIndex &edgeIdx) : TTextureMeshUndo(edgeIdx.m_meshIdx), m_eIdx(edgeIdx.m_idx) {} - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const TMeshImageP &mi = getMeshImage(); @@ -834,7 +834,7 @@ public: l_plasticTool.notifyImageChanged(); } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); const TMeshImageP &mi = getMeshImage(); @@ -868,7 +868,7 @@ public: , m_origImage(TTool::getImage(false)->cloneImage()) , m_edgesSelection(edgesSelection) {} - int getSize() const { return 1 << 20; } + int getSize() const override { return 1 << 20; } bool do_() const { TMeshImageP mi = TTool::getImage(true); @@ -887,7 +887,7 @@ public: return false; } - void redo() const { + void redo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); bool ret = do_(); @@ -895,7 +895,7 @@ public: assert(ret); } - void undo() const { + void undo() const override { PlasticTool::TemporaryActivation tempActivate(m_row, m_col); TMeshImageP mi = TTool::getImage(true); diff --git a/toonz/sources/tnztools/plastictool_rigidity.cpp b/toonz/sources/tnztools/plastictool_rigidity.cpp index 4a4a670..dbb77fe 100644 --- a/toonz/sources/tnztools/plastictool_rigidity.cpp +++ b/toonz/sources/tnztools/plastictool_rigidity.cpp @@ -50,9 +50,9 @@ public: double paintValue) : m_cell(cell), m_vertices(vertices), m_paintValue(paintValue) {} - int getSize() const { return 1 << 20; } + int getSize() const override { return 1 << 20; } - void redo() const { + void redo() const override { TXshSimpleLevel *sl = static_cast(m_cell.m_level.getPointer()); sl->setDirtyFlag(true); @@ -73,7 +73,7 @@ public: mi.getPointer(), PlasticDeformerStorage::MESH); } - void undo() const { + void undo() const override { TXshSimpleLevel *sl = static_cast(m_cell.m_level.getPointer()); sl->setDirtyFlag(true); diff --git a/toonz/sources/tnztools/pumptool.cpp b/toonz/sources/tnztools/pumptool.cpp index 1d44c8a..50d8d68 100644 --- a/toonz/sources/tnztools/pumptool.cpp +++ b/toonz/sources/tnztools/pumptool.cpp @@ -94,31 +94,31 @@ public: m_prop.bind(m_accuracy); } - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - void updateTranslation() { + void updateTranslation() override { m_toolSize.setQStringName(tr("Size:")); m_accuracy.setQStringName(tr("Accuracy:")); } - void onEnter(); - void onLeave(); + void onEnter() override; + void onLeave() override; - void draw(); + void draw() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; - void mouseMove(const TPointD &pos, const TMouseEvent &e); + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; bool moveCursor(const TPointD &pos); - int getCursorId() const { return m_cursorId; } + int getCursorId() const override { return m_cursorId; } void invalidateCursorArea(); - void onDeactivate(); + void onDeactivate() override; private: double actionRadius(double strokeLength); diff --git a/toonz/sources/tnztools/rastererasertool.cpp b/toonz/sources/tnztools/rastererasertool.cpp index 9230b25..aa64d7b 100644 --- a/toonz/sources/tnztools/rastererasertool.cpp +++ b/toonz/sources/tnztools/rastererasertool.cpp @@ -107,7 +107,7 @@ public: m_stroke = new TStroke(stroke); } - void redo() const { + void redo() const override { TToonzImageP ti = getImage(); if (!ti) return; bool eraseInk = m_colorType == LINES || m_colorType == ALL; @@ -132,7 +132,7 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { return TRasterUndo::getSize() + sizeof(this) + m_stroke->getControlPointCount() * sizeof(TThickPoint) + 100; } @@ -141,8 +141,8 @@ public: if (m_stroke) delete m_stroke; } - QString getToolName() { return QString("Eraser Tool (Rect)"); } - int getHistoryType() { return HistoryType::EraserTool; } + QString getToolName() override { return QString("Eraser Tool (Rect)"); } + int getHistoryType() override { return HistoryType::EraserTool; } }; //===================================================================== @@ -172,7 +172,7 @@ public: , m_colorSelected(colorSelected) , m_isPencil(isPencil) {} - void redo() const { + void redo() const override { TToonzImageP image = m_level->getFrame(m_frameId, true); TRasterCM32P ras = image->getRaster(); RasterStrokeGenerator m_rasterTrack(ras, ERASE, m_colorType, 0, m_points[0], @@ -187,10 +187,10 @@ public: notifyImageChanged(); } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } - QString getToolName() { return QString("Eraser Tool"); } - int getHistoryType() { return HistoryType::EraserTool; } + QString getToolName() override { return QString("Eraser Tool"); } + int getHistoryType() override { return HistoryType::EraserTool; } }; //===================================================================== @@ -217,7 +217,7 @@ public: , m_hardness(hardness) , m_mode(mode) {} - void redo() const { + void redo() const override { if (m_points.size() == 0) return; TToonzImageP image = getImage(); TRasterCM32P ras = image->getRaster(); @@ -256,10 +256,10 @@ public: notifyImageChanged(); } - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } - QString getToolName() { return QString("Eraser Tool"); } - int getHistoryType() { return HistoryType::EraserTool; } + QString getToolName() override { return QString("Eraser Tool"); } + int getHistoryType() override { return HistoryType::EraserTool; } }; void eraseStroke(const TToonzImageP &ti, TStroke *stroke, @@ -447,11 +447,11 @@ public: if (m_firstStroke) delete m_firstStroke; } - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void updateTranslation(); + void updateTranslation() override; - void draw(); + void draw() override; void update(const TToonzImageP &ti, const TPointD &pos); void saveUndo(); @@ -459,10 +459,10 @@ public: const TXshSimpleLevelP &level, bool multi = false, const TFrameId &frameId = -1); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) override; void multiAreaEraser(const TXshSimpleLevelP &sl, TFrameId &firstFid, TFrameId &lastFid, TStroke *firstStroke, @@ -471,25 +471,25 @@ public: const TFrameId &fid, const TVectorImageP &firstImage, const TVectorImageP &lastImage); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void onEnter(); - void onLeave(); - void onActivate(); - bool onPropertyChanged(std::string propertyName); - void onImageChanged(); + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void onEnter() override; + void onLeave() override; + void onActivate() override; + bool onPropertyChanged(std::string propertyName) override; + void onImageChanged() override; void multiUpdate(const TXshSimpleLevelP &level, TFrameId firstFrameId, TFrameId lastFrameId, TRectD firstRect, TRectD lastRect); - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - int getCursorId() const; + int getCursorId() const override; void resetMulti(); /*-- ドラッグ中にツールが切り替わった場合、処理を終了させる--*/ - void onDeactivate(); + void onDeactivate() override; /*-- Brush、PaintBrush、EraserToolがPencilModeのときにTrueを返す --*/ - bool isPencilModeActive(); + bool isPencilModeActive() override; private: /*-- 終了処理 --*/ diff --git a/toonz/sources/tnztools/rasterselection.cpp b/toonz/sources/tnztools/rasterselection.cpp index 8f13bf2..f9ae666 100644 --- a/toonz/sources/tnztools/rasterselection.cpp +++ b/toonz/sources/tnztools/rasterselection.cpp @@ -341,7 +341,7 @@ public: TImageCache::instance()->remove(m_erasedImageId); } - void undo() const { + void undo() const override { TImageP image = m_level->getFrame(m_frameId, true); if (!image) return; TRasterP ras = getRaster(image); @@ -358,7 +358,7 @@ public: m_tool->invalidate(); } - void redo() const { + void redo() const override { TImageP image = m_level->getFrame(m_frameId, true); TImageP erasedImage = TImageCache::instance()->get(m_erasedImageId, false); if (!erasedImage) return; @@ -370,7 +370,7 @@ public: m_tool->invalidate(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; int UndoDeleteSelection::m_id = 0; @@ -390,20 +390,20 @@ public: ~UndoPasteSelection() {} - void undo() const { + void undo() const override { m_currentSelection->setFloatingSeletion(TRasterP()); m_currentSelection->selectNone(); m_currentSelection->notify(); } - void redo() const { + void redo() const override { *m_currentSelection = m_newSelection; m_currentSelection->notify(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Paste"); } + QString getHistoryString() override { return QObject::tr("Paste"); } }; //============================================================================= @@ -502,7 +502,7 @@ public: TImageCache::instance()->remove(m_undoImageId); } - void undo() const { + void undo() const override { TImageP image = TImageCache::instance()->get(m_imageId, false); if (!image) return; TRasterP rasImage = getRaster(image); @@ -538,7 +538,7 @@ public: m_tool->invalidate(); } - void redo() const { + void redo() const override { TImageP image = TImageCache::instance()->get(m_imageId, false); TImageP floatingImage = TImageCache::instance()->get(m_floatingImageId, false); @@ -566,9 +566,9 @@ public: m_tool->invalidate(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Paste"); } + QString getHistoryString() override { return QObject::tr("Paste"); } }; int UndoPasteFloatingSelection::m_id = 0; diff --git a/toonz/sources/tnztools/rasterselectiontool.h b/toonz/sources/tnztools/rasterselectiontool.h index bc4237d..1519708 100644 --- a/toonz/sources/tnztools/rasterselectiontool.h +++ b/toonz/sources/tnztools/rasterselectiontool.h @@ -25,12 +25,12 @@ public: ~RasterFreeDeformer(); /*! Set \b index point to \b p, with index from 0 to 3. */ - void setPoint(int index, const TPointD &p); + void setPoint(int index, const TPointD &p) override; /*! Helper function. */ void setPoints(const TPointD &p0, const TPointD &p1, const TPointD &p2, - const TPointD &p3); + const TPointD &p3) override; TRasterP getImage() const { return m_newRas; } - void deformImage(); + void deformImage() override; void setNoAntialiasing(bool value) { m_noAntialiasing = value; } }; @@ -63,12 +63,12 @@ public: void registerRasterDeformation(); - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; - int getSize() const; + int getSize() const override; - QString getHistoryString() { return QObject::tr("Deform Raster"); } + QString getHistoryString() override { return QObject::tr("Deform Raster"); } }; //============================================================================= @@ -85,12 +85,12 @@ class UndoRasterTransform : public TUndo { public: UndoRasterTransform(RasterSelectionTool *tool); void setChangedValues(); - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Transform Raster"); } + QString getHistoryString() override { return QObject::tr("Transform Raster"); } }; //============================================================================= @@ -106,12 +106,12 @@ protected: //! It's true when use RasterFreeDeformer bool m_isFreeDeformer; - void applyTransform(FourPoints bbox); + void applyTransform(FourPoints bbox) override; void applyTransform(TAffine aff, bool modifyCenter); - void addTransformUndo(); + void addTransformUndo() override; - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e){}; - void draw(){}; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override {}; + void draw() override {}; public: RasterDeformTool(RasterSelectionTool *tool, bool freeDeformer); @@ -126,9 +126,9 @@ class RasterRotationTool : public RasterDeformTool { public: RasterRotationTool(RasterSelectionTool *tool); - void transform(TAffine aff, double angle); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void draw(); + void transform(TAffine aff, double angle) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void draw() override; }; //============================================================================= @@ -140,7 +140,7 @@ class RasterFreeDeformTool : public RasterDeformTool { public: RasterFreeDeformTool(RasterSelectionTool *tool); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; }; //============================================================================= @@ -152,9 +152,9 @@ class RasterMoveSelectionTool : public RasterDeformTool { public: RasterMoveSelectionTool(RasterSelectionTool *tool); - void transform(TAffine aff); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void transform(TAffine aff) override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; }; //============================================================================= @@ -167,9 +167,9 @@ class RasterScaleTool : public RasterDeformTool { public: RasterScaleTool(RasterSelectionTool *tool, int type); /*! Return scale value. */ - TPointD transform(int index, TPointD newPos); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + TPointD transform(int index, TPointD newPos) override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; }; } // namespace DragSelectionTool @@ -194,53 +194,53 @@ class RasterSelectionTool : public SelectionTool { VectorFreeDeformer *m_selectionFreeDeformer; void modifySelectionOnClick(TImageP image, const TPointD &pos, - const TMouseEvent &e); + const TMouseEvent &e) override; void drawFloatingSelection(); public: RasterSelectionTool(int targetType); - void setBBox(const DragSelectionTool::FourPoints &points, int index = 0); + void setBBox(const DragSelectionTool::FourPoints &points, int index = 0) override; - void setNewFreeDeformer(); + void setNewFreeDeformer() override; VectorFreeDeformer *getSelectionFreeDeformer() const; - bool isFloating() const; + bool isFloating() const override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) override; - void draw(); + void draw() override; - TSelection *getSelection(); - bool isSelectionEmpty(); + TSelection *getSelection() override; + bool isSelectionEmpty() override; - void computeBBox(); + void computeBBox() override; - void doOnActivate(); - void doOnDeactivate(); + void doOnActivate() override; + void doOnDeactivate() override; - void onImageChanged(); + void onImageChanged() override; void transformFloatingSelection(const TAffine &affine, const TPointD ¢er, const DragSelectionTool::FourPoints &points); void increaseTransformationCount(); void decreaseTransformationCount(); - void onActivate(); + void onActivate() override; TBoolProperty *getModifySaveboxProperty() { if (m_targetType & ToonzImage) return &m_modifySavebox; return 0; } - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; bool getNoAntialiasingValue() { return m_noAntialiasing.getValue(); } protected: - void updateTranslation(); + void updateTranslation() override; }; #endif // RASTERSELECTIONTOOL_INCLUDED diff --git a/toonz/sources/tnztools/rastertapetool.cpp b/toonz/sources/tnztools/rastertapetool.cpp index 8b07576..d119fb1 100644 --- a/toonz/sources/tnztools/rastertapetool.cpp +++ b/toonz/sources/tnztools/rastertapetool.cpp @@ -72,7 +72,7 @@ public: //------------------------------------------------------------------- - void redo() const { + void redo() const override { TToonzImageP image = getImage(); if (!image) return; TAutocloser ac(image->getRaster(), m_params.m_closingDistance, @@ -88,10 +88,10 @@ public: //------------------------------------------------------------------- - int getSize() const { return sizeof(*this) + TRasterUndo::getSize(); } + int getSize() const override { return sizeof(*this) + TRasterUndo::getSize(); } - QString getToolName() { return QString("Autoclose Tool"); } - int getHistoryType() { return HistoryType::AutocloseTool; } + QString getToolName() override { return QString("Autoclose Tool"); } + int getHistoryType() override { return HistoryType::AutocloseTool; } }; } // namespace @@ -169,11 +169,11 @@ public: //------------------------------------------------------------ - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } //------------------------------------------------------------ - void updateTranslation() { + void updateTranslation() override { m_closeType.setQStringName(tr("Type:")); m_distance.setQStringName(tr("Distance:")); m_inkIndex.setQStringName(tr("Style Index:")); @@ -184,7 +184,7 @@ public: //------------------------------------------------------------ - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { if (m_closeType.getValue() == RECT_CLOSE) { if (!m_selecting) return; m_selectingRect.x1 = pos.x; @@ -372,7 +372,7 @@ public: //---------------------------------------------------------------------- - void leftButtonUp(const TPointD &pos, const TMouseEvent &e) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override { TToonzImageP ti = TToonzImageP(getImage(true)); if (!ti) return; @@ -439,7 +439,7 @@ public: //------------------------------------------------------------ - void draw() { + void draw() override { double pixelSize2 = getPixelSize() * getPixelSize(); m_thick = sqrt(pixelSize2) / 2.0; if (m_closeType.getValue() == RECT_CLOSE) { @@ -477,7 +477,7 @@ public: //------------------------------------------------------------ - bool onPropertyChanged(std::string propertyName) { + bool onPropertyChanged(std::string propertyName) override { if (propertyName == m_closeType.getName()) { AutocloseVectorType = ::to_string(m_closeType.getValue()); resetMulti(); @@ -523,7 +523,7 @@ public: //---------------------------------------------------------------------- - void onImageChanged() { + void onImageChanged() override { if (!m_multi.getValue()) return; TTool::Application *app = TTool::getApplication(); TXshSimpleLevel *xshl = 0; @@ -551,7 +551,7 @@ public: //---------------------------------------------------------------------- - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { TToonzImageP ti = TToonzImageP(getImage(true)); if (!ti) return; @@ -600,7 +600,7 @@ public: //---------------------------------------------------------------------- - void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) override { TToonzImageP ti = TToonzImageP(getImage(true)); if (m_closeType.getValue() == POLYLINE_CLOSE && ti) { closePolyline(pos); @@ -629,7 +629,7 @@ public: //---------------------------------------------------------------------- - void mouseMove(const TPointD &pos, const TMouseEvent &e) { + void mouseMove(const TPointD &pos, const TMouseEvent &e) override { if (m_closeType.getValue() == POLYLINE_CLOSE) { m_mousePosition = pos; invalidate(); @@ -638,17 +638,17 @@ public: //---------------------------------------------------------------------- - void onEnter() { + void onEnter() override { // getApplication()->editImage(); } //---------------------------------------------------------------------- - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } //---------------------------------------------------------------------- - void onActivate() { + void onActivate() override { if (m_firstTime) { m_closeType.setValue(::to_wstring(AutocloseVectorType.getValue())); m_distance.setValue(AutocloseDistance); @@ -663,11 +663,11 @@ public: //---------------------------------------------------------------------- - void onDeactivate() {} + void onDeactivate() override {} //---------------------------------------------------------------------- - int getCursorId() const { + int getCursorId() const override { if (ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg) return ToolCursor::TapeCursorWhite; else diff --git a/toonz/sources/tnztools/rgbpickertool.cpp b/toonz/sources/tnztools/rgbpickertool.cpp index 9a26dd7..5886b53 100644 --- a/toonz/sources/tnztools/rgbpickertool.cpp +++ b/toonz/sources/tnztools/rgbpickertool.cpp @@ -95,13 +95,13 @@ public: } } - void undo() const { setColor(m_oldValue); } + void undo() const override { setColor(m_oldValue); } - void redo() const { setColor(m_newValue); } + void redo() const override { setColor(m_newValue); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("RGB Picker (R%1, G%2, B%3)") .arg(QString::number((int)m_newValue.r)) .arg(QString::number((int)m_newValue.g)) diff --git a/toonz/sources/tnztools/rgbpickertool.h b/toonz/sources/tnztools/rgbpickertool.h index cc3e86f..8137680 100644 --- a/toonz/sources/tnztools/rgbpickertool.h +++ b/toonz/sources/tnztools/rgbpickertool.h @@ -43,9 +43,9 @@ public: /*-- ToolOptionBox上にPassiveに拾った色を表示するため --*/ void setToolOptionsBox(RGBPickerToolOptionsBox *toolOptionsBox); - ToolType getToolType() const { return TTool::LevelReadTool; } + ToolType getToolType() const override { return TTool::LevelReadTool; } - void updateTranslation(); + void updateTranslation() override; // Used to notify and set the currentColor outside the draw() methods: // using special style there was a conflict between the draw() methods of the @@ -54,19 +54,19 @@ public: // use // another glContext - void onImageChanged(); + void onImageChanged() override; - void draw(); + void draw() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; - void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e); + void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) override; - void mouseMove(const TPointD &pos, const TMouseEvent &e); + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; void pick(TPoint pos); @@ -74,13 +74,13 @@ public: void pickStroke(); - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; - void onActivate(); + void onActivate() override; - TPropertyGroup *getProperties(int targetType); + TPropertyGroup *getProperties(int targetType) override; - int getCursorId() const; + int getCursorId() const override; void doPolylinePick(); diff --git a/toonz/sources/tnztools/rulertool.h b/toonz/sources/tnztools/rulertool.h index 3665169..f8ffc97 100644 --- a/toonz/sources/tnztools/rulertool.h +++ b/toonz/sources/tnztools/rulertool.h @@ -30,23 +30,23 @@ public: void setToolOptionsBox(RulerToolOptionsBox *toolOptionsBox); - ToolType getToolType() const { return TTool::GenericTool; } + ToolType getToolType() const override { return TTool::GenericTool; } - void onImageChanged(); + void onImageChanged() override; - void draw(); + void draw() override; - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; - void mouseMove(const TPointD &pos, const TMouseEvent &e); + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; - void onActivate(); + void onActivate() override; - int getCursorId() const; + int getCursorId() const override; void updateToolOption(); diff --git a/toonz/sources/tnztools/screenpicker.cpp b/toonz/sources/tnztools/screenpicker.cpp index 896ee1a..92733c2 100644 --- a/toonz/sources/tnztools/screenpicker.cpp +++ b/toonz/sources/tnztools/screenpicker.cpp @@ -147,7 +147,7 @@ void ScreenPicker::startGrab() { class PickScreenCommandHandler : public MenuItemHandler { public: PickScreenCommandHandler(CommandId cmdId) : MenuItemHandler(cmdId) {} - void execute() { + void execute() override { static ScreenPicker *picker = new ScreenPicker; picker->startGrab(); } diff --git a/toonz/sources/tnztools/selectiontool.cpp b/toonz/sources/tnztools/selectiontool.cpp index ec77adb..782f9c6 100644 --- a/toonz/sources/tnztools/selectiontool.cpp +++ b/toonz/sources/tnztools/selectiontool.cpp @@ -307,17 +307,17 @@ public: UndoMoveCenter(SelectionTool *tool, const TAffine &aff) : m_tool(tool), m_aff(aff) {} ~UndoMoveCenter() {} - void undo() const { + void undo() const override { m_tool->setCenter(m_aff.inv() * m_tool->getCenter()); m_tool->invalidate(); } - void redo() const { + void redo() const override { m_tool->setCenter(m_aff * m_tool->getCenter()); m_tool->invalidate(); } - int getSize() const { return sizeof(*this) + sizeof(*m_tool); } + int getSize() const override { return sizeof(*this) + sizeof(*m_tool); } - QString getHistoryString() { return QObject::tr("Move Center"); } + QString getHistoryString() override { return QObject::tr("Move Center"); } }; //============================================================================= @@ -336,10 +336,10 @@ public: m_transform *= aff; getTool()->invalidate(); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { m_startPos = pos; } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { TPointD delta = pos - m_startPos; FourPoints bbox = getTool()->getBBox(); TPointD bboxCenter = 0.5 * (bbox.getP11() + bbox.getP00()); @@ -352,11 +352,11 @@ public: else translateCenter(aff); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &e) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override { UndoMoveCenter *undo = new UndoMoveCenter(getTool(), m_transform); TUndoManager::manager()->add(undo); } - void draw() {} + void draw() override {} }; //============================================================================= diff --git a/toonz/sources/tnztools/selectiontool.h b/toonz/sources/tnztools/selectiontool.h index e268032..eced7fa 100644 --- a/toonz/sources/tnztools/selectiontool.h +++ b/toonz/sources/tnztools/selectiontool.h @@ -179,7 +179,8 @@ public: virtual void applyTransform(FourPoints bbox) = 0; virtual void applyTransform(TAffine aff){}; - virtual void addTransformUndo() = 0; + + void addTransformUndo() override = 0; int getSimmetricPointIndex(int index) const; /*! Return before point \b index between possible point index @@ -202,10 +203,10 @@ public: bool isDragging() const { return m_isDragging; } TPointD getStartScaleValue() const { return m_startScaleValue; } - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - virtual void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) = 0; - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - virtual void draw() = 0; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override = 0; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void draw() override = 0; }; //============================================================================= @@ -388,7 +389,7 @@ protected: void addPointPolyline(const TPointD &pos); void closePolyline(const TPointD &pos); - void updateTranslation(); + void updateTranslation() override; void drawPolylineSelection(); void drawRectSelection(const TImage *image); @@ -400,7 +401,7 @@ public: SelectionTool(int targetType); ~SelectionTool(); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } TPointD getCenter(int index = 0) const; void setCenter(const TPointD ¢er, int index = 0); @@ -427,30 +428,30 @@ public: virtual QSet getSelectedStyles() const { return QSet(); } - virtual void leftButtonDown(const TPointD &pos, const TMouseEvent &); - virtual void leftButtonDrag(const TPointD &pos, const TMouseEvent &) = 0; - virtual void leftButtonUp(const TPointD &pos, const TMouseEvent &) = 0; - void mouseMove(const TPointD &pos, const TMouseEvent &e); - virtual void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) = 0; - bool keyDown(int key, TUINT32 flags, const TPoint &pos); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override = 0; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override = 0; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) override = 0; + bool keyDown(int key, TUINT32 flags, const TPoint &pos) override; - int getCursorId() const; + int getCursorId() const override; - virtual void draw() = 0; + void draw() override = 0; - virtual TSelection *getSelection() = 0; + TSelection *getSelection() override = 0; virtual bool isSelectionEmpty() = 0; virtual void computeBBox() = 0; - void onActivate(); - void onDeactivate(); - virtual void onImageChanged() = 0; - void onSelectionChanged(); + void onActivate() override; + void onDeactivate() override; + void onImageChanged() override = 0; + void onSelectionChanged() override; - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; }; #endif // SELECTIONTOOL_INCLUDED diff --git a/toonz/sources/tnztools/setsaveboxtool.cpp b/toonz/sources/tnztools/setsaveboxtool.cpp index c6fcfb0..5fda5c7 100644 --- a/toonz/sources/tnztools/setsaveboxtool.cpp +++ b/toonz/sources/tnztools/setsaveboxtool.cpp @@ -31,7 +31,7 @@ public: , m_modifiedSavebox(modifiedSavebox) , m_originalSavebox(originalSavebox) {} - void redo() const { + void redo() const override { TToonzImageP ti = getImage(); if (!ti) return; TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged(); @@ -40,18 +40,18 @@ public: notifyImageChanged(); } - void undo() const { + void undo() const override { TRasterUndo::undo(); TToonzImageP ti = getImage(); if (!ti) return; ti->setSavebox(m_originalSavebox); } - int getSize() const { return TRasterUndo::getSize() + sizeof(this) + 100; } + int getSize() const override { return TRasterUndo::getSize() + sizeof(this) + 100; } ~SetSaveboxUndo() {} - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Set Save Box : (X%1,Y%2,W%3,H%4)->(X%5,Y%6,W%7,H%8)") .arg(QString::number(m_originalSavebox.x0)) .arg(QString::number(m_originalSavebox.y0)) diff --git a/toonz/sources/tnztools/skeletonsubtools.cpp b/toonz/sources/tnztools/skeletonsubtools.cpp index f1f7236..13f21b3 100644 --- a/toonz/sources/tnztools/skeletonsubtools.cpp +++ b/toonz/sources/tnztools/skeletonsubtools.cpp @@ -620,7 +620,7 @@ public: m_nodes.back().m_wasKeyframe = param->isKeyframe(frame); } - void onAdd() { + void onAdd() override { TXsheet *xsh = TTool::getApplication()->getCurrentXsheet()->getXsheet(); m_frame = TTool::getApplication()->getCurrentFrame()->getFrame(); for (int i = 0; i < (int)m_nodes.size(); i++) { @@ -641,7 +641,7 @@ public: obj->invalidate(); } - void undo() const { + void undo() const override { TXsheet *xsh = TTool::getApplication()->getCurrentXsheet()->getXsheet(); for (int i = 0; i < (int)m_nodes.size(); i++) { TDoubleParam *param = @@ -656,7 +656,7 @@ public: TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged(); TTool::getApplication()->getCurrentObject()->notifyObjectIdChanged(false); } - void redo() const { + void redo() const override { TXsheet *xsh = TTool::getApplication()->getCurrentXsheet()->getXsheet(); for (int i = 0; i < (int)m_nodes.size(); i++) { TDoubleParam *param = @@ -669,7 +669,7 @@ public: TTool::getApplication()->getCurrentObject()->notifyObjectIdChanged(false); } - int getSize() const { + int getSize() const override { return sizeof(*this) + (int)m_nodes.size() * sizeof(Node); } }; @@ -1083,10 +1083,10 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - void onAdd() { m_newFid = getDrawing(); } - void undo() const { setDrawing(m_oldFid); } - void redo() const { setDrawing(m_newFid); } - int getSize() const { return sizeof(*this); } + void onAdd() override { m_newFid = getDrawing(); } + void undo() const override { setDrawing(m_oldFid); } + void redo() const override { setDrawing(m_newFid); } + int getSize() const override { return sizeof(*this); } TFrameId getOldDrawing() const { return m_oldFid; } }; diff --git a/toonz/sources/tnztools/skeletonsubtools.h b/toonz/sources/tnztools/skeletonsubtools.h index f095a4b..27d2044 100644 --- a/toonz/sources/tnztools/skeletonsubtools.h +++ b/toonz/sources/tnztools/skeletonsubtools.h @@ -47,9 +47,9 @@ class DragCenterTool : public DragTool { public: DragCenterTool(SkeletonTool *tool); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; }; //--------------------------------------------------------- @@ -79,7 +79,7 @@ public: m_after.applyValues(); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; }; //--------------------------------------------------------- @@ -90,8 +90,8 @@ class DragPositionTool : public DragChannelTool { public: DragPositionTool(SkeletonTool *tool); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; }; //--------------------------------------------------------- @@ -104,8 +104,8 @@ class DragRotationTool : public DragChannelTool { public: DragRotationTool(SkeletonTool *tool, bool snapped); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; }; //--------------------------------------------------------- @@ -143,11 +143,11 @@ class ParentChangeTool : public DragTool { public: ParentChangeTool(SkeletonTool *tool, TTool::Viewer *viewer); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; - void draw(); + void draw() override; }; //--------------------------------------------------------- @@ -200,11 +200,11 @@ public: void setAngleOffsets(); void apply(); - void leftButtonDown(const TPointD &, const TMouseEvent &e); - void leftButtonDrag(const TPointD &, const TMouseEvent &e); - void leftButtonUp(const TPointD &, const TMouseEvent &e); + void leftButtonDown(const TPointD &, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &, const TMouseEvent &e) override; - void draw(); + void draw() override; }; //--------------------------------------------------------- @@ -217,9 +217,9 @@ class ChangeDrawingTool : public DragTool { public: ChangeDrawingTool(SkeletonTool *tool, int d); - void leftButtonDown(const TPointD &, const TMouseEvent &e); - void leftButtonDrag(const TPointD &, const TMouseEvent &e); - void leftButtonUp(const TPointD &, const TMouseEvent &e); + void leftButtonDown(const TPointD &, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &, const TMouseEvent &e) override; bool changeDrawing(int delta); }; diff --git a/toonz/sources/tnztools/skeletontool.cpp b/toonz/sources/tnztools/skeletontool.cpp index 21d24f8..c993a05 100644 --- a/toonz/sources/tnztools/skeletontool.cpp +++ b/toonz/sources/tnztools/skeletontool.cpp @@ -569,7 +569,7 @@ public: } } - void undo() const { + void undo() const override { m_tool->setTemporaryPinnedColumns(m_oldTemp); if (m_columnIndex >= 0) @@ -593,7 +593,7 @@ public: notify(); } - void redo() const { + void redo() const override { TXsheet *xsh = getXsheet(); for (int i = 0; i < (int)m_keyframes.size(); i++) { TStageObject *stageObject = @@ -612,7 +612,7 @@ public: } notify(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } }; //------------------------------------------------------------------- diff --git a/toonz/sources/tnztools/strokeselection.cpp b/toonz/sources/tnztools/strokeselection.cpp index 49df4d1..0ac11f8 100644 --- a/toonz/sources/tnztools/strokeselection.cpp +++ b/toonz/sources/tnztools/strokeselection.cpp @@ -179,17 +179,17 @@ public: CopyStrokesUndo(QMimeData *oldData, QMimeData *newData) : m_oldData(oldData), m_newData(newData) {} - void undo() const { + void undo() const override { QClipboard *clipboard = QApplication::clipboard(); clipboard->setMimeData(cloneData(m_oldData), QClipboard::Clipboard); } - void redo() const { + void redo() const override { QClipboard *clipboard = QApplication::clipboard(); clipboard->setMimeData(cloneData(m_newData), QClipboard::Clipboard); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //============================================================================= @@ -219,7 +219,7 @@ public: ~PasteStrokesUndo() { delete m_oldData; } - void undo() const { + void undo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); // Se la selezione corrente e' la stroke selection devo svuotarla, @@ -232,7 +232,7 @@ public: deleteStrokesWithoutUndo(image, indexes); } - void redo() const { + void redo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); std::set indexes = m_indexes; @@ -247,7 +247,7 @@ public: clipboard->setMimeData(data, QClipboard::Clipboard); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //-------------------------------------------------------------------- @@ -271,7 +271,7 @@ public: for (i = 0; i < (int)m_strokes.size(); i++) delete m_strokes[i].second; } - void undo() const { + void undo() const override { TVectorImageP vi = m_level->getFrame(m_frameId, true); int i; for (i = 0; i < (int)m_strokes.size(); i++) { @@ -286,7 +286,7 @@ public: TTool::getApplication()->getCurrentTool()->getTool()->notifyImageChanged(); } - void redo() const { + void redo() const override { int i; TVectorImageP vi = m_level->getFrame(m_frameId, true); for (i = 0; i < (int)m_strokes.size(); i++) { @@ -297,7 +297,7 @@ public: TTool::getApplication()->getCurrentTool()->getTool()->notifyImageChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //============================================================================= // DeleteFramesUndo @@ -323,7 +323,7 @@ public: ~DeleteStrokesUndo() { delete m_data; } - void undo() const { + void undo() const override { QClipboard *clipboard = QApplication::clipboard(); QMimeData *oldData = cloneData(clipboard->mimeData()); @@ -336,13 +336,13 @@ public: clipboard->setMimeData(oldData, QClipboard::Clipboard); } - void redo() const { + void redo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); std::set indexes = m_indexes; deleteStrokesWithoutUndo(image, indexes); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //============================================================================= @@ -358,7 +358,7 @@ public: ~CutStrokesUndo() {} - void redo() const { + void redo() const override { TVectorImageP image = m_level->getFrame(m_frameId, true); std::set indexes = m_indexes; cutStrokesWithoutUndo(image, indexes); @@ -634,7 +634,7 @@ public: m_oldStyles.push_back(stroke->getStyle()); } - void undo() const { + void undo() const override { UINT size = m_strokeIndexes.size(); assert(size == m_oldStyles.size()); @@ -647,7 +647,7 @@ public: TTool::getApplication()->getCurrentTool()->getTool()->notifyImageChanged(); } - void redo() const { + void redo() const override { UINT size = m_strokeIndexes.size(); assert(size == m_oldStyles.size()); @@ -660,7 +660,7 @@ public: TTool::getApplication()->getCurrentTool()->getTool()->notifyImageChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + m_strokeIndexes.capacity() * sizeof(m_strokeIndexes[0]) + m_oldStyles.capacity() * sizeof(m_oldStyles[0]); diff --git a/toonz/sources/tnztools/stylepickertool.cpp b/toonz/sources/tnztools/stylepickertool.cpp index 217aaef..77000fd 100644 --- a/toonz/sources/tnztools/stylepickertool.cpp +++ b/toonz/sources/tnztools/stylepickertool.cpp @@ -44,7 +44,7 @@ class StylePickerTool : public TTool { TBoolProperty m_passivePick; public: - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } StylePickerTool() : TTool("T_StylePicker") @@ -62,16 +62,16 @@ public: m_passivePick.setId("PassivePick"); } - ToolType getToolType() const { return TTool::LevelReadTool; } + ToolType getToolType() const override { return TTool::LevelReadTool; } - void draw() {} + void draw() override {} - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { m_oldStyleId = m_currentStyleId = getApplication()->getCurrentLevelStyleIndex(); pick(pos, e); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { pick(pos, e); } @@ -191,7 +191,7 @@ public: getApplication()->setCurrentLevelStyleIndex(styleId); } - void mouseMove(const TPointD &pos, const TMouseEvent &e) { + void mouseMove(const TPointD &pos, const TMouseEvent &e) override { if (!m_passivePick.getValue()) return; /*--- PassiveにStyleを拾う機能 ---*/ PaletteController *controller = @@ -218,9 +218,9 @@ public: controller->notifyStylePassivePicked(inkStyleId, paintStyleId, tone); } - void onActivate() {} + void onActivate() override {} - int getCursorId() const { + int getCursorId() const override { bool isBlackBG = ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg; if (m_colorType.getValue() == LINES) diff --git a/toonz/sources/tnztools/tool.cpp b/toonz/sources/tnztools/tool.cpp index 6a4e3e0..c5516c0 100644 --- a/toonz/sources/tnztools/tool.cpp +++ b/toonz/sources/tnztools/tool.cpp @@ -60,13 +60,13 @@ std::set *toolNames = 0; // Local classes struct DummyTool : public TTool { - ToolType getToolType() const { + ToolType getToolType() const override { return TTool::LevelReadTool; } // Test level type ToolTargetType getTargetType() const { return TTool::NoTarget; } // Works on nothing - int getCursorId() const { + int getCursorId() const override { return ToolCursor::ForbiddenCursor; } // Forbids everything diff --git a/toonz/sources/tnztools/tooloptionscontrols.h b/toonz/sources/tnztools/tooloptionscontrols.h index 742fcce..2eb1376 100644 --- a/toonz/sources/tnztools/tooloptionscontrols.h +++ b/toonz/sources/tnztools/tooloptionscontrols.h @@ -69,7 +69,7 @@ public: const std::string &propertyName() const { return m_propertyName; } - void onPropertyChanged() { updateStatus(); } + void onPropertyChanged() override { updateStatus(); } void notifyTool(); // return true if the control is belonging to the visible viewer bool isInVisibleViewer(QWidget *widget); @@ -90,12 +90,12 @@ protected: public: ToolOptionCheckbox(TTool *tool, TBoolProperty *property, ToolHandle *toolHandle = 0, QWidget *parent = 0); - void updateStatus(); + void updateStatus() override; public slots: void doClick(); protected: - void nextCheckState(); + void nextCheckState() override; }; //----------------------------------------------------------------------------- @@ -109,7 +109,7 @@ protected: public: ToolOptionSlider(TTool *tool, TDoubleProperty *property, ToolHandle *toolHandle = 0); - void updateStatus(); + void updateStatus() override; protected slots: @@ -131,7 +131,7 @@ public: ToolOptionPairSlider(TTool *tool, TDoublePairProperty *property, const QString &leftName, const QString &rightName, ToolHandle *toolHandle = 0); - void updateStatus(); + void updateStatus() override; protected slots: @@ -155,7 +155,7 @@ public: ToolOptionIntPairSlider(TTool *tool, TIntPairProperty *property, const QString &leftName, const QString &rightName, ToolHandle *toolHandle = 0); - void updateStatus(); + void updateStatus() override; protected slots: @@ -177,7 +177,7 @@ protected: public: ToolOptionIntSlider(TTool *tool, TIntProperty *property, ToolHandle *toolHandle = 0); - void updateStatus(); + void updateStatus() override; protected slots: @@ -198,7 +198,7 @@ public: ToolOptionCombo(TTool *tool, TEnumProperty *property, ToolHandle *toolHandle = 0); void loadEntries(); - void updateStatus(); + void updateStatus() override; public slots: @@ -217,7 +217,7 @@ protected: public: ToolOptionPopupButton(TTool *tool, TEnumProperty *property); - void updateStatus(); + void updateStatus() override; TEnumProperty *getProperty() { return m_property; } public slots: @@ -238,7 +238,7 @@ protected: public: ToolOptionTextField(TTool *tool, TStringProperty *property); - void updateStatus(); + void updateStatus() override; public slots: @@ -258,7 +258,7 @@ protected: public: StyleIndexFieldAndChip(TTool *tool, TStyleIndexProperty *property, TPaletteHandle *pltHandle, ToolHandle *toolHandle = 0); - void updateStatus(); + void updateStatus() override; public slots: @@ -300,7 +300,7 @@ public: void setGlobalKey(TBoolProperty *globalKey, TPropertyGroup *globalGroup); - void updateStatus(); + void updateStatus() override; protected slots: @@ -373,7 +373,7 @@ public: ~PegbarChannelField() {} - void updateStatus(); + void updateStatus() override; public slots: @@ -401,7 +401,7 @@ public: ~PegbarCenterField() {} - void updateStatus(); + void updateStatus() override; protected slots: @@ -417,7 +417,7 @@ public: NoScaleField(TTool *tool, QString name); ~NoScaleField() {} - void updateStatus(); + void updateStatus() override; protected slots: @@ -438,7 +438,7 @@ public: QIcon icon = QIcon(), QString tooltip = QString()); ~PropertyMenuButton() {} - void updateStatus(); + void updateStatus() override; protected slots: diff --git a/toonz/sources/tnztools/trackertool.cpp b/toonz/sources/tnztools/trackertool.cpp index 9dcfeac..0ef5045 100644 --- a/toonz/sources/tnztools/trackertool.cpp +++ b/toonz/sources/tnztools/trackertool.cpp @@ -78,9 +78,9 @@ public: select(objectId, trackerRegionIndex); } - bool isEmpty() const { return m_objtp.empty(); } + bool isEmpty() const override { return m_objtp.empty(); } - void selectNone() { m_objtp.clear(); } + void selectNone() override { m_objtp.clear(); } HookSet *getHookSet() const { TXshLevel *xl = TTool::getApplication()->getCurrentLevel()->getLevel(); @@ -128,7 +128,7 @@ return TDataP(); */ return false; } - void enableCommands(); + void enableCommands() override; void convertToRegion(); }; @@ -183,39 +183,39 @@ class TrackerTool : public TTool { public: TrackerTool(); - ToolType getToolType() const { return TTool::LevelReadTool; } + ToolType getToolType() const override { return TTool::LevelReadTool; } - void updateTranslation(); + void updateTranslation() override; TrackerObjectsSet *getTrackerObjectsSet() const; HookSet *getHookSet() const; - void draw(); + void draw() override; void deleteSelectedTrackerRegion(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void mouseMove(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; - bool keyDown(int key, TUINT32 flags, const TPoint &pos); + bool keyDown(int key, TUINT32 flags, const TPoint &pos) override; // bool moveCursor(const TPointD &pos){} - void onEnter(); - void onLeave(); - void onActivate(); - void onDeactivate(); + void onEnter() override; + void onLeave() override; + void onActivate() override; + void onDeactivate() override; - void onImageChanged() {} - void reset(); - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + void onImageChanged() override {} + void reset() override; + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } void onSelectionChanged() { invalidate(); } - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; bool select(const TSelection *) { return false; } bool pick(int &hookIndex, const TPointD &pos); - int getCursorId() const; + int getCursorId() const override; } trackerTool; diff --git a/toonz/sources/tnztools/typetool.cpp b/toonz/sources/tnztools/typetool.cpp index 6c922fe..c8eca3e 100644 --- a/toonz/sources/tnztools/typetool.cpp +++ b/toonz/sources/tnztools/typetool.cpp @@ -119,7 +119,7 @@ public: m_strokes.push_back(s); } - void undo() const { + void undo() const override { TTool::Application *application = TTool::getApplication(); TVectorImageP image = m_level->getFrame(m_frameId, true); @@ -147,7 +147,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TVectorImageP image = m_level->getFrame(m_frameId, true); assert(!!image); @@ -178,7 +178,7 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { if (m_fillInformationAfter && m_fillInformationBefore) return sizeof(*this) + m_fillInformationBefore->capacity() * sizeof(TFilledRegionInf) + @@ -188,7 +188,7 @@ public: return sizeof(*this) + m_strokes.capacity() * sizeof(TStroke) + 500; } - QString getToolName() { return QString("Type Tool"); } + QString getToolName() override { return QString("Type Tool"); } }; //--------------------------------------------------------- @@ -205,7 +205,7 @@ public: ~RasterUndoTypeTool() { delete m_afterTiles; } - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TToonzImageP image = getImage(); if (!image) return; @@ -218,14 +218,14 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { if (m_afterTiles) return TRasterUndo::getSize() + m_afterTiles->getMemorySize(); else return TRasterUndo::getSize(); } - QString getToolName() { return QString("Type Tool"); } + QString getToolName() override { return QString("Type Tool"); } }; //--------------------------------------------------------- @@ -333,9 +333,9 @@ public: TypeTool(); ~TypeTool(); - void updateTranslation(); + void updateTranslation() override; - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } void init(); void initTypeFaces(); @@ -345,7 +345,7 @@ public: void setTypeface(std::wstring typeface); void setSize(std::wstring size); void setVertical(bool vertical); - void draw(); + void draw() override; void updateMouseCursor(const TPointD &pos); void updateStrokeChar(); @@ -355,13 +355,13 @@ public: void setCursorIndexFromPoint(TPointD point); - void mouseMove(const TPointD &pos, const TMouseEvent &); - void leftButtonDown(const TPointD &pos, const TMouseEvent &); - void rightButtonDown(const TPointD &pos, const TMouseEvent &); + void mouseMove(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override; + void rightButtonDown(const TPointD &pos, const TMouseEvent &) override; bool keyDown(int key, std::wstring unicodeChar, TUINT32 flags, - const TPoint &pos); + const TPoint &pos) override; void onInputText(std::wstring preedit, std::wstring commit, - int replacementStart, int replacementLen); + int replacementStart, int replacementLen) override; // cancella gli StrokeChar fra from e to-1 e inserisce nuovi StrokeChar // corrispondenti a text a partire da from @@ -380,17 +380,17 @@ public: void addTextToToonzImage(const TToonzImageP ¤tImage); void stopEditing(); - void reset(); + void reset() override; - void onActivate(); - void onDeactivate(); - void onImageChanged(); + void onActivate() override; + void onDeactivate() override; + void onImageChanged() override; - int getCursorId() const { return m_cursorId; } + int getCursorId() const override { return m_cursorId; } - bool onPropertyChanged(std::string propertyName); + bool onPropertyChanged(std::string propertyName) override; - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } int getColorClass() const { return 1; } diff --git a/toonz/sources/tnztools/vectorerasertool.cpp b/toonz/sources/tnztools/vectorerasertool.cpp index 73901d4..f14eff0 100644 --- a/toonz/sources/tnztools/vectorerasertool.cpp +++ b/toonz/sources/tnztools/vectorerasertool.cpp @@ -95,7 +95,7 @@ public: image->getBBox()); } - void onAdd() { + void onAdd() override { TVectorImageP image = m_level->getFrame(m_frameId, true); assert(!!image); if (!image) return; @@ -121,7 +121,7 @@ public: m_newStrokes.insert(std::map::value_type(index, s)); } - void undo() const { + void undo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -175,7 +175,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -229,16 +229,16 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + (m_oldFillInformation.capacity() + m_newFillInformation.capacity()) * sizeof(TFilledRegionInf) + 500; } - QString getToolName() { return QString("Vector Eraser Tool"); } + QString getToolName() override { return QString("Vector Eraser Tool"); } - int getHistoryType() { return HistoryType::EraserTool; } + int getHistoryType() override { return HistoryType::EraserTool; } }; } // namespace @@ -254,9 +254,9 @@ public: EraserTool(); ~EraserTool(); - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } - void draw(); + void draw() override; void startErase( TVectorImageP vi, @@ -267,23 +267,23 @@ public: void stopErase(TVectorImageP vi); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e); - void mouseMove(const TPointD &pos, const TMouseEvent &e); - bool onPropertyChanged(std::string propertyName); - void onEnter(); - void onLeave(); - void onActivate(); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDoubleClick(const TPointD &pos, const TMouseEvent &e) override; + void mouseMove(const TPointD &pos, const TMouseEvent &e) override; + bool onPropertyChanged(std::string propertyName) override; + void onEnter() override; + void onLeave() override; + void onActivate() override; - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - int getCursorId() const { return ToolCursor::EraserCursor; } - void onImageChanged(); + int getCursorId() const override { return ToolCursor::EraserCursor; } + void onImageChanged() override; /*-- ドラッグ中にツールが切り替わった場合、Eraseの終了処理を行う --*/ - void onDeactivate(); + void onDeactivate() override; private: TPropertyGroup m_prop; @@ -327,7 +327,7 @@ private: private: void resetMulti(); - void updateTranslation(); + void updateTranslation() override; // Metodi per disegnare la linea della modalita' Freehand void startFreehand(const TPointD &pos); diff --git a/toonz/sources/tnztools/vectorselectiontool.cpp b/toonz/sources/tnztools/vectorselectiontool.cpp index 51a9a21..eaa99bb 100644 --- a/toonz/sources/tnztools/vectorselectiontool.cpp +++ b/toonz/sources/tnztools/vectorselectiontool.cpp @@ -438,9 +438,9 @@ public: void registerStrokes(bool beforeModify = false); void transform(const std::vector &options, FourPoints bbox) const; - void undo() const; - void redo() const; - int getSize() const; + void undo() const override; + void redo() const override; + int getSize() const override; }; //----------------------------------------------------------------------------- @@ -1130,15 +1130,15 @@ class UndoEnterGroup : public TUndo { public: UndoEnterGroup(TVectorImageP vi, int strokeIndex) : m_vi(vi), m_strokeIndex(strokeIndex) {} - void undo() const { + void undo() const override { m_vi->exitGroup(); TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { m_vi->enterGroup(m_strokeIndex); TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //============================================================================= @@ -1152,16 +1152,16 @@ class UndoExitGroup : public TUndo { public: UndoExitGroup(TVectorImageP vi, int strokeIndex) : m_vi(vi), m_strokeIndex(strokeIndex) {} - void undo() const { + void undo() const override { m_vi->enterGroup(m_strokeIndex); TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { m_vi->exitGroup(); TTool::getApplication()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; } // namespace diff --git a/toonz/sources/tnztools/vectorselectiontool.h b/toonz/sources/tnztools/vectorselectiontool.h index daa19d8..15960f4 100644 --- a/toonz/sources/tnztools/vectorselectiontool.h +++ b/toonz/sources/tnztools/vectorselectiontool.h @@ -85,15 +85,15 @@ public: /*! Return \b index point, with index from 0 to 3. */ TPointD getPoint(int index) const { return m_newPoints[index]; } /*! Set \b index point to \b p, with index from 0 to 3. */ - void setPoint(int index, const TPointD &p); + void setPoint(int index, const TPointD &p) override; /*! Helper function. */ void setPoints(const TPointD &p0, const TPointD &p1, const TPointD &p2, - const TPointD &p3); + const TPointD &p3) override; /*! Helper function. */ TVectorImage *getDeformedImage() const { return m_vi.getPointer(); } void deformRegions(); - void deformImage(); + void deformImage() override; }; //============================================================================= @@ -120,9 +120,9 @@ public: void transform(const std::vector &strokes, FourPoints bbox, TPointD center, DeformValues deformValue) const; void restoreRegions() const; - void undo() const; - void redo() const; - int getSize() const; + void undo() const override; + void redo() const override; + int getSize() const override; private: VectorSelectionTool *m_tool; @@ -152,8 +152,8 @@ public: VectorDeformTool(VectorSelectionTool *tool); ~VectorDeformTool(); - void applyTransform(FourPoints bbox); - void addTransformUndo(); + void applyTransform(FourPoints bbox) override; + void addTransformUndo() override; /*! Trasform whole level and add undo. */ void transformWholeLevel(); @@ -163,9 +163,11 @@ protected: tcg::unique_ptr m_undo; protected: - virtual void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) {} - virtual void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - virtual void draw() {} + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override {} + + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + + void draw() override {} private: struct VFDScopedBlock; @@ -182,9 +184,9 @@ class VectorRotationTool : public VectorDeformTool { public: VectorRotationTool(VectorSelectionTool *tool); - void transform(TAffine aff, double angle); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void draw(); + void transform(TAffine aff, double angle) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void draw() override; }; //============================================================================= @@ -197,7 +199,7 @@ class VectorFreeDeformTool : public VectorDeformTool { public: VectorFreeDeformTool(VectorSelectionTool *tool); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; }; //============================================================================= @@ -210,9 +212,9 @@ class VectorMoveSelectionTool : public VectorDeformTool { public: VectorMoveSelectionTool(VectorSelectionTool *tool); - void transform(TAffine aff); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void transform(TAffine aff) override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; }; //============================================================================= @@ -225,10 +227,10 @@ class VectorScaleTool : public VectorDeformTool { public: VectorScaleTool(VectorSelectionTool *tool, int type); - TPointD transform(int index, TPointD newPos); //!< Returns scale value. + TPointD transform(int index, TPointD newPos) override; //!< Returns scale value. - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; }; //============================================================================= @@ -252,10 +254,10 @@ public: void changeImageThickness(TVectorImage &vi, double newThickness); void addUndo(); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &e); - void draw() {} + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override; + void draw() override {} }; } // namespace DragSelectionTool @@ -274,15 +276,15 @@ class VectorSelectionTool : public SelectionTool { public: VectorSelectionTool(int targetType); - void setNewFreeDeformer(); + void setNewFreeDeformer() override; void setCanEnterGroup(bool value) { m_canEnterGroup = value; } - bool isConstantThickness() const { return m_constantThickness.getValue(); } - bool isLevelType() const; - bool isSelectedFramesType() const; - bool isSameStyleType() const; - bool isModifiableSelectionType() const; + bool isConstantThickness() const override { return m_constantThickness.getValue(); } + bool isLevelType() const override; + bool isSelectedFramesType() const override; + bool isSameStyleType() const override; + bool isModifiableSelectionType() const override; const std::set &selectedStyles() const { return m_levelSelection.styles(); @@ -297,29 +299,29 @@ public: const LevelSelection &levelSelection() const { return m_levelSelection; } - TSelection *getSelection(); - bool isSelectionEmpty(); + TSelection *getSelection() override; + bool isSelectionEmpty() override; - void computeBBox(); + void computeBBox() override; - TPropertyGroup *getProperties(int targetType); + TPropertyGroup *getProperties(int targetType) override; protected: - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; - void leftButtonDrag(const TPointD &pos, const TMouseEvent &); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); - void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e); - void addContextMenuItems(QMenu *menu); + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; + void leftButtonDoubleClick(const TPointD &, const TMouseEvent &e) override; + void addContextMenuItems(QMenu *menu) override; - void draw(); + void draw() override; - void updateAction(TPointD pos, const TMouseEvent &e); - void onSelectedFramesChanged(); + void updateAction(TPointD pos, const TMouseEvent &e) override; + void onSelectedFramesChanged() override; - bool onPropertyChanged(std::string propertyName); - void onImageChanged(); + bool onPropertyChanged(std::string propertyName) override; + void onImageChanged() override; private: class AttachedLevelSelection : public LevelSelection { @@ -330,7 +332,7 @@ private: AttachedLevelSelection(StrokeSelection &strokeSelection) : m_strokeSelection(strokeSelection) {} - void selectNone() { + void selectNone() override { LevelSelection::selectNone(), m_strokeSelection.selectNone(); } }; @@ -358,15 +360,15 @@ private: private: void modifySelectionOnClick(TImageP image, const TPointD &pos, - const TMouseEvent &e); + const TMouseEvent &e) override; bool selectStroke(int index, bool toggle); - void doOnActivate(); - void doOnDeactivate(); + void doOnActivate() override; + void doOnDeactivate() override; void selectRegionVectorImage(); - void updateTranslation(); + void updateTranslation() override; /*! \details The updateSelectionTarget() function reads the selection target (styles, frames, etc) selected by the user, and ensures diff --git a/toonz/sources/tnztools/vectortapetool.cpp b/toonz/sources/tnztools/vectortapetool.cpp index 7861856..39aff8b 100644 --- a/toonz/sources/tnztools/vectortapetool.cpp +++ b/toonz/sources/tnztools/vectortapetool.cpp @@ -92,7 +92,7 @@ public: if (m_isLastInBlock) delete m_fillInformation; } - void undo() const { + void undo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; if (app->getCurrentFrame()->isEditingScene()) { @@ -125,7 +125,7 @@ public: notifyImageChanged(); } - void redo() const { + void redo() const override { TTool::Application *app = TTool::getApplication(); if (!app) return; @@ -158,13 +158,13 @@ public: notifyImageChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + m_fillInformation->capacity() * sizeof(TFilledRegionInf) + 500; } - virtual QString getToolName() { return QString("Autoclose Tool"); } - int getHistoryType() { return HistoryType::AutocloseTool; } + QString getToolName() override { return QString("Autoclose Tool"); } + int getHistoryType() override { return HistoryType::AutocloseTool; } }; } // namespace @@ -234,11 +234,11 @@ public: //----------------------------------------------------------------------------- - ToolType getToolType() const { return TTool::LevelWriteTool; } + ToolType getToolType() const override { return TTool::LevelWriteTool; } //----------------------------------------------------------------------------- - bool onPropertyChanged(std::string propertyName) { + bool onPropertyChanged(std::string propertyName) override { TapeMode = ::to_string(m_mode.getValue()); TapeSmooth = (int)(m_smooth.getValue()); std::wstring s = m_type.getValue(); @@ -255,7 +255,7 @@ public: } //----------------------------------------------------------------------------- - void updateTranslation() { + void updateTranslation() override { m_smooth.setQStringName(tr("Smooth")); m_joinStrokes.setQStringName(tr("Join Vectors")); m_mode.setQStringName(tr("Mode:")); @@ -264,9 +264,9 @@ public: //----------------------------------------------------------------------------- - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - void draw() { + void draw() override { TVectorImageP vi(getImage(false)); if (!m_draw) return; if (!vi) return; @@ -313,7 +313,7 @@ public: //----------------------------------------------------------------------------- - void mouseMove(const TPointD &pos, const TMouseEvent &) { + void mouseMove(const TPointD &pos, const TMouseEvent &) override { TVectorImageP vi(getImage(false)); if (!vi) return; @@ -373,7 +373,7 @@ public: //----------------------------------------------------------------------------- - void leftButtonDown(const TPointD &pos, const TMouseEvent &) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &) override { if (!(TVectorImageP)getImage(false)) return; if (m_type.getValue() == RECT) { @@ -384,7 +384,7 @@ public: //----------------------------------------------------------------------------- - void leftButtonDrag(const TPointD &pos, const TMouseEvent &) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &) override { TVectorImageP vi(getImage(false)); if (!vi) return; @@ -684,7 +684,7 @@ public: } //------------------------------------------------------------------------------- - void leftButtonUp(const TPointD &, const TMouseEvent &) { + void leftButtonUp(const TPointD &, const TMouseEvent &) override { TVectorImageP vi(getImage(true)); if (vi && m_type.getValue() == RECT) { @@ -723,19 +723,19 @@ public: //----------------------------------------------------------------------------- - void onEnter() { + void onEnter() override { // getApplication()->editImage(); m_draw = true; m_selectionRect = TRectD(); m_startRect = TPointD(); } - void onLeave() { + void onLeave() override { m_draw = false; // m_strokeIndex1=-1; } - void onActivate() { + void onActivate() override { if (!m_firstTime) return; std::wstring s = ::to_wstring(TapeMode.getValue()); @@ -750,7 +750,7 @@ public: m_startRect = TPointD(); } - int getCursorId() const { + int getCursorId() const override { if (ToonzCheck::instance()->getChecks() & ToonzCheck::eBlackBg) return ToolCursor::TapeCursorWhite; else diff --git a/toonz/sources/tnztools/viewtools.cpp b/toonz/sources/tnztools/viewtools.cpp index e107360..a0ef448 100644 --- a/toonz/sources/tnztools/viewtools.cpp +++ b/toonz/sources/tnztools/viewtools.cpp @@ -27,11 +27,11 @@ public: bind(TTool::AllTargets); } - ToolType getToolType() const { return TTool::GenericTool; } + ToolType getToolType() const override { return TTool::GenericTool; } - void updateMatrix() { return setMatrix(TAffine()); } + void updateMatrix() override { return setMatrix(TAffine()); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { if (!m_viewer) return; m_dragging = true; int v = 1; @@ -42,24 +42,24 @@ public: m_factor = 1; invalidate(); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { int d = m_oldY - e.m_pos.y; m_oldY = e.m_pos.y; double f = exp(-d * 0.01); m_factor = f; m_viewer->zoom(m_center, f); } - void leftButtonUp(const TPointD &pos, const TMouseEvent &e) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override { m_dragging = false; invalidate(); } - void rightButtonDown(const TPointD &, const TMouseEvent &e) { + void rightButtonDown(const TPointD &, const TMouseEvent &e) override { if (!m_viewer) return; invalidate(); } - void draw() { + void draw() override { if (!m_dragging) return; TPointD center = m_viewer->winToWorld(TPoint(m_center.x, m_center.y)); @@ -81,7 +81,7 @@ public: glPopMatrix(); } - int getCursorId() const { return ToolCursor::ZoomCursor; } + int getCursorId() const override { return ToolCursor::ZoomCursor; } } zoomTool; @@ -96,17 +96,17 @@ class HandTool : public TTool { public: HandTool() : TTool("T_Hand") { bind(TTool::AllTargets); } - ToolType getToolType() const { return TTool::GenericTool; } + ToolType getToolType() const override { return TTool::GenericTool; } - void updateMatrix() { return setMatrix(TAffine()); } + void updateMatrix() override { return setMatrix(TAffine()); } - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { if (!m_viewer) return; m_oldPos = e.m_pos; m_sw.start(true); } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { if (!m_viewer) return; if (m_sw.getTotalTime() < 10) return; m_sw.stop(); @@ -117,12 +117,12 @@ public: m_oldPos = e.m_pos; } - void leftButtonUp(const TPointD &pos, const TMouseEvent &e) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override { if (!m_viewer) return; m_sw.stop(); } - int getCursorId() const { return ToolCursor::PanCursor; } + int getCursorId() const override { return ToolCursor::PanCursor; } } handTool; @@ -150,13 +150,13 @@ public: m_prop.bind(m_cameraCentered); } - ToolType getToolType() const { return TTool::GenericTool; } + ToolType getToolType() const override { return TTool::GenericTool; } - void updateMatrix() { return setMatrix(TAffine()); } + void updateMatrix() override { return setMatrix(TAffine()); } - TPropertyGroup *getProperties(int targetType) { return &m_prop; } + TPropertyGroup *getProperties(int targetType) override { return &m_prop; } - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { if (!m_viewer) return; m_angle = 0.0; @@ -172,7 +172,7 @@ public: // virtual TPointD winToWorld(const TPoint &winPos) const = 0; } - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { if (!m_viewer) return; if (m_sw.getTotalTime() < 50) return; m_sw.stop(); @@ -195,13 +195,13 @@ public: m_oldPos = p; } - void leftButtonUp(const TPointD &pos, const TMouseEvent &e) { + void leftButtonUp(const TPointD &pos, const TMouseEvent &e) override { m_dragging = false; invalidate(); m_sw.stop(); } - void draw() { + void draw() override { glColor3f(1, 0, 0); double u = 50; if (m_cameraCentered.getValue()) @@ -217,7 +217,7 @@ public: TPointD(m_center.x, u + m_center.y)); } - int getCursorId() const { return ToolCursor::RotateCursor; } + int getCursorId() const override { return ToolCursor::RotateCursor; } } rotateTool; diff --git a/toonz/sources/toonz/adjustlevelspopup.cpp b/toonz/sources/toonz/adjustlevelspopup.cpp index 0b50de4..ba7c5d7 100644 --- a/toonz/sources/toonz/adjustlevelspopup.cpp +++ b/toonz/sources/toonz/adjustlevelspopup.cpp @@ -566,10 +566,10 @@ public: TRasterP ras); ~AdjustLevelsUndo(); - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; - int getSize() const { return sizeof(*this) + m_rasSize; } + int getSize() const override { return sizeof(*this) + m_rasSize; } }; //-------------------------------------------------------------- diff --git a/toonz/sources/toonz/adjustlevelspopup.h b/toonz/sources/toonz/adjustlevelspopup.h index 2ef4512..2a3f050 100644 --- a/toonz/sources/toonz/adjustlevelspopup.h +++ b/toonz/sources/toonz/adjustlevelspopup.h @@ -80,8 +80,8 @@ public: AdjustLevelsPopup(); protected: - void showEvent(QShowEvent *se); - void hideEvent(QHideEvent *se); + void showEvent(QShowEvent *se) override; + void hideEvent(QHideEvent *se) override; void acquireRaster(); void updateProcessedImage(); diff --git a/toonz/sources/toonz/adjustthicknesspopup.cpp b/toonz/sources/toonz/adjustthicknesspopup.cpp index 98c0d2e..aca6f9c 100644 --- a/toonz/sources/toonz/adjustthicknesspopup.cpp +++ b/toonz/sources/toonz/adjustthicknesspopup.cpp @@ -977,10 +977,10 @@ public: AdjustThicknessUndo(const SelectionData &selData, double (&fromTransform)[2], double (&toTransform)[2]); - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { + int getSize() const override { return (10 << 20); } // 10 MB, flat - ie, at max 10 of these for a standard 100MB // undo cache size. diff --git a/toonz/sources/toonz/adjustthicknesspopup.h b/toonz/sources/toonz/adjustthicknesspopup.h index 5052141..c6eaefc 100644 --- a/toonz/sources/toonz/adjustthicknesspopup.h +++ b/toonz/sources/toonz/adjustthicknesspopup.h @@ -42,8 +42,8 @@ public: AdjustThicknessPopup(); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public: class Swatch; diff --git a/toonz/sources/toonz/antialiaspopup.cpp b/toonz/sources/toonz/antialiaspopup.cpp index f9a170d..db74fd8 100644 --- a/toonz/sources/toonz/antialiaspopup.cpp +++ b/toonz/sources/toonz/antialiaspopup.cpp @@ -294,7 +294,7 @@ public: ~TRasterAntialiasUndo() { TImageCache::instance()->remove(m_rasId); } - void undo() const { + void undo() const override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); TXshCell cell = xsheet->getCell(m_r, m_c); TImageP image = cell.getImage(true); @@ -323,7 +323,7 @@ public: } } - void redo() const { + void redo() const override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); TXshCell cell = xsheet->getCell(m_r, m_c); TImageP image = (TRasterImageP)cell.getImage(true); @@ -342,7 +342,7 @@ public: } } - int getSize() const { return sizeof(*this) + m_rasSize; } + int getSize() const override { return sizeof(*this) + m_rasSize; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/antialiaspopup.h b/toonz/sources/toonz/antialiaspopup.h index f904db4..197d081 100644 --- a/toonz/sources/toonz/antialiaspopup.h +++ b/toonz/sources/toonz/antialiaspopup.h @@ -32,8 +32,8 @@ public: AntialiasPopup(); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; protected slots: diff --git a/toonz/sources/toonz/batches.cpp b/toonz/sources/toonz/batches.cpp index 6e75aa1..aa9c65e 100644 --- a/toonz/sources/toonz/batches.cpp +++ b/toonz/sources/toonz/batches.cpp @@ -34,9 +34,9 @@ class NotifyMessage : public TThread::Message { public: NotifyMessage() {} - void onDeliver() { BatchesController::instance()->update(); } + void onDeliver() override { BatchesController::instance()->update(); } - TThread::Message *clone() const { return new NotifyMessage(*this); } + TThread::Message *clone() const override { return new NotifyMessage(*this); } }; } // namespace @@ -142,9 +142,9 @@ public: TaskRunner(TFarmTask *task, int localControllerPort) : m_task(task), m_localControllerPort(localControllerPort) {} - void run(); + void run() override; - int taskLoad(); + int taskLoad() override; void doRun(TFarmTask *task); @@ -957,11 +957,11 @@ class ControllerFailureMsg : public TThread::Message { public: ControllerFailureMsg(const TException &e) : m_e(e) {} - void onDeliver() { + void onDeliver() override { // throw m_e; } - TThread::Message *clone() const { return new ControllerFailureMsg(m_e); } + TThread::Message *clone() const override { return new ControllerFailureMsg(m_e); } TException m_e; }; @@ -1029,52 +1029,52 @@ class MyLocalController : public TFarmController, public TFarmExecutor { public: MyLocalController(int port) : TFarmExecutor(port) {} - QString execute(const std::vector &argv); + QString execute(const std::vector &argv) override; - QString addTask(const TFarmTask &task, bool suspended); - void removeTask(const QString &id); - void suspendTask(const QString &id); - void activateTask(const QString &id); - void restartTask(const QString &id); + QString addTask(const TFarmTask &task, bool suspended) override; + void removeTask(const QString &id) override; + void suspendTask(const QString &id) override; + void activateTask(const QString &id) override; + void restartTask(const QString &id) override; - void getTasks(vector &tasks); - void getTasks(const QString &parentId, std::vector &tasks); - void getTasks(const QString &parentId, std::vector &tasks); + void getTasks(vector &tasks) override; + void getTasks(const QString &parentId, std::vector &tasks) override; + void getTasks(const QString &parentId, std::vector &tasks) override; - void queryTaskInfo(const QString &id, TFarmTask &task); + void queryTaskInfo(const QString &id, TFarmTask &task) override; void queryTaskShortInfo(const QString &id, QString &parentId, QString &name, - TaskState &status); + TaskState &status) override; - void attachServer(const QString &name, const QString &addr, int port) { + void attachServer(const QString &name, const QString &addr, int port) override { assert(false); } - void detachServer(const QString &name, const QString &addr, int port) { + void detachServer(const QString &name, const QString &addr, int port) override { assert(false); } - void taskSubmissionError(const QString &taskId, int errCode) { + void taskSubmissionError(const QString &taskId, int errCode) override { assert(false); } void taskProgress(const QString &taskId, int step, int stepCount, - int frameNumber, FrameState state); + int frameNumber, FrameState state) override; - void taskCompleted(const QString &taskId, int exitCode); + void taskCompleted(const QString &taskId, int exitCode) override; - void getServers(vector &servers) { assert(false); } + void getServers(vector &servers) override { assert(false); } - ServerState queryServerState2(const QString &id) { + ServerState queryServerState2(const QString &id) override { assert(false); return ServerUnknown; } - void queryServerInfo(const QString &id, ServerInfo &info) { assert(false); } + void queryServerInfo(const QString &id, ServerInfo &info) override { assert(false); } - void activateServer(const QString &id) { assert(false); } + void activateServer(const QString &id) override { assert(false); } - void deactivateServer(const QString &id, bool completeRunningTasks) { + void deactivateServer(const QString &id, bool completeRunningTasks) override { assert(false); } @@ -1180,11 +1180,11 @@ public: SLOT(onFinished(TThread::RunnableP))); } - void run() { m_controller->run(); } + void run() override { m_controller->run(); } public slots: - void onFinished(TThread::RunnableP thisTask) { + void onFinished(TThread::RunnableP thisTask) override { BatchesController::instance()->notify(); } }; diff --git a/toonz/sources/toonz/batches.h b/toonz/sources/toonz/batches.h index 2633d5c..e8fdb8b 100644 --- a/toonz/sources/toonz/batches.h +++ b/toonz/sources/toonz/batches.h @@ -113,7 +113,7 @@ class LoadTaskListPopup : public FileBrowserPopup { public: LoadTaskListPopup(); - bool execute(); + bool execute() override; }; //----------------------------------------------------------------------------- @@ -126,7 +126,7 @@ class LoadTaskPopup : public FileBrowserPopup { public: LoadTaskPopup(); - bool execute(); + bool execute() override; void open(bool isRenderTask); }; @@ -138,7 +138,7 @@ class SaveTaskListPopup : public FileBrowserPopup { public: SaveTaskListPopup(); - bool execute(); + bool execute() override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/toonz/batchserversviewer.h b/toonz/sources/toonz/batchserversviewer.h index 33c4664..b91e71a 100644 --- a/toonz/sources/toonz/batchserversviewer.h +++ b/toonz/sources/toonz/batchserversviewer.h @@ -36,7 +36,7 @@ protected slots: private: void openContextMenu(const QPoint &p); - void mousePressEvent(QMouseEvent *event); + void mousePressEvent(QMouseEvent *event) override; std::unique_ptr m_menu; }; diff --git a/toonz/sources/toonz/binarizepopup.cpp b/toonz/sources/toonz/binarizepopup.cpp index e5efc74..d07c976 100644 --- a/toonz/sources/toonz/binarizepopup.cpp +++ b/toonz/sources/toonz/binarizepopup.cpp @@ -93,7 +93,7 @@ public: } } - void undo() const { + void undo() const override { TXshSimpleLevel *sl = getLevel(); if (!sl) return; TRasterImageP ri = sl->getFrame(m_fid, true); @@ -104,7 +104,7 @@ public: notify(sl); } - void redo() const { + void redo() const override { TXshSimpleLevel *sl = getLevel(); if (!sl) return; TRasterImageP ri = sl->getFrame(m_fid, true); @@ -117,7 +117,7 @@ public: notify(sl); } - int getSize() const { return sizeof(*this) + m_rasSize; } + int getSize() const override { return sizeof(*this) + m_rasSize; } }; //************************************************************************** diff --git a/toonz/sources/toonz/binarizepopup.h b/toonz/sources/toonz/binarizepopup.h index 6b298af..56b9bf9 100644 --- a/toonz/sources/toonz/binarizepopup.h +++ b/toonz/sources/toonz/binarizepopup.h @@ -39,8 +39,8 @@ public: void setSample(const TRasterP &ras); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; private: typedef std::vector> Frames; diff --git a/toonz/sources/toonz/brightnessandcontrastpopup.cpp b/toonz/sources/toonz/brightnessandcontrastpopup.cpp index d2481de..59147b0 100644 --- a/toonz/sources/toonz/brightnessandcontrastpopup.cpp +++ b/toonz/sources/toonz/brightnessandcontrastpopup.cpp @@ -423,7 +423,7 @@ public: ~TRasterBrightnessUndo() { TImageCache::instance()->remove(m_rasId); } - void undo() const { + void undo() const override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); TXshCell cell = xsheet->getCell(m_r, m_c); TRasterImageP rasImage = (TRasterImageP)cell.getImage(true); @@ -443,7 +443,7 @@ public: } } - void redo() const { + void redo() const override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); TXshCell cell = xsheet->getCell(m_r, m_c); TRasterImageP rasImage = (TRasterImageP)cell.getImage(true); @@ -462,7 +462,7 @@ public: } } - int getSize() const { return sizeof(*this) + m_rasSize; } + int getSize() const override { return sizeof(*this) + m_rasSize; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/brightnessandcontrastpopup.h b/toonz/sources/toonz/brightnessandcontrastpopup.h index ab4c8f3..d811942 100644 --- a/toonz/sources/toonz/brightnessandcontrastpopup.h +++ b/toonz/sources/toonz/brightnessandcontrastpopup.h @@ -35,8 +35,8 @@ public: BrightnessAndContrastPopup(); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; protected slots: diff --git a/toonz/sources/toonz/camerasettingspopup.cpp b/toonz/sources/toonz/camerasettingspopup.cpp index 70d15b2..2a3beab 100644 --- a/toonz/sources/toonz/camerasettingspopup.cpp +++ b/toonz/sources/toonz/camerasettingspopup.cpp @@ -60,7 +60,7 @@ class OpenCameraStageCommandHandler : public MenuItemHandler { public: OpenCameraStageCommandHandler(CommandId cmdId) : MenuItemHandler(cmdId) {} - void execute() { + void execute() override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); TStageObjectId cameraId = TApp::instance()->getCurrentObject()->getObjectId(); diff --git a/toonz/sources/toonz/camerasettingspopup.h b/toonz/sources/toonz/camerasettingspopup.h index 0151ab7..052351e 100644 --- a/toonz/sources/toonz/camerasettingspopup.h +++ b/toonz/sources/toonz/camerasettingspopup.h @@ -51,9 +51,9 @@ public: static CameraSettingsPopup *createPopup(const TStageObjectId &id); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); - void moveEvent(QMoveEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; + void moveEvent(QMoveEvent *e) override; protected slots: diff --git a/toonz/sources/toonz/canvassizepopup.cpp b/toonz/sources/toonz/canvassizepopup.cpp index b59bd18..0bed09e 100644 --- a/toonz/sources/toonz/canvassizepopup.cpp +++ b/toonz/sources/toonz/canvassizepopup.cpp @@ -87,7 +87,7 @@ public: TImageCache::instance()->remove(m_newImageId); } - void undo() const { + void undo() const override { TImageP img = TImageCache::instance()->get(m_oldImageId, true); m_level->setFrame(m_fid, img); IconGenerator::instance()->invalidate(m_level.getPointer(), m_fid); @@ -99,7 +99,7 @@ public: } } - void redo() const { + void redo() const override { TImageP img = TImageCache::instance()->get(m_newImageId, true); m_level->setFrame(m_fid, img); IconGenerator::instance()->invalidate(m_level.getPointer(), m_fid); @@ -113,7 +113,7 @@ public: } } - int getSize() const { return m_undoSize; } + int getSize() const override { return m_undoSize; } }; int ResizeCanvasUndo::m_idCount = 0; diff --git a/toonz/sources/toonz/canvassizepopup.h b/toonz/sources/toonz/canvassizepopup.h index 22aaceb..3953e4e 100644 --- a/toonz/sources/toonz/canvassizepopup.h +++ b/toonz/sources/toonz/canvassizepopup.h @@ -48,7 +48,7 @@ private: void createButton(QPushButton **button, PeggingPositions position); protected: - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; public slots: void on00(); @@ -85,7 +85,7 @@ public: CanvasSizePopup(); protected: - void showEvent(QShowEvent *e); + void showEvent(QShowEvent *e) override; public slots: void onOkBtn(); diff --git a/toonz/sources/toonz/castselection.h b/toonz/sources/toonz/castselection.h index 62e63e0..c966246 100644 --- a/toonz/sources/toonz/castselection.h +++ b/toonz/sources/toonz/castselection.h @@ -29,7 +29,7 @@ public: void getSelectedLevels(std::vector &levels); // commands - void enableCommands(); + void enableCommands() override; }; //============================================================================= @@ -66,15 +66,15 @@ public: LevelCastItem(TXshLevel *level, QSize itemPixmapSize) : m_level(level), m_itemPixmapSize(itemPixmapSize) {} TXshLevel *getLevel() const { return m_level; } - QString getName() const; - QString getToolTip() const; - int getFrameCount() const; - QPixmap getPixmap(bool isSelected = false) const; - TXshSimpleLevel *getSimpleLevel() const; - CastItem *clone() const { + QString getName() const override; + QString getToolTip() const override; + int getFrameCount() const override; + QPixmap getPixmap(bool isSelected = false) const override; + TXshSimpleLevel *getSimpleLevel() const override; + CastItem *clone() const override { return new LevelCastItem(m_level, m_itemPixmapSize); } - bool exists() const; + bool exists() const override; }; //----------------------------------------------------------------------------- @@ -85,15 +85,15 @@ class SoundCastItem : public CastItem { public: SoundCastItem(TXshSoundLevel *soundLevel, QSize itemPixmapSize) : m_soundLevel(soundLevel), m_itemPixmapSize(itemPixmapSize) {} - TXshSoundLevel *getSoundLevel() const { return m_soundLevel; } - QString getName() const; - QString getToolTip() const; - int getFrameCount() const; - QPixmap getPixmap(bool isSelected = false) const; - CastItem *clone() const { + TXshSoundLevel *getSoundLevel() const override { return m_soundLevel; } + QString getName() const override; + QString getToolTip() const override; + int getFrameCount() const override; + QPixmap getPixmap(bool isSelected = false) const override; + CastItem *clone() const override { return new SoundCastItem(m_soundLevel, m_itemPixmapSize); } - bool exists() const; + bool exists() const override; }; //----------------------------------------------------------------------------- @@ -105,15 +105,15 @@ class PaletteCastItem : public CastItem { public: PaletteCastItem(TXshPaletteLevel *paletteLevel, QSize itemPixmapSize) : m_paletteLevel(paletteLevel), m_itemPixmapSize(itemPixmapSize) {} - TXshPaletteLevel *getPaletteLevel() const { return m_paletteLevel; } - QString getName() const; - QString getToolTip() const; - int getFrameCount() const; - QPixmap getPixmap(bool isSelected = false) const; - CastItem *clone() const { + TXshPaletteLevel *getPaletteLevel() const override { return m_paletteLevel; } + QString getName() const override; + QString getToolTip() const override; + int getFrameCount() const override; + QPixmap getPixmap(bool isSelected = false) const override; + CastItem *clone() const override { return new PaletteCastItem(m_paletteLevel, m_itemPixmapSize); } - bool exists() const; + bool exists() const override; }; //----------------------------------------------------------------------------- @@ -134,8 +134,8 @@ public: std::swap(m_items[index1], m_items[index2]); } - QStringList formats() const; - bool hasFormat(const QString &mimeType) const; + QStringList formats() const override; + bool hasFormat(const QString &mimeType) const override; static QString getMimeFormat(); CastItems *getSelectedItems(const std::set &indices) const; diff --git a/toonz/sources/toonz/castviewer.cpp b/toonz/sources/toonz/castviewer.cpp index 18b4550..de46de5 100644 --- a/toonz/sources/toonz/castviewer.cpp +++ b/toonz/sources/toonz/castviewer.cpp @@ -74,21 +74,21 @@ public: m_oldFolder = m_levelSet->getFolder(level); } - void undo() const { + void undo() const override { TXshLevel *level = m_levelSet->getLevel(m_levelName); m_levelSet->moveLevelToFolder(m_oldFolder, level); TApp::instance()->getCurrentScene()->notifyCastChange(); } - void redo() const { + void redo() const override { TXshLevel *level = m_levelSet->getLevel(m_levelName); m_levelSet->moveLevelToFolder(m_newFolder, level); TApp::instance()->getCurrentScene()->notifyCastChange(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Move Level to Cast Folder"); } }; diff --git a/toonz/sources/toonz/castviewer.h b/toonz/sources/toonz/castviewer.h index b0045bc..499fb31 100644 --- a/toonz/sources/toonz/castviewer.h +++ b/toonz/sources/toonz/castviewer.h @@ -26,23 +26,23 @@ class CastTreeViewer : public QTreeWidget, public TSelection { public: CastTreeViewer(QWidget *parent = 0); - QSize sizeHint() const; + QSize sizeHint() const override; TFilePath getCurrentFolder() const; static TLevelSet *getLevelSet(); // da TSelection - bool isEmpty() const { return false; } - void selectNone() {} - void enableCommands(); + bool isEmpty() const override { return false; } + void selectNone() override {} + void enableCommands() override; protected: - void paintEvent(QPaintEvent *); - void dragEnterEvent(QDragEnterEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); - void resizeEvent(QResizeEvent *); + void paintEvent(QPaintEvent *) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void resizeEvent(QResizeEvent *) override; public slots: void onItemChanged(QTreeWidgetItem *item, int column); @@ -87,15 +87,15 @@ public: CastItems const &getCastItems() const { return *m_castItems; } - void sortByDataModel(DataType dataType, bool isDiscendent); + void sortByDataModel(DataType dataType, bool isDiscendent) override; - int getItemCount() const; - void refreshData(); - QVariant getItemData(int index, DataType dataType, bool isSelected = false); - QMenu *getContextMenu(QWidget *parent, int index); - void startDragDrop(); - bool acceptDrop(const QMimeData *data) const; - bool drop(const QMimeData *data); + int getItemCount() const override; + void refreshData() override; + QVariant getItemData(int index, DataType dataType, bool isSelected = false) override; + QMenu *getContextMenu(QWidget *parent, int index) override; + void startDragDrop() override; + bool acceptDrop(const QMimeData *data) const override; + bool drop(const QMimeData *data) override; void expose(); void edit(); diff --git a/toonz/sources/toonz/celldata.h b/toonz/sources/toonz/celldata.h index 29aedc5..4d3536a 100644 --- a/toonz/sources/toonz/celldata.h +++ b/toonz/sources/toonz/celldata.h @@ -33,7 +33,7 @@ public: const TXshCell getCell(int index) const { return m_cells[index]; } const TXshCell getCell(int row, int col) const; - TCellData *clone() const { return new TCellData(this); } + TCellData *clone() const override { return new TCellData(this); } // data <- xsh void setCells(TXsheet *xsh, int r0, int c0, int r1, int c1); diff --git a/toonz/sources/toonz/cellkeyframedata.h b/toonz/sources/toonz/cellkeyframedata.h index 4e47740..59f7d3b 100644 --- a/toonz/sources/toonz/cellkeyframedata.h +++ b/toonz/sources/toonz/cellkeyframedata.h @@ -29,7 +29,7 @@ public: void setKeyframeData(TKeyframeData *data) { m_keyframeData = data; } TKeyframeData *getKeyframeData() const { return m_keyframeData; } - TCellKeyframeData *clone() const { return new TCellKeyframeData(this); } + TCellKeyframeData *clone() const override { return new TCellKeyframeData(this); } }; #endif diff --git a/toonz/sources/toonz/cellkeyframeselection.h b/toonz/sources/toonz/cellkeyframeselection.h index 8f9296e..3a17caf 100644 --- a/toonz/sources/toonz/cellkeyframeselection.h +++ b/toonz/sources/toonz/cellkeyframeselection.h @@ -33,9 +33,9 @@ public: m_xsheetHandle = xsheetHandle; } - void enableCommands(); + void enableCommands() override; - bool isEmpty() const; + bool isEmpty() const override; void copyCellsKeyframes(); void pasteCellsKeyframes(); @@ -45,7 +45,7 @@ public: //! \note: puo' anche essere r0>r1 o c0>c1 void selectCellsKeyframes(int r0, int c0, int r1, int c1); void selectCellKeyframe(int row, int col); - void selectNone(); + void selectNone() override; /* void getSelectedCells(int &r0, int &c0, int &r1, int &c1) const; diff --git a/toonz/sources/toonz/cellselection.cpp b/toonz/sources/toonz/cellselection.cpp index 223fb27..3cfc059 100644 --- a/toonz/sources/toonz/cellselection.cpp +++ b/toonz/sources/toonz/cellselection.cpp @@ -181,7 +181,7 @@ public: delete m_data; } - void undo() const { + void undo() const override { int r0, c0, r1, c1; m_newSelection->getSelectedCells(r0, c0, r1, c1); @@ -205,7 +205,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { int r0, c0, r1, c1; m_newSelection->getSelectedCells(r0, c0, c1, r1); // Cut delle celle che sono in newSelection @@ -213,10 +213,10 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Paste Cells"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Paste Cells"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -266,7 +266,7 @@ public: it.value()->release(); } - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); // devo rimettere le colonne che ho rimosso dall'xsheet @@ -295,16 +295,16 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { int r0, c0, r1, c1; m_selection->getSelectedCells(r0, c0, r1, c1); deleteCellsWithoutUndo(r0, c0, r1, c1); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Delete Cells"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Delete Cells"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -350,7 +350,7 @@ public: delete m_data; } - void undo() const { + void undo() const override { int r0, c0, r1, c1; m_selection->getSelectedCells(r0, c0, r1, c1); @@ -368,7 +368,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { QClipboard *clipboard = QApplication::clipboard(); QMimeData *currentData = cloneData(clipboard->mimeData()); @@ -379,10 +379,10 @@ public: clipboard->setMimeData(currentData, QClipboard::Clipboard); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Cut Cells"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Cut Cells"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -395,7 +395,7 @@ class InsertUndo : public TUndo { public: InsertUndo(const TCellSelection::Range &range) : m_range(range) {} - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int rowCount = m_range.getRowCount(); int c; @@ -403,7 +403,7 @@ public: xsh->removeCells(m_range.m_r0, c, rowCount); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int rowCount = m_range.getRowCount(); int c; @@ -411,9 +411,9 @@ public: xsh->insertCells(m_range.m_r0, c, rowCount); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Insert Cells"); } - int getHistoryType() { return HistoryType::Xsheet; } + int getSize() const override { return sizeof(*this); } + QString getHistoryString() override { return QObject::tr("Insert Cells"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -456,30 +456,30 @@ public: } } - void undo() const { renumber(m_undoTable); } - void redo() const { renumber(m_redoTable); } + void undo() const override { renumber(m_undoTable); } + void redo() const override { renumber(m_redoTable); } - int getSize() const { return (m_redoTable.size() << 2) * sizeof(TXshCell); } + int getSize() const override { return (m_redoTable.size() << 2) * sizeof(TXshCell); } }; class RenumberUndo::RedoNotifier : public TUndo { - void undo() const {} - void redo() const { + void undo() const override {} + void redo() const override { TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); TApp::instance()->getCurrentScene()->setDirtyFlag(true); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; class RenumberUndo::UndoNotifier : public TUndo { - void redo() const {} - void undo() const { + void redo() const override {} + void undo() const override { TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); TApp::instance()->getCurrentScene()->setDirtyFlag(true); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //============================================================================= @@ -585,7 +585,7 @@ public: void setIndices(const std::vector &indices) { m_indices = indices; } - void onAdd() { + void onAdd() override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); TXshCell cell = xsh->getCell(m_row, m_col); m_sl = cell.getSimpleLevel(); @@ -593,7 +593,7 @@ public: m_image = cell.getImage(false); } - void undo() const { + void undo() const override { m_image->removeStrokes(m_indices, true, true); if (m_createdFrame) { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); @@ -619,7 +619,7 @@ public: IconGenerator::instance()->invalidate(m_sl.getPointer(), m_fid); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { if (m_isLevelCreated) { TLevelSet *levelSet = TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); @@ -639,9 +639,9 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } - QString getHistoryString() { return QObject::tr("Paste (Strokes)"); } - int getHistoryType() { return HistoryType::Xsheet; } + int getSize() const override { return sizeof *this; } + QString getHistoryString() override { return QObject::tr("Paste (Strokes)"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -794,7 +794,7 @@ public: ~PasteToonzImageInCellsUndo() { delete m_rasterImageData; } - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TTileSet *tiles; bool isLevelCreated; @@ -804,11 +804,11 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return m_rasterImageData->getMemorySize() + TRasterUndo::getSize(); } - QString getHistoryString() { return QObject::tr("Paste"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Paste"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -830,7 +830,7 @@ public: ~PasteFullColorImageInCellsUndo() { delete m_rasterImageData; } - void redo() const { + void redo() const override { insertLevelAndFrameIfNeeded(); TTileSet *tiles = 0; bool isLevelCreated; @@ -840,11 +840,11 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return m_rasterImageData->getMemorySize() + TFullColorRasterUndo::getSize(); } - QString getHistoryString() { return QObject::tr("Paste (Raster)"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Paste (Raster)"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -884,22 +884,22 @@ public: ~PasteDrawingsInCellUndo() { m_xsheet->release(); } - void undo() const { + void undo() const override { int cellsToRemove = m_frameIds.size(); m_xsheet->removeCells(m_r0, m_c0, cellsToRemove); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { pasteDrawingsInCellWithoutUndo(m_xsheet, m_level.getPointer(), m_frameIds, m_r0, m_c0); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { return QObject::tr("Paste"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Paste"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -964,7 +964,7 @@ public: delete m_beforeData; } - void undo() const { + void undo() const override { int r0, c0, r1, c1; m_newSelection->getSelectedCells(r0, c0, r1, c1); @@ -1008,7 +1008,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { int r0, c0, r1, c1; m_newSelection->getSelectedCells(r0, c0, c1, r1); QClipboard *clipboard = QApplication::clipboard(); @@ -1018,10 +1018,10 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Overwrite Paste Cells"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Overwrite Paste Cells"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -1653,7 +1653,7 @@ public: : m_row(row), m_col(col), m_levelCreated(levelCreated) { m_oldCell = getXsheet()->getCell(m_row, m_col); } - void onAdd() { + void onAdd() override { m_newCell = getXsheet()->getCell(m_row, m_col); TImageP img = m_newCell.getImage(false); if (img) m_img = img->cloneImage(); @@ -1665,7 +1665,7 @@ public: return TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); } - void undo() const { + void undo() const override { getXsheet()->setCell(m_row, m_col, m_oldCell); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); TXshSimpleLevel *sl = m_newCell.getSimpleLevel(); @@ -1679,7 +1679,7 @@ public: } } } - void redo() const { + void redo() const override { getXsheet()->setCell(m_row, m_col, m_newCell); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); TXshSimpleLevel *sl = m_newCell.getSimpleLevel(); @@ -1695,7 +1695,7 @@ public: } } } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(TXshLevel); // impreciso. } }; diff --git a/toonz/sources/toonz/cellselection.h b/toonz/sources/toonz/cellselection.h index 4e3e0e8..6e2eee7 100644 --- a/toonz/sources/toonz/cellselection.h +++ b/toonz/sources/toonz/cellselection.h @@ -35,9 +35,9 @@ public: TCellSelection(Range range) : m_range(range) {} ~TCellSelection(); - void enableCommands(); + void enableCommands() override; - bool isEmpty() const; + bool isEmpty() const override; void copyCells(); void pasteCells(); @@ -51,7 +51,7 @@ public: //! \note: puo' anche essere r0>r1 o c0>c1 void selectCells(int r0, int c0, int r1, int c1); void selectCell(int row, int col); - void selectNone(); + void selectNone() override; void getSelectedCells(int &r0, int &c0, int &r1, int &c1) const; Range getSelectedCells() const; diff --git a/toonz/sources/toonz/cellselectioncommand.cpp b/toonz/sources/toonz/cellselectioncommand.cpp index d8209cb..65363a6 100644 --- a/toonz/sources/toonz/cellselectioncommand.cpp +++ b/toonz/sources/toonz/cellselectioncommand.cpp @@ -60,13 +60,13 @@ public: ReverseUndo(int r0, int c0, int r1, int c1) : m_r0(r0), m_c0(c0), m_r1(r1), m_c1(c1) {} - void redo() const; - void undo() const { redo(); } // Reverse is idempotent :) + void redo() const override; + void undo() const override { redo(); } // Reverse is idempotent :) - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Reverse"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Reverse"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -108,13 +108,13 @@ public: SwingUndo(int r0, int c0, int r1, int c1) : m_r0(r0), m_c0(c0), m_r1(r1), m_c1(c1) {} - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Swing"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Swing"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -171,13 +171,13 @@ public: IncrementUndo(int r0, int c0, int r1, int c1) : m_r0(r0), m_c0(c0), m_r1(r1), m_c1(c1), m_ok(true) {} - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Autoexpose"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Autoexpose"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -256,15 +256,15 @@ public: void shuffleCells(int row, int col, const std::vector &data) const; - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { + int getSize() const override { return sizeof(*this) + 2 * sizeof(int) * m_shuffle.size(); } - QString getHistoryString() { return QObject::tr("Random"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Random"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -356,15 +356,15 @@ class StepUndo : public TUndo { public: StepUndo(int r0, int c0, int r1, int c1, int step); - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Step %1").arg(QString::number(m_step)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -457,15 +457,15 @@ class EachUndo : public TUndo { public: EachUndo(int r0, int c0, int r1, int c1, int each); - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Each %1").arg(QString::number(m_each)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -562,16 +562,16 @@ public: ReframeUndo(int r0, int r1, std::vector columnIndeces, int type); ~ReframeUndo(); - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; void repeat() const; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Reframe to %1's").arg(QString::number(m_type)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -715,10 +715,10 @@ class ResetStepUndo : public TUndo { public: ResetStepUndo(int r0, int c0, int r1, int c1); - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //----------------------------------------------------------------------------- @@ -817,10 +817,10 @@ public: public: IncreaseStepUndo(int r0, int c0, int r1, int c1); - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //----------------------------------------------------------------------------- @@ -921,10 +921,10 @@ public: public: DecreaseStepUndo(int r0, int c0, int r1, int c1); - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //----------------------------------------------------------------------------- @@ -1026,7 +1026,7 @@ public: RollupUndo(int r0, int c0, int r1, int c1) : m_r0(r0), m_c0(c0), m_r1(r1), m_c1(c1) {} - void redo() const { + void redo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); @@ -1036,7 +1036,7 @@ public: app->getCurrentScene()->setDirtyFlag(true); } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); @@ -1046,10 +1046,10 @@ public: app->getCurrentScene()->setDirtyFlag(true); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - virtual QString getHistoryString() { return QObject::tr("Roll Up"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Roll Up"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; } // namespace @@ -1074,10 +1074,10 @@ class RolldownUndo : public RollupUndo { public: RolldownUndo(int r0, int c0, int r1, int c1) : RollupUndo(r0, c0, r1, c1) {} - void redo() const { RollupUndo::undo(); } - void undo() const { RollupUndo::redo(); } + void redo() const override { RollupUndo::undo(); } + void undo() const override { RollupUndo::redo(); } - QString getHistoryString() { return QObject::tr("Roll Down"); } + QString getHistoryString() override { return QObject::tr("Roll Down"); } }; } // namespace @@ -1163,16 +1163,16 @@ public: CloneLevelUndo(const TCellSelection::Range &range) : m_range(range), m_clonedLevels(false), m_ok(false) {} - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { + int getSize() const override { return sizeof *this + (sizeof(TXshLevelP) + sizeof(TXshSimpleLevel *)) * m_insertedLevels.size(); } - QString getHistoryString() { + QString getHistoryString() override { if (m_insertedLevels.empty()) return QString(); QString str; if (m_insertedLevels.size() == 1) { @@ -1193,7 +1193,7 @@ public: } return str; } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } private: TXshSimpleLevel *cloneLevel(const TXshSimpleLevel *srcSl, @@ -1217,13 +1217,13 @@ struct CloneLevelUndo::ExistsFunc : public OverwriteDialog::ExistsFunc { public: ExistsFunc(ToonzScene *scene) : m_scene(scene) {} - QString conflictString(const TFilePath &fp) const { + QString conflictString(const TFilePath &fp) const override { return OverwriteDialog::tr( "Level \"%1\" already exists.\n\nWhat do you want to do?") .arg(QString::fromStdWString(fp.withoutParentDir().getWideString())); } - bool operator()(const TFilePath &fp) const { + bool operator()(const TFilePath &fp) const override { return TSystem::doesExistFileOrLevel(fp) || m_scene->getLevelSet()->getLevel(*m_scene, fp); } diff --git a/toonz/sources/toonz/cleanuppopup.cpp b/toonz/sources/toonz/cleanuppopup.cpp index 02d3447..690a5b4 100644 --- a/toonz/sources/toonz/cleanuppopup.cpp +++ b/toonz/sources/toonz/cleanuppopup.cpp @@ -1584,7 +1584,7 @@ class CleanupCommand : public MenuItemHandler { public: CleanupCommand() : MenuItemHandler("MI_Cleanup") {} - void execute() { + void execute() override { static CleanupPopup *popup = new CleanupPopup; popup->execute(); } diff --git a/toonz/sources/toonz/cleanuppopup.h b/toonz/sources/toonz/cleanuppopup.h index 1be1d1a..dfc88ed 100644 --- a/toonz/sources/toonz/cleanuppopup.h +++ b/toonz/sources/toonz/cleanuppopup.h @@ -54,7 +54,7 @@ public: void execute(); protected: - void closeEvent(QCloseEvent *); + void closeEvent(QCloseEvent *) override; private: class OverwriteDialog; @@ -147,15 +147,15 @@ class CleanupPopup::OverwriteDialog : public DVGui::ValidatedChoiceDialog { public: OverwriteDialog(); - virtual void reset(); + void reset() override; private: DVGui::LineEdit *m_suffix; QString m_suffixText; private: - virtual QString acceptResolution(void *obj, int resolution, bool applyToAll); - virtual void initializeUserInteraction(const void *obj); + QString acceptResolution(void *obj, int resolution, bool applyToAll) override; + void initializeUserInteraction(const void *obj) override; private slots: diff --git a/toonz/sources/toonz/cleanuppreview.cpp b/toonz/sources/toonz/cleanuppreview.cpp index 9248195..d910194 100644 --- a/toonz/sources/toonz/cleanuppreview.cpp +++ b/toonz/sources/toonz/cleanuppreview.cpp @@ -406,7 +406,7 @@ public: TApp::instance()->getCurrentTool()->getTool()->invalidate(); } - void undo() const { + void undo() const override { /*--- 既にCleanupSettingsを移動していたらreturn ---*/ CleanupParameters *cp = CleanupSettingsModel::instance()->getCurrentParameters(); @@ -416,7 +416,7 @@ public: onChange(); } - void redo() const { + void redo() const override { /*--- 既にCleanupSettingsを移動していたらreturn ---*/ CleanupParameters *cp = CleanupSettingsModel::instance()->getCurrentParameters(); @@ -426,10 +426,10 @@ public: onChange(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Move Cleanup Camera"); } - int getHistoryType() { return HistoryType::EditTool_Move; } + QString getHistoryString() override { return QObject::tr("Move Cleanup Camera"); } + int getHistoryType() override { return HistoryType::EditTool_Move; } }; //============================================================================= @@ -455,7 +455,7 @@ public: TApp::instance()->getCurrentTool()->getTool()->invalidate(); } - void undo() const { + void undo() const override { /*--- 既にCleanupSettingsを移動していたらreturn ---*/ CleanupParameters *cp = CleanupSettingsModel::instance()->getCurrentParameters(); @@ -467,7 +467,7 @@ public: onChange(); } - void redo() const { + void redo() const override { /*--- 既にCleanupSettingsを移動していたらreturn ---*/ CleanupParameters *cp = CleanupSettingsModel::instance()->getCurrentParameters(); @@ -478,10 +478,10 @@ public: onChange(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Scale Cleanup Camera"); } - int getHistoryType() { return HistoryType::EditTool_Move; } + QString getHistoryString() override { return QObject::tr("Scale Cleanup Camera"); } + int getHistoryType() override { return HistoryType::EditTool_Move; } }; //********************************************************************************** @@ -505,16 +505,16 @@ class CameraTestTool : public TTool { public: CameraTestTool(); - void draw(); + void draw() override; - void mouseMove(const TPointD &p, const TMouseEvent &e); - void leftButtonDown(const TPointD &pos, const TMouseEvent &e); - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e); - void leftButtonUp(const TPointD &pos, const TMouseEvent &); + void mouseMove(const TPointD &p, const TMouseEvent &e) override; + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override; + void leftButtonUp(const TPointD &pos, const TMouseEvent &) override; - ToolType getToolType() const { return TTool::GenericTool; } + ToolType getToolType() const override { return TTool::GenericTool; } - int getCursorId() const; + int getCursorId() const override; private: void drawCleanupCamera(double pixelSize); @@ -868,7 +868,7 @@ int CameraTestTool::getCursorId() const { class OpacityCheckToggleCommand : public MenuItemHandler { public: OpacityCheckToggleCommand() : MenuItemHandler("MI_OpacityCheck") {} - void execute() { + void execute() override { CleanupSettingsModel *model = CleanupSettingsModel::instance(); CleanupParameters *params = model->getCurrentParameters(); diff --git a/toonz/sources/toonz/cleanuppreview.h b/toonz/sources/toonz/cleanuppreview.h index 7102d94..3838f7b 100644 --- a/toonz/sources/toonz/cleanuppreview.h +++ b/toonz/sources/toonz/cleanuppreview.h @@ -39,7 +39,7 @@ class PreviewToggleCommand : public MenuItemHandler { public: PreviewToggleCommand(); - void execute(); + void execute() override; protected: friend class CameraTestToggleCommand; @@ -73,7 +73,7 @@ class CameraTestToggleCommand : public MenuItemHandler { public: CameraTestToggleCommand(); - void execute(); + void execute() override; protected: friend class PreviewToggleCommand; diff --git a/toonz/sources/toonz/cleanupsettingsmodel.cpp b/toonz/sources/toonz/cleanupsettingsmodel.cpp index b9ddaa5..41d1541 100644 --- a/toonz/sources/toonz/cleanupsettingsmodel.cpp +++ b/toonz/sources/toonz/cleanupsettingsmodel.cpp @@ -85,7 +85,7 @@ public: setOkText(tr("Save")); } - bool execute() { + bool execute() override { if (m_selectedPaths.empty()) return false; TFilePath savePath(*m_selectedPaths.begin()); @@ -117,7 +117,7 @@ public: setOkText(tr("Load")); } - bool execute() { + bool execute() override { if (m_selectedPaths.empty()) return false; const TFilePath &loadPath = *m_selectedPaths.begin(); diff --git a/toonz/sources/toonz/cleanupsettingspane.h b/toonz/sources/toonz/cleanupsettingspane.h index d3facd7..f83cd2f 100644 --- a/toonz/sources/toonz/cleanupsettingspane.h +++ b/toonz/sources/toonz/cleanupsettingspane.h @@ -37,7 +37,7 @@ public: : DVGui::FileField(parent, path) {} protected slots: - void browseDirectory(); + void browseDirectory() override; }; class CleanupSettingsPane : public QFrame { @@ -71,8 +71,8 @@ public: CleanupSettingsPane(QWidget *parent = 0); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public slots: diff --git a/toonz/sources/toonz/cleanupsettingspopup.cpp b/toonz/sources/toonz/cleanupsettingspopup.cpp index 6c43037..778be7f 100644 --- a/toonz/sources/toonz/cleanupsettingspopup.cpp +++ b/toonz/sources/toonz/cleanupsettingspopup.cpp @@ -833,7 +833,7 @@ class ToggleOpacityCheckCommand : public MenuItemHandler { public: ToggleOpacityCheckCommand() : MenuItemHandler(MI_OpacityCheck) {} - void execute() { + void execute() override { CleanupSettingsModel *model = CleanupSettingsModel::instance(); CleanupParameters *params = model->getCurrentParameters(); diff --git a/toonz/sources/toonz/cleanupsettingspopup.h b/toonz/sources/toonz/cleanupsettingspopup.h index 4f1bd0d..1879a04 100644 --- a/toonz/sources/toonz/cleanupsettingspopup.h +++ b/toonz/sources/toonz/cleanupsettingspopup.h @@ -78,8 +78,8 @@ public slots: void enableOpacityCheck(bool); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; private slots: diff --git a/toonz/sources/toonz/cleanupswatch.h b/toonz/sources/toonz/cleanupswatch.h index 3ec9f17..e0eb02e 100644 --- a/toonz/sources/toonz/cleanupswatch.h +++ b/toonz/sources/toonz/cleanupswatch.h @@ -21,12 +21,12 @@ class CleanupSwatch : public QWidget { void updateCleanupped(bool dragging = false); protected: - void paintEvent(QPaintEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *event); - void keyPressEvent(QKeyEvent *event); + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; }; int m_lx, m_ly; @@ -49,7 +49,7 @@ public: // void enableRightSwatch(bool state); protected: // void hideEvent(QHideEvent* e); - void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; signals: void enabled(); diff --git a/toonz/sources/toonz/colormodelviewer.h b/toonz/sources/toonz/colormodelviewer.h index 1c612dc..c4ec7bb 100644 --- a/toonz/sources/toonz/colormodelviewer.h +++ b/toonz/sources/toonz/colormodelviewer.h @@ -23,8 +23,8 @@ public: ~ColorModelViewer(); protected: - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; void loadImage(const TFilePath &fp); void resetImageViewer() { clearCache(); @@ -35,14 +35,14 @@ protected: m_palette = 0; } - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; void pick(const QPoint &p); void hideEvent( - QHideEvent *e); // to avoid calling the hideEvent of class Flipbook! - void showEvent(QShowEvent *e); + QHideEvent *e) override; // to avoid calling the hideEvent of class Flipbook! + void showEvent(QShowEvent *e) override; /*- * UseCurrentFrameのLevelに移動してきたときに、改めてCurrentFrameを格納しなおす diff --git a/toonz/sources/toonz/columncommand.cpp b/toonz/sources/toonz/columncommand.cpp index 9f7034f..5e2d62d 100644 --- a/toonz/sources/toonz/columncommand.cpp +++ b/toonz/sources/toonz/columncommand.cpp @@ -496,14 +496,14 @@ public: ~PasteColumnsUndo() { delete m_data; } - void undo() const { + void undo() const override { std::set indices; std::set::const_iterator indicesIt = m_indices.begin(); while (indicesIt != m_indices.end()) indices.insert(*indicesIt++); deleteColumnsWithoutUndo(&indices); } - void redo() const { + void redo() const override { std::set indices; std::set::const_iterator indicesIt = m_indices.begin(); while (indicesIt != m_indices.end()) indices.insert(*indicesIt++); @@ -512,9 +512,9 @@ public: QMap>()); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Paste Column : "); std::set::iterator it; @@ -525,7 +525,7 @@ public: return str; } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -588,7 +588,7 @@ public: } } - void redo() const { + void redo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); assert(!m_data.get()); @@ -601,7 +601,7 @@ public: deleteColumnsWithoutUndo(&indices); } - void undo() const { + void undo() const override { std::set indices = m_indices; resetColumns(m_data.get(), &indices, m_columnFxLinks, m_columnObjParents, m_columnObjChildren); @@ -609,9 +609,9 @@ public: m_data.reset(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Delete Column : "); std::set::iterator it; @@ -622,7 +622,7 @@ public: return str; } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; } // namespace @@ -651,14 +651,14 @@ public: initialize(indices); } - bool isConsistent() const { return true; } + bool isConsistent() const override { return true; } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Insert Column : "); std::vector>::iterator it; @@ -669,7 +669,7 @@ public: return str; } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } private: void initialize(const std::vector &indices); @@ -861,7 +861,7 @@ public: } } - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int r0, r1; xsh->getCellRange(m_index, r0, r1); @@ -881,7 +881,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int r0, r1; xsh->getCellRange(m_index, r0, r1); @@ -898,15 +898,15 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + m_oldFrames.size() * sizeof(TFrameId); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Resequence : Col%1").arg(QString::number(m_index + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -980,13 +980,13 @@ public: CloneChildUndo(TXshChildLevel *childLevel, int columnIndex) : m_childLevel(childLevel), m_columnIndex(columnIndex) {} - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); xsh->removeColumn(m_columnIndex); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); xsh->insertColumn(m_columnIndex); int frameCount = m_childLevel->getXsheet()->getFrameCount(); @@ -997,17 +997,17 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { // bisognerebbe tener conto della dimensione del sottoxsheet return sizeof(*this) + 100; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Clone Sub-xsheet : Col%1") .arg(QString::number(m_columnIndex + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -1143,7 +1143,7 @@ public: } } - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); for (int i = 0; i < (int)m_oldFrames.size(); i++) { xsh->setCell(m_r0 + i, m_col, m_oldFrames[i]); @@ -1151,7 +1151,7 @@ public: xsh->updateFrameCount(); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int r0, r1; xsh->getCellRange(m_col, r0, r1); @@ -1162,15 +1162,15 @@ public: } } - int getSize() const { + int getSize() const override { return sizeof(*this) + m_oldFrames.size() * sizeof(m_oldFrames[0]); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Clear Cells : Col%1").arg(QString::number(m_col + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -1220,7 +1220,7 @@ public: ColumnsStatusCommand(CommandId id, int cmd, int target) : MenuItemHandler(id), m_cmd(cmd), m_target(target) {} - void execute() { + void execute() override { TColumnSelection *selection = dynamic_cast( TApp::instance()->getCurrentSelection()->getSelection()); TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); diff --git a/toonz/sources/toonz/columnselection.h b/toonz/sources/toonz/columnselection.h index 301998f..c6ace6a 100644 --- a/toonz/sources/toonz/columnselection.h +++ b/toonz/sources/toonz/columnselection.h @@ -18,15 +18,15 @@ public: TColumnSelection(); ~TColumnSelection(); - bool isEmpty() const; + bool isEmpty() const override; void selectColumn(int col, bool on = true); - void selectNone(); + void selectNone() override; bool isColumnSelected(int col) const; const std::set &getIndices() const { return m_indices; } - void enableCommands(); + void enableCommands() override; void copyColumns(); void pasteColumns(); diff --git a/toonz/sources/toonz/comboviewerpane.h b/toonz/sources/toonz/comboviewerpane.h index 5aa9717..306e5c5 100644 --- a/toonz/sources/toonz/comboviewerpane.h +++ b/toonz/sources/toonz/comboviewerpane.h @@ -72,28 +72,28 @@ public: } bool getShowHideFlag(CV_Parts parts) { return m_visibleFlag[parts]; } // reimplementation of TPanel::widgetInThisPanelIsFocused - bool widgetInThisPanelIsFocused() { return m_sceneViewer->hasFocus(); } + bool widgetInThisPanelIsFocused() override { return m_sceneViewer->hasFocus(); } - void onDrawFrame(int frame, const ImagePainter::VisualSettings &settings); + void onDrawFrame(int frame, const ImagePainter::VisualSettings &settings) override; // reimplementation of FlipConsoleOwner::isFrameAlreadyCached - bool isFrameAlreadyCached(int frame); + bool isFrameAlreadyCached(int frame) override; protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; void initializeTitleBar(TPanelTitleBar *titleBar); void createFrameToolBar(); void createPlayToolBar(); void addColorMaskButton(QWidget *parent, const char *iconSVGName, int id); - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; // reimplementation of TPanel::widgetFocusOnEnter - void widgetFocusOnEnter() { + void widgetFocusOnEnter() override { m_sceneViewer->setFocus(Qt::OtherFocusReason); // activate shortcut key for this flipconsole m_flipConsole->makeCurrent(); }; - void widgetClearFocusOnLeave() { m_sceneViewer->clearFocus(); }; + void widgetClearFocusOnLeave() override { m_sceneViewer->clearFocus(); }; public slots: void onSceneChanged(); diff --git a/toonz/sources/toonz/convertpopup.cpp b/toonz/sources/toonz/convertpopup.cpp index 8b9ab18..bbda2dc 100644 --- a/toonz/sources/toonz/convertpopup.cpp +++ b/toonz/sources/toonz/convertpopup.cpp @@ -93,7 +93,7 @@ class ConvertPopup::Converter : public QThread { public: Converter(ConvertPopup *parent) : m_parent(parent), m_skippedCount(0) {} - void run(); + void run() override; void convertLevel(const TFilePath &fp); void convertLevelWithConvert2Tlv(const TFilePath &fp); int getSkippedCount() const { return m_skippedCount; } diff --git a/toonz/sources/toonz/curveio.cpp b/toonz/sources/toonz/curveio.cpp index 9213974..a37a5f8 100644 --- a/toonz/sources/toonz/curveio.cpp +++ b/toonz/sources/toonz/curveio.cpp @@ -20,11 +20,11 @@ public: LoadCurveUndo(TDoubleParam *curve) : m_curve(curve) { m_oldCurve = static_cast(curve->clone()); } - void onAdd() { m_newCurve = static_cast(m_curve->clone()); } + void onAdd() override { m_newCurve = static_cast(m_curve->clone()); } - void undo() const { m_curve->copy(m_oldCurve.getPointer()); } - void redo() const { m_curve->copy(m_newCurve.getPointer()); } - int getSize() const { + void undo() const override { m_curve->copy(m_oldCurve.getPointer()); } + void redo() const override { m_curve->copy(m_newCurve.getPointer()); } + int getSize() const override { return sizeof(*this) + 2 * sizeof(TDoubleParam); // not very accurate } }; @@ -50,7 +50,7 @@ public: setFilterTypes(sl); } - void initFolder() { setFolder(m_folderPath); } + void initFolder() override { setFolder(m_folderPath); } bool checkOverride(const TFilePath &fp) const { if (TFileStatus(fp).doesExist()) { @@ -76,7 +76,7 @@ public: setFilterType("curve"); } - bool execute(); + bool execute() override; }; //----------------------------------------------------------------------------- @@ -111,7 +111,7 @@ public: setFilterType("curve"); } - bool execute(); + bool execute() override; }; //----------------------------------------------------------------------------- @@ -155,7 +155,7 @@ public: setFilterType("dat"); } - bool execute(); + bool execute() override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/drawingdata.h b/toonz/sources/toonz/drawingdata.h index 1f09556..ebd710f 100644 --- a/toonz/sources/toonz/drawingdata.h +++ b/toonz/sources/toonz/drawingdata.h @@ -37,10 +37,10 @@ public: , m_level(src->m_level) , m_levelHooks(src->m_levelHooks) {} - void releaseData(); + void releaseData() override; ~DrawingData(); - DrawingData *clone() const; + DrawingData *clone() const override; // data <- filmstrip void setLevelFrames(TXshSimpleLevel *sl, std::set &frames); diff --git a/toonz/sources/toonz/dummyprocessor.h b/toonz/sources/toonz/dummyprocessor.h index 6f24f99..857136e 100644 --- a/toonz/sources/toonz/dummyprocessor.h +++ b/toonz/sources/toonz/dummyprocessor.h @@ -16,9 +16,9 @@ public: ~DummyProcessor(); //! process the raster - void process(TRaster32P raster); + void process(TRaster32P raster) override; //! draw after the processing phase - void draw(); + void draw() override; }; #endif // DUMMYPROCESSOR_H diff --git a/toonz/sources/toonz/duplicatepopup.cpp b/toonz/sources/toonz/duplicatepopup.cpp index d250cca..1d5e779 100644 --- a/toonz/sources/toonz/duplicatepopup.cpp +++ b/toonz/sources/toonz/duplicatepopup.cpp @@ -38,15 +38,15 @@ class DuplicateUndo : public TUndo { public: DuplicateUndo(int r0, int c0, int r1, int c1, int upTo); ~DuplicateUndo() {} - void undo() const; - void redo() const; + void undo() const override; + void redo() const override; void repeat() const; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Duplicate"); } + QString getHistoryString() override { return QObject::tr("Duplicate"); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/duplicatepopup.h b/toonz/sources/toonz/duplicatepopup.h index e2614f9..29b0c2c 100644 --- a/toonz/sources/toonz/duplicatepopup.h +++ b/toonz/sources/toonz/duplicatepopup.h @@ -37,7 +37,7 @@ public slots: void onSelectionChanged(); protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; }; #endif // DUPLICATEPOPUP_H diff --git a/toonz/sources/toonz/dvdirtreeview.h b/toonz/sources/toonz/dvdirtreeview.h index 598b240..1856294 100644 --- a/toonz/sources/toonz/dvdirtreeview.h +++ b/toonz/sources/toonz/dvdirtreeview.h @@ -65,9 +65,9 @@ public: DvDirModelNode *getCurrentDropNode() const { return m_currentDropItem; } // From TSelection - bool isEmpty() const { return false; } - void selectNone() {} - void enableCommands(); + bool isEmpty() const override { return false; } + void selectNone() override {} + void enableCommands() override; void enableGlobalSelection(bool enabled) { m_globalSelectionEnabled = enabled; @@ -157,18 +157,18 @@ public slots: void onMonitoredDirectoryChanged(const QString &); protected: - QSize sizeHint() const; + QSize sizeHint() const override; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous); - bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *ev); - void resizeEvent(QResizeEvent *); + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; + bool edit(const QModelIndex &index, EditTrigger trigger, QEvent *ev) override; + void resizeEvent(QResizeEvent *) override; - void dragEnterEvent(QDragEnterEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; void createMenuAction(QMenu &menu, QString name, const char *slot, bool enable = true); @@ -207,22 +207,22 @@ public: ~DvDirTreeViewDelegate(); QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, - const QModelIndex &index); + const QModelIndex &index) override; void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const; + const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; private: DvDirTreeView *m_treeView; @@ -250,7 +250,7 @@ signals: void editingFinished(); protected: - void focusInEvent(QFocusEvent *event); + void focusInEvent(QFocusEvent *event) override; protected slots: diff --git a/toonz/sources/toonz/dvitemview.h b/toonz/sources/toonz/dvitemview.h index cb150d9..c9f526f 100644 --- a/toonz/sources/toonz/dvitemview.h +++ b/toonz/sources/toonz/dvitemview.h @@ -154,7 +154,7 @@ public: void paint(QPainter *painter, QRect rect); protected: - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; }; //============================================================================= @@ -194,20 +194,20 @@ public: void select(int index, bool on = true); void select(int *indices, int indicesCount); - void selectNone(); + void selectNone() override; void selectAll(); bool isSelected(int index) const { return m_selectedIndices.count(index) > 0; } - bool isEmpty() const { return m_selectedIndices.empty(); } + bool isEmpty() const override { return m_selectedIndices.empty(); } const std::set &getSelectedIndices() const { return m_selectedIndices; } void setModel(DvItemListModel *model); DvItemListModel *getModel() const { return m_model; } - void enableCommands(); + void enableCommands() override; signals: @@ -339,7 +339,7 @@ public: void paintTableItem(QPainter &p, int index); // da TSelection::View - void onSelectionChanged() { update(); } + void onSelectionChanged() override { update(); } const std::set &getSelectedIndices() const; @@ -353,13 +353,13 @@ public: void setMissingTextColor(const QColor &color); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *); - void mouseMoveEvent(QMouseEvent *); - void mouseReleaseEvent(QMouseEvent *); - void mouseDoubleClickEvent(QMouseEvent *); - void contextMenuEvent(QContextMenuEvent *); - bool event(QEvent *event); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void contextMenuEvent(QContextMenuEvent *) override; + bool event(QEvent *event) override; signals: void viewTypeChange(DvItemViewerPanel::ViewType viewType); @@ -387,7 +387,7 @@ private: DvItemViewerPanel *m_panel; protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *) override; public: DvItemViewer(QWidget *parent, bool noContextMenu = false, @@ -416,11 +416,11 @@ public: m_panel->enableGlobalSelection(enabled); } void selectNone(); - void keyPressEvent(QKeyEvent *event); + void keyPressEvent(QKeyEvent *event) override; protected: - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; signals: void clickedItem(int index); @@ -445,10 +445,10 @@ protected slots: void onViewTypeChanged(DvItemViewerPanel::ViewType viewType); protected: - void mouseMoveEvent(QMouseEvent *); + void mouseMoveEvent(QMouseEvent *) override; void openContextMenu(QMouseEvent *); - void mousePressEvent(QMouseEvent *); - void paintEvent(QPaintEvent *); + void mousePressEvent(QMouseEvent *) override; + void paintEvent(QPaintEvent *) override; }; //============================================================================= diff --git a/toonz/sources/toonz/dvwidgets.h b/toonz/sources/toonz/dvwidgets.h index 96cfd75..33896e2 100644 --- a/toonz/sources/toonz/dvwidgets.h +++ b/toonz/sources/toonz/dvwidgets.h @@ -45,7 +45,7 @@ protected slots: void onCurrentIndexChanged(const QString &text); private: - void onPropertyChanged(); + void onPropertyChanged() override; }; //----------------------------------------------------------------------------- @@ -60,7 +60,7 @@ protected slots: void onStateChanged(int state); private: - void onPropertyChanged(); + void onPropertyChanged() override; }; //----------------------------------------------------------------------------- @@ -75,7 +75,7 @@ protected slots: void onTextChanged(const QString &text); private: - void onPropertyChanged(); + void onPropertyChanged() override; }; //----------------------------------------------------------------------------- @@ -90,7 +90,7 @@ protected slots: void onValueChanged(bool isDragging); private: - void onPropertyChanged(); + void onPropertyChanged() override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/exportlevelcommand.cpp b/toonz/sources/toonz/exportlevelcommand.cpp index 7b62ff8..ff7988e 100644 --- a/toonz/sources/toonz/exportlevelcommand.cpp +++ b/toonz/sources/toonz/exportlevelcommand.cpp @@ -62,7 +62,7 @@ struct BusyCursorOverride { //--------------------------------------------------------------------------- struct ExportOverwriteCB : public IoCmd::OverwriteCallbacks { - bool overwriteRequest(const TFilePath &fp) { + bool overwriteRequest(const TFilePath &fp) override { int ret = DVGui::MsgBox( QObject::tr("Warning: file %1 already exists.").arg(toQString(fp)), QObject::tr("Continue Exporting"), QObject::tr("Stop Exporting"), 1); @@ -82,13 +82,13 @@ public: return QObject::tr("Exporting level of %1 frames in %2"); } - void setProcessedName(const QString &name) { m_processedName = name; } - void setRange(int min, int max) { + void setProcessedName(const QString &name) override { m_processedName = name; } + void setRange(int min, int max) override { m_pb.setMaximum(max); buildString(); } - void setValue(int val) { m_pb.setValue(val); } - bool canceled() const { return m_pb.wasCanceled(); } + void setValue(int val) override { m_pb.setValue(val); } + bool canceled() const override { return m_pb.wasCanceled(); } void buildString() { m_pb.setLabelText( msg().arg(QString::number(m_pb.maximum())).arg(m_processedName)); diff --git a/toonz/sources/toonz/exportlevelpopup.cpp b/toonz/sources/toonz/exportlevelpopup.cpp index d8d55a9..18fc49c 100644 --- a/toonz/sources/toonz/exportlevelpopup.cpp +++ b/toonz/sources/toonz/exportlevelpopup.cpp @@ -64,7 +64,7 @@ struct MultiExportOverwriteCB : public IoCmd::OverwriteCallbacks { bool m_stopped; MultiExportOverwriteCB() : m_yesToAll(false), m_stopped(false) {} - bool overwriteRequest(const TFilePath &fp) { + bool overwriteRequest(const TFilePath &fp) override { if (m_yesToAll) return true; if (m_stopped) return false; @@ -93,13 +93,13 @@ public: return QObject::tr("Exporting level of %1 frames in %2"); } - void setProcessedName(const QString &name) { m_processedName = name; } - void setRange(int min, int max) { + void setProcessedName(const QString &name) override { m_processedName = name; } + void setRange(int min, int max) override { m_pb.setMaximum(max); buildString(); } - void setValue(int val) { m_pb.setValue(val); } - bool canceled() const { return m_pb.wasCanceled(); } + void setValue(int val) override { m_pb.setValue(val); } + bool canceled() const override { return m_pb.wasCanceled(); } void buildString() { m_pb.setLabelText( msg().arg(QString::number(m_pb.maximum())).arg(m_processedName)); @@ -132,10 +132,10 @@ private: ShortcutZoomer(Swatch *swatch) : ImageUtils::ShortcutZoomer(swatch) {} private: - bool zoom(bool zoomin, bool resetZoom) { + bool zoom(bool zoomin, bool resetZoom) override { return false; } // Already covered by PlaneViewer - bool setActualPixelSize() { + bool setActualPixelSize() override { static_cast(getWidget())->setActualPixelSize(); return true; } diff --git a/toonz/sources/toonz/exportlevelpopup.h b/toonz/sources/toonz/exportlevelpopup.h index 66d467e..82a9444 100644 --- a/toonz/sources/toonz/exportlevelpopup.h +++ b/toonz/sources/toonz/exportlevelpopup.h @@ -62,14 +62,14 @@ public: ExportLevelPopup(); ~ExportLevelPopup(); - bool execute(); + bool execute() override; TPropertyGroup *getFormatProperties(const std::string &ext); IoCmd::ExportLevelOptions getOptions(const std::string &ext); protected: - void showEvent(QShowEvent *se); - void hideEvent(QHideEvent *he); + void showEvent(QShowEvent *se) override; + void hideEvent(QHideEvent *he) override; private: class ExportOptions; @@ -96,7 +96,7 @@ private slots: void onOptionsClicked(); void onRetas(int); - void initFolder(); + void initFolder() override; void updateOnSelection(); void onformatChanged(const QString &); void checkAlpha(); @@ -120,7 +120,7 @@ signals: void optionsChanged(); protected: - void showEvent(QShowEvent *se); + void showEvent(QShowEvent *se) override; void updateCameraDefault(); void updateDpi(); diff --git a/toonz/sources/toonz/exportpanel.h b/toonz/sources/toonz/exportpanel.h index e71c83e..b1dfae0 100644 --- a/toonz/sources/toonz/exportpanel.h +++ b/toonz/sources/toonz/exportpanel.h @@ -56,20 +56,20 @@ public: void getSelectedClips(std::vector &selectedClips); // da DvItemListModel - int getItemCount() const; - QVariant getItemData(int index, DataType dataType, bool isSelected = false); - bool isSceneItem(int index) const { return true; } - QMenu *getContextMenu(QWidget *parent, int index); - void enableSelectionCommands(TSelection *); - void startDragDrop(); + int getItemCount() const override; + QVariant getItemData(int index, DataType dataType, bool isSelected = false) override; + bool isSceneItem(int index) const override { return true; } + QMenu *getContextMenu(QWidget *parent, int index) override; + void enableSelectionCommands(TSelection *) override; + void startDragDrop() override; - void draw(QPainter &); + void draw(QPainter &) override; protected: - void dragEnterEvent(QDragEnterEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; public slots: void resetList(); @@ -161,7 +161,7 @@ public: static int computeTotalFrameCount(const std::vector &clipList, bool useMarkers = false); bool addScene(MovieGenerator &g, ToonzScene *scene); - bool onFrameCompleted(int frameCount); + bool onFrameCompleted(int frameCount) override; void getMovieProperties(const TFilePath &scenePath, TDimension &resolution); }; diff --git a/toonz/sources/toonz/exportscenepopup.h b/toonz/sources/toonz/exportscenepopup.h index f5889be..5e366cd 100644 --- a/toonz/sources/toonz/exportscenepopup.h +++ b/toonz/sources/toonz/exportscenepopup.h @@ -28,7 +28,7 @@ public: const TFilePath &path) : DvDirModelFileFolderNode(parent, path) {} - DvDirModelNode *makeChild(std::wstring name); + DvDirModelNode *makeChild(std::wstring name) override; DvDirModelFileFolderNode *createExposeSceneNode(DvDirModelNode *parent, const TFilePath &path); }; @@ -45,7 +45,7 @@ public: std::wstring name, const TFilePath &path) : ExportSceneDvDirModelFileFolderNode(parent, name, path) {} - QPixmap getPixmap(bool isOpen) const { return m_pixmap; } + QPixmap getPixmap(bool isOpen) const override { return m_pixmap; } void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; } }; @@ -59,7 +59,7 @@ public: const TFilePath &path) : ExportSceneDvDirModelFileFolderNode(parent, path) {} void makeCurrent() {} - QPixmap getPixmap(bool isOpen) const; + QPixmap getPixmap(bool isOpen) const override; }; //============================================================================= @@ -73,8 +73,8 @@ class ExportSceneDvDirModelRootNode : public DvDirModelNode { public: ExportSceneDvDirModelRootNode(); - void refreshChildren(); - DvDirModelNode *getNodeByPath(const TFilePath &path); + void refreshChildren() override; + DvDirModelNode *getNodeByPath(const TFilePath &path) override; }; //============================================================================= @@ -88,17 +88,17 @@ public: ~ExportSceneDvDirModel(); DvDirModelNode *getNode(const QModelIndex &index) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &index) const; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &index) const override; QModelIndex childByName(const QModelIndex &parent, const std::wstring &name) const; - int columnCount(const QModelIndex &parent) const { return 1; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &index) const; + int columnCount(const QModelIndex &parent) const override { return 1; } + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, - int role = Qt::EditRole); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool hasChildren(const QModelIndex &parent) const; + int role = Qt::EditRole) override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent) const override; void refresh(const QModelIndex &index); }; @@ -113,9 +113,9 @@ public: ExportSceneTreeViewDelegate(ExportSceneTreeView *parent); ~ExportSceneTreeViewDelegate(); void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const override; }; //============================================================================= @@ -127,13 +127,13 @@ class ExportSceneTreeView : public QTreeView { public: ExportSceneTreeView(QWidget *parent); - QSize sizeHint() const; + QSize sizeHint() const override; DvDirModelNode *getCurrentNode() const; protected: void refresh(); - void showEvent(QShowEvent *); - void focusInEvent(QFocusEvent *event); + void showEvent(QShowEvent *) override; + void focusInEvent(QFocusEvent *event) override; public slots: void resizeToConts(); diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cpp index 8ea7ac7..80417e0 100644 --- a/toonz/sources/toonz/filebrowser.cpp +++ b/toonz/sources/toonz/filebrowser.cpp @@ -110,14 +110,14 @@ public: ~FrameCountTask(); - void run(); + void run() override; - QThread::Priority runningPriority(); + QThread::Priority runningPriority() override; public slots: - void onStarted(TThread::RunnableP thisTask); - void onCanceled(TThread::RunnableP thisTask); + void onStarted(TThread::RunnableP thisTask) override; + void onCanceled(TThread::RunnableP thisTask) override; }; //============================ diff --git a/toonz/sources/toonz/filebrowser.h b/toonz/sources/toonz/filebrowser.h index 4a9c7d2..0a7c7ac 100644 --- a/toonz/sources/toonz/filebrowser.h +++ b/toonz/sources/toonz/filebrowser.h @@ -69,18 +69,18 @@ public: #endif ~FileBrowser(); - void sortByDataModel(DataType dataType, bool isDiscendent); - void refreshData(); + void sortByDataModel(DataType dataType, bool isDiscendent) override; + void refreshData() override; - int getItemCount() const; - QVariant getItemData(int index, DataType dataType, bool isSelected = false); + int getItemCount() const override; + QVariant getItemData(int index, DataType dataType, bool isSelected = false) override; - bool canRenameItem(int index) const; - void renameItem(int index, const QString &newName); + bool canRenameItem(int index) const override; + void renameItem(int index, const QString &newName) override; - bool isSceneItem(int index) const; - void startDragDrop(); - QMenu *getContextMenu(QWidget *parent, int index); + bool isSceneItem(int index) const override; + void startDragDrop() override; + QMenu *getContextMenu(QWidget *parent, int index) override; /*! This functions adds to the types to be filtered a new type; @@ -129,10 +129,10 @@ protected: bool dropMimeData(QTreeWidgetItem *parent, int index, const QMimeData *data, Qt::DropAction action); - bool acceptDrop(const QMimeData *data) const; - bool drop(const QMimeData *data); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + bool acceptDrop(const QMimeData *data) const override; + bool drop(const QMimeData *data) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; // Fill the QStringList with files selected in the browser, auxiliary files // (palette for tlv, hooks, sceneIcons) diff --git a/toonz/sources/toonz/filebrowsermodel.h b/toonz/sources/toonz/filebrowsermodel.h index baab3bb..34d7962 100644 --- a/toonz/sources/toonz/filebrowsermodel.h +++ b/toonz/sources/toonz/filebrowsermodel.h @@ -92,26 +92,26 @@ public: const TFilePath &path); DvDirModelFileFolderNode(DvDirModelNode *parent, const TFilePath &path); - QPixmap getPixmap(bool isOpen) const; + QPixmap getPixmap(bool isOpen) const override; TFilePath getPath() const { return m_path; } - void visualizeContent(FileBrowser *browser); //????????????? + void visualizeContent(FileBrowser *browser) override; //????????????? - virtual void refreshChildren(); - virtual bool hasChildren(); + void refreshChildren() override; + bool hasChildren() override; virtual void getChildrenNames(std::vector &names) const; virtual DvDirModelNode *makeChild(std::wstring name); - int rowByName(const std::wstring &name) const; //????? + int rowByName(const std::wstring &name) const override; //????? - bool setName(std::wstring newName); // chiamarlo rename ???? - bool isFolder(const TFilePath &folderPath) const { + bool setName(std::wstring newName) override; // chiamarlo rename ???? + bool isFolder(const TFilePath &folderPath) const override { return folderPath == m_path; } - bool isFolder() const { return !m_path.isEmpty(); } + bool isFolder() const override { return !m_path.isEmpty(); } static DvDirModelFileFolderNode *createNode(DvDirModelNode *parent, const TFilePath &path); - DvDirModelNode *getNodeByPath(const TFilePath &path); + DvDirModelNode *getNodeByPath(const TFilePath &path) override; bool isProjectFolder() const { return m_isProjectFolder; } void setIsProjectFolder(bool yes) { m_isProjectFolder = yes; } @@ -133,11 +133,11 @@ public: const TFilePath &scenePath); DvDirModelSceneFolderNode(DvDirModelNode *parent, const TFilePath &path); ~DvDirModelSceneFolderNode(); - bool setName(std::wstring newName); - QPixmap getPixmap(bool isOpen) const; - DvDirModelNode *makeChild(std::wstring name); - void getChildrenNames(std::vector &names) const; - void refreshChildren(); + bool setName(std::wstring newName) override; + QPixmap getPixmap(bool isOpen) const override; + DvDirModelNode *makeChild(std::wstring name) override; + void getChildrenNames(std::vector &names) const override; + void refreshChildren() override; static DvDirModelFileFolderNode *createNode(DvDirModelNode *parent, const TFilePath &path); int rowByName(const std::wstring &name); @@ -151,7 +151,7 @@ class DvDirModelSpecialFileFolderNode : public DvDirModelFileFolderNode { public: DvDirModelSpecialFileFolderNode(DvDirModelNode *parent, std::wstring name, const TFilePath &localPath); - QPixmap getPixmap(bool isOpen) const; + QPixmap getPixmap(bool isOpen) const override; void setPixmap(const QPixmap &pixmap); }; @@ -173,10 +173,10 @@ public: DvDirVersionControlNode(DvDirModelNode *parent, std::wstring name, const TFilePath &path); - DvDirModelNode *makeChild(std::wstring name); - QPixmap getPixmap(bool isOpen) const; + DvDirModelNode *makeChild(std::wstring name) override; + QPixmap getPixmap(bool isOpen) const override; - void getChildrenNames(std::vector &names) const; + void getChildrenNames(std::vector &names) const override; QList getMissingFiles() const; QStringList getMissingFiles(const QRegExp &filter) const; @@ -201,7 +201,7 @@ public: void setIsUnversioned(bool value) { m_isUnversioned = value; } bool isUnversioned() const { return m_isUnversioned; } - DvDirVersionControlRootNode *getVersionControlRootNode(); + DvDirVersionControlRootNode *getVersionControlRootNode() override; }; //----------------------------------------------------------------------------- @@ -216,9 +216,9 @@ class DvDirVersionControlRootNode : public DvDirVersionControlNode { public: DvDirVersionControlRootNode(DvDirModelNode *parent, std::wstring name, const TFilePath &localPath); - void refreshChildren(); + void refreshChildren() override; - QPixmap getPixmap(bool isOpen) const { return m_pixmap; } + QPixmap getPixmap(bool isOpen) const override { return m_pixmap; } void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; } void setLocalPath(const std::wstring &localPath) { m_localPath = localPath; } @@ -234,7 +234,7 @@ public: void setPassword(const std::wstring &password) { m_password = password; } std::wstring getPassword() const { return m_password; } - DvDirVersionControlRootNode *getVersionControlRootNode() { return this; } + DvDirVersionControlRootNode *getVersionControlRootNode() override { return this; } }; //----------------------------------------------------------------------------- @@ -246,9 +246,9 @@ public: TFilePath getProjectPath() const; bool isCurrent() const; void makeCurrent(); - QPixmap getPixmap(bool isOpen) const; - void refreshChildren(); - void getChildrenNames(std::vector &names) const; + QPixmap getPixmap(bool isOpen) const override; + void refreshChildren() override; + void getChildrenNames(std::vector &names) const override; // DvDirModelNode *makeChild(std::wstring name); }; @@ -260,10 +260,10 @@ public: TFilePath getProjectPath() const; bool isCurrent() const; void makeCurrent(); - QPixmap getPixmap(bool isOpen) const; - void refreshChildren(); - void getChildrenNames(std::vector &names) const; - DvDirModelNode *makeChild(std::wstring name); + QPixmap getPixmap(bool isOpen) const override; + void refreshChildren() override; + void getChildrenNames(std::vector &names) const override; + DvDirModelNode *makeChild(std::wstring name) override; }; //----------------------------------------------------------------------------- @@ -273,9 +273,9 @@ class DvDirModelDayNode : public DvDirModelNode { public: DvDirModelDayNode(DvDirModelNode *parent, std::wstring dayDateString); - void refreshChildren() {} - void visualizeContent(FileBrowser *browser); //?????????????????? - QPixmap getPixmap(bool isOpen) const; + void refreshChildren() override {} + void visualizeContent(FileBrowser *browser) override; //?????????????????? + QPixmap getPixmap(bool isOpen) const override; }; //----------------------------------------------------------------------------- @@ -283,8 +283,8 @@ public: class DvDirModelHistoryNode : public DvDirModelNode { public: DvDirModelHistoryNode(DvDirModelNode *parent); - void refreshChildren(); - QPixmap getPixmap(bool isOpen) const; + void refreshChildren() override; + QPixmap getPixmap(bool isOpen) const override; }; //----------------------------------------------------------------------------- @@ -292,9 +292,9 @@ public: class DvDirModelMyComputerNode : public DvDirModelNode { public: DvDirModelMyComputerNode(DvDirModelNode *parent); - void refreshChildren(); - QPixmap getPixmap(bool isOpen) const; - bool isFolder() const { return true; } + void refreshChildren() override; + QPixmap getPixmap(bool isOpen) const override; + bool isFolder() const override { return true; } }; //----------------------------------------------------------------------------- @@ -302,9 +302,9 @@ public: class DvDirModelNetworkNode : public DvDirModelNode { public: DvDirModelNetworkNode(DvDirModelNode *parent); - void refreshChildren(); - QPixmap getPixmap(bool isOpen) const; - bool isFolder() const { return true; } + void refreshChildren() override; + QPixmap getPixmap(bool isOpen) const override; + bool isFolder() const override { return true; } }; //----------------------------------------------------------------------------- @@ -320,9 +320,9 @@ class DvDirModelRootNode : public DvDirModelNode { public: DvDirModelRootNode(); - void refreshChildren(); + void refreshChildren() override; - DvDirModelNode *getNodeByPath(const TFilePath &path); + DvDirModelNode *getNodeByPath(const TFilePath &path) override; // QPixmap getPixmap(bool isOpen) const; }; @@ -339,12 +339,12 @@ public: static DvDirModel *instance(); - void onFolderChanged(const TFilePath &path); + void onFolderChanged(const TFilePath &path) override; DvDirModelNode *getNode(const QModelIndex &index) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &index) const; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &index) const override; QModelIndex getIndexByPath(const TFilePath &path) const; QModelIndex getIndexByNode(DvDirModelNode *node) const; @@ -352,19 +352,19 @@ public: QModelIndex childByName(const QModelIndex &parent, const std::wstring &name) const; - int columnCount(const QModelIndex &parent) const { return 1; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &index) const; + int columnCount(const QModelIndex &parent) const override { return 1; } + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, - int role = Qt::EditRole); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const; + int role = Qt::EditRole) override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; void refresh(const QModelIndex &index); void refreshFolder(const TFilePath &folderPath, const QModelIndex &i = QModelIndex()); void refreshFolderChild(const QModelIndex &i = QModelIndex()); bool removeRows(int row, int count, - const QModelIndex &parent = QModelIndex()); + const QModelIndex &parent = QModelIndex()) override; QModelIndex getCurrentProjectIndex() const; }; diff --git a/toonz/sources/toonz/filebrowserpopup.h b/toonz/sources/toonz/filebrowserpopup.h index d775829..4671347 100644 --- a/toonz/sources/toonz/filebrowserpopup.h +++ b/toonz/sources/toonz/filebrowserpopup.h @@ -135,8 +135,8 @@ successful (accepted) - in which case the popup closes. // change the "Apply" button for the browser in flipbook to "Append" virtual bool executeApply() { return execute(); } - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; protected slots: @@ -164,7 +164,7 @@ was explicitly aborted by the user. TFilePath getPath(); protected: - bool execute(); + bool execute() override; }; //----------------------------------------------------------------------------- @@ -186,7 +186,7 @@ action was explicitly aborted by the user. TFilePath getPath(); protected: - bool execute(); + bool execute() override; }; //----------------------------------------------------------------------------- @@ -197,14 +197,14 @@ class LoadScenePopup : public FileBrowserPopup { public: LoadScenePopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; // change the initial path according to the current room void setInitialFolderByCurrentRoom(); protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; }; //----------------------------------------------------------------------------- @@ -215,11 +215,11 @@ class LoadSubScenePopup : public FileBrowserPopup { public: LoadSubScenePopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; }; //----------------------------------------------------------------------------- @@ -230,8 +230,8 @@ class SaveSceneAsPopup : public FileBrowserPopup { public: SaveSceneAsPopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; }; //----------------------------------------------------------------------------- @@ -242,8 +242,8 @@ class SaveSubSceneAsPopup : public FileBrowserPopup { public: SaveSubSceneAsPopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; }; //----------------------------------------------------------------------------- @@ -270,17 +270,17 @@ class LoadLevelPopup : public FileBrowserPopup { public: LoadLevelPopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; protected: // reflect the current frame to GUI - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public slots: void onFilePathsSelected(const std::set &paths, - const std::list> &fIds); + const std::list> &fIds) override; // if the frame switched, then move m_posFrom void onFrameSwitched(); // if the from/to values in the subsequent box are changed, then reflect them @@ -310,8 +310,8 @@ class SaveLevelAsPopup : public FileBrowserPopup { public: SaveLevelAsPopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; }; //----------------------------------------------------------------------------- @@ -326,10 +326,10 @@ class ReplaceLevelPopup : public FileBrowserPopup { public: ReplaceLevelPopup(); - bool execute(); + bool execute() override; void show(); - void initFolder(); + void initFolder() override; protected slots: void onSelectionChanged(TSelection *selection); @@ -343,8 +343,8 @@ class SavePaletteAsPopup : public FileBrowserPopup { public: SavePaletteAsPopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; }; //----------------------------------------------------------------------------- @@ -357,10 +357,10 @@ class LoadColorModelPopup : public FileBrowserPopup { public: LoadColorModelPopup(); - bool execute(); + bool execute() override; protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; protected slots: @@ -375,11 +375,11 @@ class ImportMagpieFilePopup : public FileBrowserPopup { public: ImportMagpieFilePopup(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; }; //----------------------------------------------------------------------------- @@ -394,8 +394,8 @@ class ReplaceParentDirectoryPopup : public FileBrowserPopup { public: ReplaceParentDirectoryPopup(); void show(); - bool execute(); - void initFolder(); + bool execute() override; + void initFolder() override; }; //----------------------------------------------------------------------------- @@ -410,7 +410,7 @@ public: const TFilePath &getPath() { return m_path; } - bool execute(); + bool execute() override; void initFolder(TFilePath path); }; @@ -426,10 +426,10 @@ class BrowserPopupController : public QObject, public: BrowserPopupController(); - bool isExecute() { return m_isExecute; } + bool isExecute() override { return m_isExecute; } void openPopup(QStringList filters, bool isDirectoryOnly, - QString lastSelectedPath); - QString getPath(); + QString lastSelectedPath) override; + QString getPath() override; }; #endif // FILEBROWSERPOPUP_H diff --git a/toonz/sources/toonz/filedata.h b/toonz/sources/toonz/filedata.h index 140ef71..b1f9bce 100644 --- a/toonz/sources/toonz/filedata.h +++ b/toonz/sources/toonz/filedata.h @@ -18,7 +18,7 @@ public: FileData(const FileData *src); ~FileData(); - FileData *clone() const { return new FileData(this); } + FileData *clone() const override { return new FileData(this); } // data <- files. void setFiles(std::vector &files); diff --git a/toonz/sources/toonz/fileselection.cpp b/toonz/sources/toonz/fileselection.cpp index 4a39654..383bb6e 100644 --- a/toonz/sources/toonz/fileselection.cpp +++ b/toonz/sources/toonz/fileselection.cpp @@ -61,19 +61,19 @@ public: CopyFilesUndo(QMimeData *oldData, QMimeData *newData) : m_oldData(oldData), m_newData(newData) {} - void undo() const { + void undo() const override { QClipboard *clipboard = QApplication::clipboard(); clipboard->setMimeData(cloneData(m_oldData), QClipboard::Clipboard); } - void redo() const { + void redo() const override { QClipboard *clipboard = QApplication::clipboard(); clipboard->setMimeData(cloneData(m_newData), QClipboard::Clipboard); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Copy File"); } + QString getHistoryString() override { return QObject::tr("Copy File"); } }; //============================================================================= @@ -90,7 +90,7 @@ public: ~PasteFilesUndo() {} - void undo() const { + void undo() const override { int i; for (i = 0; i < (int)m_newFiles.size(); i++) { TFilePath path = m_newFiles[i]; @@ -103,7 +103,7 @@ public: FileBrowser::refreshFolder(m_folder); } - void redo() const { + void redo() const override { if (!TSystem::touchParentDir(m_folder)) TSystem::mkDir(m_folder); const FileData *data = dynamic_cast(QApplication::clipboard()->mimeData()); @@ -114,9 +114,9 @@ public: FileBrowser::refreshFolder(m_folder); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Paste File : "); for (int i = 0; i < (int)m_newFiles.size(); i++) { if (i != 0) str += QString(", "); @@ -140,7 +140,7 @@ public: ~DuplicateUndo() {} - void undo() const { + void undo() const override { int i; for (i = 0; i < (int)m_newFiles.size(); i++) { TFilePath path = m_newFiles[i]; @@ -155,7 +155,7 @@ public: FileBrowser::refreshFolder(m_newFiles[0].getParentDir()); } - void redo() const { + void redo() const override { int i; for (i = 0; i < (int)m_files.size(); i++) { TFilePath fp = m_files[i]; @@ -165,9 +165,9 @@ public: FileBrowser::refreshFolder(m_files[0].getParentDir()); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Duplicate File : "); int i; for (i = 0; i < (int)m_files.size(); i++) { diff --git a/toonz/sources/toonz/fileselection.h b/toonz/sources/toonz/fileselection.h index 8666f6e..417fc5b 100644 --- a/toonz/sources/toonz/fileselection.h +++ b/toonz/sources/toonz/fileselection.h @@ -24,7 +24,7 @@ public: void getSelectedFiles(std::vector &files); // commands - void enableCommands(); + void enableCommands() override; void duplicateFiles(); void deleteFiles(); diff --git a/toonz/sources/toonz/filmstrip.h b/toonz/sources/toonz/filmstrip.h index 0777632..f0a16bf 100644 --- a/toonz/sources/toonz/filmstrip.h +++ b/toonz/sources/toonz/filmstrip.h @@ -94,7 +94,7 @@ public: void scroll(int dy); // overriden from TSelection::View - void onSelectionChanged() { update(); } + void onSelectionChanged() override { update(); } enum SelectionMode { SIMPLE_SELECT, @@ -109,9 +109,9 @@ public: int getOneFrameHeight(); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void paintEvent(QPaintEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void paintEvent(QPaintEvent *) override; enum { F_NORMAL = 0, @@ -121,24 +121,24 @@ protected: void drawFrameIcon(QPainter &p, const QRect &r, int index, const TFrameId &fid, int flags); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *); - void keyPressEvent(QKeyEvent *event); - void wheelEvent(QWheelEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *) override; + void keyPressEvent(QKeyEvent *event) override; + void wheelEvent(QWheelEvent *event) override; void startAutoPanning(); void stopAutoPanning(); - void timerEvent(QTimerEvent *); + void timerEvent(QTimerEvent *) override; - void contextMenuEvent(QContextMenuEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; void startDragDrop(); void inbetween(); void execNavigatorPan(const QPoint &point); - void mouseDoubleClickEvent(QMouseEvent *event); + void mouseDoubleClickEvent(QMouseEvent *event) override; protected slots: void onLevelChanged(); @@ -211,9 +211,9 @@ public: ~Filmstrip(); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void resizeEvent(QResizeEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void resizeEvent(QResizeEvent *) override; // void keyPressEvent(QKeyEvent* event){ // event->ignore(); //} diff --git a/toonz/sources/toonz/filmstripcommand.cpp b/toonz/sources/toonz/filmstripcommand.cpp index 23a6cbf..e35d5aa 100644 --- a/toonz/sources/toonz/filmstripcommand.cpp +++ b/toonz/sources/toonz/filmstripcommand.cpp @@ -462,9 +462,9 @@ public: if (m_data) delete m_data; } - void onAdd() { m_newPalette = m_level->getPalette()->clone(); } + void onAdd() override { m_newPalette = m_level->getPalette()->clone(); } - void undo() const { + void undo() const override { if (!m_level || m_frames.empty()) return; std::set frames = m_frames; @@ -512,7 +512,7 @@ public: TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - void redo() const { + void redo() const override { if (!m_level || m_frames.empty()) return; if (m_isFrameInserted) { assert(m_frames.size() == 1); @@ -605,11 +605,11 @@ public: TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(*m_data) + sizeof(*m_tiles); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Paste : Level %1 : Frame ") .arg(QString::fromStdWString(m_level->getName())); @@ -621,7 +621,7 @@ public: return str; } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; //============================================================================= @@ -654,9 +654,9 @@ public: if (m_data) delete m_data; } - void onAdd() { m_newPalette = m_level->getPalette()->clone(); } + void onAdd() override { m_newPalette = m_level->getPalette()->clone(); } - void undo() const { + void undo() const override { if (!m_level || m_frames.empty()) return; std::set frames = m_frames; @@ -696,7 +696,7 @@ public: TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - void redo() const { + void redo() const override { if (!m_level || m_frames.empty()) return; if (m_isFrameInserted) { @@ -727,9 +727,9 @@ public: TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - int getSize() const { return sizeof(*this) + sizeof(*m_data); } + int getSize() const override { return sizeof(*this) + sizeof(*m_data); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Paste : Level %1 : Frame ") .arg(QString::fromStdWString(m_level->getName())); @@ -741,7 +741,7 @@ public: return str; } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; /*//============================================================================= @@ -904,7 +904,7 @@ public: if (m_newData) m_newData->releaseData(); } - void undo() const { + void undo() const override { TSelection *selection = TSelection::getCurrent(); if (selection) selection->selectNone(); std::set frames = m_frames; @@ -955,7 +955,7 @@ public: *m_sl->getHookSet() = *m_oldLevelHooks; } - void redo() const { + void redo() const override { if (!m_sl || m_frames.empty()) return; TSelection *selection = TSelection::getCurrent(); if (selection) selection->selectNone(); @@ -966,9 +966,9 @@ public: true, keepOriginalPalette, true); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Paste : Level %1 : Frame ") .arg(QString::fromStdWString(m_sl->getName())); @@ -980,7 +980,7 @@ public: return str; } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; //============================================================================= @@ -1012,16 +1012,16 @@ public: true, dummy); } - void undo() const { pasteFramesFromData(m_oldData); } + void undo() const override { pasteFramesFromData(m_oldData); } // OSS.: Non posso usare il metodo "clearFramesWithoutUndo(...)" perche' // genera un NUOVO frame vuoto, perdendo quello precedente e le eventuali // modifiche che ad esso possono essere state fatte successivamente. - void redo() const { pasteFramesFromData(m_newData); } + void redo() const override { pasteFramesFromData(m_newData); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Delete Frames : Level %1 : Frame ") .arg(QString::fromStdWString(m_sl->getName())); @@ -1033,7 +1033,7 @@ public: return str; } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; //============================================================================= @@ -1060,7 +1060,7 @@ public: if (m_newData) m_newData->releaseData(); } - void undo() const { + void undo() const override { std::set frames = m_framesCutted; bool dummy = true; pasteFramesWithoutUndo(m_newData, m_sl, frames, DrawingData::OVER_SELECTION, @@ -1068,7 +1068,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { // Prendo il clipboard corrente. QClipboard *clipboard = QApplication::clipboard(); QMimeData *currentData = cloneData(clipboard->mimeData()); @@ -1080,9 +1080,9 @@ public: clipboard->setMimeData(currentData, QClipboard::Clipboard); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Cut Frames : Level %1 : Frame ") .arg(QString::fromStdWString(m_sl->getName())); @@ -1094,7 +1094,7 @@ public: return str; } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -1117,7 +1117,7 @@ public: std::vector oldFids) : m_level(level), m_insertedFids(insertedFids), m_oldFids(oldFids) {} - void undo() const { + void undo() const override { removeFramesWithoutUndo(m_level, m_insertedFids); m_level->renumber(m_oldFids); invalidateIcons(m_level.getPointer(), m_oldFids); @@ -1128,7 +1128,7 @@ public: app->getCurrentLevel()->notifyLevelChange(); } - void redo() const { + void redo() const override { makeSpaceForFids(m_level.getPointer(), m_insertedFids); for (auto const &fid : m_insertedFids) { @@ -1142,9 +1142,9 @@ public: app->getCurrentLevel()->notifyLevelChange(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Add Frames : Level %1 : Frame ") .arg(QString::fromStdWString(m_level->getName())); @@ -1156,7 +1156,7 @@ public: return str; } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -1225,7 +1225,7 @@ public: invalidateIcons(m_level.getPointer(), fids); TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - void undo() const { + void undo() const override { std::vector fids; m_level->getFids(fids); assert(fids.size() == m_fids.size()); @@ -1240,16 +1240,16 @@ public: } renumber(fids); } - void redo() const { renumber(m_fids); } - int getSize() const { + void redo() const override { renumber(m_fids); } + int getSize() const override { return sizeof(*this) + sizeof(TFrameId) * m_fids.size(); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Renumber : Level %1") .arg(QString::fromStdWString(m_level->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -1639,7 +1639,7 @@ public: QString::number((uintptr_t)this)); } - void undo() const { + void undo() const override { removeFramesWithoutUndo(m_level, m_frames); assert(m_oldFrames.size() == m_level->getFrameCount()); m_level->renumber(m_oldFrames); @@ -1647,7 +1647,7 @@ public: TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - void redo() const { + void redo() const override { if (!m_level || m_frames.empty()) return; if (m_level->getType() == PLI_XSHLEVEL) FilmstripCmd::insert(m_level.getPointer(), m_frames, false); @@ -1668,13 +1668,13 @@ public: } } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Insert : Level %1") .arg(QString::fromStdWString(m_level->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -1734,15 +1734,15 @@ public: FilmstripReverseUndo(TXshSimpleLevelP level, std::set frames) : m_level(level), m_frames(frames) {} - void undo() const { performReverse(m_level, m_frames); } - void redo() const { performReverse(m_level, m_frames); } - int getSize() const { return sizeof *this; } + void undo() const override { performReverse(m_level, m_frames); } + void redo() const override { performReverse(m_level, m_frames); } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Reverse : Level %1") .arg(QString::fromStdWString(m_level->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -1815,23 +1815,23 @@ public: for (i = 0; i < count; i++) m_newFrames.insert(insertPoint + i); } - void undo() const { + void undo() const override { TSelection *selection = TSelection::getCurrent(); if (selection) selection->selectNone(); removeFramesWithoutUndo(m_level, m_newFrames); } - void redo() const { + void redo() const override { TSelection *selection = TSelection::getCurrent(); if (selection) selection->selectNone(); performSwing(m_level, m_frames); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Swing : Level %1") .arg(QString::fromStdWString(m_level->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -1911,7 +1911,7 @@ public: for (int j = 1; j < step; j++) m_insertedFrames.insert(*it + (++d)); } - void undo() const { + void undo() const override { removeFramesWithoutUndo(m_level, m_insertedFrames); std::set::const_iterator it = m_frames.begin(); m_level->renumber(m_oldFrames); @@ -1920,19 +1920,19 @@ public: invalidateIcons(m_level.getPointer(), m_oldFrames); TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - void redo() const { + void redo() const override { TSelection *selection = TSelection::getCurrent(); if (selection) selection->selectNone(); stepFilmstripFrames(m_level, m_frames, m_step); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Step %1 : Level %2") .arg(QString::number(m_step)) .arg(QString::fromStdWString(m_level->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -2011,24 +2011,24 @@ public: for (; it != m_cutFrames.end(); ++it) TImageCache::instance()->remove(it->second); } - void undo() const { + void undo() const override { TSelection *selection = TSelection::getCurrent(); if (selection) selection->selectNone(); insertNotEmptyframes(m_level, m_cutFrames); } - void redo() const { + void redo() const override { TSelection *selection = TSelection::getCurrent(); if (selection) selection->selectNone(); eachFilmstripFrames(m_level, m_frames, m_each); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Each %1 : Level %2") .arg(QString::number(m_each)) .arg(QString::fromStdWString(m_level->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -2070,24 +2070,24 @@ public: , m_frameInserted(frameInserted) , m_framesForRedo(framesForRedo) {} - void undo() const { + void undo() const override { assert(m_level); removeFramesWithoutUndo(m_level, m_frameInserted); m_level->renumber(m_oldFrames); invalidateIcons(m_level.getPointer(), m_oldFrames); TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - void redo() const { + void redo() const override { std::set framesForRedo = m_framesForRedo; FilmstripCmd::duplicate(m_level.getPointer(), framesForRedo, false); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Duplicate : Level %1") .arg(QString::fromStdWString(m_level->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -2160,7 +2160,7 @@ public: MoveLevelToSceneUndo(std::wstring levelName, int col, std::set fids) : m_levelName(levelName), m_col(col), m_fids(fids) {} - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); ToonzScene *scene = app->getCurrentScene()->getScene(); @@ -2169,20 +2169,20 @@ public: xsh->clearCells(0, m_col, m_fids.size()); app->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); TXshLevel *xl = scene->getLevelSet()->getLevel(m_levelName); if (!xl) return; moveToSceneFrames(xl, m_fids); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Move Level to Scene : Level %1") .arg(QString::fromStdWString(m_levelName)); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace @@ -2275,7 +2275,7 @@ public: // rilascia queste immagini a causa dell'inbetweener } - void undo() const { + void undo() const override { UINT levelSize = m_fids.size() - 1; for (UINT count = 1; count != levelSize; count++) { TVectorImageP vImage = m_images[count]; @@ -2287,19 +2287,19 @@ public: TApp::instance()->getCurrentLevel()->notifyLevelChange(); } - void redo() const { + void redo() const override { TFrameId fid0 = *m_fids.begin(); TFrameId fid1 = *(--m_fids.end()); FilmstripCmd::inbetweenWithoutUndo(m_level.getPointer(), fid0, fid1, m_interpolation); } - int getSize() const { + int getSize() const override { assert(!m_images.empty()); return m_images.size() * m_images.front()->getStrokeCount() * 100; } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Inbetween : Level %1, ") .arg(QString::fromStdWString(m_level->getName())); switch (m_interpolation) { @@ -2318,7 +2318,7 @@ public: } return str; } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; } // namespace diff --git a/toonz/sources/toonz/filmstripselection.h b/toonz/sources/toonz/filmstripselection.h index 0ffc135..476f01a 100644 --- a/toonz/sources/toonz/filmstripselection.h +++ b/toonz/sources/toonz/filmstripselection.h @@ -27,11 +27,11 @@ public: TFilmstripSelection(); ~TFilmstripSelection(); - void enableCommands(); + void enableCommands() override; - bool isEmpty() const; + bool isEmpty() const override; - void selectNone(); + void selectNone() override; void select(const TFrameId &fid, bool selected = true); bool isSelected(const TFrameId &fid) const; diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp index 1972e26..4e1fd8f 100644 --- a/toonz/sources/toonz/flipbook.cpp +++ b/toonz/sources/toonz/flipbook.cpp @@ -310,7 +310,7 @@ public: QString m_str; ProgressBarMessager(int choice, int val, const QString &str = "") : m_choice(choice), m_val(val), m_str(str) {} - void onDeliver() { + void onDeliver() override { switch (m_choice) { case eBegin: if (!Pd) @@ -340,7 +340,7 @@ public: } } - TThread::Message *clone() const { return new ProgressBarMessager(*this); } + TThread::Message *clone() const override { return new ProgressBarMessager(*this); } }; } // namespace diff --git a/toonz/sources/toonz/flipbook.h b/toonz/sources/toonz/flipbook.h index 75c52e9..d8b6f2c 100644 --- a/toonz/sources/toonz/flipbook.h +++ b/toonz/sources/toonz/flipbook.h @@ -33,7 +33,7 @@ class SaveImagesPopup : public FileBrowserPopup { public: SaveImagesPopup(FlipBook *flip); - bool execute(); + bool execute() override; }; class LoadImagesPopup : public FileBrowserPopup { @@ -55,8 +55,8 @@ class LoadImagesPopup : public FileBrowserPopup { public: LoadImagesPopup(FlipBook *flip); - bool execute(); - bool executeApply(); + bool execute() override; + bool executeApply() override; bool doLoad(bool append); public slots: @@ -189,7 +189,7 @@ public: TPalette *palette = 0, int from = -1, int to = -1, int step = 1, int currentFrame = 1, TSoundTrack *snd = 0); void setLevel(TXshSimpleLevel *xl); - void onPlayCompleted() {} + void onPlayCompleted() override {} bool doSaveImages(TFilePath fp); int getCurrentFrame() { return m_flipConsole->getCurrentFrame(); } QString getLevelZoomTitle() const { return m_title1 + m_title; } @@ -227,7 +227,7 @@ public: void reset(); - void onDrawFrame(int frame, const ImagePainter::VisualSettings &vs); + void onDrawFrame(int frame, const ImagePainter::VisualSettings &vs) override; void minimize(bool doMinimize); @@ -236,8 +236,8 @@ public: void setLoadbox(const TRect &box); TDimension getImageSize() const { return m_dim; } - void swapBuffers(); - void changeSwapBehavior(bool enable); + void swapBuffers() override; + void changeSwapBehavior(bool enable) override; private: // When viewing the tlv, try to cache all frames at the beginning. @@ -251,18 +251,18 @@ protected: void adaptWidGeometry(const TRect &interestWidRect, const TRect &imgWidRect, bool keepPosition); - void dragEnterEvent(QDragEnterEvent *e); - void dropEvent(QDropEvent *e); + void dragEnterEvent(QDragEnterEvent *e) override; + void dropEvent(QDropEvent *e) override; void playAudioFrame(int frame); TImageP getCurrentImage(int frame); - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); - void focusInEvent(QFocusEvent *e); - void resizeEvent(QResizeEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void resizeEvent(QResizeEvent *e) override; - void enterEvent(QEvent *e) { m_flipConsole->makeCurrent(); } + void enterEvent(QEvent *e) override { m_flipConsole->makeCurrent(); } signals: diff --git a/toonz/sources/toonz/floatingpanelcommand.h b/toonz/sources/toonz/floatingpanelcommand.h index 107ab0d..7f044b8 100644 --- a/toonz/sources/toonz/floatingpanelcommand.h +++ b/toonz/sources/toonz/floatingpanelcommand.h @@ -18,7 +18,7 @@ class OpenFloatingPanel : public MenuItemHandler { public: OpenFloatingPanel(CommandId id, const std::string &panelType, QString title); - void execute(); + void execute() override; static TPanel *getOrOpenFloatingPanel(const std::string &panelType); }; diff --git a/toonz/sources/toonz/formatsettingspopups.h b/toonz/sources/toonz/formatsettingspopups.h index cf1c910..3e2bf55 100644 --- a/toonz/sources/toonz/formatsettingspopups.h +++ b/toonz/sources/toonz/formatsettingspopups.h @@ -64,7 +64,7 @@ private: void buildValueField(int index, TPropertyGroup *props); void buildPropertyCheckBox(int index, TPropertyGroup *props); void buildPropertyLineEdit(int index, TPropertyGroup *props); - void showEvent(QShowEvent *se); + void showEvent(QShowEvent *se) override; #ifdef _WIN32 diff --git a/toonz/sources/toonz/frameheadgadget.cpp b/toonz/sources/toonz/frameheadgadget.cpp index 28a0fd8..bebd07d 100644 --- a/toonz/sources/toonz/frameheadgadget.cpp +++ b/toonz/sources/toonz/frameheadgadget.cpp @@ -652,7 +652,7 @@ bool FilmstripFrameHeadGadget::eventFilter(QObject *obj, QEvent *e) { class OnionSkinToggle : public MenuItemHandler { public: OnionSkinToggle() : MenuItemHandler(MI_OnionSkin) {} - void execute() { + void execute() override { QAction *action = CommandManager::instance()->getAction(MI_OnionSkin); if (!action) return; bool checked = action->isChecked(); diff --git a/toonz/sources/toonz/frameheadgadget.h b/toonz/sources/toonz/frameheadgadget.h index 00af70c..83bc7f0 100644 --- a/toonz/sources/toonz/frameheadgadget.h +++ b/toonz/sources/toonz/frameheadgadget.h @@ -59,7 +59,7 @@ public: void setMos(int frame, bool on); // reimpremented in FilmstripFrameHeadGadget - virtual bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; }; class XsheetFrameHeadGadget : public FrameHeadGadget { @@ -73,17 +73,17 @@ class FilmstripFrameHeadGadget : public FrameHeadGadget { public: FilmstripFrameHeadGadget(FilmstripFrames *filmstrip); - int getY() const; - int index2y(int index) const; - int y2index(int y) const; + int getY() const override; + int index2y(int index) const override; + int y2index(int y) const override; void drawOnionSkinSelection(QPainter &p, const QColor &lightColor, - const QColor &darkColor); + const QColor &darkColor) override; - void setCurrentFrame(int index) const; - int getCurrentFrame() const; + void setCurrentFrame(int index) const override; + int getCurrentFrame() const override; - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; }; #endif diff --git a/toonz/sources/toonz/histogrampopup.h b/toonz/sources/toonz/histogrampopup.h index 86f0eb5..cc3db16 100644 --- a/toonz/sources/toonz/histogrampopup.h +++ b/toonz/sources/toonz/histogrampopup.h @@ -41,8 +41,8 @@ public: ViewerHistogramPopup(); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; protected slots: void setCurrentRaster(); diff --git a/toonz/sources/toonz/historypane.h b/toonz/sources/toonz/historypane.h index a6c210e..9311002 100644 --- a/toonz/sources/toonz/historypane.h +++ b/toonz/sources/toonz/historypane.h @@ -25,8 +25,8 @@ public: void exposeCurrent(); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *event); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *event) override; }; class HistoryPane : public QWidget { @@ -44,9 +44,9 @@ public: ~HistoryPane(){}; protected: - void resizeEvent(QResizeEvent *); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void resizeEvent(QResizeEvent *) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public slots: void onHistoryChanged(); diff --git a/toonz/sources/toonz/imageviewer.cpp b/toonz/sources/toonz/imageviewer.cpp index 124e813..93e9ccc 100644 --- a/toonz/sources/toonz/imageviewer.cpp +++ b/toonz/sources/toonz/imageviewer.cpp @@ -115,17 +115,17 @@ class FlipZoomer : public ImageUtils::ShortcutZoomer { public: FlipZoomer(ImageViewer *parent) : ShortcutZoomer(parent) {} - bool zoom(bool zoomin, bool resetZoom) { + bool zoom(bool zoomin, bool resetZoom) override { static_cast(getWidget())->zoomQt(zoomin, resetZoom); return true; } - bool fit() { + bool fit() override { static_cast(getWidget())->fitView(); return true; } - bool toggleFullScreen(bool quit) { + bool toggleFullScreen(bool quit) override { if (ImageUtils::FullScreenWidget *fsWidget = dynamic_cast( getWidget()->parentWidget())) @@ -1164,7 +1164,7 @@ class LoadRecentFlipbookImagesCommandHandler : public MenuItemHandler { public: LoadRecentFlipbookImagesCommandHandler() : MenuItemHandler(MI_LoadRecentImage) {} - void execute() { + void execute() override { QAction *act = CommandManager::instance()->getAction(MI_LoadRecentImage); /*--- 右クリックで呼ばれないとここにWidgetが入らない ---*/ @@ -1192,7 +1192,7 @@ class ClearRecentFlipbookImagesCommandHandler : public MenuItemHandler { public: ClearRecentFlipbookImagesCommandHandler() : MenuItemHandler(MI_ClearRecentImage) {} - void execute() { + void execute() override { RecentFiles::instance()->clearRecentFilesList(RecentFiles::Flip); } } clearRecentFlipbookImagesCommandHandler; diff --git a/toonz/sources/toonz/imageviewer.h b/toonz/sources/toonz/imageviewer.h index 2e0fcad..7318151 100644 --- a/toonz/sources/toonz/imageviewer.h +++ b/toonz/sources/toonz/imageviewer.h @@ -114,17 +114,17 @@ public: // Ghibli3DLutUtil* get3DLutUtil(){ return m_ghibli3DLutUtil; } protected: - void contextMenuEvent(QContextMenuEvent *event); - void initializeGL(); - void resizeGL(int width, int height); - void paintGL(); - - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void keyPressEvent(QKeyEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *); + void contextMenuEvent(QContextMenuEvent *event) override; + void initializeGL() override; + void resizeGL(int width, int height) override; + void paintGL() override; + + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *) override; void panQt(const QPoint &delta); void zoomQt(const QPoint ¢er, double factor); diff --git a/toonz/sources/toonz/insertfxpopup.h b/toonz/sources/toonz/insertfxpopup.h index 23d8fbd..3085220 100644 --- a/toonz/sources/toonz/insertfxpopup.h +++ b/toonz/sources/toonz/insertfxpopup.h @@ -52,9 +52,9 @@ public slots: void onAdd(); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void contextMenuEvent(QContextMenuEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void contextMenuEvent(QContextMenuEvent *) override; protected slots: void updatePresets(); diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp index 808e86e..6063c19 100644 --- a/toonz/sources/toonz/iocommand.cpp +++ b/toonz/sources/toonz/iocommand.cpp @@ -180,7 +180,7 @@ public: // the method returns the processed codedPath (related to scene) // TFilePath process(ToonzScene *scene, ToonzScene *srcScene, - TFilePath srcPath) { + TFilePath srcPath) override { TFilePath actualSrcPath = srcPath; if (srcScene) actualSrcPath = srcScene->decodeFilePath(srcPath); @@ -386,7 +386,7 @@ public: m_columnInserted = columnInserted; } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); /*- 最初にシーンに読み込んだ操作のUndoのとき、Castから除く -*/ if (m_level && m_isFirstTime) @@ -420,7 +420,7 @@ public: app->getCurrentLevel()->setLevel(0); app->getCurrentScene()->notifyCastChange(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); if (m_level) app->getCurrentScene()->getScene()->getLevelSet()->insertLevel( @@ -438,11 +438,11 @@ public: app->getCurrentLevel()->setLevel(m_level.getPointer()); app->getCurrentScene()->notifyCastChange(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(TXshCell) * m_cells.size() + sizeof(TXshLevel); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Load Level %1") .arg(QString::fromStdWString(m_level->getName())); } @@ -472,7 +472,7 @@ public: } } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int c, r; @@ -490,7 +490,7 @@ public: app->getCurrentScene()->notifyCastChange(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int c, r; @@ -507,8 +507,8 @@ public: app->getCurrentScene()->notifyCastChange(); } - int getSize() const { return sizeof(*this); } - QString getHistoryString() { + int getSize() const override { return sizeof(*this); } + QString getHistoryString() override { return QObject::tr("Load and Replace Level %1") .arg(QString::fromStdWString(m_level->getName())); } @@ -597,10 +597,10 @@ public: m_levelSetFolder = levelSetFolder; } - void process(TXshSimpleLevel *sl); - void process(TXshPaletteLevel *sl); - void process(TXshSoundLevel *sl); - bool aborted() const { return m_importStrategy.aborted(); } + void process(TXshSimpleLevel *sl) override; + void process(TXshPaletteLevel *sl) override; + void process(TXshSoundLevel *sl) override; + bool aborted() const override { return m_importStrategy.aborted(); } }; //--------------------------------------------------------------------------- @@ -1020,7 +1020,7 @@ public: void setFids(const std::vector &fids) { m_fids = fids; } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); if (m_insertEmptyColumn) @@ -1037,7 +1037,7 @@ public: } } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); if (m_insertEmptyColumn) xsh->insertColumn(m_col); @@ -1058,9 +1058,9 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Expose Level %1") .arg(QString::fromStdWString(m_sl->getName())); } @@ -1084,7 +1084,7 @@ public: , m_insertEmptyColumn(insertEmptyColumn) , m_columnName(columnName) {} - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); xsh->removeColumn(m_col); @@ -1092,7 +1092,7 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); if (m_insertEmptyColumn) xsh->insertColumn(m_col); @@ -1106,7 +1106,7 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } }; //============================================================================= @@ -2457,7 +2457,7 @@ bool IoCmd::importLipSync(TFilePath levelPath, QList frameList, class SaveSceneCommandHandler : public MenuItemHandler { public: SaveSceneCommandHandler() : MenuItemHandler(MI_SaveScene) {} - void execute() { IoCmd::saveScene(); } + void execute() override { IoCmd::saveScene(); } } saveSceneCommandHandler; //--------------------------------------------------------------------------- @@ -2465,7 +2465,7 @@ public: class SaveLevelCommandHandler : public MenuItemHandler { public: SaveLevelCommandHandler() : MenuItemHandler(MI_SaveLevel) {} - void execute() { + void execute() override { TXshSimpleLevel *sl = TApp::instance()->getCurrentLevel()->getSimpleLevel(); if (!sl) { DVGui::warning(QObject::tr("No Current Level")); @@ -2498,7 +2498,7 @@ public: class SaveProjectTemplate : public MenuItemHandler { public: SaveProjectTemplate() : MenuItemHandler(MI_SaveDefaultSettings) {} - void execute() { + void execute() override { QString question; question = QObject::tr("Are you sure you want to save the Default Settings?"); @@ -2520,7 +2520,7 @@ public: class OpenRecentSceneFileCommandHandler : public MenuItemHandler { public: OpenRecentSceneFileCommandHandler() : MenuItemHandler(MI_OpenRecentScene) {} - void execute() { + void execute() override { QAction *act = CommandManager::instance()->getAction(MI_OpenRecentScene); DVMenuAction *menu = dynamic_cast(act->menu()); int index = menu->getTriggeredActionIndex(); @@ -2536,7 +2536,7 @@ public: class OpenRecentLevelFileCommandHandler : public MenuItemHandler { public: OpenRecentLevelFileCommandHandler() : MenuItemHandler(MI_OpenRecentLevel) {} - void execute() { + void execute() override { QAction *act = CommandManager::instance()->getAction(MI_OpenRecentLevel); DVMenuAction *menu = dynamic_cast(act->menu()); int index = menu->getTriggeredActionIndex(); @@ -2560,7 +2560,7 @@ class ClearRecentSceneFileListCommandHandler : public MenuItemHandler { public: ClearRecentSceneFileListCommandHandler() : MenuItemHandler(MI_ClearRecentScene) {} - void execute() { + void execute() override { RecentFiles::instance()->clearRecentFilesList(RecentFiles::Scene); } } clearRecentSceneFileListCommandHandler; @@ -2571,7 +2571,7 @@ class ClearRecentLevelFileListCommandHandler : public MenuItemHandler { public: ClearRecentLevelFileListCommandHandler() : MenuItemHandler(MI_ClearRecentLevel) {} - void execute() { + void execute() override { RecentFiles::instance()->clearRecentFilesList(RecentFiles::Level); } } clearRecentLevelFileListCommandHandler; @@ -2581,7 +2581,7 @@ public: class RevertScene : public MenuItemHandler { public: RevertScene() : MenuItemHandler(MI_RevertScene) {} - void execute() { + void execute() override { TSceneHandle *sceneHandle = TApp::instance()->getCurrentScene(); ToonzScene *scene = sceneHandle->getScene(); assert(scene); @@ -2611,7 +2611,7 @@ class OverwritePaletteCommandHandler : public MenuItemHandler { public: OverwritePaletteCommandHandler() : MenuItemHandler(MI_OverwritePalette) {} - void execute() { + void execute() override { TXshLevel *level = TApp::instance()->getCurrentLevel()->getLevel(); if (!level) { DVGui::warning("No current level."); @@ -2699,5 +2699,5 @@ public: class SaveAllCommandHandler : public MenuItemHandler { public: SaveAllCommandHandler() : MenuItemHandler(MI_SaveAll) {} - void execute() { IoCmd::saveAll(); } + void execute() override { IoCmd::saveAll(); } } saveAllCommandHandler; diff --git a/toonz/sources/toonz/keyframedata.h b/toonz/sources/toonz/keyframedata.h index 346e8a9..ee73bc3 100644 --- a/toonz/sources/toonz/keyframedata.h +++ b/toonz/sources/toonz/keyframedata.h @@ -31,7 +31,7 @@ public: TKeyframeData(const TKeyframeData *src); ~TKeyframeData(); - TKeyframeData *clone() const { return new TKeyframeData(this); } + TKeyframeData *clone() const override { return new TKeyframeData(this); } // data <- xsh void setKeyframes(std::set positions, TXsheet *xsh); diff --git a/toonz/sources/toonz/keyframemover.cpp b/toonz/sources/toonz/keyframemover.cpp index 9ed118f..51ba960 100644 --- a/toonz/sources/toonz/keyframemover.cpp +++ b/toonz/sources/toonz/keyframemover.cpp @@ -204,22 +204,22 @@ class UndoMoveKeyFrame : public TUndo { public: UndoMoveKeyFrame(int dr, KeyframeMover *mover) : m_dr(dr), m_mover(mover) {} - void undo() const { + void undo() const override { m_mover->undoMoveKeyframe(); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { std::set newPositions; m_mover->moveKeyframes(m_dr, newPositions); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Move Keyframe"); } + QString getHistoryString() override { return QObject::tr("Move Keyframe"); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/keyframemover.h b/toonz/sources/toonz/keyframemover.h index ad14ba4..cb47b56 100644 --- a/toonz/sources/toonz/keyframemover.h +++ b/toonz/sources/toonz/keyframemover.h @@ -90,10 +90,10 @@ public: void onCellChange(int row, int col); - void onClick(const QMouseEvent *event); - void onDrag(const QMouseEvent *event); - void onRelease(int row, int col); - void drawCellsArea(QPainter &p); + void onClick(const QMouseEvent *event) override; + void onDrag(const QMouseEvent *event) override; + void onRelease(int row, int col) override; + void drawCellsArea(QPainter &p) override; }; #endif diff --git a/toonz/sources/toonz/keyframeselection.cpp b/toonz/sources/toonz/keyframeselection.cpp index 3c8e472..bd1217e 100644 --- a/toonz/sources/toonz/keyframeselection.cpp +++ b/toonz/sources/toonz/keyframeselection.cpp @@ -147,7 +147,7 @@ public: if (keyframeData) pasteKeyframesWithoutUndo(keyframeData, &m_selection->getSelection()); } - void undo() const { + void undo() const override { // Delete merged data deleteKeyframesWithoutUndo(&m_selection->getSelection()); if (-(m_r1 - m_r0 + 1) != 0) @@ -155,16 +155,16 @@ public: if (m_oldData) setXshFromData(m_oldData); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { if (m_r1 - m_r0 + 1 != 0) shiftKeyframesWithoutUndo(m_r0, m_r1, m_c0, m_c1, false); // Delete merged data setXshFromData(m_newData); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Paste Key Frames"); } + QString getHistoryString() override { return QObject::tr("Paste Key Frames"); } }; //============================================================================= @@ -191,7 +191,7 @@ public: delete m_data; } - void undo() const { + void undo() const override { const TKeyframeData *keyframeData = dynamic_cast(m_data); if (m_r1 - m_r0 + 1 != 0) shiftKeyframesWithoutUndo(m_r0, m_r1, m_c0, m_c1, false); @@ -200,16 +200,16 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { deleteKeyframesWithoutUndo(&m_selection->getSelection()); if (m_r1 - m_r0 + 1 != 0) shiftKeyframesWithoutUndo(m_r0, m_r1, m_c0, m_c1, true); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Delete Key Frames"); } + QString getHistoryString() override { return QObject::tr("Delete Key Frames"); } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/keyframeselection.h b/toonz/sources/toonz/keyframeselection.h index 04647d3..ffe43f5 100644 --- a/toonz/sources/toonz/keyframeselection.h +++ b/toonz/sources/toonz/keyframeselection.h @@ -21,7 +21,7 @@ public: TKeyframeSelection() {} - void enableCommands(); + void enableCommands() override; /* FIXME: clang * でテンポラリオブジェクトをアドレッシングしたとエラーになっていたので参照を返すようにしたが、元の意図が不明なので注意 */ @@ -39,7 +39,7 @@ public: void clear() { m_positions.clear(); } - void selectNone() { m_positions.clear(); } + void selectNone() override { m_positions.clear(); } void select(int row, int col) { m_positions.insert(std::make_pair(row, col)); @@ -53,7 +53,7 @@ public: return m_positions.find(std::make_pair(row, col)) != m_positions.end(); } - bool isEmpty() const { return m_positions.empty(); } + bool isEmpty() const override { return m_positions.empty(); } TSelection *clone() const { return new TKeyframeSelection(m_positions); } diff --git a/toonz/sources/toonz/levelcommand.cpp b/toonz/sources/toonz/levelcommand.cpp index 2e09cf0..bbbbd0f 100644 --- a/toonz/sources/toonz/levelcommand.cpp +++ b/toonz/sources/toonz/levelcommand.cpp @@ -41,20 +41,20 @@ class DeleteLevelUndo : public TUndo { public: DeleteLevelUndo(TXshLevel *xl) : m_xl(xl) {} - void undo() const { + void undo() const override { ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); scene->getLevelSet()->insertLevel(m_xl.getPointer()); TApp::instance()->getCurrentScene()->notifyCastChange(); } - void redo() const { + void redo() const override { ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); scene->getLevelSet()->removeLevel(m_xl.getPointer()); TApp::instance()->getCurrentScene()->notifyCastChange(); } - int getSize() const { return sizeof *this + 100; } + int getSize() const override { return sizeof *this + 100; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Delete Level : %1") .arg(QString::fromStdWString(m_xl->getName())); } @@ -70,7 +70,7 @@ class RemoveUnusedLevelsCommand : public MenuItemHandler { public: RemoveUnusedLevelsCommand() : MenuItemHandler(MI_RemoveUnused) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); @@ -128,7 +128,7 @@ public: return true; } - void execute() { + void execute() override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); CastSelection *castSelection = dynamic_cast(TSelection::getCurrent()); @@ -272,7 +272,7 @@ public: TImageCache::instance()->remove(m_replacedImgsId[i]); } - void undo() const { + void undo() const override { assert((int)m_replacedImgsId.size() == (int)m_selectedFids.size()); int i = 0; for (auto const &fid : m_selectedFids) { @@ -285,7 +285,7 @@ public: invalidateIcons(m_sl, m_selectedFids); } - void redo() const { + void redo() const override { if (m_isCleanedUp) loadUnpaintedFids(m_sl, m_selectedFids); else @@ -293,11 +293,11 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + m_selectedFids.size() * sizeof(TFrameId); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Revert To %1 : Level %2") .arg((m_isCleanedUp) ? QString("Cleaned Up") : QString("Last Saved")) .arg(QString::fromStdWString(m_sl->getName())); @@ -413,7 +413,7 @@ class RevertToCleanedUpCommand : public MenuItemHandler { public: RevertToCleanedUpCommand() : MenuItemHandler(MI_RevertToCleanedUp) {} - void execute() { revertTo(true); } + void execute() override { revertTo(true); } } revertToCleanedUpCommand; @@ -425,6 +425,6 @@ class RevertToLastSaveCommand : public MenuItemHandler { public: RevertToLastSaveCommand() : MenuItemHandler(MI_RevertToLastSaved) {} - void execute() { revertTo(false); } + void execute() override { revertTo(false); } } revertToLastSaveCommand; diff --git a/toonz/sources/toonz/levelcreatepopup.cpp b/toonz/sources/toonz/levelcreatepopup.cpp index f28dda4..d310921 100644 --- a/toonz/sources/toonz/levelcreatepopup.cpp +++ b/toonz/sources/toonz/levelcreatepopup.cpp @@ -93,7 +93,7 @@ public: void onAdd(TXshSimpleLevelP sl) { m_sl = sl; } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); TXsheet *xsh = scene->getXsheet(); @@ -116,7 +116,7 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { if (!m_sl.getPointer()) return; TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); @@ -140,8 +140,8 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } - QString getHistoryString() { + int getSize() const override { return sizeof *this; } + QString getHistoryString() override { return QObject::tr("Create Level %1 at Column %2") .arg(QString::fromStdWString(m_sl->getName())) .arg(QString::number(m_columnIndex + 1)); @@ -288,49 +288,49 @@ LevelCreatePopup::LevelCreatePopup() void LevelCreatePopup::updatePath() { - ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); - TFilePath defaultPath; - defaultPath = scene->getDefaultLevelPath(getLevelType()).getParentDir(); - m_pathFld->setPath(toQString(defaultPath)); + ToonzScene *scene = TApp::instance()->getCurrentScene()->getScene(); + TFilePath defaultPath; + defaultPath = scene->getDefaultLevelPath(getLevelType()).getParentDir(); + m_pathFld->setPath(toQString(defaultPath)); } //----------------------------------------------------------------------------- void LevelCreatePopup::nextName() { - const std::auto_ptr nameBuilder(NameBuilder::getBuilder(L"")); + const std::auto_ptr nameBuilder(NameBuilder::getBuilder(L"")); - TLevelSet* levelSet = TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); - ToonzScene* scene = TApp::instance()->getCurrentScene()->getScene(); - std::wstring levelName = L""; + TLevelSet* levelSet = TApp::instance()->getCurrentScene()->getScene()->getLevelSet(); + ToonzScene* scene = TApp::instance()->getCurrentScene()->getScene(); + std::wstring levelName = L""; - // Select a different unique level name in case it already exists (either in scene or on disk) - TFilePath fp; - TFilePath actualFp; - for (;;) { - levelName = nameBuilder->getNext(); + // Select a different unique level name in case it already exists (either in scene or on disk) + TFilePath fp; + TFilePath actualFp; + for (;;) { + levelName = nameBuilder->getNext(); - if (levelSet->getLevel(levelName) != 0) - continue; + if (levelSet->getLevel(levelName) != 0) + continue; - fp = scene->getDefaultLevelPath(getLevelType(), levelName); - actualFp = scene->decodeFilePath(fp); + fp = scene->getDefaultLevelPath(getLevelType(), levelName); + actualFp = scene->decodeFilePath(fp); - if (TSystem::doesExistFileOrLevel(actualFp)) { - continue; - } + if (TSystem::doesExistFileOrLevel(actualFp)) { + continue; + } - break; - } + break; + } - m_nameFld->setText(QString::fromStdWString(levelName)); + m_nameFld->setText(QString::fromStdWString(levelName)); } void LevelCreatePopup::showEvent(QShowEvent *) { - nextName(); - update(); - m_nameFld->setFocus(); + nextName(); + update(); + m_nameFld->setFocus(); } //----------------------------------------------------------------------------- @@ -363,33 +363,33 @@ int LevelCreatePopup::getLevelType() const { void LevelCreatePopup::onLevelTypeChanged(const QString &text) { - if (text == "Raster Level" || text == "Toonz Raster Level") - setSizeWidgetEnable(true); - else - setSizeWidgetEnable(false); - updatePath(); - nextName(); - m_nameFld->setFocus(); + if (text == "Raster Level" || text == "Toonz Raster Level") + setSizeWidgetEnable(true); + else + setSizeWidgetEnable(false); + updatePath(); + nextName(); + m_nameFld->setFocus(); } //----------------------------------------------------------------------------- void LevelCreatePopup::onOkBtn() { - if(apply()) - close(); - else - m_nameFld->setFocus(); + if(apply()) + close(); + else + m_nameFld->setFocus(); } //----------------------------------------------------------------------------- void LevelCreatePopup::onApplyButton() { - if (apply()) { - nextName(); - } - m_nameFld->setFocus(); + if (apply()) { + nextName(); + } + m_nameFld->setFocus(); } //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/levelcreatepopup.h b/toonz/sources/toonz/levelcreatepopup.h index b3f9a6b..d5b58e7 100644 --- a/toonz/sources/toonz/levelcreatepopup.h +++ b/toonz/sources/toonz/levelcreatepopup.h @@ -44,10 +44,10 @@ public: bool apply(); protected: - // set m_pathFld to the default path - void updatePath(); - void nextName(); - void showEvent(QShowEvent *); + // set m_pathFld to the default path + void updatePath(); + void nextName(); + void showEvent(QShowEvent *) override; public slots: void onLevelTypeChanged(const QString &text); diff --git a/toonz/sources/toonz/levelsettingspopup.cpp b/toonz/sources/toonz/levelsettingspopup.cpp index 70f85be..0c4f458 100644 --- a/toonz/sources/toonz/levelsettingspopup.cpp +++ b/toonz/sources/toonz/levelsettingspopup.cpp @@ -1052,7 +1052,7 @@ class ViewLevelFileInfoHandler : public MenuItemHandler { public: ViewLevelFileInfoHandler(CommandId cmdId) : MenuItemHandler(cmdId) {} - void execute() { + void execute() override { TSelection *selection = TApp::instance()->getCurrentSelection()->getSelection(); @@ -1110,7 +1110,7 @@ class ViewLevelHandler : public MenuItemHandler { public: ViewLevelHandler(CommandId cmdId) : MenuItemHandler(cmdId) {} - void execute() { + void execute() override { TSelection *selection = TApp::instance()->getCurrentSelection()->getSelection(); if (FileSelection *fileSelection = diff --git a/toonz/sources/toonz/levelsettingspopup.h b/toonz/sources/toonz/levelsettingspopup.h index a867433..76bc9a9 100644 --- a/toonz/sources/toonz/levelsettingspopup.h +++ b/toonz/sources/toonz/levelsettingspopup.h @@ -68,8 +68,8 @@ public: LevelSettingsPopup(); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; public slots: diff --git a/toonz/sources/toonz/linesfadepopup.cpp b/toonz/sources/toonz/linesfadepopup.cpp index e56d238..4dee3a8 100644 --- a/toonz/sources/toonz/linesfadepopup.cpp +++ b/toonz/sources/toonz/linesfadepopup.cpp @@ -318,7 +318,7 @@ public: ~TLineFadeUndo() { TImageCache::instance()->remove(m_rasId); } - void undo() const { + void undo() const override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); TXshCell cell = xsheet->getCell(m_r, m_c); TRasterImageP rasImage = (TRasterImageP)cell.getImage(true); @@ -338,7 +338,7 @@ public: } } - void redo() const { + void redo() const override { TXsheet *xsheet = TApp::instance()->getCurrentXsheet()->getXsheet(); TXshCell cell = xsheet->getCell(m_r, m_c); TRasterImageP rasImage = (TRasterImageP)cell.getImage(true); @@ -357,7 +357,7 @@ public: } } - int getSize() const { return sizeof(*this) + m_rasSize; } + int getSize() const override { return sizeof(*this) + m_rasSize; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/linesfadepopup.h b/toonz/sources/toonz/linesfadepopup.h index 55ffae2..25bbb0b 100644 --- a/toonz/sources/toonz/linesfadepopup.h +++ b/toonz/sources/toonz/linesfadepopup.h @@ -36,8 +36,8 @@ public: LinesFadePopup(); protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; protected slots: diff --git a/toonz/sources/toonz/loadfoldercommand.cpp b/toonz/sources/toonz/loadfoldercommand.cpp index e462356..c8da846 100644 --- a/toonz/sources/toonz/loadfoldercommand.cpp +++ b/toonz/sources/toonz/loadfoldercommand.cpp @@ -150,7 +150,7 @@ public: public: OverwriteDialog(QWidget *parent); - virtual QString acceptResolution(void *obj, int resolution, bool applyToAll); + QString acceptResolution(void *obj, int resolution, bool applyToAll) override; }; //************************************************************************ diff --git a/toonz/sources/toonz/magpiefileimportpopup.h b/toonz/sources/toonz/magpiefileimportpopup.h index a2937b6..3e59e6f 100644 --- a/toonz/sources/toonz/magpiefileimportpopup.h +++ b/toonz/sources/toonz/magpiefileimportpopup.h @@ -55,8 +55,8 @@ public: void setFilePath(TFilePath path); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; protected slots: void onLevelPathChanged(); diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 9ecf9dd..04fee41 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1728,9 +1728,9 @@ void MainWindow::defineActions() { createMenuCellsAction(MI_Autorenumber, tr("&Autorenumber"), ""); createMenuCellsAction(MI_CloneLevel, tr("&Clone"), ""); createMenuCellsAction(MI_DrawingSubForward, tr("Drawing Substitution Forward"), "."); - createMenuCellsAction(MI_DrawingSubBackward, tr("Drawing Substitution Backward"), ","); - createMenuCellsAction(MI_DrawingSubGroupForward, tr("Similar Drawing Substitution Forward"), "Ctrl+."); - createMenuCellsAction(MI_DrawingSubGroupBackward, tr("Similar Drawing Substitution Backward"), "Ctrl+,"); + createMenuCellsAction(MI_DrawingSubBackward, tr("Drawing Substitution Backward"), ","); + createMenuCellsAction(MI_DrawingSubGroupForward, tr("Similar Drawing Substitution Forward"), "Ctrl+."); + createMenuCellsAction(MI_DrawingSubGroupBackward, tr("Similar Drawing Substitution Backward"), "Ctrl+,"); createMenuCellsAction(MI_Reframe1, tr("1's"), ""); @@ -2151,7 +2151,7 @@ void MainWindow::togglePickStyleLines() { class ReloadStyle : public MenuItemHandler { public: ReloadStyle() : MenuItemHandler("MI_ReloadStyle") {} - void execute() { + void execute() override { QString currentStyle = Preferences::instance()->getCurrentStyleSheet(); QFile file(currentStyle); file.open(QFile::ReadOnly); diff --git a/toonz/sources/toonz/mainwindow.h b/toonz/sources/toonz/mainwindow.h index 81c4b50..b3a4b1c 100644 --- a/toonz/sources/toonz/mainwindow.h +++ b/toonz/sources/toonz/mainwindow.h @@ -120,8 +120,8 @@ public: QString getLayoutName() { return m_layoutName; } protected: - void showEvent(QShowEvent *); - void closeEvent(QCloseEvent *); + void showEvent(QShowEvent *) override; + void closeEvent(QCloseEvent *) override; void readSettings(const QString &layoutFileName); void writeSettings(); diff --git a/toonz/sources/toonz/matchline.cpp b/toonz/sources/toonz/matchline.cpp index 972c4e7..5fd4a1b 100644 --- a/toonz/sources/toonz/matchline.cpp +++ b/toonz/sources/toonz/matchline.cpp @@ -507,7 +507,7 @@ public: } } - void undo() const { + void undo() const override { int i; for (i = 0; i < m_fids.size(); i++) { @@ -524,7 +524,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { int i; applyDeleteMatchline(m_sl, m_fids, m_indexes); @@ -536,7 +536,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } ~DeleteMatchlineUndo() { int i; @@ -546,11 +546,11 @@ public: QString::number(i)); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Delete Matchline : Level %1") .arg(QString::fromStdWString(m_sl->getName())); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; //----------------------------------------------------------------------------- @@ -580,7 +580,7 @@ public: , m_prevalence(prevalence) , m_images(images) {} - void undo() const { + void undo() const override { std::map::const_iterator it = m_images.begin(); m_level->getPalette()->assign(m_palette); @@ -609,12 +609,12 @@ public: ->notifyPaletteChanged(); } - void redo() const { + void redo() const override { doMatchlines(m_column, m_mColumn, m_index, m_prevalence, m_mergeCmappedSessionId); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } ~MatchlineUndo() { std::map::const_iterator it = m_images.begin(); @@ -627,12 +627,12 @@ public: delete m_palette; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Apply Matchline : Column%1 < Column%2") .arg(QString::number(m_column + 1)) .arg(QString::number(m_mColumn + 1)); } - int getHistoryType() { return HistoryType::FilmStrip; } + int getHistoryType() override { return HistoryType::FilmStrip; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/matchline.h b/toonz/sources/toonz/matchline.h index 1d3a28e..8560d35 100644 --- a/toonz/sources/toonz/matchline.h +++ b/toonz/sources/toonz/matchline.h @@ -34,7 +34,7 @@ class MergeCmappedDialog : public DVGui::Dialog { public: MergeCmappedDialog(TFilePath &); - void accept(); + void accept() override; protected slots: @@ -63,10 +63,10 @@ protected slots: void onChooseInkClicked(bool value); void onLineStackButtonPressed(int id); void onInkPrevalenceChanged(bool isDragging); - void accept(); + void accept() override; protected: - void showEvent(QShowEvent *e); + void showEvent(QShowEvent *e) override; public: MatchlinesDialog(); diff --git a/toonz/sources/toonz/matchlinecommand.cpp b/toonz/sources/toonz/matchlinecommand.cpp index 1a7fe06..6144269 100644 --- a/toonz/sources/toonz/matchlinecommand.cpp +++ b/toonz/sources/toonz/matchlinecommand.cpp @@ -104,7 +104,7 @@ class MergeColumnsCommand : public MenuItemHandler { public: MergeColumnsCommand() : MenuItemHandler(MI_MergeColumns) {} - void execute() { + void execute() override { TColumnSelection *selection = dynamic_cast(TSelection::getCurrent()); @@ -139,7 +139,7 @@ class ApplyMatchlinesCommand : public MenuItemHandler { public: ApplyMatchlinesCommand() : MenuItemHandler(MI_ApplyMatchLines) {} - void execute() { + void execute() override { TColumnSelection *selection = dynamic_cast(TSelection::getCurrent()); if (!selection) { @@ -237,7 +237,7 @@ public: , m_insertedColumnIndices(insertedColumnIndices) , m_levelname(levelname) {} - void undo() const { + void undo() const override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); TXsheet *xsh = scene->getXsheet(); @@ -258,9 +258,9 @@ public: } app->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { doCloneLevelNoSave(m_range, m_levelname, false); } + void redo() const override { doCloneLevelNoSave(m_range, m_levelname, false); } - int getSize() const { + int getSize() const override { return sizeof *this + (sizeof(TXshLevelP) + sizeof(TXshSimpleLevel *)) * m_createdLevels.size(); @@ -414,7 +414,7 @@ void cloneColumn(const TCellSelection::Range &cells, class MergeCmappedCommand : public MenuItemHandler { public: MergeCmappedCommand() : MenuItemHandler(MI_MergeCmapped) {} - void execute() { + void execute() override { TColumnSelection *selection = dynamic_cast(TSelection::getCurrent()); if (!selection) { @@ -583,7 +583,7 @@ void doDeleteCommand(bool isMatchline) { class DeleteInkCommand : public MenuItemHandler { public: DeleteInkCommand() : MenuItemHandler(MI_DeleteInk) {} - void execute() { doDeleteCommand(false); } + void execute() override { doDeleteCommand(false); } } DeleteInkCommand; @@ -592,6 +592,6 @@ public: class DeleteMatchlinesCommand : public MenuItemHandler { public: DeleteMatchlinesCommand() : MenuItemHandler(MI_DeleteMatchLines) {} - void execute() { doDeleteCommand(true); } + void execute() override { doDeleteCommand(true); } } DeleteMatchlinesCommand; diff --git a/toonz/sources/toonz/menubar.h b/toonz/sources/toonz/menubar.h index 161f88f..8d6f56e 100644 --- a/toonz/sources/toonz/menubar.h +++ b/toonz/sources/toonz/menubar.h @@ -46,11 +46,11 @@ public: protected: void swapIndex(int firstIndex, int secondIndex); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void contextMenuEvent(QContextMenuEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; protected slots: void updateTabName(); @@ -188,7 +188,7 @@ public: protected: /*-- 右クリックで消えないようにする--*/ - void contextMenuEvent(QContextMenuEvent *event) { event->accept(); } + void contextMenuEvent(QContextMenuEvent *event) override { event->accept(); } }; #endif // MENUBAR_H diff --git a/toonz/sources/toonz/menubarpopup.h b/toonz/sources/toonz/menubarpopup.h index bd376fb..ea79411 100644 --- a/toonz/sources/toonz/menubarpopup.h +++ b/toonz/sources/toonz/menubarpopup.h @@ -33,9 +33,9 @@ public: protected: bool dropMimeData(QTreeWidgetItem* parent, int index, const QMimeData* data, - Qt::DropAction action); - QStringList mimeTypes() const; - void contextMenuEvent(QContextMenuEvent* event); + Qt::DropAction action) override; + QStringList mimeTypes() const override; + void contextMenuEvent(QContextMenuEvent* event) override; protected slots: void insertMenu(); void removeItem(); @@ -55,7 +55,7 @@ public: CommandListTree(QWidget* parent = 0); protected: - void mousePressEvent(QMouseEvent*); + void mousePressEvent(QMouseEvent*) override; }; //============================================================================= diff --git a/toonz/sources/toonz/mergecmapped.cpp b/toonz/sources/toonz/mergecmapped.cpp index 093d723..a3019a1 100644 --- a/toonz/sources/toonz/mergecmapped.cpp +++ b/toonz/sources/toonz/mergecmapped.cpp @@ -246,7 +246,7 @@ public: } } - void undo() const { + void undo() const override { int i; // TPalette *palette = m_matchlinePalette->clone(); // m_sl->setPalette(palette); @@ -265,7 +265,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { int i; // for (i=0; igetCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } ~DeleteMatchlineUndo() { int i; @@ -365,7 +365,7 @@ public: m_fullpath = m_xl->getPath().getWideString(); } - void undo() const { + void undo() const override { std::map::const_iterator it = m_images.begin(); TPalette *palette = m_palette->clone(); m_level->setPalette(palette); @@ -391,12 +391,12 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { mergeCmapped(m_column, m_mColumn, QString::fromStdWString(m_fullpath), true); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } ~MergeCmappedUndo() { std::map::const_iterator it = m_images.begin(); diff --git a/toonz/sources/toonz/mergecolumns.cpp b/toonz/sources/toonz/mergecolumns.cpp index e1cecb9..a4af378 100644 --- a/toonz/sources/toonz/mergecolumns.cpp +++ b/toonz/sources/toonz/mergecolumns.cpp @@ -199,7 +199,7 @@ public: , m_images(images) , m_palette(palette->clone()) {} - void undo() const { + void undo() const override { QApplication::setOverrideCursor(Qt::WaitCursor); std::map::const_iterator it = m_images.begin(); @@ -222,7 +222,7 @@ public: QApplication::restoreOverrideCursor(); } - void redo() const { + void redo() const override { QApplication::setOverrideCursor(Qt::WaitCursor); mergeColumns(m_column, m_mColumn, true); @@ -230,7 +230,7 @@ public: QApplication::restoreOverrideCursor(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } ~MergeColumnsUndo() { std::map::const_iterator it = m_images.begin(); @@ -242,8 +242,8 @@ public: } } - QString getHistoryString() { return QObject::tr("Merge Raster Levels"); } - int getHistoryType() { return HistoryType::FilmStrip; } + QString getHistoryString() override { return QObject::tr("Merge Raster Levels"); } + int getHistoryType() override { return HistoryType::FilmStrip; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/meshifypopup.cpp b/toonz/sources/toonz/meshifypopup.cpp index dd87a79..ba4b479 100644 --- a/toonz/sources/toonz/meshifypopup.cpp +++ b/toonz/sources/toonz/meshifypopup.cpp @@ -1310,7 +1310,7 @@ class MeshifyCommand : public MenuItemHandler { public: MeshifyCommand() : MenuItemHandler("A_ToolOption_Meshify") {} - void execute() { + void execute() override { static MeshifyPopup *thePopup = 0; if (!thePopup) thePopup = new MeshifyPopup; diff --git a/toonz/sources/toonz/meshifypopup.h b/toonz/sources/toonz/meshifypopup.h index 945140e..b84daf8 100644 --- a/toonz/sources/toonz/meshifypopup.h +++ b/toonz/sources/toonz/meshifypopup.h @@ -45,8 +45,8 @@ public: MeshifyPopup(); protected: - void showEvent(QShowEvent *se); - void hideEvent(QHideEvent *se); + void showEvent(QShowEvent *se) override; + void hideEvent(QHideEvent *se) override; void acquirePreview(); void updateMeshPreview(); diff --git a/toonz/sources/toonz/messagepanel.cpp b/toonz/sources/toonz/messagepanel.cpp index aeb052b..09e743d 100644 --- a/toonz/sources/toonz/messagepanel.cpp +++ b/toonz/sources/toonz/messagepanel.cpp @@ -25,7 +25,7 @@ public: void setText(const QString &text) { m_text = text; } protected: - void paintEvent(QPaintEvent *) { + void paintEvent(QPaintEvent *) override { QPainter p(this); QFontMetrics fm = p.fontMetrics(); @@ -161,7 +161,7 @@ void LogPanel::clear() { class OpenFloatingLogPanel : public MenuItemHandler { public: OpenFloatingLogPanel() : MenuItemHandler(MI_OpenMessage) {} - void execute() { + void execute() override { TMainWindow *currentRoom = TApp::instance()->getCurrentRoom(); if (currentRoom) { QList list = currentRoom->findChildren(); diff --git a/toonz/sources/toonz/messagepanel.h b/toonz/sources/toonz/messagepanel.h index 9c38729..5785a13 100644 --- a/toonz/sources/toonz/messagepanel.h +++ b/toonz/sources/toonz/messagepanel.h @@ -34,8 +34,8 @@ private: // These methods are used to remember special panel infos // when a MessagePanel substitutes a panel due to license // limitations. - void setViewType(int viewType); - int getViewType(); + void setViewType(int viewType) override; + int getViewType() override; void setPoolIndex(int poolIndex); int getPoolIndex() const; @@ -61,7 +61,7 @@ public: #endif ~LogPanel(); - void onLogChanged(); + void onLogChanged() override; public slots: void clear(); diff --git a/toonz/sources/toonz/moviegenerator.cpp b/toonz/sources/toonz/moviegenerator.cpp index a19e046..cd3d53f 100644 --- a/toonz/sources/toonz/moviegenerator.cpp +++ b/toonz/sources/toonz/moviegenerator.cpp @@ -112,13 +112,13 @@ public: AlphaChecker() : m_alphaEnabled(false) {} bool isAlphaEnabled() const { return m_alphaEnabled; } - void visit(TDoubleProperty *p) {} - void visit(TIntProperty *p) {} - void visit(TBoolProperty *p) { + void visit(TDoubleProperty *p) override {} + void visit(TIntProperty *p) override {} + void visit(TBoolProperty *p) override { if (p->getName() == "Alpha Channel") m_alphaEnabled = p->getValue(); } - void visit(TStringProperty *p) {} - void visit(TEnumProperty *p) { + void visit(TStringProperty *p) override {} + void visit(TEnumProperty *p) override { if (p->getName() == "Resolution") m_alphaEnabled = p->getValue() == L"32 bits"; } @@ -181,7 +181,7 @@ public: if (m_st) m_lw->saveSoundTrack(m_st.getPointer()); } - bool addFrame(ToonzScene &scene, int row, bool isLast) { + bool addFrame(ToonzScene &scene, int row, bool isLast) override { assert(m_status == 3); if (!m_started) start(scene); @@ -264,7 +264,7 @@ false,0); } void addSoundtrack(const ToonzScene &scene, int frameOffset, - int sceneFrameCount) { + int sceneFrameCount) override { assert(m_status <= 2); m_status = 2; TXsheet::SoundProperties *prop = new TXsheet::SoundProperties(); @@ -290,11 +290,11 @@ false,0); m_whiteSample = 0; } - void startScene(const ToonzScene &scene, int r) { + void startScene(const ToonzScene &scene, int r) override { if (!m_started) start(scene); } - void close() { + void close() override { m_lw = TLevelWriterP(); m_st = TSoundTrackP(); } @@ -318,7 +318,7 @@ public: , m_cameraAff(cameraAff) , m_bgColor(bgColor) {} - void onImage(const Stage::Player &player) { + void onImage(const Stage::Player &player) override { const TImageP &img = player.image(); m_flash.pushMatrix(); m_flash.multMatrix(m_cameraAff * player.m_placement * player.m_dpiAff); @@ -336,10 +336,10 @@ public: m_flash.popMatrix(); } - void beginMask() { m_flash.beginMask(); } - void endMask() { m_flash.endMask(); } - void enableMask() { m_flash.enableMask(); } - void disableMask() { m_flash.disableMask(); } + void beginMask() override { m_flash.beginMask(); } + void endMask() override { m_flash.endMask(); } + void enableMask() override { m_flash.enableMask(); } + void disableMask() override { m_flash.disableMask(); } }; //============================================================================= @@ -370,9 +370,9 @@ public: } void addSoundtrack(const ToonzScene &scene, int frameOffset, - int sceneFrameCount) {} + int sceneFrameCount) override {} - void startScene(const ToonzScene &scene, int r) { + void startScene(const ToonzScene &scene, int r) override { m_flash.cleanCachedImages(); m_flash.setBackgroundColor(m_bgColor); TXsheet::SoundProperties *prop = new TXsheet::SoundProperties(); @@ -396,7 +396,7 @@ public: m_sceneIndex++; } - bool addFrame(ToonzScene &scene, int row, bool isLast) { + bool addFrame(ToonzScene &scene, int row, bool isLast) override { TAffine cameraView = scene.getXsheet()->getPlacement(TStageObjectId::CameraId(0), row).inv(); TPixel32 bgColor = scene.getProperties()->getBgColor(); @@ -436,7 +436,7 @@ public: return true; } - void close() { + void close() override { TFilePath flashFn = m_filepath.withType("swf"); FILE *fp = fopen(flashFn, "wb"); if (!fp) throw TException("Can't open file"); diff --git a/toonz/sources/toonz/outputsettingspopup.h b/toonz/sources/toonz/outputsettingspopup.h index 8a24483..3a1ee97 100644 --- a/toonz/sources/toonz/outputsettingspopup.h +++ b/toonz/sources/toonz/outputsettingspopup.h @@ -62,8 +62,8 @@ public: protected: ToonzScene *getCurrentScene() const; TOutputProperties *getProperties() const; - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; protected slots: diff --git a/toonz/sources/toonz/overwritepopup.h b/toonz/sources/toonz/overwritepopup.h index 8115646..0ee9625 100644 --- a/toonz/sources/toonz/overwritepopup.h +++ b/toonz/sources/toonz/overwritepopup.h @@ -63,8 +63,8 @@ public: ToonzScene *m_scene; DecodeFileExistsFunc(ToonzScene *scene) : m_scene(scene) {} - QString conflictString(const TFilePath &fp) const; - bool operator()(const TFilePath &fp) const; + QString conflictString(const TFilePath &fp) const override; + bool operator()(const TFilePath &fp) const override; }; public: diff --git a/toonz/sources/toonz/pane.h b/toonz/sources/toonz/pane.h index efc76f4..62934ac 100644 --- a/toonz/sources/toonz/pane.h +++ b/toonz/sources/toonz/pane.h @@ -35,12 +35,12 @@ public slots: void setPressed(bool pressed); // n.b. doesn't emit signals. calls update() protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; - void mouseMoveEvent(QMouseEvent *event); - void enterEvent(QEvent *); - void leaveEvent(QEvent *); - virtual void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event) override; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; + void mousePressEvent(QMouseEvent *event) override; signals: //! emitted when the user press the button @@ -65,8 +65,8 @@ public: void getSafeAreaNameList(QList &nameList); protected: - void contextMenuEvent(QContextMenuEvent *event); - void mousePressEvent(QMouseEvent *event); + void contextMenuEvent(QContextMenuEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; protected slots: void onSetSafeArea(); }; @@ -103,8 +103,8 @@ public: TPanelTitleBar(QWidget *parent = 0, TDockWidget::Orientation orientation = TDockWidget::vertical); - QSize sizeHint() const { return minimumSizeHint(); } - QSize minimumSizeHint() const; + QSize sizeHint() const override { return minimumSizeHint(); } + QSize minimumSizeHint() const override; void setIsActive(bool value); bool isActive() { return m_isActive; } @@ -113,15 +113,15 @@ public: void add(const QPoint &pos, QWidget *widget); protected: - void resizeEvent(QResizeEvent *e); + void resizeEvent(QResizeEvent *e) override; // To Disable the default context Menu - void contextMenuEvent(QContextMenuEvent *) {} + void contextMenuEvent(QContextMenuEvent *) override {} - void paintEvent(QPaintEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *); + void paintEvent(QPaintEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *) override; signals: @@ -198,11 +198,11 @@ public: }; protected: - void paintEvent(QPaintEvent *); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void enterEvent(QEvent *); - void leaveEvent(QEvent *); + void paintEvent(QPaintEvent *) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; virtual bool isActivatableOnEnter() { return false; } diff --git a/toonz/sources/toonz/pltgizmopopup.cpp b/toonz/sources/toonz/pltgizmopopup.cpp index 844d452..9e3a5ec 100644 --- a/toonz/sources/toonz/pltgizmopopup.cpp +++ b/toonz/sources/toonz/pltgizmopopup.cpp @@ -83,12 +83,12 @@ public: ~GizmoUndo() {} - int getSize() const { + int getSize() const override { return sizeof *this + (m_oldColors.size() + m_newColors.size()) * sizeof(TPixel32); } - void onAdd() { getColors(m_newColors, m_newEditedFlags); } + void onAdd() override { getColors(m_newColors, m_newEditedFlags); } void getColors(std::vector &colors, std::vector &flags) const { @@ -122,10 +122,10 @@ public: ->notifyColorStyleChanged(false, false); } - void undo() const { setColors(m_oldColors, m_oldEditedFlags); } - void redo() const { setColors(m_newColors, m_newEditedFlags); } + void undo() const override { setColors(m_oldColors, m_oldEditedFlags); } + void redo() const override { setColors(m_newColors, m_newEditedFlags); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Palette Gizmo %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); @@ -142,7 +142,7 @@ public: str.append(")"); return str; } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= diff --git a/toonz/sources/toonz/previewer.cpp b/toonz/sources/toonz/previewer.cpp index 601d6d8..99f9800 100644 --- a/toonz/sources/toonz/previewer.cpp +++ b/toonz/sources/toonz/previewer.cpp @@ -199,9 +199,9 @@ public: void refreshFrame(int frame); // TRenderPort methods - void onRenderRasterStarted(const RenderData &renderData); - void onRenderRasterCompleted(const RenderData &renderData); - void onRenderFailure(const RenderData &renderData, TException &e); + void onRenderRasterStarted(const RenderData &renderData) override; + void onRenderRasterCompleted(const RenderData &renderData) override; + void onRenderFailure(const RenderData &renderData, TException &e) override; // Main-thread executed code related to TRenderPort. Used to update // thread-vulnerable infos. @@ -775,7 +775,7 @@ public: QString m_str; ProgressBarMessager(int choice, int val, const QString &str = "") : m_choice(choice), m_val(val), m_str(str) {} - void onDeliver() { + void onDeliver() override { switch (m_choice) { case eBegin: if (!Pd) @@ -805,7 +805,7 @@ public: } } - TThread::Message *clone() const { return new ProgressBarMessager(*this); } + TThread::Message *clone() const override { return new ProgressBarMessager(*this); } }; } // namespace @@ -822,7 +822,7 @@ public: void setPreview(Previewer *p) { m_p = p; } - bool execute() { + bool execute() override { if (m_selectedPaths.empty()) return false; return m_p->doSaveRenderedFrames(*m_selectedPaths.begin()); diff --git a/toonz/sources/toonz/previewer.h b/toonz/sources/toonz/previewer.h index 7e798df..9753f30 100644 --- a/toonz/sources/toonz/previewer.h +++ b/toonz/sources/toonz/previewer.h @@ -77,7 +77,7 @@ public: bool isActive() const; bool isBusy() const; - void onChange(const TFxChange &change); + void onChange(const TFxChange &change) override; void onImageChange(TXshLevel *xl, const TFrameId &fid); void onLevelChange(TXshLevel *xl); diff --git a/toonz/sources/toonz/previewfxmanager.cpp b/toonz/sources/toonz/previewfxmanager.cpp index ce9f99c..019a114 100644 --- a/toonz/sources/toonz/previewfxmanager.cpp +++ b/toonz/sources/toonz/previewfxmanager.cpp @@ -149,10 +149,10 @@ public: PreviewFxRenderPort(PreviewFxInstance *owner); ~PreviewFxRenderPort(); - void onRenderRasterStarted(const TRenderPort::RenderData &renderData); - void onRenderRasterCompleted(const RenderData &renderData); - void onRenderFailure(const RenderData &renderData, TException &e); - void onRenderFinished(bool inCanceled = false); + void onRenderRasterStarted(const TRenderPort::RenderData &renderData) override; + void onRenderRasterCompleted(const RenderData &renderData) override; + void onRenderFailure(const RenderData &renderData, TException &e) override; + void onRenderFinished(bool inCanceled = false) override; }; //---------------------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/print.cpp b/toonz/sources/toonz/print.cpp index 956741c..5810bd7 100644 --- a/toonz/sources/toonz/print.cpp +++ b/toonz/sources/toonz/print.cpp @@ -69,7 +69,7 @@ void printCurrentFrame() { class PrintCommand : public MenuItemHandler { public: PrintCommand() : MenuItemHandler(MI_Print) {} - void execute() { + void execute() override { qApp->setOverrideCursor(QCursor(Qt::WaitCursor)); qApp->processEvents(); printCurrentFrame(); diff --git a/toonz/sources/toonz/projectpopup.h b/toonz/sources/toonz/projectpopup.h index ea70e4b..55188dc 100644 --- a/toonz/sources/toonz/projectpopup.h +++ b/toonz/sources/toonz/projectpopup.h @@ -24,7 +24,7 @@ class QComboBox; class ProjectDvDirModelRootNode : public DvDirModelNode { public: ProjectDvDirModelRootNode(); - void refreshChildren(); + void refreshChildren() override; }; //============================================================================= @@ -37,7 +37,7 @@ public: : DvDirModelFileFolderNode(parent, name, path) {} ProjectDvDirModelFileFolderNode(DvDirModelNode *parent, const TFilePath &path) : DvDirModelFileFolderNode(parent, path) {} - DvDirModelNode *makeChild(std::wstring name); + DvDirModelNode *makeChild(std::wstring name) override; DvDirModelFileFolderNode *createNode(DvDirModelNode *parent, const TFilePath &path); }; @@ -54,7 +54,7 @@ public: std::wstring name, const TFilePath &path) : ProjectDvDirModelFileFolderNode(parent, name, path) {} - QPixmap getPixmap(bool isOpen) const { return m_pixmap; } + QPixmap getPixmap(bool isOpen) const override { return m_pixmap; } void setPixmap(const QPixmap &pixmap) { m_pixmap = pixmap; } }; @@ -66,7 +66,7 @@ public: ProjectDvDirModelProjectNode(DvDirModelNode *parent, const TFilePath &path) : ProjectDvDirModelFileFolderNode(parent, path) {} void makeCurrent() {} - QPixmap getPixmap(bool isOpen) const; + QPixmap getPixmap(bool isOpen) const override; }; //============================================================================= @@ -80,17 +80,17 @@ public: ~ProjectDirModel(); DvDirModelNode *getNode(const QModelIndex &index) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const; - QModelIndex parent(const QModelIndex &index) const; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &index) const override; QModelIndex childByName(const QModelIndex &parent, const std::wstring &name) const; - int columnCount(const QModelIndex &parent) const { return 1; } - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - Qt::ItemFlags flags(const QModelIndex &index) const; + int columnCount(const QModelIndex &parent) const override { return 1; } + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; bool setData(const QModelIndex &index, const QVariant &value, - int role = Qt::EditRole); - int rowCount(const QModelIndex &parent = QModelIndex()) const; - bool hasChildren(const QModelIndex &parent) const; + int role = Qt::EditRole) override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent) const override; void refresh(const QModelIndex &index); void refreshFolderChild(const QModelIndex &i = QModelIndex()); QModelIndex getIndexByNode(DvDirModelNode *node) const; @@ -118,9 +118,9 @@ protected: public: ProjectPopup(bool isModal); // da TProjectManager::Listener - void onProjectSwitched(); + void onProjectSwitched() override; // da TProjectManager::Listener - void onProjectChanged() {} + void onProjectChanged() override {} void updateProjectFromFields(TProject *); void updateFieldsFromProject(TProject *); @@ -128,7 +128,7 @@ public: void updateChooseProjectCombo(); protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; }; //============================================================================= @@ -162,7 +162,7 @@ public slots: void createProject(); protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; }; #endif // PROJECTPOPUP_H diff --git a/toonz/sources/toonz/rendercommand.cpp b/toonz/sources/toonz/rendercommand.cpp index 66b8486..e558b0c 100644 --- a/toonz/sources/toonz/rendercommand.cpp +++ b/toonz/sources/toonz/rendercommand.cpp @@ -107,9 +107,9 @@ public: OnRenderCompleted(const TFilePath &fp, bool error) : m_fp(fp), m_error(error) {} - TThread::Message *clone() const { return new OnRenderCompleted(*this); } + TThread::Message *clone() const override { return new OnRenderCompleted(*this); } - void onDeliver() { + void onDeliver() override { if (m_error) { m_error = false; DVGui::error( @@ -395,8 +395,8 @@ class RenderListener : public DVGui::ProgressDialog, , m_pb(pb) , m_frame(frame) , m_labelText(labelText) {} - TThread::Message *clone() const { return new Message(*this); } - void onDeliver() { + TThread::Message *clone() const override { return new Message(*this); } + void onDeliver() override { if (m_frame == -1) m_pb->hide(); else { @@ -431,23 +431,23 @@ public: } /*-- 以下３つの関数はMovieRenderer::Listenerの純粋仮想関数の実装 --*/ - bool onFrameCompleted(int frame) { + bool onFrameCompleted(int frame) override { bool ret = wasCanceled(); Message(this, ret ? -1 : ++m_frameCounter, m_progressBarString).send(); return !ret; } - bool onFrameFailed(int frame, TException &) { + bool onFrameFailed(int frame, TException &) override { m_error = true; return onFrameCompleted(frame); } - void onSequenceCompleted(const TFilePath &fp) { + void onSequenceCompleted(const TFilePath &fp) override { Message(this, -1, "").send(); OnRenderCompleted(fp, m_error).send(); m_error = false; RenderCommand::resetBgColor(); } - void onCancel() { + void onCancel() override { m_isCanceled = true; setLabelText("Aborting render..."); reset(); @@ -624,9 +624,9 @@ class MultimediaProgressBar : public DVGui::ProgressDialog, , m_pbValue(pbValue) , m_labelText(labelText) {} - TThread::Message *clone() const { return new Message(*this); } + TThread::Message *clone() const override { return new Message(*this); } - void onDeliver() { + void onDeliver() override { if (m_pbValue == -1) m_pb->hide(); else { @@ -669,7 +669,7 @@ public: MultimediaRenderer *getRenderer() { return m_renderer; } - bool onFrameCompleted(int frame, int column) { + bool onFrameCompleted(int frame, int column) override { bool ret = wasCanceled(); Message(this, ++m_frameCounter, m_columnCounter, ret ? -1 : ++m_pbCounter, m_progressBarString) @@ -677,11 +677,11 @@ public: return !ret; } - bool onFrameFailed(int frame, int column, TException &) { + bool onFrameFailed(int frame, int column, TException &) override { return onFrameCompleted(frame, column); } - void onSequenceCompleted(int column) { + void onSequenceCompleted(int column) override { m_frameCounter = 0; Message(this, m_frameCounter, ++m_columnCounter, m_pbCounter, m_progressBarString) @@ -690,12 +690,12 @@ public: // - and no viewfile to be called... } - virtual void onRenderCompleted() { + void onRenderCompleted() override { Message(this, -1, -1, -1, "").send(); // OnRenderCompleted(fp).send(); } - void onCancel() { + void onCancel() override { m_isCanceled = true; setLabelText("Aborting render..."); TRenderer *trenderer(m_renderer->getTRenderer()); diff --git a/toonz/sources/toonz/ruler.h b/toonz/sources/toonz/ruler.h index 8155183..3065ce8 100644 --- a/toonz/sources/toonz/ruler.h +++ b/toonz/sources/toonz/ruler.h @@ -55,13 +55,13 @@ public: void drawVertical(QPainter &); void drawHorizontal(QPainter &); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; double posToValue(const QPoint &p) const; - void mousePressEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); - void mouseReleaseEvent(QMouseEvent *e); + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; }; #endif diff --git a/toonz/sources/toonz/runscriptcommand.cpp b/toonz/sources/toonz/runscriptcommand.cpp index 9e85bef..89fba7a 100644 --- a/toonz/sources/toonz/runscriptcommand.cpp +++ b/toonz/sources/toonz/runscriptcommand.cpp @@ -20,7 +20,7 @@ class RunScriptCommand : public MenuItemHandler { public: RunScriptCommand() : MenuItemHandler("MI_RunScript") {} - void execute(); + void execute() override; } runScriptCommand; void RunScriptCommand::execute() { diff --git a/toonz/sources/toonz/scanpopup.cpp b/toonz/sources/toonz/scanpopup.cpp index 15496f8..483a71b 100644 --- a/toonz/sources/toonz/scanpopup.cpp +++ b/toonz/sources/toonz/scanpopup.cpp @@ -879,7 +879,7 @@ OpenPopupCommandHandler openAutocenterPopup(MI_Autocenter); class ScanCommand : public MenuItemHandler { public: ScanCommand() : MenuItemHandler("MI_Scan") {} - void execute() { doScan(); } + void execute() override { doScan(); } } ScanCommand; //========================================================================================= @@ -895,7 +895,7 @@ public: SetCropboxCommand() : MenuItemHandler("MI_SetScanCropbox"), m_currentTool(0) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); SetScanCropboxCheck *cropboxCheck = SetScanCropboxCheck::instance(); cropboxCheck->setIsEnabled(!cropboxCheck->isEnabled()); @@ -961,7 +961,7 @@ class ResetCropboxCommand : public MenuItemHandler { public: ResetCropboxCommand() : MenuItemHandler("MI_ResetScanCropbox") {} - void execute() { + void execute() override { TScannerParameters *sp = TApp::instance() ->getCurrentScene() ->getScene() @@ -995,11 +995,11 @@ public: //----------------------------------------------------------------------------- - ToolType getToolType() const { return TTool::GenericTool; } + ToolType getToolType() const override { return TTool::GenericTool; } //----------------------------------------------------------------------------- - void draw() { + void draw() override { TRasterImageP ri = TImageCache::instance()->get(m_imgId, false); if (ri) { TPointD center = ri->getRaster()->getCenterD(); @@ -1039,7 +1039,7 @@ public: //----------------------------------------------------------------------------- - void mouseMove(const TPointD &p, const TMouseEvent &e) { + void mouseMove(const TPointD &p, const TMouseEvent &e) override { double pixelSize = getPixelSize(); TPointD size(10 * pixelSize, 10 * pixelSize); TRectD cropBox = rect2pix(m_parameters->getCropBox()); @@ -1077,13 +1077,13 @@ public: //----------------------------------------------------------------------------- - void leftButtonDown(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDown(const TPointD &pos, const TMouseEvent &e) override { m_lastPos = pos; } //----------------------------------------------------------------------------- - void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) { + void leftButtonDrag(const TPointD &pos, const TMouseEvent &e) override { TPointD dp = pos - m_lastPos; double scaleFactor = Stage::inch / previewDPI; dp.x = ((dp.x / scaleFactor) * 25.4) / previewDPI; @@ -1146,7 +1146,7 @@ public: //----------------------------------------------------------------------------- - int getCursorId() const { + int getCursorId() const override { switch (m_scaling) { case eNone: return ToolCursor::StrokeSelectCursor; @@ -1172,7 +1172,7 @@ public: //----------------------------------------------------------------------------- - void onActivate() { + void onActivate() override { m_parameters = TTool::getApplication() ->getCurrentScene() ->getScene() @@ -1180,7 +1180,7 @@ public: ->getScanParameters(); } - void onEnter() { + void onEnter() override { m_parameters = TTool::getApplication() ->getCurrentScene() ->getScene() diff --git a/toonz/sources/toonz/scanpopup.h b/toonz/sources/toonz/scanpopup.h index 7c839b2..58b40b4 100644 --- a/toonz/sources/toonz/scanpopup.h +++ b/toonz/sources/toonz/scanpopup.h @@ -32,11 +32,11 @@ class MyScannerListener : public QObject, public TScannerListener { public: MyScannerListener(const ScanList &scanList); - void onImage(const TRasterImageP &); - void onError(); - void onNextPaper(); - void onAutomaticallyNextPaper(); - bool isCanceled(); + void onImage(const TRasterImageP &) override; + void onError() override; + void onNextPaper() override; + void onAutomaticallyNextPaper() override; + bool isCanceled() override; protected slots: void cancelButtonPressed(); @@ -54,7 +54,7 @@ public: DefineScannerPopup(); public slots: - void accept(); + void accept() override; }; //============================================================================= @@ -81,8 +81,8 @@ public: ScanSettingsPopup(); protected: - void showEvent(QShowEvent *event); - void hideEvent(QHideEvent *event); + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; void connectAll(); void disconnectAll(); diff --git a/toonz/sources/toonz/scenesettingspopup.h b/toonz/sources/toonz/scenesettingspopup.h index 8feab26..801d0b9 100644 --- a/toonz/sources/toonz/scenesettingspopup.h +++ b/toonz/sources/toonz/scenesettingspopup.h @@ -39,8 +39,8 @@ public: void configureNotify(); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; public slots: diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp index 3ec9488..dcaaae7 100644 --- a/toonz/sources/toonz/sceneviewer.cpp +++ b/toonz/sources/toonz/sceneviewer.cpp @@ -102,8 +102,8 @@ QGLWidget *touchProxy() { l_proxy = 0; } - void makeCurrent() { l_proxy->makeCurrent(); } - void doneCurrent() { l_proxy->doneCurrent(); } + void makeCurrent() override { l_proxy->makeCurrent(); } + void doneCurrent() override { l_proxy->doneCurrent(); } }; // If it does not exist, create the viewer's display lists proxy @@ -321,7 +321,7 @@ void executeCheck(int checkType) { class TCheckToggleCommand : public MenuItemHandler { public: TCheckToggleCommand() : MenuItemHandler("MI_TCheck") {} - void execute() { executeCheck(ToonzCheck::eTransparency); } + void execute() override { executeCheck(ToonzCheck::eTransparency); } } tcheckToggle; //----------------------------------------------------------------------------- @@ -329,7 +329,7 @@ public: class ICheckToggleCommand : public MenuItemHandler { public: ICheckToggleCommand() : MenuItemHandler("MI_ICheck") {} - void execute() { executeCheck(ToonzCheck::eInk); } + void execute() override { executeCheck(ToonzCheck::eInk); } } icheckToggle; //----------------------------------------------------------------------------- @@ -337,7 +337,7 @@ public: class PCheckToggleCommand : public MenuItemHandler { public: PCheckToggleCommand() : MenuItemHandler("MI_PCheck") {} - void execute() { executeCheck(ToonzCheck::ePaint); } + void execute() override { executeCheck(ToonzCheck::ePaint); } } pcheckToggle; //----------------------------------------------------------------------------- @@ -345,7 +345,7 @@ public: class BCheckToggleCommand : public MenuItemHandler { public: BCheckToggleCommand() : MenuItemHandler("MI_BCheck") {} - void execute() { executeCheck(ToonzCheck::eBlackBg); } + void execute() override { executeCheck(ToonzCheck::eBlackBg); } } bcheckToggle; //----------------------------------------------------------------------------- @@ -353,7 +353,7 @@ public: class TAutocloseToggleCommand : public MenuItemHandler { public: TAutocloseToggleCommand() : MenuItemHandler("MI_ACheck") {} - void execute() { executeCheck(ToonzCheck::eAutoclose); } + void execute() override { executeCheck(ToonzCheck::eAutoclose); } } tautocloseToggle; //----------------------------------------------------------------------------- @@ -361,7 +361,7 @@ public: class TGapToggleCommand : public MenuItemHandler { public: TGapToggleCommand() : MenuItemHandler("MI_GCheck") {} - void execute() { executeCheck(ToonzCheck::eGap); } + void execute() override { executeCheck(ToonzCheck::eGap); } } tgapToggle; //----------------------------------------------------------------------------- @@ -369,7 +369,7 @@ public: class TInksOnlyToggleCommand : public MenuItemHandler { public: TInksOnlyToggleCommand() : MenuItemHandler("MI_IOnly") {} - void execute() { executeCheck(ToonzCheck::eInksOnly); } + void execute() override { executeCheck(ToonzCheck::eInksOnly); } } tinksOnlyToggle; //----------------------------------------------------------------------------- @@ -378,7 +378,7 @@ public: class Ink1CheckToggleCommand : public MenuItemHandler { public: Ink1CheckToggleCommand() : MenuItemHandler("MI_Ink1Check") {} - void execute() { executeCheck(ToonzCheck::eInk1); } + void execute() override { executeCheck(ToonzCheck::eInk1); } } ink1checkToggle; //============================================================================= @@ -389,7 +389,7 @@ class TShiftTraceToggleCommand : public MenuItemHandler { public: TShiftTraceToggleCommand(CommandId cmdId) : MenuItemHandler(cmdId), m_cmdId(cmdId) {} - void execute() { + void execute() override { CommandManager *cm = CommandManager::instance(); QAction *action = cm->getAction(m_cmdId); bool checked = action->isChecked(); @@ -443,7 +443,7 @@ TShiftTraceToggleCommand shiftTraceToggleCommand(MI_ShiftTrace), class TResetShiftTraceCommand : public MenuItemHandler { public: TResetShiftTraceCommand() : MenuItemHandler(MI_ResetShift) {} - void execute() { + void execute() override { OnionSkinMask osm = TApp::instance()->getCurrentOnionSkin()->getOnionSkinMask(); osm.setShiftTraceGhostCenter(0, TPointD()); @@ -1406,11 +1406,11 @@ class Qt_GLContextManager : public TGLContextManager { public: Qt_GLContextManager() : m_context(0) {} - void store() { + void store() override { // m_context = const_cast(QGLContext::currentContext()); } void store(QGLContext *context) { m_context = context; } - void restore() { + void restore() override { if (m_context) m_context->makeCurrent(); } }; diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h index ffee840..6f477a5 100644 --- a/toonz/sources/toonz/sceneviewer.h +++ b/toonz/sources/toonz/sceneviewer.h @@ -49,7 +49,7 @@ public: bool getStatus() const { return m_status; } // For reproducing the UI toggle when launch void setStatus(bool status) { m_status = status; } - void execute(); + void execute() override; }; //============================================================================= @@ -154,16 +154,16 @@ public: SceneViewer(ImageUtils::FullScreenWidget *parent); ~SceneViewer(); - double getPixelSize() const { return m_pixelSize; } + double getPixelSize() const override { return m_pixelSize; } // Previewer::Listener - TRectD getPreviewRect() const; - void onRenderStarted(int frame); - void onRenderCompleted(int frame); - void onPreviewUpdate(); + TRectD getPreviewRect() const override; + void onRenderStarted(int frame) override; + void onRenderCompleted(int frame) override; + void onPreviewUpdate() override; - void startForegroundDrawing(); - void endForegroundDrawing(); + void startForegroundDrawing() override; + void endForegroundDrawing() override; bool isPreviewEnabled() const { return m_previewMode != NO_PREVIEW; } int getPreviewMode() const { return m_previewMode; } @@ -177,7 +177,7 @@ public: //! in Camera view Mode (m_referenceMode = CAMERA_REFERENCE) the returned //! affine is composed with camera //! transformation. - TAffine getViewMatrix() const; + TAffine getViewMatrix() const override; //! Return the view matrix. //! The view matrix is a matrix contained in \b m_viewAff TAffine getSceneMatrix() const; @@ -191,20 +191,20 @@ public: m_hRuler = h; } - bool is3DView() const; + bool is3DView() const override; TDimension getViewportSize() const { return TDimension(width(), height()); } - void invalidateAll(); - void GLInvalidateAll(); - void GLInvalidateRect(const TRectD &rect); - void invalidateToolStatus(); + void invalidateAll() override; + void GLInvalidateAll() override; + void GLInvalidateRect(const TRectD &rect) override; + void invalidateToolStatus() override; TPointD getPan3D() const { return m_pan3D; } double getZoomScale3D() const { return m_zoomScale3D; } - double projectToZ(const TPoint &delta); + double projectToZ(const TPoint &delta) override; - TPointD getDpiScale() const { return m_dpiScale; } + TPointD getDpiScale() const override { return m_dpiScale; } void zoomQt(bool forward, bool reset); TAffine getNormalZoomScale(); @@ -225,16 +225,16 @@ public: // return the viewer geometry in order to avoid picking the style outside of // the viewer // when using the stylepicker and the finger tools - virtual TRectD getGeometry() const; + TRectD getGeometry() const override; void setFocus(Qt::FocusReason reason) { QWidget::setFocus(reason); }; public: // SceneViewer's gadget public functions TPointD winToWorld(const QPoint &pos) const; - TPointD winToWorld(const TPoint &winPos) const; + TPointD winToWorld(const TPoint &winPos) const override; - TPoint worldToPos(const TPointD &worldPos) const; + TPoint worldToPos(const TPointD &worldPos) const override; protected: // Paint vars @@ -261,28 +261,28 @@ protected: protected: void mult3DMatrix(); - void initializeGL(); - void resizeGL(int width, int height); - - void paintGL(); - - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - - void tabletEvent(QTabletEvent *); - void leaveEvent(QEvent *); - void enterEvent(QEvent *); - void mouseMoveEvent(QMouseEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *); - void keyPressEvent(QKeyEvent *event); - void keyReleaseEvent(QKeyEvent *event); - void contextMenuEvent(QContextMenuEvent *event); - void inputMethodEvent(QInputMethodEvent *); + void initializeGL() override; + void resizeGL(int width, int height) override; + + void paintGL() override; + + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + + void tabletEvent(QTabletEvent *) override; + void leaveEvent(QEvent *) override; + void enterEvent(QEvent *) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void wheelEvent(QWheelEvent *) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; + void inputMethodEvent(QInputMethodEvent *) override; void drawCompared(); - bool event(QEvent *event); + bool event(QEvent *event) override; // delta.x: right panning, pixel; delta.y: down panning, pixel void panQt(const QPoint &delta); @@ -291,43 +291,43 @@ protected: void zoomQt(const QPoint ¢er, double scaleFactor); // overriden from TTool::Viewer - void pan(const TPoint &delta) { panQt(QPoint(delta.x, delta.y)); } + void pan(const TPoint &delta) override { panQt(QPoint(delta.x, delta.y)); } // overriden from TTool::Viewer - void zoom(const TPointD ¢er, double factor); + void zoom(const TPointD ¢er, double factor) override; - void rotate(const TPointD ¢er, double angle); - void rotate3D(double dPhi, double dTheta); + void rotate(const TPointD ¢er, double angle) override; + void rotate3D(double dPhi, double dTheta) override; TAffine getToolMatrix() const; //! return the column index of the drawing intersecting point \b p //! (window coordinate, pixels, bottom-left origin) - int pick(const TPoint &point); + int pick(const TPoint &point) override; //! return the column indexes of the drawings intersecting point \b p //! (window coordinate, pixels, bottom-left origin) int posToColumnIndex(const TPoint &p, double distance, - bool includeInvisible = true) const; + bool includeInvisible = true) const override; void posToColumnIndexes(const TPoint &p, std::vector &indexes, - double distance, bool includeInvisible = true) const; + double distance, bool includeInvisible = true) const override; //! return the row of the drawings intersecting point \b p (used with onion //! skins) //! (window coordinate, pixels, bottom-left origin) int posToRow(const TPoint &p, double distance, - bool includeInvisible = true) const; + bool includeInvisible = true) const override; - void dragEnterEvent(QDragEnterEvent *event); - void dropEvent(QDropEvent *event); + void dragEnterEvent(QDragEnterEvent *event) override; + void dropEvent(QDropEvent *event) override; - void resetInputMethod(); + void resetInputMethod() override; void set3DLeftSideView(); void set3DRightSideView(); void set3DTopView(); - void setFocus() { QWidget::setFocus(); }; + void setFocus() override { QWidget::setFocus(); }; public slots: diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp index 758b208..6cf15ba 100644 --- a/toonz/sources/toonz/sceneviewerevents.cpp +++ b/toonz/sources/toonz/sceneviewerevents.cpp @@ -660,7 +660,7 @@ class ViewerZoomer : public ImageUtils::ShortcutZoomer { public: ViewerZoomer(SceneViewer *parent) : ShortcutZoomer(parent) {} - bool zoom(bool zoomin, bool resetZoom) { + bool zoom(bool zoomin, bool resetZoom) override { SceneViewer *sceneViewer = static_cast(getWidget()); resetZoom ? sceneViewer->resetSceneViewer() @@ -669,17 +669,17 @@ public: return true; } - bool fit() { + bool fit() override { static_cast(getWidget())->fitToCamera(); return true; } - bool setActualPixelSize() { + bool setActualPixelSize() override { static_cast(getWidget())->setActualPixelSize(); return true; } - bool toggleFullScreen(bool quit) { + bool toggleFullScreen(bool quit) override { if (ImageUtils::FullScreenWidget *fsWidget = dynamic_cast( getWidget()->parentWidget())) diff --git a/toonz/sources/toonz/shifttracetool.cpp b/toonz/sources/toonz/shifttracetool.cpp index bfc2429..e21b0ff 100644 --- a/toonz/sources/toonz/shifttracetool.cpp +++ b/toonz/sources/toonz/shifttracetool.cpp @@ -83,7 +83,7 @@ private: public: ShiftTraceTool(); - ToolType getToolType() const { return GenericTool; } + ToolType getToolType() const override { return GenericTool; } void clearData(); void updateData(); @@ -91,16 +91,16 @@ public: void updateCurveAffs(); void updateGhost(); - void reset() { + void reset() override { onActivate(); invalidate(); } - void mouseMove(const TPointD &, const TMouseEvent &e); - void leftButtonDown(const TPointD &, const TMouseEvent &); - void leftButtonDrag(const TPointD &, const TMouseEvent &); - void leftButtonUp(const TPointD &, const TMouseEvent &); - void draw(); + void mouseMove(const TPointD &, const TMouseEvent &e) override; + void leftButtonDown(const TPointD &, const TMouseEvent &) override; + void leftButtonDrag(const TPointD &, const TMouseEvent &) override; + void leftButtonUp(const TPointD &, const TMouseEvent &) override; + void draw() override; TAffine getGhostAff(); GadgetId getGadget(const TPointD &); @@ -109,7 +109,7 @@ public: void drawControlRect(); void drawCurve(); - void onActivate() { + void onActivate() override { m_ghostIndex = 0; m_curveStatus = NoCurve; clearData(); @@ -120,12 +120,12 @@ public: m_center[0] = osm.getShiftTraceGhostCenter(0); m_center[1] = osm.getShiftTraceGhostCenter(1); } - void onDeactivate() { + void onDeactivate() override { QAction *action = CommandManager::instance()->getAction("MI_EditShift"); action->setChecked(false); } - int getCursorId() const; + int getCursorId() const override; }; ShiftTraceTool::ShiftTraceTool() diff --git a/toonz/sources/toonz/shortcutpopup.h b/toonz/sources/toonz/shortcutpopup.h index 6630728..b4e8e60 100644 --- a/toonz/sources/toonz/shortcutpopup.h +++ b/toonz/sources/toonz/shortcutpopup.h @@ -30,11 +30,11 @@ public: ~ShortcutViewer(); protected: - void paintEvent(QPaintEvent *); - bool event(QEvent *event); - void keyPressEvent(QKeyEvent *event); - void enterEvent(QEvent *event); - void leaveEvent(QEvent *event); + void paintEvent(QPaintEvent *) override; + bool event(QEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; public slots: void setAction(QAction *action); diff --git a/toonz/sources/toonz/subcameramanager.h b/toonz/sources/toonz/subcameramanager.h index f5015b8..f8eaf50 100644 --- a/toonz/sources/toonz/subcameramanager.h +++ b/toonz/sources/toonz/subcameramanager.h @@ -99,9 +99,9 @@ public: TRectD getEditingCameraInterestStageRect() const; - bool mousePressEvent(SceneViewer *viewer, QMouseEvent *event); - bool mouseMoveEvent(SceneViewer *viewer, QMouseEvent *event); - bool mouseReleaseEvent(SceneViewer *viewer, QMouseEvent *event); + bool mousePressEvent(SceneViewer *viewer, QMouseEvent *event) override; + bool mouseMoveEvent(SceneViewer *viewer, QMouseEvent *event) override; + bool mouseReleaseEvent(SceneViewer *viewer, QMouseEvent *event) override; void deleteSubCamera(SceneViewer *viewer); diff --git a/toonz/sources/toonz/subscenecommand.cpp b/toonz/sources/toonz/subscenecommand.cpp index 872af7f..e1a7fc6 100644 --- a/toonz/sources/toonz/subscenecommand.cpp +++ b/toonz/sources/toonz/subscenecommand.cpp @@ -907,7 +907,7 @@ public: TXshCell cell = xsh->getCell(m_row, m_col); } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); int row, col; @@ -916,7 +916,7 @@ public: changeSaveSubXsheetAsCommand(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); scene->getChildStack()->openChild(m_row, m_col); @@ -924,7 +924,7 @@ public: changeSaveSubXsheetAsCommand(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //============================================================================= @@ -938,7 +938,7 @@ public: CloseChildUndo(const std::vector> &cells) : m_cells(cells) {} - void undo() const { + void undo() const override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); for (int i = m_cells.size() - 1; i >= 0; i--) { @@ -949,7 +949,7 @@ public: changeSaveSubXsheetAsCommand(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); ToonzScene *scene = app->getCurrentScene()->getScene(); for (int i = 0; i < (int)m_cells.size(); i++) { @@ -960,10 +960,10 @@ public: changeSaveSubXsheetAsCommand(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Close SubXsheet"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Close SubXsheet"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -1507,7 +1507,7 @@ public: delete m_newData; } - virtual void undo() const { + void undo() const override { doUndo(); TApp *app = TApp::instance(); app->getCurrentXsheet()->notifyXsheetChanged(); @@ -1515,17 +1515,17 @@ public: changeSaveSubXsheetAsCommand(); } - virtual void redo() const { + void redo() const override { doRedo(false); TApp *app = TApp::instance(); app->getCurrentXsheet()->notifyXsheetChanged(); app->getCurrentObject()->notifyObjectIdSwitched(); changeSaveSubXsheetAsCommand(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Collapse"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Collapse"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -1554,7 +1554,7 @@ public: for (it = m_fxs.begin(); it != m_fxs.end(); it++) (*it)->release(); } - void undo() const { + void undo() const override { doUndo(); TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); @@ -1595,7 +1595,7 @@ public: changeSaveSubXsheetAsCommand(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); std::map> roots = @@ -1615,9 +1615,9 @@ public: app->getCurrentObject()->notifyObjectIdSwitched(); changeSaveSubXsheetAsCommand(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Collapse (Fx)"); } + QString getHistoryString() override { return QObject::tr("Collapse (Fx)"); } }; //============================================================================= @@ -1740,7 +1740,7 @@ public: } } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int editingGroup = -1; @@ -1822,7 +1822,7 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); @@ -1904,10 +1904,10 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Explode"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Explode"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -1987,7 +1987,7 @@ public: (*it2)->release(); } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); @@ -2040,7 +2040,7 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); xsh->clearCells(m_from, m_index, m_to - m_from + 1); @@ -2086,10 +2086,10 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Explode"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Explode"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; } // namespace @@ -2101,7 +2101,7 @@ public: class OpenChildCommand : public MenuItemHandler { public: OpenChildCommand() : MenuItemHandler(MI_OpenChild) {} - void execute() { openSubXsheet(); } + void execute() override { openSubXsheet(); } } openChildCommand; //============================================================================= @@ -2111,7 +2111,7 @@ public: class CloseChildCommand : public MenuItemHandler { public: CloseChildCommand() : MenuItemHandler(MI_CloseChild) {} - void execute() { closeSubXsheet(1); } + void execute() override { closeSubXsheet(1); } } closeChildCommand; //============================================================================= @@ -2121,7 +2121,7 @@ public: class ToggleEditInPlaceCommand : public MenuItemHandler { public: ToggleEditInPlaceCommand() : MenuItemHandler(MI_ToggleEditInPlace) {} - void execute() { toggleEditInPlace(); } + void execute() override { toggleEditInPlace(); } } toggleEditInPlaceCommand; //============================================================================= diff --git a/toonz/sources/toonz/svndeletedialog.h b/toonz/sources/toonz/svndeletedialog.h index 19da011..ec19195 100644 --- a/toonz/sources/toonz/svndeletedialog.h +++ b/toonz/sources/toonz/svndeletedialog.h @@ -53,7 +53,7 @@ public: int sceneIconAdded); protected: - void showEvent(QShowEvent *); + void showEvent(QShowEvent *) override; private: void switchToCloseButton(); diff --git a/toonz/sources/toonz/tapp.h b/toonz/sources/toonz/tapp.h index 505126c..3055c19 100644 --- a/toonz/sources/toonz/tapp.h +++ b/toonz/sources/toonz/tapp.h @@ -102,47 +102,47 @@ public: /*! Returns a pointer to the current scene. */ - TSceneHandle *getCurrentScene() const { return m_currentScene; } + TSceneHandle *getCurrentScene() const override { return m_currentScene; } /*! Returns a pointer to the current Xsheet. */ - TXsheetHandle *getCurrentXsheet() const { return m_currentXsheet; } + TXsheetHandle *getCurrentXsheet() const override { return m_currentXsheet; } /*! Returns a pointer to the current frame. */ - TFrameHandle *getCurrentFrame() const { return m_currentFrame; } + TFrameHandle *getCurrentFrame() const override { return m_currentFrame; } /*! Returns a pointer to the current column. */ - TColumnHandle *getCurrentColumn() const { return m_currentColumn; } + TColumnHandle *getCurrentColumn() const override { return m_currentColumn; } /*! Returns a pointer to the current level. */ - TXshLevelHandle *getCurrentLevel() const { return m_currentLevel; } + TXshLevelHandle *getCurrentLevel() const override { return m_currentLevel; } /*! Returns a pointer to the current tool used. */ - ToolHandle *getCurrentTool() const { return m_currentTool; } + ToolHandle *getCurrentTool() const override { return m_currentTool; } /*! Returns a pointer to the current object in use. */ - TObjectHandle *getCurrentObject() const { return m_currentObject; } + TObjectHandle *getCurrentObject() const override { return m_currentObject; } /*! Returns a pointer to the current selection. */ - TSelectionHandle *getCurrentSelection() const { return m_currentSelection; } + TSelectionHandle *getCurrentSelection() const override { return m_currentSelection; } /*! Returns a pointer to the current layer's mask. */ - TOnionSkinMaskHandle *getCurrentOnionSkin() const { + TOnionSkinMaskHandle *getCurrentOnionSkin() const override { return m_currentOnionSkinMask; } /*! Returns a pointer to the current effect. */ - TFxHandle *getCurrentFx() const { return m_currentFx; } + TFxHandle *getCurrentFx() const override { return m_currentFx; } - PaletteController *getPaletteController() const { + PaletteController *getPaletteController() const override { return m_paletteController; } /*! @@ -151,13 +151,13 @@ public: // Current Palette (PaletteController) methods - TPaletteHandle *getCurrentPalette() const; + TPaletteHandle *getCurrentPalette() const override; - TColorStyle *getCurrentLevelStyle() const; + TColorStyle *getCurrentLevelStyle() const override; - int getCurrentLevelStyleIndex() const; + int getCurrentLevelStyleIndex() const override; - void setCurrentLevelStyleIndex(int index); + void setCurrentLevelStyleIndex(int index) override; void setMainWindow(QMainWindow *mainWindow) { m_mainWindow = mainWindow; } /*! @@ -200,7 +200,7 @@ public: void writeSettings(); protected: - bool eventFilter(QObject *obj, QEvent *event); + bool eventFilter(QObject *obj, QEvent *event) override; private: void updateXshLevel(); diff --git a/toonz/sources/toonz/tasksviewer.h b/toonz/sources/toonz/tasksviewer.h index bc21e88..12c8994 100644 --- a/toonz/sources/toonz/tasksviewer.h +++ b/toonz/sources/toonz/tasksviewer.h @@ -31,7 +31,7 @@ public: Item(const QString &name); Item(TFarmTask *task); //~Item(); - void *getInternalPointer() const { return m_task; } + void *getInternalPointer() const override { return m_task; } TFarmTask *getTask() const { return m_task; } void setName(QString name) { m_name = name; } QString getName() const { return m_name; } @@ -60,7 +60,7 @@ public slots: void setupModelData(); protected: - QVariant data(const QModelIndex &index, int role) const; + QVariant data(const QModelIndex &index, int role) const override; private: // void setLayout(Item *oldPegs); @@ -79,8 +79,8 @@ public: QModelIndexList getSelectedIndexes() const { return selectedIndexes(); } protected: - void onClick(TreeModel::Item *item, const QPoint &pos, QMouseEvent *e); - void openContextMenu(TreeModel::Item *item, const QPoint &globalPos); + void onClick(TreeModel::Item *item, const QPoint &pos, QMouseEvent *e) override; + void openContextMenu(TreeModel::Item *item, const QPoint &globalPos) override; }; //------------------------------------------------------------------------------------------ @@ -175,7 +175,7 @@ public: #endif ~TasksViewer(); - void update(); + void update() override; void setSelected(TFarmTask *task); const std::vector &getActions() const; @@ -192,8 +192,8 @@ protected: void add(const QString &iconName, QString text, QToolBar *toolBar, const char *slot, QString iconText); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; }; //============================================================================= diff --git a/toonz/sources/toonz/testpanel.cpp b/toonz/sources/toonz/testpanel.cpp index a5a090b..70f5845 100644 --- a/toonz/sources/toonz/testpanel.cpp +++ b/toonz/sources/toonz/testpanel.cpp @@ -116,7 +116,7 @@ void TestPanel::onColorValueChanged(const TPixel32 &, bool isDragging) { class OpenFloatingTestPanel : public MenuItemHandler { public: OpenFloatingTestPanel() : MenuItemHandler(MI_OpenTest) {} - void execute() { + void execute() override { TMainWindow *currentRoom = TApp::instance()->getCurrentRoom(); if (currentRoom) { QList list = currentRoom->findChildren(); diff --git a/toonz/sources/toonz/tfarmstuff.h b/toonz/sources/toonz/tfarmstuff.h index 089f3af..a6e4790 100644 --- a/toonz/sources/toonz/tfarmstuff.h +++ b/toonz/sources/toonz/tfarmstuff.h @@ -38,12 +38,12 @@ public: TaskInfoPage(TWidget *parent); ~TaskInfoPage(); - void configureNotify(const TDimension &size); - void rightButtonDown(const TMouseEvent &e); + void configureNotify(const TDimension &size) override; + void rightButtonDown(const TMouseEvent &e) override; - void onActivate(); - void onDeactivate(); - void update(); + void onActivate() override; + void onDeactivate() override; + void update() override; void showTaskInfo(const std::string &id); @@ -95,10 +95,10 @@ public: SubmitPage(TWidget *parent); ~SubmitPage(); - void configureNotify(const TDimension &size); + void configureNotify(const TDimension &size) override; - void onActivate(); - void onDeactivate(); + void onActivate() override; + void onDeactivate() override; SubmitPageTask *getTask() const; void setTask(SubmitPageTask *task); @@ -127,14 +127,14 @@ public: void onOk(); - TDimension getPreferredSize() const; + TDimension getPreferredSize() const override; - void configureNotify(const TDimension &d); - bool onNcPaint(bool is_active, const TDimension &size, const TRect &titlebar); + void configureNotify(const TDimension &d) override; + bool onNcPaint(bool is_active, const TDimension &size, const TRect &titlebar) override; void popup(const TPoint &p, const TFilePath &fp); void onIntFieldChange(const TNumField::Event &e); - void draw(); + void draw() override; private: class Data; @@ -150,14 +150,14 @@ public: void onOk(); - TDimension getPreferredSize() const; + TDimension getPreferredSize() const override; - void configureNotify(const TDimension &d); - bool onNcPaint(bool is_active, const TDimension &size, const TRect &titlebar); + void configureNotify(const TDimension &d) override; + bool onNcPaint(bool is_active, const TDimension &size, const TRect &titlebar) override; void popup(const TPoint &p, const TFilePath &fp); void onIntFieldChange(const TNumField::Event &e); - void draw(); + void draw() override; private: class Data; @@ -173,10 +173,10 @@ public: void onOk(); - TDimension getPreferredSize() const; + TDimension getPreferredSize() const override; - void configureNotify(const TDimension &d); - void draw(); + void configureNotify(const TDimension &d) override; + void draw() override; // bool onNcPaint(bool is_active, const TDimension &size, const TRect // &titlebar); diff --git a/toonz/sources/toonz/timestretchpopup.cpp b/toonz/sources/toonz/timestretchpopup.cpp index 8ed7272..d6d57db 100644 --- a/toonz/sources/toonz/timestretchpopup.cpp +++ b/toonz/sources/toonz/timestretchpopup.cpp @@ -78,7 +78,7 @@ public: m_c1Old = c1; } - void undo() const { + void undo() const override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int oldNr = m_newRange; @@ -119,7 +119,7 @@ public: app->getCurrentXsheet()->notifyXsheetSoundChanged(); } - void redo() const { + void redo() const override { if (m_r1 - m_r0 < 0 || m_c1 - m_c0 < 0) return; TApp *app = TApp::instance(); app->getCurrentXsheet()->getXsheet()->timeStretch(m_r0, m_c0, m_r1, m_c1, @@ -137,10 +137,10 @@ public: app->getCurrentXsheet()->notifyXsheetSoundChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Time Stretch"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Time Stretch"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonz/timestretchpopup.h b/toonz/sources/toonz/timestretchpopup.h index 9830161..4ef3002 100644 --- a/toonz/sources/toonz/timestretchpopup.h +++ b/toonz/sources/toonz/timestretchpopup.h @@ -38,8 +38,8 @@ public: TimeStretchPopup(); protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; protected slots: void setCurrentStretchType(int index); diff --git a/toonz/sources/toonz/toolbar.h b/toonz/sources/toonz/toolbar.h index 5632008..80e2d09 100755 --- a/toonz/sources/toonz/toolbar.h +++ b/toonz/sources/toonz/toolbar.h @@ -22,8 +22,8 @@ public: protected: bool addAction(QAction *act); - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; protected slots: void onToolChanged(); diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cpp index 5df13af..0e05e3e 100644 --- a/toonz/sources/toonz/tpanels.cpp +++ b/toonz/sources/toonz/tpanels.cpp @@ -92,7 +92,7 @@ class XsheetViewerFactory : public TPanelFactory { public: XsheetViewerFactory() : TPanelFactory("Xsheet") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { panel->setWidget(new XsheetViewer(panel)); panel->resize(500, 300); } @@ -110,7 +110,7 @@ class SchematicSceneViewerFactory : public QObject, public TPanelFactory { public: SchematicSceneViewerFactory() : TPanelFactory("Schematic") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { SchematicScenePanel *panel = new SchematicScenePanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr("Schematic")); @@ -118,7 +118,7 @@ public: return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } schematicSceneViewerFactory; @@ -386,7 +386,7 @@ public: CurrentStyleChangeCommand() {} ~CurrentStyleChangeCommand() {} - bool onStyleChanged() { + bool onStyleChanged() override { TApp *app = TApp::instance(); int styleIndex = app->getPaletteController()->getCurrentLevelPalette()->getStyleIndex(); @@ -553,7 +553,7 @@ class PaletteViewerFactory : public TPanelFactory { public: PaletteViewerFactory() : TPanelFactory("LevelPalette") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { PaletteViewerPanel *panel = new PaletteViewerPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr(("Level Palette"))); @@ -561,7 +561,7 @@ public: return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } paletteViewerFactory; @@ -615,7 +615,7 @@ class StudioPaletteViewerFactory : public TPanelFactory { public: StudioPaletteViewerFactory() : TPanelFactory("StudioPalette") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { StudioPaletteViewerPanel *panel = new StudioPaletteViewerPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr("Studio Palette")); @@ -623,7 +623,7 @@ public: return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } studioPaletteViewerFactory; @@ -802,14 +802,14 @@ class StyleEditorFactory : public TPanelFactory { public: StyleEditorFactory() : TPanelFactory("StyleEditor") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { StyleEditorPanel *panel = new StyleEditorPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr("Style Editor")); return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } styleEditorFactory; @@ -826,7 +826,7 @@ class SceneViewerFactory : public TPanelFactory { public: SceneViewerFactory() : TPanelFactory("SceneViewer") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { SceneViewerPanel *panel = new SceneViewerPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr("Viewer")); @@ -834,7 +834,7 @@ public: return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } sceneViewerFactory; @@ -848,7 +848,7 @@ OpenFloatingPanel openSceneViewerCommand(MI_OpenLevelView, "SceneViewer", class ToolbarFactory : public TPanelFactory { public: ToolbarFactory() : TPanelFactory("ToolBar") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { Toolbar *toolbar = new Toolbar(panel); panel->setWidget(toolbar); panel->setIsMaximizable(false); @@ -882,14 +882,14 @@ class ToolOptionsFactory : public TPanelFactory { public: ToolOptionsFactory() : TPanelFactory("ToolOptions") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { TPanel *panel = new ToolOptionPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(getPanelType()); panel->resize(600, panel->height()); return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } toolOptionsFactory; //============================================================================= @@ -980,14 +980,14 @@ class FlipbookFactory : public TPanelFactory { public: FlipbookFactory() : TPanelFactory("FlipBook") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { TPanel *panel = new FlipbookPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr("FlipBook")); return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } flipbookFactory; #ifndef LINETEST @@ -998,7 +998,7 @@ public: class TasksViewerFactory : public TPanelFactory { public: TasksViewerFactory() : TPanelFactory("Tasks") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { panel->setWindowTitle(QObject::tr("Tasks")); panel->setWidget(new TasksViewer(panel)); } @@ -1007,7 +1007,7 @@ public: class BatchServersViewerFactory : public TPanelFactory { public: BatchServersViewerFactory() : TPanelFactory("BatchServers") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { panel->setWindowTitle(QObject::tr("Batch Servers")); panel->setWidget(new BatchServersViewer(panel)); } @@ -1017,7 +1017,7 @@ public: class BrowserFactory : public TPanelFactory { public: BrowserFactory() : TPanelFactory("Browser") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { FileBrowser *browser = new FileBrowser(panel, 0, false, true); panel->setWidget(browser); panel->setWindowTitle(QObject::tr("File Browser")); @@ -1034,7 +1034,7 @@ public: class CastViewerFactory : public TPanelFactory { public: CastViewerFactory() : TPanelFactory("SceneCast") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { panel->setWidget(new CastBrowser(panel)); panel->setWindowTitle(QObject::tr("Scene Cast")); } @@ -1047,7 +1047,7 @@ public: class FilmStripFactory : public TPanelFactory { public: FilmStripFactory() : TPanelFactory("FilmStrip") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { Filmstrip *filmstrip = new Filmstrip(panel); panel->setWidget(filmstrip); panel->setIsMaximizable(false); @@ -1085,7 +1085,7 @@ OpenFloatingPanel openExportPanelCommand(MI_OpenExport, "Export", class ColorModelViewerFactory : public TPanelFactory { public: ColorModelViewerFactory() : TPanelFactory("ColorModel") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { panel->setWidget(new ColorModelViewer(panel)); panel->resize(400, 300); } @@ -1101,14 +1101,14 @@ class FunctionViewerFactory : public TPanelFactory { public: FunctionViewerFactory() : TPanelFactory("FunctionEditor") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { FunctionViewerPanel *panel = new FunctionViewerPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr("Function Editor")); return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } functionViewerFactory; @@ -1123,7 +1123,7 @@ OpenFloatingPanel openFunctionViewerCommand(MI_OpenFunctionEditor, class TMessageViewerFactory : public TPanelFactory { public: TMessageViewerFactory() : TPanelFactory("TMessage") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { panel->setWindowTitle(QObject::tr("Message Center")); panel->setWidget(new TMessageViewer(panel)); panel->setMinimumHeight(80); @@ -1141,7 +1141,7 @@ class ScriptConsolePanelFactory : public TPanelFactory { public: ScriptConsolePanelFactory() : TPanelFactory("ScriptConsole") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { ScriptConsolePanel *panel = new ScriptConsolePanel(parent); panel->setObjectName(getPanelType()); @@ -1150,7 +1150,7 @@ public: return panel; } - void initialize(TPanel *panel) { assert(0); } + void initialize(TPanel *panel) override { assert(0); } } scriptConsolePanelFactory; OpenFloatingPanel openTScriptConsoleCommand("MI_OpenScriptConsole", @@ -1219,14 +1219,14 @@ OpenFloatingPanel openLineTestCaptureCommand(MI_OpenLineTestCapture, class ComboViewerFactory : public TPanelFactory { public: ComboViewerFactory() : TPanelFactory("ComboViewer") {} - TPanel *createPanel(QWidget *parent) { + TPanel *createPanel(QWidget *parent) override { ComboViewerPanel *panel = new ComboViewerPanel(parent); panel->setObjectName(getPanelType()); panel->setWindowTitle(QObject::tr("Combo Viewer")); panel->resize(700, 600); return panel; } - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { assert(0); panel->setWidget(new ComboViewerPanel(panel)); } @@ -1245,7 +1245,7 @@ class CleanupSettingsFactory : public TPanelFactory { public: CleanupSettingsFactory() : TPanelFactory("CleanupSettings") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { panel->setWidget(new CleanupSettingsPane(panel)); panel->setIsMaximizable(false); } @@ -1266,7 +1266,7 @@ OpenFloatingPanel openCleanupSettingsDockCommand( class HistoryPanelFactory : public TPanelFactory { public: HistoryPanelFactory() : TPanelFactory("HistoryPanel") {} - void initialize(TPanel *panel) { + void initialize(TPanel *panel) override { HistoryPane *historyPane = new HistoryPane(panel); panel->setWidget(historyPane); panel->setIsMaximizable(false); diff --git a/toonz/sources/toonz/tpanels.h b/toonz/sources/toonz/tpanels.h index e0b01dc..1f36945 100644 --- a/toonz/sources/toonz/tpanels.h +++ b/toonz/sources/toonz/tpanels.h @@ -39,14 +39,14 @@ class PaletteViewerPanel : public TPanel { public: PaletteViewerPanel(QWidget *parent); - void setViewType(int viewType); - int getViewType(); + void setViewType(int viewType) override; + int getViewType() override; - void reset(); + void reset() override; protected: void initializeTitleBar(); - bool isActivatableOnEnter() { return true; } + bool isActivatableOnEnter() override { return true; } protected slots: void onColorStyleSwitched(); @@ -69,7 +69,7 @@ public: StudioPaletteViewerPanel(QWidget *parent); protected: - bool isActivatableOnEnter() { return true; } + bool isActivatableOnEnter() override { return true; } protected slots: void onColorStyleSwitched(); void onPaletteSwitched(); @@ -105,8 +105,8 @@ public: ~ColorFieldEditorController() {} // Indice dello stile corrente == 1 - void edit(DVGui::ColorField *colorField); - void hide(); + void edit(DVGui::ColorField *colorField) override; + void hide() override; protected slots: void onColorStyleChanged(); @@ -132,8 +132,8 @@ public: ~CleanupColorFieldEditorController() {} // Indice dello stile corrente == 1 - void edit(DVGui::CleanupColorField *colorField); - void hide(); + void edit(DVGui::CleanupColorField *colorField) override; + void hide() override; protected slots: void onColorStyleChanged(); @@ -151,12 +151,12 @@ class SchematicScenePanel : public TPanel { public: SchematicScenePanel(QWidget *parent); - void setViewType(int viewType); - int getViewType(); + void setViewType(int viewType) override; + int getViewType() override; protected: - void showEvent(QShowEvent *e); - void hideEvent(QHideEvent *e); + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; protected slots: void onShowPreview(TFxP fx); @@ -179,16 +179,16 @@ class FunctionViewerPanel : public TPanel { public: FunctionViewerPanel(QWidget *parent = 0); - void reset(); + void reset() override; void attachHandles(); void detachHandles(); - bool widgetInThisPanelIsFocused(); + bool widgetInThisPanelIsFocused() override; protected: - void widgetFocusOnEnter(); - void widgetClearFocusOnLeave(); + void widgetFocusOnEnter() override; + void widgetClearFocusOnLeave() override; public slots: @@ -226,9 +226,9 @@ protected: public: FlipbookPanel(QWidget *parent); - void reset(); + void reset() override; // disable minimize button when docked - void onDock(bool docked); + void onDock(bool docked) override; protected slots: void onMinimizeButtonToggled(bool); diff --git a/toonz/sources/toonz/trackerpopup.h b/toonz/sources/toonz/trackerpopup.h index 1708c65..04cc1df 100644 --- a/toonz/sources/toonz/trackerpopup.h +++ b/toonz/sources/toonz/trackerpopup.h @@ -139,7 +139,7 @@ class MyThread : public QThread { public: MyThread(Tracker *tracker); - void run(); + void run() override; // Ritorna 0 se non c'è stato alcun errore nell'esecuzione del thread // altrimenti ritorna il codice di errore del tracker int getLastError() { return m_trackerError; }; diff --git a/toonz/sources/toonz/vcrcommand.cpp b/toonz/sources/toonz/vcrcommand.cpp index a7a8218..c716b59 100644 --- a/toonz/sources/toonz/vcrcommand.cpp +++ b/toonz/sources/toonz/vcrcommand.cpp @@ -23,7 +23,7 @@ class LinkToggleCommand : public MenuItemHandler { public: LinkToggleCommand() : MenuItemHandler("MI_Link") {} - void execute() { FlipConsole::toggleLinked(); } + void execute() override { FlipConsole::toggleLinked(); } } linkToggleCommand; //----------------------------------------------------------------------------- @@ -34,7 +34,7 @@ class VcrCommand : public MenuItemHandler { public: VcrCommand(const char *cmdId, FlipConsole::EGadget buttonId) : MenuItemHandler(cmdId), m_buttonId(buttonId) {} - void execute() { + void execute() override { FlipConsole *console = FlipConsole::getCurrent(); if (console) console->pressButton(m_buttonId); } @@ -46,7 +46,7 @@ class NextDrawingCommand : public MenuItemHandler { public: NextDrawingCommand() : MenuItemHandler(MI_NextDrawing) {} - void execute() { + void execute() override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int row = TApp::instance()->getCurrentFrame()->getFrame(); @@ -69,7 +69,7 @@ class PrevDrawingCommand : public MenuItemHandler { public: PrevDrawingCommand() : MenuItemHandler(MI_PrevDrawing) {} - void execute() { + void execute() override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int row = TApp::instance()->getCurrentFrame()->getFrame(); @@ -100,7 +100,7 @@ class NextStepCommand : public MenuItemHandler { public: NextStepCommand() : MenuItemHandler(MI_NextStep) {} - void execute() { + void execute() override { int row = TApp::instance()->getCurrentFrame()->getFrame(); int step = Preferences::instance()->getXsheetStep(); @@ -114,7 +114,7 @@ class PrevStepCommand : public MenuItemHandler { public: PrevStepCommand() : MenuItemHandler(MI_PrevStep) {} - void execute() { + void execute() override { int row = TApp::instance()->getCurrentFrame()->getFrame(); int step = Preferences::instance()->getXsheetStep(); diff --git a/toonz/sources/toonz/vectorizerpopup.h b/toonz/sources/toonz/vectorizerpopup.h index 69bd6b0..31c1950 100644 --- a/toonz/sources/toonz/vectorizerpopup.h +++ b/toonz/sources/toonz/vectorizerpopup.h @@ -203,8 +203,8 @@ private: void updateVisibility(); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; private slots: @@ -313,7 +313,7 @@ protected: /*! \details Remember that \b each of the above \a set methods \b must be called before invoking run(). */ - void run(); //!< Starts the vectorization thread (see QThread documentation). + void run() override; //!< Starts the vectorization thread (see QThread documentation). private: TXshSimpleLevelP m_level; //!< Input level to vectorize (only one level at a diff --git a/toonz/sources/toonz/vectorizerswatch.h b/toonz/sources/toonz/vectorizerswatch.h index 12fb676..6a49b9f 100644 --- a/toonz/sources/toonz/vectorizerswatch.h +++ b/toonz/sources/toonz/vectorizerswatch.h @@ -44,8 +44,8 @@ protected: void connectUpdates(); void disconnectUpdates(); - void showEvent(QShowEvent *se); // { connectUpdates(); } - void hideEvent(QHideEvent *he); // { disconnectUpdates(); } + void showEvent(QShowEvent *se) override; // { connectUpdates(); } + void hideEvent(QHideEvent *he) override; // { disconnectUpdates(); } public slots: @@ -98,9 +98,9 @@ class VectorizationSwatchTask : public TThread::Runnable { public: VectorizationSwatchTask(int row, int col); - void run(); - void onStarted(TThread::RunnableP task); - void onFinished(TThread::RunnableP task); + void run() override; + void onStarted(TThread::RunnableP task) override; + void onFinished(TThread::RunnableP task) override; signals: diff --git a/toonz/sources/toonz/versioncontrol.h b/toonz/sources/toonz/versioncontrol.h index 1886d13..46ac697 100644 --- a/toonz/sources/toonz/versioncontrol.h +++ b/toonz/sources/toonz/versioncontrol.h @@ -52,7 +52,7 @@ public: bool depthInfinity = false); protected: - void run(); + void run() override; protected slots: void onStandardOutputReady(); diff --git a/toonz/sources/toonz/viewerpane.h b/toonz/sources/toonz/viewerpane.h index 2906624..43e9213 100644 --- a/toonz/sources/toonz/viewerpane.h +++ b/toonz/sources/toonz/viewerpane.h @@ -45,12 +45,12 @@ public: #endif ~SceneViewerPanel(); - void onDrawFrame(int frame, const ImagePainter::VisualSettings &settings); + void onDrawFrame(int frame, const ImagePainter::VisualSettings &settings) override; protected: - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void resizeEvent(QResizeEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void resizeEvent(QResizeEvent *) override; void initializeTitleBar(TPanelTitleBar *titleBar); void createFrameToolBar(); void createPlayToolBar(); diff --git a/toonz/sources/toonz/xshcellmover.cpp b/toonz/sources/toonz/xshcellmover.cpp index 702f23e..29c0664 100644 --- a/toonz/sources/toonz/xshcellmover.cpp +++ b/toonz/sources/toonz/xshcellmover.cpp @@ -252,7 +252,7 @@ public: CellsMover *getCellsMover() { return &m_cellsMover; } - void undo() const { + void undo() const override { m_cellsMover.undoMoveCells(); int ca = m_cellsMover.getStartPos().x; @@ -269,7 +269,7 @@ public: if (m_cellsMover.getColumnTypeFromCell(0) == TXshColumn::eSoundType) TApp::instance()->getCurrentXsheet()->notifyXsheetSoundChanged(); } - void redo() const { + void redo() const override { int ca = m_cellsMover.getStartPos().x; int cb = m_cellsMover.getPos().x; int colCount = m_cellsMover.getColumnCount(); @@ -297,10 +297,10 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetSoundChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Move Level"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Move Level"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= diff --git a/toonz/sources/toonz/xshcellmover.h b/toonz/sources/toonz/xshcellmover.h index 9ab3bb2..ec63cee 100644 --- a/toonz/sources/toonz/xshcellmover.h +++ b/toonz/sources/toonz/xshcellmover.h @@ -106,11 +106,11 @@ public: LevelMoverTool(XsheetViewer *viewer); ~LevelMoverTool(); - void onClick(const QMouseEvent *e); + void onClick(const QMouseEvent *e) override; void onCellChange(int row, int col); - void onDrag(const QMouseEvent *e); - void onRelease(int row, int col); - void drawCellsArea(QPainter &p); + void onDrag(const QMouseEvent *e) override; + void onRelease(int row, int col) override; + void drawCellsArea(QPainter &p) override; }; #endif diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp index 035608b..22599e2 100644 --- a/toonz/sources/toonz/xshcellviewer.cpp +++ b/toonz/sources/toonz/xshcellviewer.cpp @@ -466,18 +466,18 @@ public: app->getCurrentXsheet()->notifyXsheetChanged(); } - void undo() const { setcell(m_oldCell); } + void undo() const override { setcell(m_oldCell); } - void redo() const { setcell(m_newCell); } + void redo() const override { setcell(m_newCell); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Rename Cell at Column %1 Frame %2") .arg(QString::number(m_col + 1)) .arg(QString::number(m_row + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; // display upper-directional smart tab only when pressing ctrl key @@ -1580,18 +1580,18 @@ public: // indices sono le colonne inserite CycleUndo(TStageObject *pegbar, CellArea *area) : m_pegbar(pegbar), m_area(area) {} - void undo() const { + void undo() const override { m_pegbar->enableCycle(!m_pegbar->isCycleEnabled()); m_area->update(); } - void redo() const { undo(); } - int getSize() const { return sizeof *this; } + void redo() const override { undo(); } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Toggle cycle of %1") .arg(QString::fromStdString(m_pegbar->getName())); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //---------------------------------------------------------- diff --git a/toonz/sources/toonz/xshcellviewer.h b/toonz/sources/toonz/xshcellviewer.h index fc24ebb..e88f8da 100644 --- a/toonz/sources/toonz/xshcellviewer.h +++ b/toonz/sources/toonz/xshcellviewer.h @@ -30,8 +30,8 @@ public: void showInRowCol(int row, int col); protected: - void focusOutEvent(QFocusEvent *); - void keyPressEvent(QKeyEvent *event); + void focusOutEvent(QFocusEvent *) override; + void keyPressEvent(QKeyEvent *event) override; void renameCell(); @@ -84,7 +84,7 @@ public: #endif ~CellArea(); - void mouseMoveEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event) override; // display upper-directional smart tab only when pressing ctrl key void onControlPressed(bool pressed); @@ -92,17 +92,17 @@ public: // void keyUpDownPressed(int newRow); protected: - void paintEvent(QPaintEvent *); - - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void contextMenuEvent(QContextMenuEvent *event); - void dragEnterEvent(QDragEnterEvent *event); - void dragLeaveEvent(QDragLeaveEvent *event); - void dragMoveEvent(QDragMoveEvent *event); - void dropEvent(QDropEvent *event); - bool event(QEvent *event); + void paintEvent(QPaintEvent *) override; + + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; + bool event(QEvent *event) override; /*!Crea il menu' del tasto destro che si visualizza quando si clicca sulla cella, diff --git a/toonz/sources/toonz/xshcolumnviewer.h b/toonz/sources/toonz/xshcolumnviewer.h index cba24e3..5b1303c 100644 --- a/toonz/sources/toonz/xshcolumnviewer.h +++ b/toonz/sources/toonz/xshcolumnviewer.h @@ -41,11 +41,11 @@ public: ~MotionPathMenu(); protected: - void paintEvent(QPaintEvent *); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void leaveEvent(QEvent *event); + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void leaveEvent(QEvent *event) override; }; //============================================================================= @@ -71,9 +71,9 @@ public: virtual void refresh(){}; protected: - void mouseMoveEvent(QMouseEvent *event); - void focusOutEvent(QFocusEvent *e); - void focusInEvent(QFocusEvent *e) {} + void mouseMoveEvent(QMouseEvent *event) override; + void focusOutEvent(QFocusEvent *e) override; + void focusInEvent(QFocusEvent *e) override {} void selectCurrent(const QString &text); protected slots: @@ -91,10 +91,10 @@ public: ChangeObjectParent(QWidget *parent = 0); ~ChangeObjectParent(); - void refresh(); + void refresh() override; protected slots: - void onTextChanged(const QString &); + void onTextChanged(const QString &) override; }; //============================================================================= @@ -108,10 +108,10 @@ public: ChangeObjectHandle(QWidget *parent = 0); ~ChangeObjectHandle(); - void refresh(); + void refresh() override; protected slots: - void onTextChanged(const QString &); + void onTextChanged(const QString &) override; }; //============================================================================= @@ -136,7 +136,7 @@ public: void show(QPoint pos, int col); protected: - void focusOutEvent(QFocusEvent *); + void focusOutEvent(QFocusEvent *) override; protected slots: void renameColumn(); @@ -159,7 +159,7 @@ public: protected: // void mouseMoveEvent ( QMouseEvent * e ); - void mouseReleaseEvent(QMouseEvent *e); + void mouseReleaseEvent(QMouseEvent *e) override; protected slots: void onSliderReleased(); @@ -227,14 +227,14 @@ public: protected: void select(int columnIndex, QMouseEvent *event); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - void contextMenuEvent(QContextMenuEvent *event); - bool event(QEvent *event); + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; + bool event(QEvent *event) override; protected slots: void onSubSampling(QAction *); diff --git a/toonz/sources/toonz/xsheetcmd.cpp b/toonz/sources/toonz/xsheetcmd.cpp index 9549d03..9185bbe 100644 --- a/toonz/sources/toonz/xsheetcmd.cpp +++ b/toonz/sources/toonz/xsheetcmd.cpp @@ -120,27 +120,27 @@ protected: public: InsertSceneFrameUndo(int frame) : m_frame(frame) {} - void undo() const { + void undo() const override { doRemoveSceneFrame(m_frame); TApp::instance()->getCurrentScene()->setDirtyFlag(true); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { doInsertSceneFrame(m_frame); TApp::instance()->getCurrentScene()->setDirtyFlag(true); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Insert Frame at Frame %1") .arg(QString::number(m_frame + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } protected: static void doInsertSceneFrame(int frame); @@ -215,7 +215,7 @@ void insertSceneFrame(int frame) { class InsertSceneFrameCommand : public MenuItemHandler { public: InsertSceneFrameCommand() : MenuItemHandler(MI_InsertSceneFrame) {} - void execute() { + void execute() override { int frame = TApp::instance()->getCurrentFrame()->getFrame(); XshCmd::insertSceneFrame(frame); } @@ -254,9 +254,9 @@ public: } } - void redo() const { InsertSceneFrameUndo::undo(); } + void redo() const override { InsertSceneFrameUndo::undo(); } - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); // Insert an empty frame, need space for our stored stuff @@ -285,15 +285,15 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return 10 << 10; } // Gave up exact calculation. Say ~ 10 kB? - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Remove Frame at Frame %1") .arg(QString::number(m_frame + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -310,7 +310,7 @@ void removeSceneFrame(int frame) { class RemoveSceneFrameCommand : public MenuItemHandler { public: RemoveSceneFrameCommand() : MenuItemHandler(MI_RemoveSceneFrame) {} - void execute() { + void execute() override { int frame = TApp::instance()->getCurrentFrame()->getFrame(); XshCmd::removeSceneFrame(frame); } @@ -324,9 +324,9 @@ class GlobalKeyframeUndo : public TUndo { public: GlobalKeyframeUndo(int frame) : m_frame(frame) {} - int getSize() const { return sizeof(*this) + m_columns.size() * sizeof(int); } + int getSize() const override { return sizeof(*this) + m_columns.size() * sizeof(int); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } protected: std::vector m_columns; @@ -419,21 +419,21 @@ public: boost::bind(isKeyframe, frame, _1))))); } - void redo() const { + void redo() const override { doInsertGlobalKeyframes(m_frame, m_columns); TApp::instance()->getCurrentScene()->setDirtyFlag(true); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void undo() const { + void undo() const override { doRemoveGlobalKeyframes(m_frame, m_columns); TApp::instance()->getCurrentScene()->setDirtyFlag(true); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Insert Multiple Keys at Frame %1") .arg(QString::number(m_frame + 1)); } @@ -458,7 +458,7 @@ void insertGlobalKeyframe(int frame) { class InsertGlobalKeyframeCommand : public MenuItemHandler { public: InsertGlobalKeyframeCommand() : MenuItemHandler(MI_InsertGlobalKeyframe) {} - void execute() { + void execute() override { int frame = TApp::instance()->getCurrentFrame()->getFrame(); XshCmd::insertGlobalKeyframe(frame); } @@ -496,14 +496,14 @@ public: frame, _1))); } - void redo() const { + void redo() const override { doRemoveGlobalKeyframes(m_frame, m_columns); TApp::instance()->getCurrentScene()->setDirtyFlag(true); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); int c, cCount = int(m_columns.size()); @@ -521,12 +521,12 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return GlobalKeyframeUndo::getSize() + m_keyframes.size() * sizeof(TStageObject::Keyframe); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Remove Multiple Keys at Frame %1") .arg(QString::number(m_frame + 1)); } @@ -551,7 +551,7 @@ void removeGlobalKeyframe(int frame) { class RemoveGlobalKeyframeCommand : public MenuItemHandler { public: RemoveGlobalKeyframeCommand() : MenuItemHandler(MI_RemoveGlobalKeyframe) {} - void execute() { + void execute() override { int frame = TApp::instance()->getCurrentFrame()->getFrame(); XshCmd::removeGlobalKeyframe(frame); } @@ -563,72 +563,72 @@ public: class DrawingSubtitutionUndo : public TUndo { private: - int m_direction, m_row, m_col; - TCellSelection::Range m_range; - bool m_selected; + int m_direction, m_row, m_col; + TCellSelection::Range m_range; + bool m_selected; public: - DrawingSubtitutionUndo(int dir, TCellSelection::Range range, int row, int col, bool selected) + DrawingSubtitutionUndo(int dir, TCellSelection::Range range, int row, int col, bool selected) : m_direction(dir), m_range(range), m_row(row), m_col(col), m_selected(selected){} - - void undo() const { - if (!m_selected) { - changeDrawing(-m_direction, m_row, m_col); - return; - } - int col, row; - int c = m_range.m_c0; - int r = m_range.m_r0; - while (c <= m_range.m_c1) { - col = c; - while (r <= m_range.m_r1) { - row = r; - changeDrawing(-m_direction, row, col); - r++; - } - r = m_range.m_r0; - c++; - } - - } - - void redo() const { - if (!m_selected) { - changeDrawing(m_direction, m_row, m_col); - return; - } - - int col, row; - int c = m_range.m_c0; - int r = m_range.m_r0; - while (c <= m_range.m_c1) { - col = c; - while (r <= m_range.m_r1) { - row = r; - changeDrawing(m_direction, row, col); - r++; - } - r = m_range.m_r0; - c++; - } - } - - int getSize() const { - return sizeof(*this); - } - - QString getHistoryString() { - return QObject::tr("Change current drawing %1").arg(QString::number(m_direction)); - } - - int getHistoryType() { - return HistoryType::Xsheet; - } + + void undo() const override { + if (!m_selected) { + changeDrawing(-m_direction, m_row, m_col); + return; + } + int col, row; + int c = m_range.m_c0; + int r = m_range.m_r0; + while (c <= m_range.m_c1) { + col = c; + while (r <= m_range.m_r1) { + row = r; + changeDrawing(-m_direction, row, col); + r++; + } + r = m_range.m_r0; + c++; + } + + } + + void redo() const override { + if (!m_selected) { + changeDrawing(m_direction, m_row, m_col); + return; + } + + int col, row; + int c = m_range.m_c0; + int r = m_range.m_r0; + while (c <= m_range.m_c1) { + col = c; + while (r <= m_range.m_r1) { + row = r; + changeDrawing(m_direction, row, col); + r++; + } + r = m_range.m_r0; + c++; + } + } + + int getSize() const override { + return sizeof(*this); + } + + QString getHistoryString() override { + return QObject::tr("Change current drawing %1").arg(QString::number(m_direction)); + } + + int getHistoryType() override { + return HistoryType::Xsheet; + } protected: - static bool changeDrawing(int delta, int row, int col); - static void setDrawing(const TFrameId &fid, int row, int col, TXshCell cell); - friend class DrawingSubtitutionGroupUndo; + static bool changeDrawing(int delta, int row, int col); + static void setDrawing(const TFrameId &fid, int row, int col, TXshCell cell); + friend class DrawingSubtitutionGroupUndo; }; //============================================================ @@ -636,142 +636,142 @@ protected: class DrawingSubtitutionGroupUndo : public TUndo { private: - int m_direction; - int m_row; - int m_col; - int m_count; + int m_direction; + int m_row; + int m_col; + int m_count; public: - DrawingSubtitutionGroupUndo(int dir, int row, int col) : m_direction(dir), m_col(col), m_row(row) - { - m_count = 1; - TXshCell cell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row, m_col); - if (!cell.m_level || !cell.m_level->getSimpleLevel()) return; - - TFrameId id = cell.m_frameId; - - TXshCell nextCell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row + m_count, m_col); - if (!nextCell.m_level || !nextCell.m_level->getSimpleLevel()) return; - - TFrameId nextId = nextCell.m_frameId; - - while (id == nextId) { - m_count++; - nextCell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row + m_count, m_col); - nextId = nextCell.m_frameId; - } - } - - void undo() const { - int n = 1; - DrawingSubtitutionUndo::changeDrawing(-m_direction, m_row, m_col); - while (n < m_count) { - DrawingSubtitutionUndo::changeDrawing(-m_direction, m_row + n, m_col); - n++; - } - } - - void redo() const { - int n = 1; - DrawingSubtitutionUndo::changeDrawing(m_direction, m_row, m_col); - while (n < m_count) { - DrawingSubtitutionUndo::changeDrawing(m_direction, m_row + n, m_col); - n++; - } - } - - int getSize() const { - return sizeof(*this); - } - - QString getHistoryString() { - return QObject::tr("Change current drawing %1").arg(QString::number(m_direction)); - } - - int getHistoryType() { - return HistoryType::Xsheet; - } + DrawingSubtitutionGroupUndo(int dir, int row, int col) : m_direction(dir), m_col(col), m_row(row) + { + m_count = 1; + TXshCell cell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row, m_col); + if (!cell.m_level || !cell.m_level->getSimpleLevel()) return; + + TFrameId id = cell.m_frameId; + + TXshCell nextCell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row + m_count, m_col); + if (!nextCell.m_level || !nextCell.m_level->getSimpleLevel()) return; + + TFrameId nextId = nextCell.m_frameId; + + while (id == nextId) { + m_count++; + nextCell = TTool::getApplication()->getCurrentScene()->getScene()->getXsheet()->getCell(m_row + m_count, m_col); + nextId = nextCell.m_frameId; + } + } + + void undo() const override { + int n = 1; + DrawingSubtitutionUndo::changeDrawing(-m_direction, m_row, m_col); + while (n < m_count) { + DrawingSubtitutionUndo::changeDrawing(-m_direction, m_row + n, m_col); + n++; + } + } + + void redo() const override { + int n = 1; + DrawingSubtitutionUndo::changeDrawing(m_direction, m_row, m_col); + while (n < m_count) { + DrawingSubtitutionUndo::changeDrawing(m_direction, m_row + n, m_col); + n++; + } + } + + int getSize() const override { + return sizeof(*this); + } + + QString getHistoryString() override { + return QObject::tr("Change current drawing %1").arg(QString::number(m_direction)); + } + + int getHistoryType() override { + return HistoryType::Xsheet; + } }; //============================================================ bool DrawingSubtitutionUndo::changeDrawing(int delta, int row, int col) { - TTool::Application *app = TTool::getApplication(); - TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); - TXshCell cell = xsh->getCell(row, col); - - if (!cell.m_level || !cell.m_level->getSimpleLevel()) return false; - - std::vector fids; - cell.m_level->getSimpleLevel()->getFids(fids); - int n = fids.size(); - - if (n < 2) return false; - - std::vector::iterator it; - it = std::find(fids.begin(), fids.end(), cell.m_frameId); - - if (it == fids.end()) return false; - - int index = std::distance(fids.begin(), it); - while (delta < 0) delta += n; - index = (index + delta) % n; - - setDrawing(fids[index], row, col, cell); + TTool::Application *app = TTool::getApplication(); + TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); + TXshCell cell = xsh->getCell(row, col); + + if (!cell.m_level || !cell.m_level->getSimpleLevel()) return false; + + std::vector fids; + cell.m_level->getSimpleLevel()->getFids(fids); + int n = fids.size(); + + if (n < 2) return false; + + std::vector::iterator it; + it = std::find(fids.begin(), fids.end(), cell.m_frameId); + + if (it == fids.end()) return false; + + int index = std::distance(fids.begin(), it); + while (delta < 0) delta += n; + index = (index + delta) % n; + + setDrawing(fids[index], row, col, cell); } void DrawingSubtitutionUndo::setDrawing(const TFrameId &fid, int row, int col, TXshCell cell) { - TTool::Application *app = TTool::getApplication(); - TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); - cell.m_frameId = fid; - xsh->setCell(row, col, cell); - TStageObject *pegbar = xsh->getStageObject(TStageObjectId::ColumnId(col)); - pegbar->setOffset(pegbar->getOffset()); - - app->getCurrentXsheet()->notifyXsheetChanged(); - TApp::instance()->getCurrentScene()->setDirtyFlag(true); + TTool::Application *app = TTool::getApplication(); + TXsheet *xsh = app->getCurrentScene()->getScene()->getXsheet(); + cell.m_frameId = fid; + xsh->setCell(row, col, cell); + TStageObject *pegbar = xsh->getStageObject(TStageObjectId::ColumnId(col)); + pegbar->setOffset(pegbar->getOffset()); + + app->getCurrentXsheet()->notifyXsheetChanged(); + TApp::instance()->getCurrentScene()->setDirtyFlag(true); } //----------------------------------------------------------------------------- void drawingSubstituion(int dir) { - //TTool::Application *app = TTool::getApplication(); - //TCellSelection *selection = dynamic_cast(app->getCurrentSelection()->getSelection()); - TCellSelection *selection = dynamic_cast(TTool::getApplication()->getCurrentSelection()->getSelection()); - TCellSelection::Range range; - bool selected = false; - if (selection) { - range = selection->getSelectedCells(); - if (!(range.isEmpty())) - selected = true; - } - int row = TTool::getApplication()->getCurrentFrame()->getFrame(); - int col = TTool::getApplication()->getCurrentColumn()->getColumnIndex(); - - DrawingSubtitutionUndo *undo = new DrawingSubtitutionUndo(dir, range, row, col, selected); - TUndoManager::manager()->add(undo); - - undo->redo(); + //TTool::Application *app = TTool::getApplication(); + //TCellSelection *selection = dynamic_cast(app->getCurrentSelection()->getSelection()); + TCellSelection *selection = dynamic_cast(TTool::getApplication()->getCurrentSelection()->getSelection()); + TCellSelection::Range range; + bool selected = false; + if (selection) { + range = selection->getSelectedCells(); + if (!(range.isEmpty())) + selected = true; + } + int row = TTool::getApplication()->getCurrentFrame()->getFrame(); + int col = TTool::getApplication()->getCurrentColumn()->getColumnIndex(); + + DrawingSubtitutionUndo *undo = new DrawingSubtitutionUndo(dir, range, row, col, selected); + TUndoManager::manager()->add(undo); + + undo->redo(); } void drawingSubstituionGroup(int dir) { - int row = TTool::getApplication()->getCurrentFrame()->getFrame(); - int col = TTool::getApplication()->getCurrentColumn()->getColumnIndex(); - DrawingSubtitutionGroupUndo *undo = new DrawingSubtitutionGroupUndo(dir, row, col); - TUndoManager::manager()->add(undo); - undo->redo(); + int row = TTool::getApplication()->getCurrentFrame()->getFrame(); + int col = TTool::getApplication()->getCurrentColumn()->getColumnIndex(); + DrawingSubtitutionGroupUndo *undo = new DrawingSubtitutionGroupUndo(dir, row, col); + TUndoManager::manager()->add(undo); + undo->redo(); } //============================================================================= class DrawingSubstitutionForwardCommand : public MenuItemHandler { public: - DrawingSubstitutionForwardCommand() : MenuItemHandler(MI_DrawingSubForward) {} - void execute() { - XshCmd::drawingSubstituion(1); - } + DrawingSubstitutionForwardCommand() : MenuItemHandler(MI_DrawingSubForward) {} + void execute() override { + XshCmd::drawingSubstituion(1); + } } DrawingSubstitutionForwardCommand; @@ -779,20 +779,20 @@ public: class DrawingSubstitutionBackwardCommand : public MenuItemHandler { public: - DrawingSubstitutionBackwardCommand() : MenuItemHandler(MI_DrawingSubBackward) {} - void execute() { - XshCmd::drawingSubstituion(-1); - } + DrawingSubstitutionBackwardCommand() : MenuItemHandler(MI_DrawingSubBackward) {} + void execute() override { + XshCmd::drawingSubstituion(-1); + } } DrawingSubstitutionBackwardCommand; //============================================================================= class DrawingSubstitutionGroupForwardCommand : public MenuItemHandler { public: - DrawingSubstitutionGroupForwardCommand() : MenuItemHandler(MI_DrawingSubGroupForward) {} - void execute() { - XshCmd::drawingSubstituionGroup(1); - } + DrawingSubstitutionGroupForwardCommand() : MenuItemHandler(MI_DrawingSubGroupForward) {} + void execute() override { + XshCmd::drawingSubstituionGroup(1); + } } DrawingSubstitutionGroupForwardCommand; @@ -800,10 +800,10 @@ public: class DrawingSubstitutionGroupBackwardCommand : public MenuItemHandler { public: - DrawingSubstitutionGroupBackwardCommand() : MenuItemHandler(MI_DrawingSubGroupBackward) {} - void execute() { - XshCmd::drawingSubstituionGroup(-1); - } + DrawingSubstitutionGroupBackwardCommand() : MenuItemHandler(MI_DrawingSubGroupBackward) {} + void execute() override { + XshCmd::drawingSubstituionGroup(-1); + } } DrawingSubstitutionGroupBackwardCommand; @@ -819,7 +819,7 @@ class SelectRowKeyframesCommand : public MenuItemHandler { public: SelectRowKeyframesCommand() : MenuItemHandler(MI_SelectRowKeyframes) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -852,7 +852,7 @@ class SelectColumnKeyframesCommand : public MenuItemHandler { public: SelectColumnKeyframesCommand() : MenuItemHandler(MI_SelectColumnKeyframes) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -883,7 +883,7 @@ class SelectAllKeyframesCommand : public MenuItemHandler { public: SelectAllKeyframesCommand() : MenuItemHandler(MI_SelectAllKeyframes) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -923,7 +923,7 @@ public: SelectAllKeyframesBeforeCommand() : MenuItemHandler(MI_SelectAllKeyframesNotBefore) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -964,7 +964,7 @@ public: SelectAllKeyframesAfterCommand() : MenuItemHandler(MI_SelectAllKeyframesNotAfter) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -1006,7 +1006,7 @@ public: SelectPreviousKeysInColumnCommand() : MenuItemHandler(MI_SelectPreviousKeysInColumn) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -1044,7 +1044,7 @@ public: SelectFollowingKeysInColumnCommand() : MenuItemHandler(MI_SelectFollowingKeysInColumn) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -1081,7 +1081,7 @@ public: SelectPreviousKeysInRowCommand() : MenuItemHandler(MI_SelectPreviousKeysInRow) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -1125,7 +1125,7 @@ public: SelectFollowingKeysInRowCommand() : MenuItemHandler(MI_SelectFollowingKeysInRow) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -1171,7 +1171,7 @@ public: InvertKeyframeSelectionCommand() : MenuItemHandler(MI_InvertKeyframeSelection) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); @@ -1230,7 +1230,7 @@ public: m_oldKeyframeSecond = pegbar->getKeyframe(m_rowSecond); } - void onAdd() { + void onAdd() override { TStageObject *pegbar = TApp::instance()->getCurrentXsheet()->getXsheet()->getStageObject( m_objId); @@ -1254,16 +1254,16 @@ public: TApp::instance()->getCurrentObject()->notifyObjectIdChanged(false); } - void redo() const { setKeyframes(m_newKeyframeFirst, m_newKeyframeSecond); } - void undo() const { setKeyframes(m_oldKeyframeFirst, m_oldKeyframeSecond); } + void redo() const override { setKeyframes(m_newKeyframeFirst, m_newKeyframeSecond); } + void undo() const override { setKeyframes(m_oldKeyframeFirst, m_oldKeyframeSecond); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Set Keyframe : %1") .arg(QString::fromStdString(m_objId.toString())); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; } // namespace @@ -1274,7 +1274,7 @@ class SetAccelerationCommand : public MenuItemHandler { public: SetAccelerationCommand() : MenuItemHandler(MI_SetAcceleration) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int row = app->getCurrentFrame()->getFrame(); @@ -1321,7 +1321,7 @@ class SetDecelerationCommand : public MenuItemHandler { public: SetDecelerationCommand() : MenuItemHandler(MI_SetDeceleration) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int row = app->getCurrentFrame()->getFrame(); @@ -1364,7 +1364,7 @@ class SetConstantSpeedCommand : public MenuItemHandler { public: SetConstantSpeedCommand() : MenuItemHandler(MI_SetConstantSpeed) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int row = app->getCurrentFrame()->getFrame(); @@ -1405,7 +1405,7 @@ class ResetArrowCommand : public MenuItemHandler { public: ResetArrowCommand() : MenuItemHandler(MI_ResetInterpolation) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TXsheet *xsh = app->getCurrentXsheet()->getXsheet(); int row = app->getCurrentFrame()->getFrame(); @@ -1449,7 +1449,7 @@ class NewOutputFx : public MenuItemHandler { public: NewOutputFx() : MenuItemHandler(MI_NewOutputFx) {} - void execute() { + void execute() override { TApp *app = TApp::instance(); TFxCommand::createOutputFx(app->getCurrentXsheet(), app->getCurrentFx()->getFx()); @@ -1801,7 +1801,7 @@ void makeHtml(TFilePath fp) { class PrintXsheetCommand : public MenuItemHandler { public: PrintXsheetCommand() : MenuItemHandler(MI_PrintXsheet) {} - void execute(); + void execute() override; } printXsheetCommand; void PrintXsheetCommand::execute() { diff --git a/toonz/sources/toonz/xsheetdragtool.cpp b/toonz/sources/toonz/xsheetdragtool.cpp index 47d2fe5..776bf1e 100644 --- a/toonz/sources/toonz/xsheetdragtool.cpp +++ b/toonz/sources/toonz/xsheetdragtool.cpp @@ -116,7 +116,7 @@ public: XsheetSelectionDragTool(XsheetViewer *viewer) : DragTool(viewer), m_firstRow(0), m_firstCol(0), m_modifier() {} // activate when clicked the cell - void onClick(const QMouseEvent *event) { + void onClick(const QMouseEvent *event) override { m_modifier = event->modifiers(); int row = getViewer()->yToRow(event->pos().y()); int col = getViewer()->xToColumn(event->pos().x()); @@ -171,7 +171,7 @@ public: refreshCellsArea(); refreshRowsArea(); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { if (col < 0) return; if (row < 0) row = 0; if (m_modifier & Qt::ControlModifier) @@ -183,7 +183,7 @@ public: refreshCellsArea(); refreshRowsArea(); } - void onRelease(const QMouseEvent *event) { + void onRelease(const QMouseEvent *event) override { TApp::instance()->getCurrentSelection()->notifySelectionChanged(); refreshRowsArea(); } @@ -212,19 +212,19 @@ public: , m_oldStep(oldStep) , m_newStep(newStep) {} - void undo() const { + void undo() const override { XsheetGUI::setPlayRange(m_oldR0, m_oldR1, m_oldStep, false); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { XsheetGUI::setPlayRange(m_newR0, m_newR1, m_newStep, false); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { if (m_oldR0 < 0 || m_oldR1 < 0) return QObject::tr("Modify Play Range : %1 - %2") .arg(QString::number(m_newR0 + 1)) @@ -236,7 +236,7 @@ public: .arg(QString::number(m_newR0 + 1)) .arg(QString::number(m_newR1 + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; } // namespace @@ -407,7 +407,7 @@ public: } } - void undo() const { + void undo() const override { // undo for shrinking operation -> revert cells if (m_deltaRow < 0) (m_invert) ? setCells() : insertCells(); // undo for stretching operation -> remove cells @@ -422,7 +422,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { // redo for shrinking operation -> remove cells if (m_deltaRow < 0) (m_invert) ? clearCells() : removeCells(); // redo for stretching operation -> revert cells @@ -437,12 +437,12 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(TXshCell) * m_cells.size(); } - QString getHistoryString() { return QObject::tr("Use Level Extender"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Use Level Extender"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -624,7 +624,7 @@ public: , m_invert(invert) {} // called when the smart tab is clicked - void onClick(int row, int col) { + void onClick(int row, int col) override { int r0, c0, r1, c1; getViewer()->getCellSelection()->getSelectedCells(r0, c0, r1, c1); if (m_invert) @@ -645,7 +645,7 @@ public: m_undo->setCells(xsh, r0, c0, m_rowCount, m_colCount); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { if (!m_invert) onCellChange(row, col); else @@ -742,7 +742,7 @@ public: m_c0 + m_colCount - 1); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { int delta = m_r1 - (m_r0 + m_rowCount - 1); if (delta == 0) delete m_undo; @@ -804,25 +804,25 @@ public: return soundColumn; } - void undo() const { + void undo() const override { TXshSoundColumn *soundColumn = getColumn(); if (!soundColumn) return; soundColumn->assignLevels(m_oldSoundColumn.getPointer()); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXshSoundColumn *soundColumn = getColumn(); if (!soundColumn) return; soundColumn->assignLevels(m_newSoundColumn.getPointer()); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Modify Sound Level"); } + QString getHistoryString() override { return QObject::tr("Modify Sound Level"); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; } // namespace @@ -879,7 +879,7 @@ public: return soundColumn; } - void onClick(int row, int col) { + void onClick(int row, int col) override { m_firstRow = row; m_col = col; TXshSoundColumn *soundColumn = getColumn(); @@ -889,7 +889,7 @@ public: getViewer()->update(); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { onChange(row); refreshCellsArea(); } @@ -918,7 +918,7 @@ public: TApp::instance()->getCurrentXsheet()->notifyXsheetSoundChanged(); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { if (row - m_firstRow == 0) { m_undo = 0; return; @@ -962,7 +962,7 @@ class CellKeyframeMoverTool : public LevelMoverTool { KeyframeMoverTool *m_keyframeMoverTool; protected: - bool canMove(const TPoint &pos) { + bool canMove(const TPoint &pos) override { if (!m_keyframeMoverTool->canMove(pos)) return false; return LevelMoverTool::canMove(pos); } @@ -972,23 +972,23 @@ public: m_keyframeMoverTool = new KeyframeMoverTool(viewer, true); } - void onClick(const QMouseEvent *e) { + void onClick(const QMouseEvent *e) override { LevelMoverTool::onClick(e); m_keyframeMoverTool->onClick(e); } - void onDrag(const QMouseEvent *e) { + void onDrag(const QMouseEvent *e) override { LevelMoverTool::onDrag(e); if (m_validPos) m_keyframeMoverTool->onDrag(e); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { TUndoManager::manager()->beginBlock(); LevelMoverTool::onRelease(row, col); m_keyframeMoverTool->onRelease(row, col); TUndoManager::manager()->endBlock(); } - void drawCellsArea(QPainter &p) { + void drawCellsArea(QPainter &p) override { LevelMoverTool::drawCellsArea(p); m_keyframeMoverTool->drawCellsArea(p); } @@ -1026,7 +1026,7 @@ public: m_oldKeyframe = pegbar->getKeyframe(m_row); } - void onAdd() { + void onAdd() override { TStageObject *pegbar = TApp::instance()->getCurrentXsheet()->getXsheet()->getStageObject( m_objId); @@ -1043,17 +1043,17 @@ public: TApp::instance()->getCurrentObject()->notifyObjectIdChanged(false); } - void undo() const { setKeyframe(m_oldKeyframe); } - void redo() const { setKeyframe(m_newKeyframe); } - int getSize() const { return sizeof *this; } + void undo() const override { setKeyframe(m_oldKeyframe); } + void redo() const override { setKeyframe(m_newKeyframe); } + int getSize() const override { return sizeof *this; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Move keyframe handle : %1 Handle of the keyframe %2") .arg(QString::fromStdString(m_objId.toString())) .arg(QString::number(m_row + 1)); } - int getHistoryType() { return HistoryType::Xsheet; } + int getHistoryType() override { return HistoryType::Xsheet; } }; //============================================================================= @@ -1085,7 +1085,7 @@ public: , m_r1(0) , m_enable(true) {} - void onClick(int row, int col) { + void onClick(int row, int col) override { m_r0 = m_r1 = row; TXsheet *xsh = getViewer()->getXsheet(); TStageObjectId cameraId = xsh->getStageObjectTree()->getCurrentCameraId(); @@ -1101,7 +1101,7 @@ public: m_undo = new KeyFrameHandleUndo(objId, m_startRow); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { if (!m_enable) return; m_r1 = row; onCellChange(row, col); @@ -1123,7 +1123,7 @@ public: m_stageObject->setKeyframeWithoutUndo(m_startRow, m_k); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { if (!m_enable) return; if (m_r0 == m_r1) delete m_undo; @@ -1163,7 +1163,7 @@ class NoteMoveTool : public XsheetGUI::DragTool { public: NoteMoveTool(XsheetViewer *viewer) : DragTool(viewer) {} - void onClick(const QMouseEvent *e) { + void onClick(const QMouseEvent *e) override { TXshNoteSet *notes = getViewer()->getXsheet()->getNotes(); int currentIndex = getViewer()->getCurrentNoteIndex(); m_startPos = notes->getNotePos(currentIndex); @@ -1197,13 +1197,13 @@ public: notes->setNotePos(currentIndex, newPos); } - void onDrag(const QMouseEvent *event) { + void onDrag(const QMouseEvent *event) override { QPoint p = event->pos(); onChange(TPointD(p.x(), p.y())); refreshCellsArea(); } - void onRelease(const QMouseEvent *event) { + void onRelease(const QMouseEvent *event) override { QPoint p = event->pos(); onChange(TPointD(p.x(), p.y())); @@ -1248,14 +1248,14 @@ public: TApp::instance()->getCurrentFrame()->getFrame()) , m_isFos(isFos) {} - void onClick(int row, int col) { + void onClick(int row, int col) override { OnionSkinMask mask = m_modifier.getMask(); TApp::instance()->getCurrentOnionSkin()->setOnionSkinMask(mask); m_modifier.click(row, m_isFos); TApp::instance()->getCurrentOnionSkin()->notifyOnionSkinMaskChanged(); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { if (row < 0) row = 0; onRowChange(row); TApp::instance()->getCurrentOnionSkin()->notifyOnionSkinMaskChanged(); @@ -1267,7 +1267,7 @@ public: TApp::instance()->getCurrentOnionSkin()->setOnionSkinMask(mask); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { m_modifier.release(row); OnionSkinMask mask = m_modifier.getMask(); TApp::instance()->getCurrentOnionSkin()->setOnionSkinMask(mask); @@ -1298,12 +1298,12 @@ class CurrentFrameModifier : public XsheetGUI::DragTool { public: CurrentFrameModifier(XsheetViewer *viewer) : DragTool(viewer) {} - void onClick(int row, int col) { + void onClick(int row, int col) override { TApp::instance()->getCurrentFrame()->setFrame(row); refreshRowsArea(); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { if (row < 0) row = 0; int lastRow = TApp::instance()->getCurrentFrame()->getFrameIndex(); if (lastRow == row) return; @@ -1318,7 +1318,7 @@ public: app->getCurrentFrame()->scrubXsheet(row, row, getViewer()->getXsheet()); } - void onRelease(int row, int col) { getViewer()->getXsheet()->stopScrub(); } + void onRelease(int row, int col) override { getViewer()->getXsheet()->stopScrub(); } }; //----------------------------------------------------------------------------- @@ -1348,14 +1348,14 @@ public: PlayRangeModifier(XsheetViewer *viewer) : DragTool(viewer), m_movingFirst(false) {} - void onClick(int row, int col) { + void onClick(int row, int col) override { XsheetGUI::getPlayRange(m_oldR0, m_oldR1, m_oldStep); assert(m_oldR0 == row || m_oldR1 == row); m_movingFirst = m_oldR0 == row; refreshRowsArea(); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { if (row < 0) row = 0; onRowChange(row); refreshRowsArea(); @@ -1385,7 +1385,7 @@ public: XsheetGUI::setPlayRange(r0, r1, step, false); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { int newR0, newR1, newStep; XsheetGUI::getPlayRange(newR0, newR1, newStep); if (m_oldR0 != newR0 || m_oldR1 != newR1) { @@ -1420,7 +1420,7 @@ public: ColumnSelectionTool(XsheetViewer *viewer) : DragTool(viewer), m_firstColumn(-1), m_enabled(false) {} - void onClick(const QMouseEvent *event) { + void onClick(const QMouseEvent *event) override { TColumnSelection *selection = getViewer()->getColumnSelection(); int col = getViewer()->xToColumn(event->pos().x()); m_firstColumn = col; @@ -1447,7 +1447,7 @@ public: getViewer()->update(); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { if (!m_enabled) return; if (col < 0) return; TColumnSelection *selection = getViewer()->getColumnSelection(); @@ -1459,7 +1459,7 @@ public: refreshCellsArea(); return; } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { TSelectionHandle::getCurrent()->notifySelectionChanged(); } }; @@ -1515,14 +1515,14 @@ public: assert(*indices.begin() >= 0); assert(delta < 0 || *indices.begin() - delta >= 0); } - void undo() const { + void undo() const override { moveColumns(m_indices, -m_delta); TSelection *selection = TApp::instance()->getCurrentSelection()->getSelection(); if (selection) selection->selectNone(); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { std::set ii; for (std::set::const_iterator it = m_indices.begin(); it != m_indices.end(); ++it) @@ -1533,10 +1533,10 @@ public: if (selection) selection->selectNone(); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this) + m_indices.size() * sizeof(int); } + int getSize() const override { return sizeof(*this) + m_indices.size() * sizeof(int); } - QString getHistoryString() { return QObject::tr("Move Columns"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Move Columns"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -1551,7 +1551,7 @@ public: , m_lastCol(-1) , m_offset(0) {} - void onClick(int row, int col) { + void onClick(int row, int col) override { TColumnSelection *selection = getViewer()->getColumnSelection(); if (!selection->isColumnSelected(col)) { selection->selectNone(); @@ -1566,7 +1566,7 @@ public: assert(m_lastCol == *indices.begin()); getViewer()->update(); } - void onDrag(int row, int col) { + void onDrag(int row, int col) override { TColumnSelection *selection = getViewer()->getColumnSelection(); std::set indices = selection->getIndices(); if (indices.empty()) return; @@ -1587,7 +1587,7 @@ public: ++it) selection->selectColumn(*it + dCol, true); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { int delta = m_lastCol - m_firstCol; if (delta == 0) return; TColumnSelection *selection = getViewer()->getColumnSelection(); @@ -1622,22 +1622,22 @@ public: , m_newParentId(newParentId) , m_child(child) {} - void undo() const { + void undo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); xsh->setStageObjectParent(m_child, m_oldParentId); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); xsh->setStageObjectParent(m_child, m_newParentId); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Change Pegbar"); } - int getHistoryType() { return HistoryType::Xsheet; } + QString getHistoryString() override { return QObject::tr("Change Pegbar"); } + int getHistoryType() override { return HistoryType::Xsheet; } }; //----------------------------------------------------------------------------- @@ -1649,9 +1649,9 @@ public: ChangePegbarParentDragTool(XsheetViewer *viewer) : XsheetGUI::DragTool(viewer), m_firstCol(-1), m_lastCol(-1) {} - void onClick(int row, int col) { m_firstCol = m_lastCol = col; } - void onDrag(int row, int col) { m_lastCol = col; } - void onRelease(int row, int col) { + void onClick(int row, int col) override { m_firstCol = m_lastCol = col; } + void onDrag(int row, int col) override { m_lastCol = col; } + void onRelease(int row, int col) override { // TUndoManager::manager()->add(new ColumnMoveUndo(indices, delta)); TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); TStageObjectId columnId(getViewer()->getObjectId(m_firstCol)); @@ -1720,9 +1720,9 @@ public: } } - void onClick(const QMouseEvent *) {} + void onClick(const QMouseEvent *) override {} - void onDrag(const QMouseEvent *event) { + void onDrag(const QMouseEvent *event) override { if (!m_enabled) return; double v = (double)(60 - (event->pos().y() - (XsheetGUI::RowHeight * 2 + 4))) / @@ -1737,7 +1737,7 @@ public: getViewer()->update(); } - void onRelease(const QMouseEvent *) { + void onRelease(const QMouseEvent *) override { TApp::instance()->getCurrentXsheet()->notifyXsheetSoundChanged(); } }; @@ -1774,7 +1774,7 @@ public: , m_oldRow(0) , m_timerId(0) {} - void onClick(int row, int col) { + void onClick(int row, int col) override { TColumnSelection *selection = getViewer()->getColumnSelection(); selection->selectNone(); m_startRow = row; @@ -1782,7 +1782,7 @@ public: getViewer()->updateCells(); } - void onDrag(int row, int col) { onCellChange(row, col); } + void onDrag(int row, int col) override { onCellChange(row, col); } void onCellChange(int row, int col) { assert(m_startRow >= 0); @@ -1790,7 +1790,7 @@ public: getViewer()->updateCells(); } - void onRelease(int row, int col) { + void onRelease(int row, int col) override { int r0 = std::min(row, m_startRow); int r1 = std::max(row, m_startRow); assert(m_soundColumn); @@ -1885,7 +1885,7 @@ public: , m_valid(false) , m_type(NO_MOVEMENT) {} - void onClick(const QDropEvent *e) { + void onClick(const QDropEvent *e) override { if (e->mimeData()->hasUrls()) { QList urls = e->mimeData()->urls(); int i; @@ -1918,7 +1918,7 @@ public: } refreshCellsArea(); } - void onDrag(const QDropEvent *e) { + void onDrag(const QDropEvent *e) override { TPoint pos(e->pos().x(), e->pos().y()); int row = getViewer()->yToRow(pos.y); int col = getViewer()->xToColumn(pos.x); @@ -1933,7 +1933,7 @@ public: m_curPos = pos; refreshCellsArea(); } - void onRelease(const QDropEvent *e) { + void onRelease(const QDropEvent *e) override { TPoint pos(e->pos().x(), e->pos().y()); int row = getViewer()->yToRow(pos.y); int col = getViewer()->xToColumn(pos.x); @@ -1964,7 +1964,7 @@ public: } refreshCellsArea(); } - void drawCellsArea(QPainter &p) { + void drawCellsArea(QPainter &p) override { TPoint pos(getViewer()->xToColumn(m_curPos.x), getViewer()->yToRow(m_curPos.y)); TRect rect = m_data->getLevelFrameRect(); diff --git a/toonz/sources/toonz/xsheetviewer.h b/toonz/sources/toonz/xsheetviewer.h index 4370a0e..21b3089 100644 --- a/toonz/sources/toonz/xsheetviewer.h +++ b/toonz/sources/toonz/xsheetviewer.h @@ -143,8 +143,8 @@ public: ~XsheetScrollArea() {} protected: - void keyPressEvent(QKeyEvent *event) { event->ignore(); } - void wheelEvent(QWheelEvent *event) { event->ignore(); } + void keyPressEvent(QKeyEvent *event) override { event->ignore(); } + void wheelEvent(QWheelEvent *event) override { event->ignore(); } }; //============================================================================= @@ -402,7 +402,7 @@ public: void setCurrentRow(int row); void scroll(QPoint delta); - void onPrepareToScroll(int dy); + void onPrepareToScroll(int dy) override; void setAutoPanSpeed(const QPoint &speed); void setAutoPanSpeed(const QRect &widgetBounds, const QPoint &mousePos); @@ -425,7 +425,7 @@ public: void updateAreeSize(); // provvisorio - QScrollArea *getFrameScrollArea() const { return m_cellScrollArea; } + QScrollArea *getFrameScrollArea() const override { return m_cellScrollArea; } QList getNotesWidget() const; void addNoteWidget(XsheetGUI::NoteWidget *w); @@ -640,15 +640,15 @@ protected: void scrollToRow(int row); void scrollToVerticalRange(int y0, int y1); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); - void resizeEvent(QResizeEvent *event); - void keyPressEvent(QKeyEvent *event); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void resizeEvent(QResizeEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; // display the upper-directional smart tab only when the ctrl key is pressed - void keyReleaseEvent(QKeyEvent *event); - void enterEvent(QEvent *); - void wheelEvent(QWheelEvent *event); - void timerEvent(QTimerEvent *); + void keyReleaseEvent(QKeyEvent *event) override; + void enterEvent(QEvent *) override; + void wheelEvent(QWheelEvent *event) override; + void timerEvent(QTimerEvent *) override; public slots: void onSceneSwitched(); diff --git a/toonz/sources/toonz/xshnoteviewer.h b/toonz/sources/toonz/xshnoteviewer.h index 484ea56..a465a0d 100644 --- a/toonz/sources/toonz/xshnoteviewer.h +++ b/toonz/sources/toonz/xshnoteviewer.h @@ -59,8 +59,8 @@ protected: DVGui::ColorField *createColorField(int index); void updateColorField(); - void showEvent(QShowEvent *); - void hideEvent(QHideEvent *); + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; protected slots: void onColor1Switched(const TPixel32 &, bool isDragging); @@ -104,7 +104,7 @@ public: void openNotePopup(); protected: - void paintEvent(QPaintEvent *event); + void paintEvent(QPaintEvent *event) override; }; //============================================================================= diff --git a/toonz/sources/toonz/xshrowviewer.h b/toonz/sources/toonz/xshrowviewer.h index 56dc2b6..038c92d 100644 --- a/toonz/sources/toonz/xshrowviewer.h +++ b/toonz/sources/toonz/xshrowviewer.h @@ -60,14 +60,14 @@ public: ~RowArea(); protected: - void paintEvent(QPaintEvent *); - - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void contextMenuEvent(QContextMenuEvent *event); - void mouseDoubleClickEvent(QMouseEvent *event); - bool event(QEvent *event); + void paintEvent(QPaintEvent *) override; + + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void contextMenuEvent(QContextMenuEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + bool event(QEvent *event) override; void setMarker(int index); diff --git a/toonz/sources/toonzfarm/include/tfarmexecutor.h b/toonz/sources/toonzfarm/include/tfarmexecutor.h index 5382c0f..0f82341 100644 --- a/toonz/sources/toonzfarm/include/tfarmexecutor.h +++ b/toonz/sources/toonzfarm/include/tfarmexecutor.h @@ -32,7 +32,7 @@ public: virtual ~TFarmExecutor() {} // TTcpIpServer overrides - void onReceive(int socket, const QString &data); + void onReceive(int socket, const QString &data) override; protected: virtual QString execute(const std::vector &argv) = 0; diff --git a/toonz/sources/toonzfarm/include/tfarmproxy.h b/toonz/sources/toonzfarm/include/tfarmproxy.h index ed8a682..f1edd1f 100644 --- a/toonz/sources/toonzfarm/include/tfarmproxy.h +++ b/toonz/sources/toonzfarm/include/tfarmproxy.h @@ -72,7 +72,7 @@ public: CantConnectToStub(const QString &hostname, const QString &addr, int port) : TFarmProxyException(hostname, addr, port, "") {} - TString getMessage() const; + TString getMessage() const override; }; #endif diff --git a/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp b/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp index 1b82c97..953832b 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmcontroller_c.cpp @@ -21,48 +21,48 @@ public: // TFarmController interface implementation - QString addTask(const TFarmTask &task, bool suspended); + QString addTask(const TFarmTask &task, bool suspended) override; - void removeTask(const QString &id); - void suspendTask(const QString &id); - void activateTask(const QString &id); - void restartTask(const QString &id); + void removeTask(const QString &id) override; + void suspendTask(const QString &id) override; + void activateTask(const QString &id) override; + void restartTask(const QString &id) override; - void getTasks(vector &tasks); - void getTasks(const QString &parentId, vector &tasks); - void getTasks(const QString &parentId, vector &tasks); + void getTasks(vector &tasks) override; + void getTasks(const QString &parentId, vector &tasks) override; + void getTasks(const QString &parentId, vector &tasks) override; - void queryTaskInfo(const QString &id, TFarmTask &task); + void queryTaskInfo(const QString &id, TFarmTask &task) override; void queryTaskShortInfo(const QString &id, QString &parentId, QString &name, - TaskState &status); + TaskState &status) override; - void attachServer(const QString &name, const QString &addr, int port); + void attachServer(const QString &name, const QString &addr, int port) override; - void detachServer(const QString &name, const QString &addr, int port); + void detachServer(const QString &name, const QString &addr, int port) override; - void taskSubmissionError(const QString &taskId, int errCode); + void taskSubmissionError(const QString &taskId, int errCode) override; void taskProgress(const QString &taskId, int step, int stepCount, - int frameNumber, FrameState state); + int frameNumber, FrameState state) override; - void taskCompleted(const QString &taskId, int exitCode); + void taskCompleted(const QString &taskId, int exitCode) override; // fills the servers vector with the names of the servers - void getServers(vector &servers); + void getServers(vector &servers) override; // returns the state of the server whose id has been specified - ServerState queryServerState2(const QString &id); + ServerState queryServerState2(const QString &id) override; // fills info with the infoes about the server whose id has been specified - void queryServerInfo(const QString &id, ServerInfo &info); + void queryServerInfo(const QString &id, ServerInfo &info) override; // activates the server whose id has been specified - void activateServer(const QString &id); + void activateServer(const QString &id) override; // deactivates the server whose id has been specified // once deactivated, a server is not available for task rendering - void deactivateServer(const QString &id, bool completeRunningTasks = true); + void deactivateServer(const QString &id, bool completeRunningTasks = true) override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp b/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp index 5aedfb1..1ed7633 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmserver_c.cpp @@ -15,14 +15,14 @@ public: : TFarmProxy(hostName, addr, port) {} // TFarmServer interface implementation - int addTask(const QString &taskid, const QString &cmdline); - int terminateTask(const QString &taskid); - int getTasks(vector &tasks); + int addTask(const QString &taskid, const QString &cmdline) override; + int terminateTask(const QString &taskid) override; + int getTasks(vector &tasks) override; - void queryHwInfo(HwInfo &hwInfo); + void queryHwInfo(HwInfo &hwInfo) override; - void attachController(const QString &name, const QString &addr, int port); - void detachController(const QString &name, const QString &addr, int port); + void attachController(const QString &name, const QString &addr, int port) override; + void detachController(const QString &name, const QString &addr, int port) override; }; //------------------------------------------------------------------------------ diff --git a/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp b/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp index c3af128..9f5012f 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmserverstub.cpp @@ -18,7 +18,7 @@ public: } // TFarmExecutor overrides - QString execute(const std::vector &argv); + QString execute(const std::vector &argv) override; TFarmServer *m_server; }; diff --git a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp index e6e8006..4a6f854 100644 --- a/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp +++ b/toonz/sources/toonzfarm/tfarm/tfarmtask.cpp @@ -538,7 +538,7 @@ class TFarmTaskDeclaration : public TPersistDeclaration { public: TFarmTaskDeclaration(const std::string &id) : TPersistDeclaration(id) {} - TPersist *create() const { return new TFarmTask; } + TPersist *create() const override { return new TFarmTask; } } FarmTaskDeclaration("ttask"); @@ -752,7 +752,7 @@ class TFarmTaskGroupDeclaration : public TPersistDeclaration { public: TFarmTaskGroupDeclaration(const std::string &id) : TPersistDeclaration(id) {} - TPersist *create() const { return new TFarmTaskGroup; } + TPersist *create() const override { return new TFarmTaskGroup; } } FarmTaskGroupDeclaration("ttaskgroup"); diff --git a/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp b/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp index 5fabefd..a6e75cd 100644 --- a/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp +++ b/toonz/sources/toonzfarm/tfarm/ttcpipserver.cpp @@ -272,7 +272,7 @@ public: DataReader(int clientSocket, std::shared_ptr serverImp) : m_clientSocket(clientSocket), m_serverImp(std::move(serverImp)) {} - void run(); + void run() override; int m_clientSocket; std::shared_ptr m_serverImp; @@ -304,7 +304,7 @@ public: , m_data(data) , m_serverImp(std::move(serverImp)) {} - void run(); + void run() override; int m_clientSocket; QString m_data; diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp index fa61cae..b24f169 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp +++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp @@ -191,9 +191,9 @@ public: } // TPersist implementation - void loadData(TIStream &is); - void saveData(TOStream &os); - const TPersistDeclaration *getDeclaration() const; + void loadData(TIStream &is) override; + void saveData(TOStream &os) override; + const TPersistDeclaration *getDeclaration() const override; QString m_serverId; vector m_subTasks; @@ -210,7 +210,7 @@ class TFarmTaskDeclaration : public TPersistDeclaration { public: TFarmTaskDeclaration(const std::string &id) : TPersistDeclaration(id) {} - TPersist *create() const { return new CtrlFarmTask; } + TPersist *create() const override { return new CtrlFarmTask; } } Declaration("tfarmtask"); } @@ -447,7 +447,7 @@ public: ConnectionTest(const FarmServerProxy *server, HANDLE hEvent) : m_server(server), m_hEvent(hEvent) {} - void run(); + void run() override; const FarmServerProxy *m_server; HANDLE m_hEvent; @@ -562,7 +562,7 @@ public: // TFarmExecutor interface implementation - QString execute(const vector &argv); + QString execute(const vector &argv) override; // TFarmController interface methods implementation @@ -570,53 +570,53 @@ public: const QString &user, const QString &host, bool suspended, int priority, TFarmPlatform platform); - QString addTask(const TFarmTask &task, bool suspended); + QString addTask(const TFarmTask &task, bool suspended) override; - void removeTask(const QString &id); - void suspendTask(const QString &id); - void activateTask(const QString &id); - void restartTask(const QString &id); + void removeTask(const QString &id) override; + void suspendTask(const QString &id) override; + void activateTask(const QString &id) override; + void restartTask(const QString &id) override; - void getTasks(vector &tasks); - void getTasks(const QString &parentId, vector &tasks); - void getTasks(const QString &parentId, vector &tasks); + void getTasks(vector &tasks) override; + void getTasks(const QString &parentId, vector &tasks) override; + void getTasks(const QString &parentId, vector &tasks) override; - void queryTaskInfo(const QString &id, TFarmTask &task); + void queryTaskInfo(const QString &id, TFarmTask &task) override; void queryTaskShortInfo(const QString &id, QString &parentId, QString &name, - TaskState &status); + TaskState &status) override; // used (by a server) to notify a server start - void attachServer(const QString &name, const QString &addr, int port); + void attachServer(const QString &name, const QString &addr, int port) override; // used (by a server) to notify a server stop - void detachServer(const QString &name, const QString &addr, int port); + void detachServer(const QString &name, const QString &addr, int port) override; // used (by a server) to notify a task submission error - void taskSubmissionError(const QString &taskId, int errCode); + void taskSubmissionError(const QString &taskId, int errCode) override; // used by a server to notify a task progress void taskProgress(const QString &taskId, int step, int stepCount, - int frameNumber, FrameState state); + int frameNumber, FrameState state) override; // used (by a server) to notify a task completion - void taskCompleted(const QString &taskId, int exitCode); + void taskCompleted(const QString &taskId, int exitCode) override; // fills the servers vector with the names of the servers - void getServers(vector &servers); + void getServers(vector &servers) override; // returns the state of the server whose id has been specified - ServerState queryServerState2(const QString &id); + ServerState queryServerState2(const QString &id) override; // fills info with the infoes about the server whose id is specified - void queryServerInfo(const QString &id, ServerInfo &info); + void queryServerInfo(const QString &id, ServerInfo &info) override; // activates the server whose id has been specified - void activateServer(const QString &id); + void activateServer(const QString &id) override; // deactivates the server whose id has been specified // once deactivated, a server is not available for task rendering - void deactivateServer(const QString &id, bool completeRunningTasks); + void deactivateServer(const QString &id, bool completeRunningTasks) override; // FarmController specific methods CtrlFarmTask *doAddTask(const QString &id, const QString &parentId, @@ -1328,7 +1328,7 @@ class ServerInitializer : public TThread::Runnable { public: ServerInitializer(FarmServerProxy *server) : m_server(server) {} - void run() { + void run() override { TFarmServer::HwInfo hwInfo; try { m_server->queryHwInfo(hwInfo); @@ -1385,7 +1385,7 @@ public: FarmServerProxy *server = 0) : m_controller(controller), m_task(task), m_server(server) {} - void run(); + void run() override; FarmController *m_controller; CtrlFarmTask *m_task; @@ -2182,8 +2182,8 @@ public: ~ControllerService() { delete m_controller; } - void onStart(int argc, char *argv[]); - void onStop(); + void onStart(int argc, char *argv[]) override; + void onStop() override; static TFilePath getTasksDataFile() { TFilePath fp = getGlobalRoot() + "data" + "tasks.txt"; diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index 66eedff..20c9e93 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -180,8 +180,8 @@ public: ~FarmServerService() { delete m_userLog; } - void onStart(int argc, char *argv[]); - void onStop(); + void onStart(int argc, char *argv[]) override; + void onStop() override; void loadControllerData(QString &hostName, string &ipAddr, int &port); #ifdef _WIN32 @@ -274,22 +274,22 @@ public: TFarmController *getController() const { return m_controller.getPointer(); } void setAppPaths(const vector &); - QString execute(const vector &argv); + QString execute(const vector &argv) override; // TFarmServer overrides - int addTask(const QString &taskid, const QString &cmdline); - int terminateTask(const QString &taskid); - int getTasks(vector &tasks); + int addTask(const QString &taskid, const QString &cmdline) override; + int terminateTask(const QString &taskid) override; + int getTasks(vector &tasks) override; - void queryHwInfo(HwInfo &hwInfo); + void queryHwInfo(HwInfo &hwInfo) override; void attachController(const ControllerData &data); - void attachController(const QString &name, const QString &addr, int port) { + void attachController(const QString &name, const QString &addr, int port) override { attachController(ControllerData(name, addr, port)); } void detachController(const ControllerData &data); - void detachController(const QString &name, const QString &addr, int port) { + void detachController(const QString &name, const QString &addr, int port) override { detachController(ControllerData(name, addr, port)); } @@ -334,7 +334,7 @@ public: , m_server(server) , m_controller(controller) {} - void run(); + void run() override; private: QString m_id; diff --git a/toonz/sources/toonzlib/doubleparamcmd.cpp b/toonz/sources/toonzlib/doubleparamcmd.cpp index 312d64d..a2ffdd0 100644 --- a/toonz/sources/toonzlib/doubleparamcmd.cpp +++ b/toonz/sources/toonzlib/doubleparamcmd.cpp @@ -49,7 +49,7 @@ public: return kIndex; } - void onAdd() { + void onAdd() override { Keyframes::iterator it; for (it = m_oldKeyframes.begin(); it != m_oldKeyframes.end(); ++it) { int kIndex = it->first; @@ -57,23 +57,23 @@ public: m_newKeyframes[kIndex] = m_param->getKeyframe(kIndex); } } - void undo() const { + void undo() const override { m_param->setKeyframes(m_oldKeyframes); Keyframes::const_iterator it; for (it = m_oldKeyframes.begin(); it != m_oldKeyframes.end(); ++it) if (!it->second.m_isKeyframe) m_param->deleteKeyframe(it->second.m_frame); } - void redo() const { + void redo() const override { Keyframes::const_iterator it; for (it = m_oldKeyframes.begin(); it != m_oldKeyframes.end(); ++it) if (!it->second.m_isKeyframe) m_param->setKeyframe(it->second); m_param->setKeyframes(m_newKeyframes); } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(*m_oldKeyframes.begin()) * 2 * m_oldKeyframes.size(); } - QString getHistoryString() { return QObject::tr("Set Keyframe"); } + QString getHistoryString() override { return QObject::tr("Set Keyframe"); } }; //============================================================================= @@ -812,11 +812,11 @@ public: m_keyframe = m_param->getKeyframe(kIndex); } ~RemoveKeyframeUndo() { m_param->release(); } - void undo() const { m_param->setKeyframe(m_keyframe); } - void redo() const { m_param->deleteKeyframe(m_keyframe.m_frame); } - int getSize() const { return sizeof(*this); } + void undo() const override { m_param->setKeyframe(m_keyframe); } + void redo() const override { m_param->deleteKeyframe(m_keyframe.m_frame); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Remove Keyframe"); } + QString getHistoryString() override { return QObject::tr("Remove Keyframe"); } }; //============================================================================= @@ -842,11 +842,11 @@ public: bool isEnabled = m_param->isCycleEnabled(); m_param->enableCycle(!isEnabled); } - void undo() const { invertCycleEnabled(); } - void redo() const { invertCycleEnabled(); } - int getSize() const { return sizeof(*this); } + void undo() const override { invertCycleEnabled(); } + void redo() const override { invertCycleEnabled(); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Cycle"); } + QString getHistoryString() override { return QObject::tr("Cycle"); } }; //============================================================================= diff --git a/toonz/sources/toonzlib/fxcommand.cpp b/toonz/sources/toonzlib/fxcommand.cpp index 85be53c..3b902ca 100644 --- a/toonz/sources/toonzlib/fxcommand.cpp +++ b/toonz/sources/toonzlib/fxcommand.cpp @@ -265,7 +265,7 @@ public: static std::vector inputLinks(TXsheet *xsh, TFx *fx); static std::vector outputLinks(TXsheet *xsh, TFx *fx); - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } protected: static TXshZeraryFxColumn *createZeraryFxColumn(TXsheet *xsh, TFx *zfx, @@ -716,14 +716,14 @@ public: initialize(fx, row, col); } - bool isConsistent() const { return !m_insertedFxs.isEmpty(); } + bool isConsistent() const override { return !m_insertedFxs.isEmpty(); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString(); + QString getHistoryString() override; private: void initialize(const TFxP &newFx, int row, int col); @@ -967,14 +967,14 @@ public: initialize(); } - bool isConsistent() const { return bool(m_dupFx); } + bool isConsistent() const override { return bool(m_dupFx); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString(); + QString getHistoryString() override; private: void initialize(); @@ -1102,14 +1102,14 @@ public: initialize(); } - bool isConsistent() const { return bool(m_repFx); } + bool isConsistent() const override { return bool(m_repFx); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString(); + QString getHistoryString() override; private: void initialize(); @@ -1323,21 +1323,21 @@ public: UnlinkFxUndo(const TFxP &fx, TXsheetHandle *xshHandle) : m_fx(fx), m_linkedFx(fx->getLinkedFx()), m_xshHandle(xshHandle) {} - bool isConsistent() const { return bool(m_linkedFx); } + bool isConsistent() const override { return bool(m_linkedFx); } - void undo() const { + void undo() const override { FxCommandUndo::linkParams(m_fx.getPointer(), m_linkedFx.getPointer()); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { FxCommandUndo::unlinkParams(m_fx.getPointer()); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Unlink Fx : %1 - - %2") .arg(QString::fromStdWString(m_fx->getFxId())) .arg(QString::fromStdWString(m_linkedFx->getFxId())); @@ -1371,14 +1371,14 @@ public: initialize(fxs); } - bool isConsistent() const { return bool(m_macroFx); } + bool isConsistent() const override { return bool(m_macroFx); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - virtual QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Make Macro Fx : %1") .arg(QString::fromStdWString(m_macroFx->getFxId())); } @@ -1516,12 +1516,12 @@ public: initialize(); } - void redo() const { MakeMacroUndo::undo(); } - void undo() const { MakeMacroUndo::redo(); } + void redo() const override { MakeMacroUndo::undo(); } + void undo() const override { MakeMacroUndo::redo(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Explode Macro Fx : %1") .arg(QString::fromStdWString(m_macroFx->getFxId())); } @@ -1563,9 +1563,9 @@ public: initialize(fx); } - bool isConsistent() const { return true; } + bool isConsistent() const override { return true; } - void redo() const { + void redo() const override { FxDag *fxDag = m_xshHandle->getXsheet()->getFxDag(); TOutputFx *outputFx = static_cast(m_outputFx.getPointer()); @@ -1575,16 +1575,16 @@ public: m_xshHandle->notifyXsheetChanged(); } - void undo() const { + void undo() const override { TOutputFx *outputFx = static_cast(m_outputFx.getPointer()); m_xshHandle->getXsheet()->getFxDag()->removeOutputFx(outputFx); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Create Output Fx"); } + QString getHistoryString() override { return QObject::tr("Create Output Fx"); } private: void initialize(TFx *fx) { @@ -1640,9 +1640,9 @@ public: initialize(); } - bool isConsistent() const { return !m_fxs.empty(); } + bool isConsistent() const override { return !m_fxs.empty(); } - void redo() const { + void redo() const override { /* Due to compatibility issues from *schematicnode.cpp files, the "do" operation must be @@ -1660,7 +1660,7 @@ accessible without scene change notifications (see TFxCommand::setParent()) for (f = 0; f != fCount; ++f) fxDag->addToXsheet(m_fxs[f].getPointer()); } - void undo() const { + void undo() const override { FxDag *fxDag = m_xshHandle->getXsheet()->getFxDag(); size_t f, fCount = m_fxs.size(); @@ -1670,9 +1670,9 @@ accessible without scene change notifications (see TFxCommand::setParent()) m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - virtual QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Connect to Xsheet : "); std::vector::iterator it; for (it = m_fxs.begin(); it != m_fxs.end(); it++) { @@ -1729,10 +1729,10 @@ public: initialize(); } - void redo() const { ConnectNodesToXsheetUndo::undo(); } - void undo() const { ConnectNodesToXsheetUndo::redo(); } + void redo() const override { ConnectNodesToXsheetUndo::undo(); } + void undo() const override { ConnectNodesToXsheetUndo::redo(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Disconnect from Xsheet : "); std::vector::iterator it; for (it = m_fxs.begin(); it != m_fxs.end(); it++) { @@ -1806,14 +1806,14 @@ public: initialize(); } - bool isConsistent() const { return !m_links.empty(); } + bool isConsistent() const override { return !m_links.empty(); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return 10 << 10; } // Say, around 10 kB + int getSize() const override { return 10 << 10; } // Say, around 10 kB - virtual QString getHistoryString(); + QString getHistoryString() override; protected: DeleteLinksUndo(TXsheetHandle *xshHandle) : m_xshHandle(xshHandle) {} @@ -2069,14 +2069,14 @@ public: DeleteFxOrColumnUndo(int colIdx, TXsheetHandle *xshHandle, TFxHandle *fxHandle); - bool isConsistent() const; + bool isConsistent() const override; - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString(); + QString getHistoryString() override; private: void initialize(); @@ -2438,14 +2438,14 @@ public: initialize(zeraryFxColumnSize, pos, addOffset); } - bool isConsistent() const { return !(m_fxs.empty() && m_columns.empty()); } + bool isConsistent() const override { return !(m_fxs.empty() && m_columns.empty()); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString(); + QString getHistoryString() override; protected: template @@ -2748,9 +2748,9 @@ public: initialize(inFx); } - void redo() const; + void redo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } private: void initialize(TFx *inFx); @@ -2838,10 +2838,10 @@ public: initialize(link); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } private: void initialize(const TFxCommand::Link &link); @@ -2933,13 +2933,13 @@ public: initialize(); } - bool isConsistent() const { + bool isConsistent() const override { return UndoAddPasteFxs::isConsistent() && m_deleteFxUndo->isConsistent(); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } private: static TFx *inFx(const TFx *fx) { @@ -3065,14 +3065,14 @@ public: initialize(); } - bool isConsistent() const { return !m_fxs.empty(); } + bool isConsistent() const override { return !m_fxs.empty(); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { return QObject::tr("Disconnect Fx"); } + QString getHistoryString() override { return QObject::tr("Disconnect Fx"); } private: void initialize(); @@ -3222,14 +3222,14 @@ public: initialize(); } - bool isConsistent() const { return !m_fxs.empty(); } + bool isConsistent() const override { return !m_fxs.empty(); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString(); + QString getHistoryString() override; private: void initialize(); @@ -3369,13 +3369,13 @@ public: initialize(); } - bool isConsistent() const { return m_parentFx; } + bool isConsistent() const override { return m_parentFx; } - void redo() const; + void redo() const override; void redo_() const; - void undo() const; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } private: void initialize(); @@ -3494,23 +3494,23 @@ public: assert(fx); } - bool isConsistent() const { return true; } + bool isConsistent() const override { return true; } - void redo() const { + void redo() const override { redo_(); m_xshHandle->notifyXsheetChanged(); } void redo_() const { ::getActualIn(m_fx.getPointer())->setName(m_newName); } - void undo() const { + void undo() const override { ::getActualIn(m_fx.getPointer())->setName(m_oldName); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Rename Fx : %1 > %2") .arg(QString::fromStdWString(m_oldName)) .arg(QString::fromStdWString(m_newName)); @@ -3556,14 +3556,14 @@ public: initialize(); } - bool isConsistent() const { return !m_groupData.empty(); } + bool isConsistent() const override { return !m_groupData.empty(); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - virtual QString getHistoryString() { return QObject::tr("Group Fx"); } + QString getHistoryString() override { return QObject::tr("Group Fx"); } protected: UndoGroupFxs(int groupId, TXsheetHandle *xshHandle) @@ -3664,10 +3664,10 @@ public: initialize(); } - void redo() const { UndoGroupFxs::undo(); } - void undo() const { UndoGroupFxs::redo(); } + void redo() const override { UndoGroupFxs::undo(); } + void undo() const override { UndoGroupFxs::redo(); } - QString getHistoryString() { return QObject::tr("Ungroup Fx"); } + QString getHistoryString() override { return QObject::tr("Ungroup Fx"); } private: void initialize(); @@ -3759,16 +3759,16 @@ public: initialize(fromEditor); } - bool isConsistent() const { return !m_groupData.empty(); } + bool isConsistent() const override { return !m_groupData.empty(); } - void redo() const; - void undo() const; + void redo() const override; + void undo() const override; void redo_() const; - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Rename Group : %1 > %2") .arg(QString::fromStdWString(m_oldGroupName)) .arg(QString::fromStdWString(m_newGroupName)); diff --git a/toonz/sources/toonzlib/imagebuilders.h b/toonz/sources/toonzlib/imagebuilders.h index 0dc0a24..cce6018 100644 --- a/toonz/sources/toonzlib/imagebuilders.h +++ b/toonz/sources/toonzlib/imagebuilders.h @@ -49,7 +49,7 @@ public: public: ImageLoader(const TFilePath &path, const TFrameId &fid); - bool isImageCompatible(int imFlags, void *extData); + bool isImageCompatible(int imFlags, void *extData) override; /*-- * ImageBuilder仮想関数の実装。アイコン、画像をLoad時に全てキャッシュに格納する @@ -57,13 +57,13 @@ public: void buildAllIconsAndPutInCache(TXshSimpleLevel *level, std::vector fids, std::vector iconIds, - bool cacheImagesAsWell); + bool cacheImagesAsWell) override; protected: - bool getInfo(TImageInfo &info, int imFlags, void *extData); - TImageP build(int imFlags, void *extData); + bool getInfo(TImageInfo &info, int imFlags, void *extData) override; + TImageP build(int imFlags, void *extData) override; - void invalidate(); + void invalidate() override; inline int buildSubsampling(int imFlags, BuildExtData *data); @@ -83,11 +83,11 @@ public: ImageRasterizer() {} ~ImageRasterizer() {} - bool isImageCompatible(int imFlags, void *extData) { return true; } + bool isImageCompatible(int imFlags, void *extData) override { return true; } protected: - bool getInfo(TImageInfo &info, int imFlags, void *extData); - TImageP build(int imFlags, void *extData); + bool getInfo(TImageInfo &info, int imFlags, void *extData) override; + TImageP build(int imFlags, void *extData) override; }; //----------------------------------------------------------------------------- @@ -97,11 +97,11 @@ public: ImageFiller() {} ~ImageFiller() {} - bool isImageCompatible(int imFlags, void *extData) { return true; } + bool isImageCompatible(int imFlags, void *extData) override { return true; } protected: - bool getInfo(TImageInfo &info, int imFlags, void *extData); - TImageP build(int imFlags, void *extData); + bool getInfo(TImageInfo &info, int imFlags, void *extData) override; + TImageP build(int imFlags, void *extData) override; }; #endif // IMAGE_BUILDERS_H diff --git a/toonz/sources/toonzlib/movierenderer.cpp b/toonz/sources/toonzlib/movierenderer.cpp index d54eb46..59534fe 100644 --- a/toonz/sources/toonzlib/movierenderer.cpp +++ b/toonz/sources/toonzlib/movierenderer.cpp @@ -138,11 +138,11 @@ public: // TRenderPort methods - void onRenderRasterCompleted(const RenderData &renderData); - void onRenderFailure(const RenderData &renderData, TException &e); + void onRenderRasterCompleted(const RenderData &renderData) override; + void onRenderFailure(const RenderData &renderData, TException &e) override; /*-- キャンセル時にはm_overallRenderedRegionを更新しない --*/ - virtual void onRenderFinished(bool isCanceled = false); + void onRenderFinished(bool isCanceled = false) override; void doRenderRasterCompleted(const RenderData &renderData); void doPreviewRasterCompleted(const RenderData &renderData); diff --git a/toonz/sources/toonzlib/multimediarenderer.cpp b/toonz/sources/toonzlib/multimediarenderer.cpp index e1aa24a..292292f 100644 --- a/toonz/sources/toonzlib/multimediarenderer.cpp +++ b/toonz/sources/toonzlib/multimediarenderer.cpp @@ -85,9 +85,9 @@ public: void start(); - bool onFrameCompleted(int frame); - bool onFrameFailed(int frame, TException &e); - void onSequenceCompleted(const TFilePath &fp); + bool onFrameCompleted(int frame) override; + bool onFrameFailed(int frame, TException &e) override; + void onSequenceCompleted(const TFilePath &fp) override; void onRenderCompleted(); }; diff --git a/toonz/sources/toonzlib/palettecmd.cpp b/toonz/sources/toonzlib/palettecmd.cpp index e311a7b..0c5b68c 100644 --- a/toonz/sources/toonzlib/palettecmd.cpp +++ b/toonz/sources/toonzlib/palettecmd.cpp @@ -192,7 +192,7 @@ public: assert(0 <= *srcIndicesInPage.begin() && *srcIndicesInPage.rbegin() < srcPage->getStyleCount()); } - void undo() const { + void undo() const override { TPalette::Page *srcPage = m_palette->getPage(m_srcPageIndex); assert(srcPage); TPalette::Page *dstPage = m_palette->getPage(m_dstPageIndex); @@ -220,7 +220,7 @@ public: m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { TPalette::Page *srcPage = m_palette->getPage(m_srcPageIndex); assert(srcPage); TPalette::Page *dstPage = m_palette->getPage(m_dstPageIndex); @@ -242,15 +242,15 @@ public: m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { + int getSize() const override { return sizeof *this + m_srcIndicesInPage.size() * sizeof(int); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Arrange Styles in Palette %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -294,7 +294,7 @@ public: assert(0 <= pageIndex && pageIndex < m_palette->getPageCount()); assert(0 <= styleId && styleId < m_palette->getStyleCount()); } - void undo() const { + void undo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); int indexInPage = page->search(m_styleId); @@ -302,7 +302,7 @@ public: page->removeStyle(indexInPage); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); assert(m_palette->getStylePage(m_styleId) == 0); @@ -316,13 +316,13 @@ public: m_palette->getStyle(m_styleId)->setName(m_style->getName()); m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { return sizeof *this; } - QString getHistoryString() { + int getSize() const override { return sizeof *this; } + QString getHistoryString() override { return QObject::tr("Create Style#%1 in Palette %2") .arg(QString::number(m_styleId)) .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -424,7 +424,7 @@ public: ~AddStylesUndo() { for (int i = 0; i < (int)m_styles.size(); i++) delete m_styles[i].first; } - void undo() const { + void undo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); int count = m_styles.size(); @@ -432,7 +432,7 @@ public: for (i = count - 1; i >= 0; i--) page->removeStyle(m_indexInPage + i); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); for (int i = 0; i < (int)m_styles.size(); i++) { @@ -444,15 +444,15 @@ public: } m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { + int getSize() const override { return sizeof *this + m_styles.size() * sizeof(TColorStyle); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Add Style to Palette %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -541,18 +541,18 @@ void PaletteCmd::eraseStyles(const std::set &levels, bool isValid() const { return !m_levels.empty(); } - void redo() const { + void redo() const override { std::for_each(m_imagesByLevel.begin(), m_imagesByLevel.end(), cloneImages); eraseStylesInLevels(m_levels, m_styleIds); } - void undo() const { + void undo() const override { std::for_each(m_imagesByLevel.begin(), m_imagesByLevel.end(), restoreImages); } - int getSize() const { return 10 << 20; } // At max 10 per 100 MB + int getSize() const override { return 10 << 20; } // At max 10 per 100 MB private: static bool isVector(const TXshSimpleLevel *level) { @@ -645,11 +645,11 @@ public: ~AddPageUndo() { for (int i = 0; i < (int)m_styles.size(); i++) delete m_styles[i].first; } - void undo() const { + void undo() const override { m_palette->erasePage(m_pageIndex); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { TPalette::Page *page = m_palette->addPage(m_pageName); assert(page); assert(page->getIndex() == m_pageIndex); @@ -662,16 +662,16 @@ public: }; m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { + int getSize() const override { return sizeof *this + m_styles.size() * sizeof(TColorStyle); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Add Page %1 to Palette %2") .arg(QString::fromStdWString(m_pageName)) .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -720,23 +720,23 @@ public: for (int i = 0; i < page->getStyleCount(); i++) m_styles[i] = page->getStyleId(i); } - void undo() const { + void undo() const override { TPalette::Page *page = m_palette->addPage(m_pageName); m_palette->movePage(page, m_pageIndex); for (int i = 0; i < (int)m_styles.size(); i++) page->addStyle(m_styles[i]); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { m_palette->erasePage(m_pageIndex); m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { return sizeof *this; } - QString getHistoryString() { + int getSize() const override { return sizeof *this; } + QString getHistoryString() override { return QObject::tr("Delete Page %1 from Palette %2") .arg(QString::fromStdWString(m_pageName)) .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -776,23 +776,23 @@ public: : m_palette(palette) , m_oldPalette(palette->clone()) , m_paletteHandle(paletteHandle) {} - void onAdd() { m_newPalette = m_palette->clone(); } - void undo() const { + void onAdd() override { m_newPalette = m_palette->clone(); } + void undo() const override { m_palette->assign(m_oldPalette.getPointer()); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { m_palette->assign(m_newPalette.getPointer()); m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { return sizeof(*this) + sizeof(TPalette) * 2; } - QString getHistoryString() { + int getSize() const override { return sizeof(*this) + sizeof(TPalette) * 2; } + QString getHistoryString() override { return QObject::tr("Load Color Model %1 to Palette %2") .arg(QString::fromStdString( m_newPalette->getRefImgPath().getLevelName())) .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //=================================================================== @@ -1017,17 +1017,17 @@ public: , m_dstIndex(dstIndex) { m_palette = m_paletteHandle->getPalette(); } - void undo() const { + void undo() const override { m_palette->movePage(m_palette->getPage(m_dstIndex), m_srcIndex); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { m_palette->movePage(m_palette->getPage(m_srcIndex), m_dstIndex); m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { return sizeof *this; } - QString getHistoryString() { return QObject::tr("Move Page"); } - int getHistoryType() { return HistoryType::Palette; } + int getSize() const override { return sizeof *this; } + QString getHistoryString() override { return QObject::tr("Move Page"); } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -1063,25 +1063,25 @@ public: m_palette = m_paletteHandle->getPalette(); m_oldName = m_palette->getPage(pageIndex)->getName(); } - void undo() const { + void undo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); page->setName(m_oldName); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); page->setName(m_newName); m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { return sizeof *this; } - QString getHistoryString() { + int getSize() const override { return sizeof *this; } + QString getHistoryString() override { return QObject::tr("Rename Page %1 > %2") .arg(QString::fromStdWString(m_oldName)) .arg(QString::fromStdWString(m_newName)); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -1127,27 +1127,27 @@ public: assert(style); m_oldName = style->getName(); } - void undo() const { + void undo() const override { TColorStyle *style = m_palette->getStyle(m_styleId); assert(style); style->setName(m_oldName); m_paletteHandle->notifyColorStyleChanged(false); } - void redo() const { + void redo() const override { TColorStyle *style = m_palette->getStyle(m_styleId); assert(style); style->setName(m_newName); m_paletteHandle->notifyColorStyleChanged(false); } - int getSize() const { return sizeof *this; } - QString getHistoryString() { + int getSize() const override { return sizeof *this; } + QString getHistoryString() override { return QObject::tr("Rename Style#%1 in Palette%2 : %3 > %4") .arg(QString::number(m_styleId)) .arg(QString::fromStdWString(m_palette->getPaletteName())) .arg(QString::fromStdWString(m_oldName)) .arg(QString::fromStdWString(m_newName)); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace diff --git a/toonz/sources/toonzlib/sandor_fxs/SError.h b/toonz/sources/toonzlib/sandor_fxs/SError.h index 8ef017b..e80f67d 100644 --- a/toonz/sources/toonzlib/sandor_fxs/SError.h +++ b/toonz/sources/toonzlib/sandor_fxs/SError.h @@ -33,7 +33,7 @@ public: SMemAllocError() : SError(""){}; SMemAllocError(const char *s) : SError(s){}; virtual ~SMemAllocError(){}; - void debug_print() const { + void debug_print() const override { /* if ( !m_msg.empty() ) smsg_error("Error in Memory Allocation %s!\n",m_msg.c_str()); else @@ -46,7 +46,7 @@ public: SWriteRasterError() : SError(""){}; SWriteRasterError(const char *s) : SError(s){}; virtual ~SWriteRasterError(){}; - void debug_print() const { + void debug_print() const override { /*if ( !m_msg.empty() ) smsg_error("Error in Writing Raster %s!\n",m_msg.c_str()); else @@ -59,7 +59,7 @@ public: SBlurMatrixError() : SError(""){}; SBlurMatrixError(const char *s) : SError(s){}; virtual ~SBlurMatrixError(){}; - void debug_print() const { + void debug_print() const override { /* if ( !m_msg.empty() ) { smsg_error("Error in Generating BlurMatrix %s!\n",m_msg.c_str()); } else @@ -72,7 +72,7 @@ public: SFileReadError() : SError(""){}; SFileReadError(const char *s) : SError(s){}; virtual ~SFileReadError(){}; - void debug_print() const { + void debug_print() const override { /*if ( !m_msg.empty() ) { smsg_error("Error in Reading File %s!\n",m_msg.c_str()); } else diff --git a/toonz/sources/toonzlib/scenefx.cpp b/toonz/sources/toonzlib/scenefx.cpp index a039a8b..967fb6f 100644 --- a/toonz/sources/toonzlib/scenefx.cpp +++ b/toonz/sources/toonzlib/scenefx.cpp @@ -72,7 +72,7 @@ public: } ~TimeShuffleFx() {} - TFx *clone(bool recursive = true) const { + TFx *clone(bool recursive = true) const override { TimeShuffleFx *fx = dynamic_cast(TFx::clone(recursive)); assert(fx); @@ -88,19 +88,19 @@ public: void setTimeRegion(const TFxTimeRegion &timeRegion) { m_timeRegion = timeRegion; } - TFxTimeRegion getTimeRegion() const { return m_timeRegion; } + TFxTimeRegion getTimeRegion() const override { return m_timeRegion; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - std::string getPluginId() const { return std::string(); } + std::string getPluginId() const override { return std::string(); } - void compute(TFlash &flash, int frame) { + void compute(TFlash &flash, int frame) override { if (!m_port.isConnected()) return; TRasterFxP(m_port.getFx())->compute(flash, m_frame); } - void doCompute(TTile &tile, double frame, const TRenderSettings &ri) { + void doCompute(TTile &tile, double frame, const TRenderSettings &ri) override { if (!m_port.isConnected()) { tile.getRaster()->clear(); return; @@ -110,17 +110,17 @@ public: TRasterFxP(m_port.getFx())->compute(tile, m_frame, ri); } - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) { + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override { if (!m_port.isConnected()) return false; return TRasterFxP(m_port.getFx())->doGetBBox(m_frame, bbox, info); } - std::string getAlias(double frame, const TRenderSettings &info) const { + std::string getAlias(double frame, const TRenderSettings &info) const override { return TRasterFx::getAlias(m_frame, info); } - void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) { + void doDryCompute(TRectD &rect, double frame, const TRenderSettings &info) override { if (m_port.isConnected()) TRasterFxP(m_port.getFx())->dryCompute(rect, m_frame, info); } @@ -165,7 +165,7 @@ public: } ~AffineFx() {} - TFx *clone(bool recursive = true) const { + TFx *clone(bool recursive = true) const override { AffineFx *fx = dynamic_cast(TFx::clone(recursive)); assert(fx); fx->m_stageObject = m_stageObject; @@ -173,9 +173,9 @@ public: return fx; } - bool canHandle(const TRenderSettings &info, double frame) { return true; } + bool canHandle(const TRenderSettings &info, double frame) override { return true; } - TAffine getPlacement(double frame) { + TAffine getPlacement(double frame) override { TAffine objAff = m_stageObject->getPlacement(frame); double objZ = m_stageObject->getZ(frame); @@ -197,11 +197,11 @@ public: return aff; } - TAffine getParentPlacement(double frame) { + TAffine getParentPlacement(double frame) override { return m_stageObject->getPlacement(frame); } - std::string getPluginId() const { return std::string(); } + std::string getPluginId() const override { return std::string(); } private: // not implemented diff --git a/toonz/sources/toonzlib/scriptbinding_renderer.cpp b/toonz/sources/toonzlib/scriptbinding_renderer.cpp index b545ab7..bd72ceb 100644 --- a/toonz/sources/toonzlib/scriptbinding_renderer.cpp +++ b/toonz/sources/toonzlib/scriptbinding_renderer.cpp @@ -155,8 +155,8 @@ public: render(makeRenderData(scene, rows)); } - void onRenderRasterStarted(const RenderData &renderData) { int a = 1; } - void onRenderRasterCompleted(const RenderData &renderData) { + void onRenderRasterStarted(const RenderData &renderData) override { int a = 1; } + void onRenderRasterCompleted(const RenderData &renderData) override { TRasterP outputRaster = renderData.m_rasA; TRasterImageP img(outputRaster->clone()); img->setDpi(m_cameraDpi.x, m_cameraDpi.y); @@ -175,7 +175,7 @@ public: TImageCache::instance()->compress(ids[i]); } } - void onRenderFailure(const RenderData &renderData, TException &e) {} + void onRenderFailure(const RenderData &renderData, TException &e) override {} void onRenderFinished() { m_completed = true; } }; // class RenderEngine diff --git a/toonz/sources/toonzlib/scriptengine.cpp b/toonz/sources/toonzlib/scriptengine.cpp index f0528f4..02b0c6e 100644 --- a/toonz/sources/toonzlib/scriptengine.cpp +++ b/toonz/sources/toonzlib/scriptengine.cpp @@ -140,7 +140,7 @@ public: Executor(ScriptEngine *engine, const QString &cmd) : m_engine(engine), m_cmd(cmd) {} - void run() { + void run() override { m_engine->m_engine->collectGarbage(); QScriptValue result = m_engine->m_engine->evaluate(m_cmd); if (result.isError()) { diff --git a/toonz/sources/toonzlib/studiopalettecmd.cpp b/toonz/sources/toonzlib/studiopalettecmd.cpp index c2a1a0e..31d119c 100644 --- a/toonz/sources/toonzlib/studiopalettecmd.cpp +++ b/toonz/sources/toonzlib/studiopalettecmd.cpp @@ -47,27 +47,27 @@ public: , m_newPalette(newPalette) , m_paletteHandle(paletteHandle) {} - void undo() const { + void undo() const override { m_targetPalette->assign(m_oldPalette.getPointer()); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { m_targetPalette->assign(m_newPalette.getPointer()); m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + (m_targetPalette->getStyleCount() + m_oldPalette->getStyleCount() + m_newPalette->getStyleCount()) * 100; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Load into Current Palette > %1") .arg(QString::fromStdWString(m_targetPalette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -89,28 +89,28 @@ public: , m_newPalette(newPalette) , m_paletteHandle(paletteHandle) {} - void undo() const { + void undo() const override { StudioPalette *sp = StudioPalette::instance(); sp->setPalette(m_fp, m_oldPalette.getPointer(), true); m_paletteHandle->notifyPaletteChanged(); } - void redo() const { + void redo() const override { StudioPalette *sp = StudioPalette::instance(); sp->setPalette(m_fp, m_newPalette.getPointer(), true); m_paletteHandle->notifyPaletteChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + (m_oldPalette->getStyleCount() + m_newPalette->getStyleCount()) * 100; } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Replace with Current Palette > %1") .arg(QString::fromStdString(m_fp.getLevelName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -125,17 +125,17 @@ public: m_palette = StudioPalette::instance()->getPalette(m_palettePath); } - void undo() const { + void undo() const override { StudioPalette::instance()->setPalette(m_palettePath, m_palette->clone(), true); } - void redo() const { StudioPalette::instance()->deletePalette(m_palettePath); } - int getSize() const { return sizeof(*this) + sizeof(TPalette); } - QString getHistoryString() { + void redo() const override { StudioPalette::instance()->deletePalette(m_palettePath); } + int getSize() const override { return sizeof(*this) + sizeof(TPalette); } + QString getHistoryString() override { return QObject::tr("Delete Studio Palette : %1") .arg(QString::fromStdString(m_palettePath.getLevelName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -150,17 +150,17 @@ public: m_palette = StudioPalette::instance()->getPalette(m_palettePath); } - void undo() const { StudioPalette::instance()->deletePalette(m_palettePath); } - void redo() const { + void undo() const override { StudioPalette::instance()->deletePalette(m_palettePath); } + void redo() const override { StudioPalette::instance()->setPalette(m_palettePath, m_palette->clone(), true); } - int getSize() const { return sizeof(*this) + sizeof(TPalette); } - QString getHistoryString() { + int getSize() const override { return sizeof(*this) + sizeof(TPalette); } + QString getHistoryString() override { return QObject::tr("Create Studio Palette : %1") .arg(QString::fromStdString(m_palettePath.getLevelName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -182,7 +182,7 @@ public: } } - void undo() const { + void undo() const override { StudioPalette::instance()->createFolder(m_path.getParentDir(), m_path.getWideName()); int paletteCount = -1; @@ -197,13 +197,13 @@ public: path.getWideName()); } } - void redo() const { StudioPalette::instance()->deleteFolder(m_path); } - int getSize() const { return sizeof(*this) + sizeof(TPalette); } - QString getHistoryString() { + void redo() const override { StudioPalette::instance()->deleteFolder(m_path); } + int getSize() const override { return sizeof(*this) + sizeof(TPalette); } + QString getHistoryString() override { return QObject::tr("Delete Studio Palette Folder : %1") .arg(QString::fromStdString(m_path.getName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -215,17 +215,17 @@ class CreateFolderUndo : public TUndo { public: CreateFolderUndo(const TFilePath &folderPath) : m_folderPath(folderPath) {} - void undo() const { StudioPalette::instance()->deleteFolder(m_folderPath); } - void redo() const { + void undo() const override { StudioPalette::instance()->deleteFolder(m_folderPath); } + void redo() const override { StudioPalette::instance()->createFolder(m_folderPath.getParentDir(), m_folderPath.getWideName()); } - int getSize() const { return sizeof(*this) + sizeof(TPalette); } - QString getHistoryString() { + int getSize() const override { return sizeof(*this) + sizeof(TPalette); } + QString getHistoryString() override { return QObject::tr("Create Studio Palette Folder : %1") .arg(QString::fromStdString(m_folderPath.getName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -238,20 +238,20 @@ public: MovePaletteUndo(const TFilePath &dstPath, const TFilePath &srcPath) : m_dstPath(dstPath), m_srcPath(srcPath) {} - void undo() const { + void undo() const override { StudioPalette::instance()->movePalette(m_srcPath, m_dstPath); } - void redo() const { + void redo() const override { StudioPalette::instance()->movePalette(m_dstPath, m_srcPath); } - int getSize() const { return sizeof(*this); } - QString getHistoryString() { + int getSize() const override { return sizeof(*this); } + QString getHistoryString() override { return QObject::tr("Move Studio Palette Folder : %1 : %2 > %3") .arg(QString::fromStdString(m_srcPath.getName())) .arg(QString::fromStdString(m_srcPath.getParentDir().getName())) .arg(QString::fromStdString(m_dstPath.getParentDir().getName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //------------------------------------------------------------- @@ -296,7 +296,7 @@ public: TImageCache::instance()->remove(m_oldImageId); } - void undo() const { + void undo() const override { TImageP img = TImageCache::instance()->get(m_oldImageId, true); TXshSimpleLevel *level = m_currentLevelHandle->getSimpleLevel(); level->setPalette(m_oldPalette.getPointer()); @@ -313,12 +313,12 @@ public: } } - void redo() const { + void redo() const override { adaptLevelToPalette(m_currentLevelHandle, m_paletteHandle, m_newPalette.getPointer(), m_tolerance, true); } - int getSize() const { return m_undoSize; } + int getSize() const override { return m_undoSize; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonzlib/stylemanager.cpp b/toonz/sources/toonzlib/stylemanager.cpp index d6c5f5e..a045244 100644 --- a/toonz/sources/toonzlib/stylemanager.cpp +++ b/toonz/sources/toonzlib/stylemanager.cpp @@ -54,9 +54,9 @@ class CustomStyleManager::StyleLoaderTask : public TThread::Runnable { public: StyleLoaderTask(CustomStyleManager *manager, const TFilePath &fp); - void run(); + void run() override; - void onFinished(TThread::RunnableP sender); + void onFinished(TThread::RunnableP sender) override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonzlib/tcolumnfx.cpp b/toonz/sources/toonzlib/tcolumnfx.cpp index 7bb8539..6e17dee 100644 --- a/toonz/sources/toonzlib/tcolumnfx.cpp +++ b/toonz/sources/toonzlib/tcolumnfx.cpp @@ -736,7 +736,7 @@ public: void setRasBounds(const TRect &rasBounds) { m_rasBounds = rasBounds; } - void compute(const TRectD &tileRect) { + void compute(const TRectD &tileRect) override { // Load the image TImageP img(m_sl->getFullsampledFrame( m_fid, (m_64bit ? ImageManager::is64bitEnabled : 0) | @@ -757,15 +757,15 @@ public: TRectD(0, 0, m_loadedRas->getLx(), m_loadedRas->getLy())); } - void simCompute(const TRectD &rect) {} + void simCompute(const TRectD &rect) override {} - void upload(TCacheResourceP &resource) { + void upload(TCacheResourceP &resource) override { assert(m_loadedRas); resource->upload(TPoint(), m_loadedRas); if (m_palette) resource->uploadPalette(m_palette); } - bool download(TCacheResourceP &resource) { + bool download(TCacheResourceP &resource) override { // If the image has been loaded in this builder, just use it if (m_loadedRas) return true; diff --git a/toonz/sources/toonzlib/tnewoutlinevectorize.cpp b/toonz/sources/toonzlib/tnewoutlinevectorize.cpp index c9b2fae..99bd52a 100644 --- a/toonz/sources/toonzlib/tnewoutlinevectorize.cpp +++ b/toonz/sources/toonzlib/tnewoutlinevectorize.cpp @@ -343,10 +343,10 @@ public: void openContainer(const TPoint &pos, const TPoint &dir, const pixel_type &innerColor, - const pixel_type &outerColor); + const pixel_type &outerColor) override; void addElement(const TPoint &pos, const TPoint &dir, - const pixel_type &outerColor); - void closeContainer(); + const pixel_type &outerColor) override; + void closeContainer() override; int surroundingEdges(); diff --git a/toonz/sources/toonzlib/tstageobjectcmd.cpp b/toonz/sources/toonzlib/tstageobjectcmd.cpp index 0b2d0a9..3aa2a2f 100644 --- a/toonz/sources/toonzlib/tstageobjectcmd.cpp +++ b/toonz/sources/toonzlib/tstageobjectcmd.cpp @@ -66,26 +66,26 @@ public: m_oldCurrentId = m_objHandle->getObjectId(); } ~NewCameraUndo() { m_stageObject->release(); } - void undo() const { + void undo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); if (m_cameraId == m_objHandle->getObjectId()) m_objHandle->setObjectId(m_oldCurrentId); xsh->getStageObjectTree()->removeStageObject(m_cameraId); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); xsh->getStageObjectTree()->insertStageObject(m_stageObject); m_objHandle->setObjectId(m_cameraId); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("New Camera %1") .arg(QString::fromStdString(m_cameraId.toString())); } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } private: // not implemented @@ -121,27 +121,27 @@ public: ~NewPegbarUndo() { m_stageObject->release(); } - void undo() const { + void undo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); if (m_id == m_objHandle->getObjectId()) m_objHandle->setObjectId(m_oldCurrentId); xsh->getStageObjectTree()->removeStageObject(m_id); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); xsh->getStageObjectTree()->insertStageObject(m_stageObject); m_objHandle->setObjectId(m_id); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("New Pegbar %1") .arg(QString::fromStdString(m_id.toString())); } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } private: // not implemented @@ -167,29 +167,29 @@ public: , m_newCameraId(newCameraId) , m_xshHandle(xshHandle) {} - void undo() const { + void undo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); xsh->getStageObjectTree()->setCurrentCameraId(m_oldCameraId); // make the preview camera same as the final camera xsh->getStageObjectTree()->setCurrentPreviewCameraId(m_oldCameraId); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); xsh->getStageObjectTree()->setCurrentCameraId(m_newCameraId); // make the preview camera same as the final camera xsh->getStageObjectTree()->setCurrentPreviewCameraId(m_newCameraId); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Set Active Camera %1 > %2") .arg(QString::fromStdString(m_oldCameraId.toString())) .arg(QString::fromStdString(m_newCameraId.toString())); } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } }; //=================================================================== @@ -216,7 +216,7 @@ public: } } ~RemoveSplineUndo() { m_spline->release(); } - void undo() const { + void undo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); xsh->getStageObjectTree()->insertSpline(m_spline); for (int i = 0; i < (int)m_ids.size(); i++) { @@ -226,7 +226,7 @@ public: } m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); for (int i = 0; i < (int)m_ids.size(); i++) { TStageObject *pegbar = xsh->getStageObject(m_ids[i]); @@ -236,17 +236,17 @@ public: xsh->getStageObjectTree()->removeSpline(m_spline); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return sizeof *this + sizeof(TStageObjectSpline) + sizeof(TStageObjectId) * m_ids.size(); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Remove Spline %1") .arg(QString::fromStdString(m_id.toString())); } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } }; //=================================================================== @@ -267,7 +267,7 @@ public: m_spline->addRef(); } ~NewSplineUndo() { m_spline->release(); } - void undo() const { + void undo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); TStageObject *pegbar = xsh->getStageObject(m_id); assert(pegbar); @@ -275,7 +275,7 @@ public: xsh->getStageObjectTree()->removeSpline(m_spline); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); xsh->getStageObjectTree()->insertSpline(m_spline); TStageObject *pegbar = xsh->getStageObject(m_id); @@ -283,13 +283,13 @@ public: pegbar->setSpline(m_spline); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof *this + sizeof(TStageObjectSpline); } + int getSize() const override { return sizeof *this + sizeof(TStageObjectSpline); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("New Motion Path %1") .arg(QString::fromStdString(m_spline->getName())); } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } }; //=================================================================== @@ -312,26 +312,26 @@ public: ~SplineLinkUndo() { m_spline->release(); } - void undo() const { + void undo() const override { TStageObject *object = m_xshHandle->getXsheet()->getStageObject(m_id); object->setSpline(0); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TStageObject *object = m_xshHandle->getXsheet()->getStageObject(m_id); object->setSpline(m_spline); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof *this + sizeof(TStageObjectSpline); } + int getSize() const override { return sizeof *this + sizeof(TStageObjectSpline); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Link Motion Path %1 > %2") .arg(QString::fromStdString(m_spline->getName())) .arg(QString::fromStdString(m_id.toString())); } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } }; //=================================================================== @@ -358,7 +358,7 @@ public: ~RemoveSplineLinkUndo() { m_spline->release(); } - void undo() const { + void undo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); TStageObjectTree *objTree = xsh->getStageObjectTree(); TStageObject *object = objTree->getStageObject(m_id, false); @@ -368,7 +368,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); TStageObjectTree *objTree = xsh->getStageObjectTree(); TStageObject *object = objTree->getStageObject(m_id, false); @@ -378,7 +378,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof *this + sizeof(TStageObjectSpline); } + int getSize() const override { return sizeof *this + sizeof(TStageObjectSpline); } }; //=================================================================== @@ -410,7 +410,7 @@ public: m_linkedObj = linkedObj; } - void undo() const { + void undo() const override { // reinsert Object TXsheet *xsh = m_xshHandle->getXsheet(); if (m_objId.isColumn() && m_column) @@ -428,7 +428,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); int pegbarsCount = xsh->getStageObjectTree()->getStageObjectCount(); int i; @@ -445,15 +445,15 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return sizeof *this + sizeof(TStageObjectParams) + sizeof(m_xshHandle); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Remove Object %1") .arg(QString::fromStdString(m_objId.toString())); } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } }; //=================================================================== @@ -489,7 +489,7 @@ public: for (i = 0; i < (int)m_deletedFx.size(); i++) m_deletedFx[i]->release(); } - void undo() const { + void undo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); TFxSet *terminalFxs = xsh->getFxDag()->getTerminalFxs(); TFxSet *internalFxs = xsh->getFxDag()->getInternalFxs(); @@ -514,7 +514,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TXsheet *xsh = m_xshHandle->getXsheet(); TFxSet *terminalFxs = xsh->getFxDag()->getTerminalFxs(); TFxSet *internalFxs = xsh->getFxDag()->getInternalFxs(); @@ -526,7 +526,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return sizeof *this + m_deletedFx.size() * sizeof(TFx) + m_terminalFx.size() * sizeof(TFx) + m_columnFxConnections.size() * @@ -534,7 +534,7 @@ public: m_notTerminalColumns.size() * sizeof(TFx) + sizeof(TXsheetHandle); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Remove Column "); QMap>::const_iterator it; for (it = m_columnFxConnections.begin(); it != m_columnFxConnections.end(); @@ -546,7 +546,7 @@ public: } return str; } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } }; //=================================================================== @@ -571,7 +571,7 @@ public: ~UndoGroup() {} - void undo() const { + void undo() const override { assert(m_ids.size() == m_positions.size()); TStageObjectTree *pegTree = m_xshHandle->getXsheet()->getStageObjectTree(); int i; @@ -585,7 +585,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { assert(m_ids.size() == m_positions.size()); TStageObjectTree *pegTree = m_xshHandle->getXsheet()->getStageObjectTree(); int i; @@ -600,7 +600,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } }; //=================================================================== @@ -636,7 +636,7 @@ public: m_positions = positions; } - void undo() const { + void undo() const override { assert(m_objsId.size() == m_positions.size()); TStageObjectTree *objTree = m_xshHandle->getXsheet()->getStageObjectTree(); if (!objTree) return; @@ -650,7 +650,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { assert(m_objsId.size() == m_positions.size()); TStageObjectTree *objTree = m_xshHandle->getXsheet()->getStageObjectTree(); if (!objTree) return; @@ -664,7 +664,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } }; //=================================================================== @@ -699,7 +699,7 @@ public: for (i = 0; i < m_objs.size(); i++) m_objs[i]->release(); } - void undo() const { + void undo() const override { assert(m_objs.size() == m_positions.size()); int i; for (i = 0; i < m_objs.size(); i++) { @@ -709,7 +709,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { assert(m_objs.size() == m_positions.size()); int i; for (i = 0; i < m_objs.size(); i++) { @@ -719,7 +719,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } }; //=================================================================== @@ -754,19 +754,19 @@ public: if (spline) spline->release(); } - void onAdd() { m_newStatus = m_obj->getStatus(); } + void onAdd() override { m_newStatus = m_obj->getStatus(); } - void undo() const { + void undo() const override { m_obj->setStatus(m_oldStatus); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { m_obj->setStatus(m_newStatus); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof *this; } + int getSize() const override { return sizeof *this; } }; //=================================================================== @@ -975,19 +975,19 @@ public: TStageObject *pegbar = getStageObject(); if (pegbar) setAttribute(pegbar, value); } - void undo() const { + void undo() const override { setAttribute(m_oldValue); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { setAttribute(m_newValue); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - int getHistoryType() { return HistoryType::Unidentified; } - QString getHistoryString() { + int getHistoryType() override { return HistoryType::Unidentified; } + QString getHistoryString() override { return QString("%1 %2 : %3 -> %4") .arg(getActionName()) .arg(QString::fromStdString(getId().toString())) @@ -1005,11 +1005,11 @@ public: StageObjectRenameUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, std::string oldName, std::string newName) : SetAttributeUndo(id, xshHandle, oldName, newName) {} - void setAttribute(TStageObject *pegbar, std::string name) const { + void setAttribute(TStageObject *pegbar, std::string name) const override { pegbar->setName(name); } - QString getActionName() { return QString("Rename Object"); } - QString getStringFromValue(std::string value) { + QString getActionName() override { return QString("Rename Object"); } + QString getStringFromValue(std::string value) override { return QString::fromStdString(value); } }; @@ -1021,11 +1021,11 @@ public: ResetOffsetUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, const TPointD &oldOffset) : SetAttributeUndo(id, xshHandle, oldOffset, TPointD()) {} - void setAttribute(TStageObject *pegbar, TPointD offset) const { + void setAttribute(TStageObject *pegbar, TPointD offset) const override { pegbar->setOffset(offset); } - QString getActionName() { return QString("Reset Center"); } - QString getStringFromValue(TPointD value) { + QString getActionName() override { return QString("Reset Center"); } + QString getStringFromValue(TPointD value) override { return QString("(%1,%2)") .arg(QString::number(value.x)) .arg(QString::number(value.y)); @@ -1039,11 +1039,11 @@ public: ResetCenterAndOffsetUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, const TPointD &oldOffset) : SetAttributeUndo(id, xshHandle, oldOffset, TPointD()) {} - void setAttribute(TStageObject *pegbar, TPointD offset) const { + void setAttribute(TStageObject *pegbar, TPointD offset) const override { pegbar->setCenterAndOffset(offset, offset); } - QString getActionName() { return QString("Reset Center"); } - QString getStringFromValue(TPointD value) { + QString getActionName() override { return QString("Reset Center"); } + QString getStringFromValue(TPointD value) override { return QString("(%1,%2)") .arg(QString::number(value.x)) .arg(QString::number(value.y)); @@ -1064,17 +1064,17 @@ public: TStageObject *pegbar = getStageObject(); if (pegbar) pegbar->getCenterAndOffset(m_center, m_offset); } - void setAttribute(TStageObject *pegbar, std::string handle) const { + void setAttribute(TStageObject *pegbar, std::string handle) const override { pegbar->setHandle(handle); } - void undo() const { + void undo() const override { SetAttributeUndo::undo(); TStageObject *pegbar = getStageObject(); if (pegbar) pegbar->setCenterAndOffset(m_center, m_offset); m_xshHandle->notifyXsheetChanged(); } - QString getActionName() { return QString("Set Handle"); } - QString getStringFromValue(std::string value) { + QString getActionName() override { return QString("Set Handle"); } + QString getStringFromValue(std::string value) override { return QString::fromStdString(value); } }; @@ -1086,11 +1086,11 @@ public: SetParentHandleUndo(const TStageObjectId &id, TXsheetHandle *xshHandle, std::string oldHandle, std::string newHandle) : SetAttributeUndo(id, xshHandle, oldHandle, newHandle) {} - void setAttribute(TStageObject *pegbar, std::string handle) const { + void setAttribute(TStageObject *pegbar, std::string handle) const override { pegbar->setParentHandle(handle); } - QString getActionName() { return QString("Set Parent Handle"); } - QString getStringFromValue(std::string value) { + QString getActionName() override { return QString("Set Parent Handle"); } + QString getStringFromValue(std::string value) override { return QString::fromStdString(value); } }; @@ -1107,12 +1107,12 @@ public: : SetAttributeUndo( id, xshHandle, ParentIdAndHandle(oldParentId, oldParentHandle), ParentIdAndHandle(newParentId, newParentHandle)) {} - void setAttribute(TStageObject *pegbar, ParentIdAndHandle parent) const { + void setAttribute(TStageObject *pegbar, ParentIdAndHandle parent) const override { pegbar->setParent(parent.first); pegbar->setParentHandle(parent.second); } - QString getActionName() { return QString("Set Parent Handle"); } - QString getStringFromValue(ParentIdAndHandle value) { + QString getActionName() override { return QString("Set Parent Handle"); } + QString getStringFromValue(ParentIdAndHandle value) override { return QString("(%1,%2)") .arg(QString::fromStdString(value.first.toString())) .arg(QString::fromStdString(value.second)); @@ -1164,7 +1164,7 @@ public: } } - void undo() const { + void undo() const override { TStageObject *stageObject = getStageObject(); if (!stageObject) return; stageObject->setCenterAndOffset(m_center, m_offset); @@ -1172,7 +1172,7 @@ public: restoreKeyframes(stageObject->getParam(TStageObject::T_Y), m_yKeyframes); m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { TStageObject *stageObject = getStageObject(); if (!stageObject) return; stageObject->setCenterAndOffset(TPointD(0, 0), TPointD(0, 0)); @@ -1180,7 +1180,7 @@ public: deleteAllKeyframes(stageObject->getParam(TStageObject::T_Y)); m_xshHandle->notifyXsheetChanged(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(TDoubleKeyframe) * (m_xKeyframes.size() + m_yKeyframes.size()); diff --git a/toonz/sources/toonzlib/txsheetexpr.cpp b/toonz/sources/toonzlib/txsheetexpr.cpp index 01660c5..592e46a 100644 --- a/toonz/sources/toonzlib/txsheetexpr.cpp +++ b/toonz/sources/toonzlib/txsheetexpr.cpp @@ -77,7 +77,7 @@ public: ~ParamCalculatorNode() { m_param->removeObserver(this); } - double compute(double vars[3]) const { + double compute(double vars[3]) const override { double value = m_param->getValue(m_frame->compute(vars) - 1); TMeasure *measure = m_param->getMeasure(); if (measure) { @@ -87,14 +87,14 @@ public: return value; } - void accept(TSyntax::CalculatorNodeVisitor &visitor) { + void accept(TSyntax::CalculatorNodeVisitor &visitor) override { ParamDependencyFinder *pdf = dynamic_cast(&visitor); pdf->check(m_param.getPointer()); m_param->accept(visitor); } - void onChange(const TParamChange ¶mChange) { + void onChange(const TParamChange ¶mChange) override { // The referenced parameter changed. This means the parameter owning the // expression this node is part of, changes too. @@ -132,7 +132,7 @@ public: , m_columnIndex(columnIndex) , m_frame(frame) {} - double compute(double vars[3]) const { + double compute(double vars[3]) const override { double f = m_frame->compute(vars); int i = tfloor(f); f = f - (double)i; @@ -145,7 +145,7 @@ public: return d; } - void accept(TSyntax::CalculatorNodeVisitor &) {} + void accept(TSyntax::CalculatorNodeVisitor &) override {} }; //=================================================================== @@ -219,11 +219,11 @@ public: return TStageObject::T_ChannelCount; } - bool expressionExpected(const std::vector &previousTokens) const { + bool expressionExpected(const std::vector &previousTokens) const override { return previousTokens.size() == 4; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { int i = (int)previousTokens.size(); if (i == 0) return matchObjectName(token) != TStageObjectId::NoneId; @@ -241,26 +241,26 @@ public: return false; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() >= 6; } bool isComplete(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return previousTokens.size() >= 6 || previousTokens.size() == 3; } TSyntax::TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return TSyntax::Operator; } - void getAcceptableKeywords(std::vector &keywords) const { + void getAcceptableKeywords(std::vector &keywords) const override { const std::string ks[] = {"table", "tab", "col", "cam", "camera", "peg", "pegbar"}; for (int i = 0; i < tArrayCount(ks); i++) keywords.push_back(ks[i]); } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() >= 3); std::auto_ptr frameNode( @@ -331,12 +331,12 @@ public: } return 0; } - std::string getFirstKeyword() const { return "fx"; } - bool expressionExpected(const std::vector &previousTokens) const { + std::string getFirstKeyword() const override { return "fx"; } + bool expressionExpected(const std::vector &previousTokens) const override { return !previousTokens.empty() && previousTokens.back().getText() == "("; } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { int i = (int)previousTokens.size(); std::string s = toLower(token.getText()); if (i == 0 && s == "fx") @@ -368,21 +368,21 @@ public: return false; } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return !previousTokens.empty() && previousTokens.back().getText() == ")"; } bool isComplete(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { int n = (int)previousTokens.size(); return n >= 2 && (n & 1) == 1 && previousTokens[n - 2].getText() != "("; } TSyntax::TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return TSyntax::Operator; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { int tokenSize = tokens.size(); std::auto_ptr frameNode( @@ -450,14 +450,14 @@ public: "Skeleton vertex"); } - virtual std::string getFirstKeyword() const { return "vertex"; } + std::string getFirstKeyword() const override { return "vertex"; } - bool expressionExpected(const std::vector &previousTokens) const { + bool expressionExpected(const std::vector &previousTokens) const override { return (previousTokens.size() == EXPR); } bool matchToken(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { struct { const PlasticVertexPattern *m_this; const SkD *skdp(const Token &columnToken) { @@ -503,23 +503,23 @@ public: } bool isFinished(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return (previousTokens.size() >= POSITIONS_COUNT); } bool isComplete(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return (previousTokens.size() >= POSITIONS_COUNT || previousTokens.size() == L2); } TSyntax::TokenType getTokenType(const std::vector &previousTokens, - const Token &token) const { + const Token &token) const override { return TSyntax::Operator; } void createNode(Calculator *calc, std::vector &stack, - const std::vector &tokens) const { + const std::vector &tokens) const override { assert(tokens.size() > COMPONENT); std::auto_ptr frameNode( diff --git a/toonz/sources/toonzlib/xshhandlemanager.h b/toonz/sources/toonzlib/xshhandlemanager.h index 511406c..b00a5a4 100644 --- a/toonz/sources/toonzlib/xshhandlemanager.h +++ b/toonz/sources/toonzlib/xshhandlemanager.h @@ -25,7 +25,7 @@ public: XshHandleManager(TXsheet *xsh) : m_xsh(xsh) {} TPointD getHandlePos(const TStageObjectId &id, const std::string &handle, - int row) const; + int row) const override; }; #endif diff --git a/toonz/sources/toonzqt/docklayout.h b/toonz/sources/toonzqt/docklayout.h index e1c8974..e15402d 100644 --- a/toonz/sources/toonzqt/docklayout.h +++ b/toonz/sources/toonzqt/docklayout.h @@ -85,15 +85,15 @@ public: virtual ~DockLayout(); // QLayout item handling (see Qt reference) - int count(void) const; - void addItem(QLayoutItem *item); - QSize sizeHint() const; - QSize minimumSize() const; - QSize maximumSize() const; - QLayoutItem *itemAt(int) const; + int count(void) const override; + void addItem(QLayoutItem *item) override; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; + QLayoutItem *itemAt(int) const override; QWidget *widgetAt(int) const; - QLayoutItem *takeAt(int); - void setGeometry(const QRect &rect); + QLayoutItem *takeAt(int) override; + void setGeometry(const QRect &rect) override; void update(); // Re-applies partition found void redistribute(); // Calculates partition @@ -270,16 +270,16 @@ public: private: // Event handling // Basic events - bool event(QEvent *e); - void mousePressEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); + bool event(QEvent *e) override; + void mousePressEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; void hoverMoveEvent(QHoverEvent *he); protected: // Customizable events - virtual void wheelEvent(QWheelEvent *we); - virtual void mouseDoubleClickEvent(QMouseEvent *me); + void wheelEvent(QWheelEvent *we) override; + void mouseDoubleClickEvent(QMouseEvent *me) override; virtual void windowTitleEvent(QEvent *) {} }; @@ -357,9 +357,9 @@ public: private: void calculateBounds(); - void mousePressEvent(QMouseEvent *me); - void mouseReleaseEvent(QMouseEvent *me); - void mouseMoveEvent(QMouseEvent *me); + void mousePressEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; }; //======================================================================== @@ -444,7 +444,7 @@ public: private: //! Let wheel events also be propagated to owner dock widget - void wheelEvent(QWheelEvent *we) { m_owner->wheelEvent(we); } + void wheelEvent(QWheelEvent *we) override { m_owner->wheelEvent(we); } }; //=========================================== diff --git a/toonz/sources/toonzqt/dockwidget.cpp b/toonz/sources/toonzqt/dockwidget.cpp index 4f624f7..b8f1e03 100644 --- a/toonz/sources/toonzqt/dockwidget.cpp +++ b/toonz/sources/toonzqt/dockwidget.cpp @@ -43,7 +43,7 @@ class DockingToggleCommand : public MenuItemHandler { public: DockingToggleCommand() : MenuItemHandler("MI_DockingCheck") {} - void execute() { + void execute() override { DockingCheck *dc = DockingCheck::instance(); dc->setIsEnabled(!dc->isEnabled()); } diff --git a/toonz/sources/toonzqt/dvscrollwidget.cpp b/toonz/sources/toonzqt/dvscrollwidget.cpp index 64f6c1f..070c346 100644 --- a/toonz/sources/toonzqt/dvscrollwidget.cpp +++ b/toonz/sources/toonzqt/dvscrollwidget.cpp @@ -30,7 +30,7 @@ public: assert(m_scrollWidget); } - QSize minimumSize() const { + QSize minimumSize() const override { struct locals { inline static QSize expand(const QSize &size, const QLayoutItem *item) { return size.expandedTo(item->minimumSize()); @@ -45,7 +45,7 @@ public: : QSize(minSize.width(), 0); } - QSize maximumSize() const { + QSize maximumSize() const override { struct locals { inline static QSize bound(const QSize &size, const QLayoutItem *item) { return size.boundedTo(item->minimumSize()); @@ -61,7 +61,7 @@ public: : QSize(maxSize.width(), QWIDGETSIZE_MAX); } - void setGeometry(const QRect &r) { + void setGeometry(const QRect &r) override { const Qt::Orientation orientation = m_scrollWidget->getOrientation(); QList::const_iterator it, iEnd = m_items.end(); diff --git a/toonz/sources/toonzqt/expressionfield.cpp b/toonz/sources/toonzqt/expressionfield.cpp index 934df80..bb9c590 100644 --- a/toonz/sources/toonzqt/expressionfield.cpp +++ b/toonz/sources/toonzqt/expressionfield.cpp @@ -33,7 +33,7 @@ public: void setGrammar(const Grammar *grammar) { m_grammar = grammar; } - void highlightBlock(const QString &text) { + void highlightBlock(const QString &text) override { Parser parser(m_grammar); std::vector tokens; Parser::SyntaxStatus status = @@ -114,9 +114,9 @@ public: m_tooltip->setIndent(1); m_tooltip->setWordWrap(false); } - void showEvent(QShowEvent *) { showToolTip(currentIndex()); } - void hideEvent(QHideEvent *) { m_tooltip->hide(); } - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { + void showEvent(QShowEvent *) override { showToolTip(currentIndex()); } + void hideEvent(QHideEvent *) override { m_tooltip->hide(); } + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override { showToolTip(current); QListView::currentChanged(current, previous); } @@ -139,7 +139,7 @@ public: } protected: - void resizeEvent(QResizeEvent *e) { + void resizeEvent(QResizeEvent *e) override { QListView::resizeEvent(e); if (m_tooltip->isVisible()) showToolTip(currentIndex()); } diff --git a/toonz/sources/toonzqt/flipconsole.cpp b/toonz/sources/toonzqt/flipconsole.cpp index 6d5d974..6febdfc 100644 --- a/toonz/sources/toonzqt/flipconsole.cpp +++ b/toonz/sources/toonzqt/flipconsole.cpp @@ -603,7 +603,7 @@ public: } protected: - void paintEvent(QPaintEvent *e) { + void paintEvent(QPaintEvent *e) override { QPainter p(this); p.drawPixmap(0, 0, @@ -623,7 +623,7 @@ protected: m_secondAction->icon().pixmap(QSize(LX, LY / 2), mode, state)); } - void mousePressEvent(QMouseEvent *e) { + void mousePressEvent(QMouseEvent *e) override { QRect firstActionRect(0, 0, LX, LY / 2); QRect secondActionRect(0, LY / 2 + 1, LX, LY / 2); @@ -636,7 +636,7 @@ protected: update(); } - void mouseMoveEvent(QMouseEvent *e) { + void mouseMoveEvent(QMouseEvent *e) override { QPoint pos = e->pos(); QRect firstActionRect(0, 0, LX, LY / 2); QRect secondActionRect(0, LY / 2 + 1, LX, LY / 2); @@ -656,7 +656,7 @@ protected: update(); } - void leaveEvent(QEvent *e) { + void leaveEvent(QEvent *e) override { m_firstMode = QIcon::Normal; m_firstState = QIcon::Off; m_secondMode = QIcon::Normal; @@ -1879,28 +1879,28 @@ void FlipConsole::onPreferenceChanged() { m_enableBlankFrameButton->setStyleSheet( QString("#enableBlankFrameButton{ \ - background-color: transparent; \ - padding: 2px;\ - font-weight: bold; \ - font-size: 12px; \ - color: %11;\ - border-style: inset; \ - border-left-color: rgb(%5,%6,%7); \ - border-top-color: rgb(%5,%6,%7); \ - border-right-color: rgb(%8,%9,%10); \ - border-bottom-color: rgb(%8,%9,%10); \ - border-width: 2px; \ - border-radius: 3px; \ - } \ - #enableBlankFrameButton:checked { \ - background-color: rgb(%1,%2,%3); \ - color: %4; \ - border-style: outset; \ - border-left-color: rgb(%8,%9,%10); \ - border-top-color: rgb(%8,%9,%10); \ - border-right-color: rgb(%5,%6,%7); \ - border-bottom-color: rgb(%5,%6,%7); \ - } ") + background-color: transparent; \ + padding: 2px;\ + font-weight: bold; \ + font-size: 12px; \ + color: %11;\ + border-style: inset; \ + border-left-color: rgb(%5,%6,%7); \ + border-top-color: rgb(%5,%6,%7); \ + border-right-color: rgb(%8,%9,%10); \ + border-bottom-color: rgb(%8,%9,%10); \ + border-width: 2px; \ + border-radius: 3px; \ + } \ + #enableBlankFrameButton:checked { \ + background-color: rgb(%1,%2,%3); \ + color: %4; \ + border-style: outset; \ + border-left-color: rgb(%8,%9,%10); \ + border-top-color: rgb(%8,%9,%10); \ + border-right-color: rgb(%5,%6,%7); \ + border-bottom-color: rgb(%5,%6,%7); \ + } ") .arg(m_blankColor.r) .arg(m_blankColor.g) .arg(m_blankColor.b) @@ -1928,7 +1928,7 @@ class FlipConsoleActionsCreator : AuxActionsCreator { } public: - void createActions(QObject *parent) { + void createActions(QObject *parent) override { /*createToggleAction(parent, "A_Flip_Play", "Play", FlipConsole::ePlay); createToggleAction(parent, "A_Flip_Pause", "Pause", FlipConsole::ePause); createToggleAction(parent, "A_Flip_Loop", "Loop", FlipConsole::eLoop);*/ diff --git a/toonz/sources/toonzqt/functionpanel.cpp b/toonz/sources/toonzqt/functionpanel.cpp index 7f51c88..ff75f04 100644 --- a/toonz/sources/toonzqt/functionpanel.cpp +++ b/toonz/sources/toonzqt/functionpanel.cpp @@ -59,7 +59,7 @@ public: FunctionPanelZoomer(FunctionPanel *panel) : ShortcutZoomer(panel), m_panel(panel) {} - bool zoom(bool zoomin, bool resetZoom) { + bool zoom(bool zoomin, bool resetZoom) override { if (resetZoom) m_panel->fitGraphToWindow(); else { diff --git a/toonz/sources/toonzqt/functionpaneltools.h b/toonz/sources/toonzqt/functionpaneltools.h index 4af7f48..020e7c9 100644 --- a/toonz/sources/toonzqt/functionpaneltools.h +++ b/toonz/sources/toonzqt/functionpaneltools.h @@ -28,7 +28,7 @@ class MoveFrameDragTool : public FunctionPanel::DragTool { public: MoveFrameDragTool(FunctionPanel *panel, TFrameHandle *frameHandle); - void drag(QMouseEvent *e); + void drag(QMouseEvent *e) override; }; class PanDragTool : public FunctionPanel::DragTool { @@ -38,8 +38,8 @@ class PanDragTool : public FunctionPanel::DragTool { public: PanDragTool(FunctionPanel *panel, bool xLocked, bool yLocked); - void click(QMouseEvent *e); - void drag(QMouseEvent *e); + void click(QMouseEvent *e) override; + void drag(QMouseEvent *e) override; }; class ZoomDragTool : public FunctionPanel::DragTool { @@ -52,9 +52,9 @@ public: ZoomDragTool(FunctionPanel *panel, ZoomType zoomType) : m_panel(panel), m_zoomType((int)zoomType) {} - void click(QMouseEvent *e); - void drag(QMouseEvent *e); - void release(QMouseEvent *e); + void click(QMouseEvent *e) override; + void drag(QMouseEvent *e) override; + void release(QMouseEvent *e) override; }; class RectSelectTool : public FunctionPanel::DragTool { @@ -67,11 +67,11 @@ public: RectSelectTool(FunctionPanel *panel, TDoubleParam *curve) : m_panel(panel), m_curve(curve) {} - void click(QMouseEvent *e); - void drag(QMouseEvent *e); - void release(QMouseEvent *e); + void click(QMouseEvent *e) override; + void drag(QMouseEvent *e) override; + void release(QMouseEvent *e) override; - void draw(QPainter &painter); + void draw(QPainter &painter) override; }; class MovePointDragTool : public FunctionPanel::DragTool { @@ -99,9 +99,9 @@ public: void setSelection(FunctionSelection *selection); - void click(QMouseEvent *e); - void drag(QMouseEvent *e); - void release(QMouseEvent *e); + void click(QMouseEvent *e) override; + void drag(QMouseEvent *e) override; + void release(QMouseEvent *e) override; }; class MoveHandleDragTool : public FunctionPanel::DragTool { @@ -126,9 +126,9 @@ public: MoveHandleDragTool(FunctionPanel *panel, TDoubleParam *curve, int kIndex, Handle handle); - void click(QMouseEvent *e); - void drag(QMouseEvent *e); - void release(QMouseEvent *e); + void click(QMouseEvent *e) override; + void drag(QMouseEvent *e) override; + void release(QMouseEvent *e) override; }; class MoveGroupHandleDragTool : public FunctionPanel::DragTool { @@ -146,9 +146,9 @@ public: Handle handle); ~MoveGroupHandleDragTool(); - void click(QMouseEvent *e); - void drag(QMouseEvent *e); - void release(QMouseEvent *e); + void click(QMouseEvent *e) override; + void drag(QMouseEvent *e) override; + void release(QMouseEvent *e) override; }; #endif diff --git a/toonz/sources/toonzqt/functionsegmentviewer.cpp b/toonz/sources/toonzqt/functionsegmentviewer.cpp index 69c86b3..f1213ed 100644 --- a/toonz/sources/toonzqt/functionsegmentviewer.cpp +++ b/toonz/sources/toonzqt/functionsegmentviewer.cpp @@ -65,9 +65,9 @@ public: FunctionEmptySegmentPage(FunctionSegmentViewer *parent = 0) : FunctionSegmentPage(parent) {} - void refresh() {} - void apply() {} - void init(int segmentLength) {} + void refresh() override {} + void apply() override {} + void init(int segmentLength) override {} }; //============================================================================= @@ -704,7 +704,7 @@ public: } setLayout(mainLayout); } - void refresh() { + void refresh() override { TDoubleKeyframe kf; TDoubleParam *curve = getCurve(); if (curve) kf = curve->getKeyframeAt(getR0()); @@ -731,7 +731,7 @@ public: } } - void init(int segmentLength) { + void init(int segmentLength) override { TDoubleParam *curve = getCurve(); if (!curve) return; @@ -747,7 +747,7 @@ public: m_fieldIndexFld->setText(""); } - void apply() { + void apply() override { TDoubleParam *curve = getCurve(); if (!curve) return; int kIndex = getViewer()->getSegmentIndex(); diff --git a/toonz/sources/toonzqt/functionselection.cpp b/toonz/sources/toonzqt/functionselection.cpp index 9516fe1..fd11213 100644 --- a/toonz/sources/toonzqt/functionselection.cpp +++ b/toonz/sources/toonzqt/functionselection.cpp @@ -40,16 +40,16 @@ public: delete m_newData; } - void undo() const { + void undo() const override { QApplication::clipboard()->setMimeData(cloneData(m_oldData)); } - void redo() const { + void redo() const override { QApplication::clipboard()->setMimeData(cloneData(m_newData)); } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(QMimeData) * 2; // approx } - QString getHistoryString() { return QObject::tr("Copy Keyframe"); } + QString getHistoryString() override { return QObject::tr("Copy Keyframe"); } }; //----------------------------------------------------------------------------- @@ -97,7 +97,7 @@ public: delete m_data; } - void undo() const { + void undo() const override { int columnCount = (int)m_columns.size(); for (int col = 0; col < columnCount; col++) { TDoubleParam *param = m_columns[col].m_param; @@ -108,15 +108,15 @@ public: param->setKeyframes(m_columns[col].m_oldKeyframes); } } - void redo() const { + void redo() const override { for (int col = 0; col < (int)m_columns.size(); col++) { m_data->setData(col, m_columns[col].m_param, m_frame); } } - int getSize() const { + int getSize() const override { return sizeof(*this) + 100; // approx } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Paste Keyframe at Frame : %1") .arg(QString::number((int)m_frame + 1)); } @@ -152,22 +152,22 @@ public: m_columns[col].m_param->release(); } - void undo() const { + void undo() const override { for (int col = 0; col < (int)m_columns.size(); col++) for (int i = 0; i < (int)m_columns[col].m_keyframes.size(); i++) m_columns[col].m_param->setKeyframe(m_columns[col].m_keyframes[i]); } - void redo() const { + void redo() const override { for (int col = 0; col < (int)m_columns.size(); col++) for (int i = 0; i < (int)m_columns[col].m_keyframes.size(); i++) m_columns[col].m_param->deleteKeyframe( m_columns[col].m_keyframes[i].m_frame); } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(TDoubleKeyframe) * m_columns.size(); // sbagliato! } - QString getHistoryString() { return QObject::tr("Delete Keyframe"); } + QString getHistoryString() override { return QObject::tr("Delete Keyframe"); } private: std::vector m_columns; @@ -189,7 +189,7 @@ public: param->addRef(); } - void undo() const { + void undo() const override { for (int i = (int)m_movements.size() - 1; i >= 0; i--) { TDoubleKeyframe kf = m_movements[i].m_param->getKeyframe(m_movements[i].m_kIndex); @@ -197,7 +197,7 @@ public: m_movements[i].m_param->setKeyframe(m_movements[i].m_kIndex, kf); } } - void redo() const { + void redo() const override { for (int i = 0; i < (int)m_movements.size(); i++) { TDoubleKeyframe kf = m_movements[i].m_param->getKeyframe(m_movements[i].m_kIndex); @@ -205,11 +205,11 @@ public: m_movements[i].m_param->setKeyframe(m_movements[i].m_kIndex, kf); } } - int getSize() const { + int getSize() const override { return sizeof(*this) + sizeof(m_movements[0]) * m_movements.size(); } int getCount() const { return (int)m_movements.size(); } - QString getHistoryString() { return QObject::tr("Move Keyframe"); } + QString getHistoryString() override { return QObject::tr("Move Keyframe"); } private: struct KeyframeMovement { diff --git a/toonz/sources/toonzqt/functionsheet.cpp b/toonz/sources/toonzqt/functionsheet.cpp index 048e377..b49917a 100644 --- a/toonz/sources/toonzqt/functionsheet.cpp +++ b/toonz/sources/toonzqt/functionsheet.cpp @@ -57,7 +57,7 @@ public: MoveChannelsDragTool(FunctionSheet *sheet) : m_sheet(sheet), m_firstKeyframeRow(-1) {} - void click(int row, int col, QMouseEvent *e) { + void click(int row, int col, QMouseEvent *e) override { m_firstKeyframeRow = -1; FunctionTreeModel::Channel *channel = m_sheet->getChannel(col); if (!channel) return; @@ -106,7 +106,7 @@ public: m_oldRow = row; } - void drag(int row, int col, QMouseEvent *e) { + void drag(int row, int col, QMouseEvent *e) override { int d = row - m_oldRow; m_oldRow = row; if (d + m_firstKeyframeRow < 0) d = -m_firstKeyframeRow; @@ -117,7 +117,7 @@ public: m_sheet->selectCells(m_selectedCells); } - void release(int row, int col, QMouseEvent *e) { + void release(int row, int col, QMouseEvent *e) override { for (int i = 0; i < (int)m_setters.size(); i++) delete m_setters[i]; m_setters.clear(); } @@ -133,7 +133,7 @@ public: FunctionSheetSelectionTool(FunctionSheet *sheet) : m_sheet(sheet), m_firstRow(-1), m_firstCol(-1) {} - void click(int row, int col, QMouseEvent *e) { + void click(int row, int col, QMouseEvent *e) override { if (0 != (e->modifiers() & Qt::ShiftModifier) && !m_sheet->getSelectedCells().isEmpty()) { QRect selectedCells = m_sheet->getSelectedCells(); @@ -161,7 +161,7 @@ public: } } - void drag(int row, int col, QMouseEvent *e) { + void drag(int row, int col, QMouseEvent *e) override { if (row < 0) row = 0; if (col < 0) col = 0; int r0 = qMin(row, m_firstRow); @@ -172,7 +172,7 @@ public: m_sheet->selectCells(selectedCells); } - void release(int row, int col, QMouseEvent *e) { + void release(int row, int col, QMouseEvent *e) override { if (row == m_firstRow && col == m_firstCol) { if (Preferences::instance()->isMoveCurrentEnabled()) m_sheet->setCurrentFrame(row); @@ -902,7 +902,7 @@ class FunctionSheetColumnToCurveMapper : public ColumnToCurveMapper { public: FunctionSheetColumnToCurveMapper(FunctionSheet *sheet) : m_sheet(sheet) {} - TDoubleParam *getCurve(int columnIndex) const { + TDoubleParam *getCurve(int columnIndex) const override { FunctionTreeModel::Channel *channel = m_sheet->getChannel(columnIndex); if (channel) return channel->getParam(); diff --git a/toonz/sources/toonzqt/functiontreeviewer.cpp b/toonz/sources/toonzqt/functiontreeviewer.cpp index 8a1fb4f..8e6ca66 100644 --- a/toonz/sources/toonzqt/functiontreeviewer.cpp +++ b/toonz/sources/toonzqt/functiontreeviewer.cpp @@ -58,8 +58,8 @@ public: ParamChannelGroup(TParam *param, const std::wstring &fxId, std::string ¶mName); - void refresh(); - void *getInternalPointer() const; + void refresh() override; + void *getInternalPointer() const override; }; //============================================================================= @@ -74,17 +74,17 @@ public: StageObjectChannelGroup(TStageObject *pegbar); ~StageObjectChannelGroup(); - QString getShortName() const; - QString getLongName() const; + QString getShortName() const override; + QString getLongName() const override; - QString getIdName() const; + QString getIdName() const override; - void *getInternalPointer() const { + void *getInternalPointer() const override { return static_cast(m_stageObject); } TStageObject *getStageObject() const { return m_stageObject; } - QVariant data(int role) const; + QVariant data(int role) const override; }; //============================================================================= @@ -100,10 +100,10 @@ public: , m_stageObjectGroup(stageGroup) , m_vxName(vxName) {} - QString getShortName() const { return m_stageObjectGroup->getShortName(); } - QString getLongName() const { return *m_vxName; } + QString getShortName() const override { return m_stageObjectGroup->getShortName(); } + QString getLongName() const override { return *m_vxName; } - void *getInternalPointer() const { return (void *)m_vxName; } + void *getInternalPointer() const override { return (void *)m_vxName; } static inline bool compareStr(const TreeModel::Item *item, const QString &str) { @@ -112,7 +112,7 @@ public: return (QString::localeAwareCompare(thisStr, str) < 0); } - QVariant data(int role) const; + QVariant data(int role) const override; }; } // namespace @@ -1186,7 +1186,7 @@ void FunctionTreeModel::onChange(const TParamChange &tpc) { Func(FunctionTreeModel *obj, const TParamChange *tpc) : m_obj(obj), m_tpc(tpc) {} - void operator()() { m_obj->onParamChange(m_tpc->m_dragging); } + void operator()() override { m_obj->onParamChange(m_tpc->m_dragging); } }; QMetaObject::invokeMethod(TFunctorInvoker::instance(), "invoke", diff --git a/toonz/sources/toonzqt/fxdata.h b/toonz/sources/toonzqt/fxdata.h index 1094d9a..9d226b0 100644 --- a/toonz/sources/toonzqt/fxdata.h +++ b/toonz/sources/toonzqt/fxdata.h @@ -34,7 +34,7 @@ class FxsData : public DvMimeData { public: FxsData(); - FxsData *clone() const; + FxsData *clone() const override; //! Set the FxsData. FxsData<-QList void setFxs(const QList &selectedFxs, const QList &selectedLinks, diff --git a/toonz/sources/toonzqt/icongenerator.cpp b/toonz/sources/toonzqt/icongenerator.cpp index 0032186..ec2b0fb 100644 --- a/toonz/sources/toonzqt/icongenerator.cpp +++ b/toonz/sources/toonzqt/icongenerator.cpp @@ -442,7 +442,7 @@ public: IconRenderer(const std::string &id, const TDimension &iconSize); virtual ~IconRenderer(); - virtual void run() = 0; + void run() override = 0; void setIcon(const TRaster32P &icon) { m_icon = icon; } TRaster32P getIcon() const { return m_icon; } @@ -517,7 +517,7 @@ public: , m_settings(settings) {} TRaster32P generateRaster(const TDimension &iconSize) const; - void run(); + void run() override; }; //----------------------------------------------------------------------------- @@ -570,7 +570,7 @@ public: : IconRenderer(id, iconSize), m_spline(spline) {} TRaster32P generateRaster(const TDimension &iconSize) const; - void run(); + void run() override; }; //----------------------------------------------------------------------------- @@ -631,7 +631,7 @@ public: TXshSimpleLevelP sl, const TFrameId &fid) : IconRenderer(id, iconSize), m_sl(sl), m_fid(fid) {} - void run(); + void run() override; }; //----------------------------------------------------------------------------- @@ -673,7 +673,7 @@ public: , m_settings(settings) , m_tnzImgIcon(0) {} - void run(); + void run() override; void setIcon_TnzImg(const TRasterCM32P &timgp) { m_tnzImgIcon = timgp; } TRasterCM32P getIcon_TnzImg() const { return m_tnzImgIcon; } @@ -787,7 +787,7 @@ public: , m_settings(settings) {} TRaster32P generateRaster(const TDimension &iconSize) const; - void run(); + void run() override; }; //----------------------------------------------------------------------------- @@ -856,7 +856,7 @@ public: } TRaster32P generateRaster(const TDimension &iconSize) const; - void run(); + void run() override; }; //----------------------------------------------------------------------------- @@ -905,7 +905,7 @@ public: static std::string getId(const TFilePath &path, const TFrameId &fid); - void run(); + void run() override; }; //----------------------------------------------------------------------------- @@ -1236,7 +1236,7 @@ public: static std::string getId() { return "currentScene"; } - void run(); + void run() override; TRaster32P generateIcon(const TDimension &iconSize) const; }; diff --git a/toonz/sources/toonzqt/keyframenavigator.cpp b/toonz/sources/toonzqt/keyframenavigator.cpp index fb28481..bd42c72 100644 --- a/toonz/sources/toonzqt/keyframenavigator.cpp +++ b/toonz/sources/toonzqt/keyframenavigator.cpp @@ -272,9 +272,9 @@ public: UndoPaletteSetKeyFrame(int styleId, int frame, TPaletteHandle *paletteHandle) : m_frame(frame), m_styleId(styleId), m_paletteHandle(paletteHandle) {} - void undo() const { setKeyFrame(); } - void redo() const { setKeyFrame(); } - int getSize() const { return sizeof(*this); } + void undo() const override { setKeyFrame(); } + void redo() const override { setKeyFrame(); } + int getSize() const override { return sizeof(*this); } protected: void setKeyFrame() const { diff --git a/toonz/sources/toonzqt/palettedata.h b/toonz/sources/toonzqt/palettedata.h index 14b457d..241fef4 100644 --- a/toonz/sources/toonzqt/palettedata.h +++ b/toonz/sources/toonzqt/palettedata.h @@ -25,7 +25,7 @@ public: ~PaletteData() {} - PaletteData *clone() const; + PaletteData *clone() const override; void setPaletteData(TPalette *palette, int pageIndex, std::set styleIndicesInPage); diff --git a/toonz/sources/toonzqt/palettesscanpopup.h b/toonz/sources/toonzqt/palettesscanpopup.h index d074921..b6f5975 100644 --- a/toonz/sources/toonzqt/palettesscanpopup.h +++ b/toonz/sources/toonzqt/palettesscanpopup.h @@ -49,7 +49,7 @@ protected slots: protected: void setLabel(const TFilePath &fp); - void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) override; void push(const TFilePath &fp); void push(const TFilePathSet &fs); void pop(); diff --git a/toonz/sources/toonzqt/paramfield.cpp b/toonz/sources/toonzqt/paramfield.cpp index 866d940..13aee99 100644 --- a/toonz/sources/toonzqt/paramfield.cpp +++ b/toonz/sources/toonzqt/paramfield.cpp @@ -35,8 +35,8 @@ public: FxSettingsUndo(QString name, TFxHandle *fxHandle) : m_name(name), m_fxHandle(fxHandle) {} - int getSize() const { return sizeof(*this); } - int getHistoryType() { return HistoryType::Fx; } + int getSize() const override { return sizeof(*this); } + int getHistoryType() override { return HistoryType::Fx; } }; class AnimatableFxSettingsUndo : public FxSettingsUndo { @@ -48,7 +48,7 @@ public: AnimatableFxSettingsUndo(QString name, int frame, TFxHandle *fxHandle) : FxSettingsUndo(name, fxHandle), m_frame(frame) {} - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : %1").arg(m_name); if (m_wasKeyframe) str += QString(" Frame : %1").arg(QString::number(m_frame + 1)); @@ -74,9 +74,9 @@ public: m_wasKeyframe = m_param->isKeyframe(frame); } - void onAdd() { m_newValue = m_param->getValue(m_frame); } + void onAdd() override { m_newValue = m_param->getValue(m_frame); } - void undo() const { + void undo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_oldValue); else @@ -87,7 +87,7 @@ public: } } - void redo() const { + void redo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_newValue); else @@ -112,9 +112,9 @@ public: m_wasKeyframe = m_param->isKeyframe(frame); } - void onAdd() { m_newValue = m_param->getValue(m_frame); } + void onAdd() override { m_newValue = m_param->getValue(m_frame); } - void undo() const { + void undo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_oldValue); else @@ -125,7 +125,7 @@ public: } } - void redo() const { + void redo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_newValue); else @@ -150,9 +150,9 @@ public: m_wasKeyframe = m_param->isKeyframe(frame); } - void onAdd() { m_newValue = m_param->getValue(m_frame); } + void onAdd() override { m_newValue = m_param->getValue(m_frame); } - void undo() const { + void undo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_oldValue); else @@ -163,7 +163,7 @@ public: } } - void redo() const { + void redo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_newValue); else @@ -188,9 +188,9 @@ public: m_wasKeyframe = m_param->isKeyframe(frame); } - void onAdd() { m_newValue = m_param->getValue(m_frame); } + void onAdd() override { m_newValue = m_param->getValue(m_frame); } - void undo() const { + void undo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_oldValue); else @@ -199,7 +199,7 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_newValue); else @@ -223,17 +223,17 @@ public: , m_oldString(oldString) , m_newString(newString) {} - void undo() const { + void undo() const override { m_param->setValue(m_oldString); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { m_param->setValue(m_newString); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : %1 : %2 -> %3") .arg(m_name) .arg(QString::fromStdString(m_oldString)) @@ -256,19 +256,19 @@ public: m_newValue = m_oldValue; } - void onAdd() { m_newValue = m_param->getValue(); } + void onAdd() override { m_newValue = m_param->getValue(); } - void undo() const { + void undo() const override { m_param->setValue(m_oldValue); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { m_param->setValue(m_newValue); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : %1 : %2 -> %3") .arg(m_name) .arg(QString::number(m_oldValue)) @@ -290,17 +290,17 @@ public: m_newState = param->getValue(); } - void undo() const { + void undo() const override { m_param->setValue(!m_newState); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { m_param->setValue(m_newState); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : "); if (m_newState) str += QObject::tr("ON : %1").arg(m_name); @@ -326,9 +326,9 @@ public: m_wasKeyframe = m_param->isKeyframe(frame); } - void onAdd() { m_newSpectrum = m_param->getValue(m_frame); } + void onAdd() override { m_newSpectrum = m_param->getValue(m_frame); } - void undo() const { + void undo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_oldSpectrum); else @@ -339,7 +339,7 @@ public: } } - void redo() const { + void redo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_newSpectrum); else @@ -385,7 +385,7 @@ public: m_currentParam->insertKey(m_index, m_key.first, m_key.second); } - void undo() const { + void undo() const override { if (m_isAddUndo) removeKeys(); else @@ -394,7 +394,7 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { if (m_isAddUndo) addKeys(); else @@ -402,7 +402,7 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : %1 : %2 Key") .arg(m_name) @@ -426,19 +426,19 @@ public: m_newValue = m_oldValue; } - void onAdd() { m_newValue = m_param->getValue(); } + void onAdd() override { m_newValue = m_param->getValue(); } - void undo() const { + void undo() const override { m_param->setValue(m_oldValue); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { m_param->setValue(m_newValue); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : %1 : %2 -> %3") .arg(m_name) .arg(QString::fromStdWString(m_oldValue)) @@ -463,9 +463,9 @@ public: m_wasKeyframe = m_param->isKeyframe(frame); } - void onAdd() { m_newPoints = m_param->getValue(m_frame); } + void onAdd() override { m_newPoints = m_param->getValue(m_frame); } - void undo() const { + void undo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_oldPoints); else @@ -474,7 +474,7 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { if (!m_wasKeyframe) m_param->setDefaultValue(m_newPoints); else @@ -521,7 +521,7 @@ public: m_currentParam->addValue(0, m_value, m_index); } - void undo() const { + void undo() const override { if (m_isAddUndo) removePoints(); else @@ -530,7 +530,7 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { if (m_isAddUndo) addPoints(); else @@ -538,7 +538,7 @@ public: if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : %1 : %2 Point") .arg(m_name) @@ -565,19 +565,19 @@ public: m_newState = actualParam->isLinear(); } - void undo() const { + void undo() const override { m_actualParam->setIsLinear(!m_newState); m_currentParam->setIsLinear(!m_newState); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - void redo() const { + void redo() const override { m_actualParam->setIsLinear(m_newState); m_currentParam->setIsLinear(m_newState); if (m_fxHandle) m_fxHandle->notifyFxChanged(); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Modify Fx Param : "); if (m_newState) str += QObject::tr("%1 : Linear ON").arg(m_name); diff --git a/toonz/sources/toonzqt/planeviewer.cpp b/toonz/sources/toonzqt/planeviewer.cpp index bda59e0..26ae1dc 100644 --- a/toonz/sources/toonzqt/planeviewer.cpp +++ b/toonz/sources/toonzqt/planeviewer.cpp @@ -36,7 +36,7 @@ struct PlaneViewerZoomer : public ImageUtils::ShortcutZoomer { PlaneViewerZoomer(PlaneViewer *planeViewer) : ShortcutZoomer(planeViewer) {} private: - virtual bool zoom(bool zoomin, bool resetZoom); + bool zoom(bool zoomin, bool resetZoom) override; }; //======================================================================== diff --git a/toonz/sources/toonzqt/pluginhost.cpp b/toonz/sources/toonzqt/pluginhost.cpp index 4c3bb15..3cf7934 100644 --- a/toonz/sources/toonzqt/pluginhost.cpp +++ b/toonz/sources/toonzqt/pluginhost.cpp @@ -108,7 +108,7 @@ class PluginSetupMessage : public TThread::Message { public: PluginSetupMessage(PluginInformation *pi) : pi_(pi) {} - void onDeliver() { + void onDeliver() override { RasterFxPluginHost *fx = new RasterFxPluginHost(pi_); if (pi_ && pi_->handler_) { pi_->handler_->setup(fx); @@ -121,7 +121,7 @@ public: delete fx; } - TThread::Message *clone() const { return new PluginSetupMessage(*this); } + TThread::Message *clone() const override { return new PluginSetupMessage(*this); } }; PluginInformation::~PluginInformation() { @@ -419,11 +419,11 @@ TFx *RasterFxPluginHost::clone(bool recursive) const { for (auto &ip : pi_->port_mapper_) { if (ip.second.input_) { #if 0 - /* addInputPort() 内で行われる port owner の更新は後勝ちだが, - clone された新しいインスタンスのほうが先に消えてしまう場合に, 無効なポインタを示す owner が port に残ってしまう. この問題が解決したら共有できるようにしたい. - (このため、 plugin 空間に通知される全ての handle には一貫性がない. ただし、後から一貫性がなくなるよりは遥かにいいだろう) - */ - plugin->addInputPort(getInputPortName(i), ip); + /* addInputPort() 内で行われる port owner の更新は後勝ちだが, + clone された新しいインスタンスのほうが先に消えてしまう場合に, 無効なポインタを示す owner が port に残ってしまう. この問題が解決したら共有できるようにしたい. + (このため、 plugin 空間に通知される全ての handle には一貫性がない. ただし、後から一貫性がなくなるよりは遥かにいいだろう) + */ + plugin->addInputPort(getInputPortName(i), ip); #else plugin->addInputPort(ip.first, std::shared_ptr(new TRasterFxPort)); diff --git a/toonz/sources/toonzqt/pluginhost.h b/toonz/sources/toonzqt/pluginhost.h index 132b6d9..0c551b7 100644 --- a/toonz/sources/toonzqt/pluginhost.h +++ b/toonz/sources/toonzqt/pluginhost.h @@ -167,18 +167,18 @@ public: void notify(); - const TPersistDeclaration *getDeclaration() const; - std::string getPluginId() const; + const TPersistDeclaration *getDeclaration() const override; + std::string getPluginId() const override; - bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info); - void doCompute(TTile &tile, double frame, const TRenderSettings &info); + bool doGetBBox(double frame, TRectD &bbox, const TRenderSettings &info) override; + void doCompute(TTile &tile, double frame, const TRenderSettings &info) override; int getMemoryRequirement(const TRectD &rect, double frame, - const TRenderSettings &info); - bool canHandle(const TRenderSettings &info, double frame); + const TRenderSettings &info) override; + bool canHandle(const TRenderSettings &info, double frame) override; bool addInputPort(const std::string &nm, std::shared_ptr port); bool addOutputPort(const std::string &nm, TRasterFxPort *port); - TFx *clone(bool recursive) const; + TFx *clone(bool recursive) const override; // UIPage UIPage *createUIPage(const char *name); @@ -195,14 +195,14 @@ public: Param *getParam(const char *name) const; ParamView *createParamView(); - bool isPlugin() const { return true; } - bool isPluginZerary() const { return pi_->desc_->is_geometric(); } + bool isPlugin() const override { return true; } + bool isPluginZerary() const override { return pi_->desc_->is_geometric(); } - bool isZerary() const { return isPluginZerary(); }; - void callStartRenderHandler(); - void callEndRenderHandler(); - void callStartRenderFrameHandler(const TRenderSettings *rs, double frame); - void callEndRenderFrameHandler(const TRenderSettings *rs, double frame); + bool isZerary() const override { return isPluginZerary(); }; + void callStartRenderHandler() override; + void callEndRenderHandler() override; + void callStartRenderFrameHandler(const TRenderSettings *rs, double frame) override; + void callEndRenderFrameHandler(const TRenderSettings *rs, double frame) override; void *getUserData(); void setUserData(void *user_data); diff --git a/toonz/sources/toonzqt/schematicviewer.cpp b/toonz/sources/toonzqt/schematicviewer.cpp index fd2efcc..be39595 100644 --- a/toonz/sources/toonzqt/schematicviewer.cpp +++ b/toonz/sources/toonzqt/schematicviewer.cpp @@ -50,7 +50,7 @@ class SchematicZoomer : public ImageUtils::ShortcutZoomer { public: SchematicZoomer(QWidget *parent) : ShortcutZoomer(parent) {} - bool zoom(bool zoomin, bool resetZoom) { + bool zoom(bool zoomin, bool resetZoom) override { static_cast(getWidget())->zoomQt(zoomin, resetZoom); return true; } diff --git a/toonz/sources/toonzqt/screenboard.cpp b/toonz/sources/toonzqt/screenboard.cpp index de308da..564d818 100644 --- a/toonz/sources/toonzqt/screenboard.cpp +++ b/toonz/sources/toonzqt/screenboard.cpp @@ -21,10 +21,10 @@ namespace { class MouseTrackerDrawing : public ScreenBoard::Drawing { public: - bool acceptScreenEvents(const QRect &rect) const { + bool acceptScreenEvents(const QRect &rect) const override { return rect.contains(QCursor::pos()); } - void paintEvent(QWidget *widget, QPaintEvent *pe) { + void paintEvent(QWidget *widget, QPaintEvent *pe) override { // Seems that mouse masking is on by default on the drawn regions, when using // WA_TranslucentBackground (which is weird). I think it's the Qt 2 autoMask // feature @@ -81,7 +81,7 @@ public: bool mouseOnScreen() const { return m_mouseOnScreen; } protected: - bool event(QEvent *e) { + bool event(QEvent *e) override { int i, size = m_drawings.size(); if (e->type() == QEvent::Paint) { // Invoke paint events in reversed sorting order @@ -95,14 +95,14 @@ protected: return QWidget::event(e); } - void leaveEvent(QEvent *e) { + void leaveEvent(QEvent *e) override { m_mouseOnScreen = false; ScreenBoard *screenBoard = ScreenBoard::instance(); if (screenBoard->m_grabbing) screenBoard->ensureMouseOnAScreen(); } - void enterEvent(QEvent *e) { + void enterEvent(QEvent *e) override { m_mouseOnScreen = true; ScreenBoard::instance()->m_mouseOnAScreen = true; } diff --git a/toonz/sources/toonzqt/stageobjectsdata.cpp b/toonz/sources/toonzqt/stageobjectsdata.cpp index eb9677c..4e5bd6c 100644 --- a/toonz/sources/toonzqt/stageobjectsdata.cpp +++ b/toonz/sources/toonzqt/stageobjectsdata.cpp @@ -203,7 +203,7 @@ public: //! Clones the stord data. //! \warning Clones the stored TXshColumnP, too. - TColumnDataElement *clone() const; + TColumnDataElement *clone() const override; //! Stores the stage object and column data of the specified column index in //! the supplied xsheet. @@ -348,7 +348,7 @@ public: TCameraDataElement(); ~TCameraDataElement(); - TCameraDataElement *clone() const; + TCameraDataElement *clone() const override; //! Stores the specified camera object. void storeCamera(const TStageObjectId &selectedObj, TXsheet *xsh); diff --git a/toonz/sources/toonzqt/stageobjectselection.cpp b/toonz/sources/toonzqt/stageobjectselection.cpp index 5214bdf..b286139 100644 --- a/toonz/sources/toonzqt/stageobjectselection.cpp +++ b/toonz/sources/toonzqt/stageobjectselection.cpp @@ -63,7 +63,7 @@ public: ~TPasteSelectionUndo() {} - void undo() const { + void undo() const override { m_xshHandle->blockSignals(true); TStageObjectCmd::deleteSelection( m_pastedId, std::list>(), @@ -72,7 +72,7 @@ public: m_xshHandle->notifyXsheetChanged(); } - void redo() const { + void redo() const override { std::set indexes; indexes.insert(m_index); std::list splineIds; @@ -92,9 +92,9 @@ public: m_xshHandle->notifyXsheetChanged(); } - int getSize() const { return sizeof(*this) + sizeof(StageObjectsData); } + int getSize() const override { return sizeof(*this) + sizeof(StageObjectsData); } - QString getHistoryString() { + QString getHistoryString() override { QString str = QObject::tr("Paste Object "); std::vector::iterator it = m_pastedId.begin(); for (; it != m_pastedId.end(); it++) { @@ -103,7 +103,7 @@ public: } return str; } - int getHistoryType() { return HistoryType::Schematic; } + int getHistoryType() override { return HistoryType::Schematic; } }; } diff --git a/toonz/sources/toonzqt/stageobjectselection.h b/toonz/sources/toonzqt/stageobjectselection.h index 3eb4793..20f207a 100644 --- a/toonz/sources/toonzqt/stageobjectselection.h +++ b/toonz/sources/toonzqt/stageobjectselection.h @@ -40,15 +40,15 @@ public: StageObjectSelection(const StageObjectSelection &src); ~StageObjectSelection(); - void enableCommands(); + void enableCommands() override; - bool isEmpty() const { + bool isEmpty() const override { return m_selectedObjects.empty() && m_selectedLinks.empty() && m_selectedSplines.empty(); } void setPastePosition(const TPointD &pos) { m_pastePosition = pos; }; - void selectNone() { + void selectNone() override { m_selectedObjects.clear(); m_selectedLinks.clear(); m_selectedSplines.clear(); diff --git a/toonz/sources/toonzqt/studiopaletteviewer.cpp b/toonz/sources/toonzqt/studiopaletteviewer.cpp index 64d1cbf..72cbc33 100644 --- a/toonz/sources/toonzqt/studiopaletteviewer.cpp +++ b/toonz/sources/toonzqt/studiopaletteviewer.cpp @@ -653,7 +653,7 @@ public: InvalidateIconsUndo(TXshLevelHandle *levelHandle) : m_levelHandle(levelHandle) {} - void undo() const { + void undo() const override { TXshLevel *level = m_levelHandle->getLevel(); if (level) { std::vector fids; @@ -661,9 +661,9 @@ public: invalidateIcons(level, fids); } } - void redo() const { undo(); } + void redo() const override { undo(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } }; //---------------------------------------------------------------------- diff --git a/toonz/sources/toonzqt/styledata.h b/toonz/sources/toonzqt/styledata.h index 83d6a57..61ab89d 100644 --- a/toonz/sources/toonzqt/styledata.h +++ b/toonz/sources/toonzqt/styledata.h @@ -21,7 +21,7 @@ public: StyleData(); ~StyleData(); - StyleData *clone() const; + StyleData *clone() const override; void addStyle(int styleIndex, TColorStyle *style); // gets ownership diff --git a/toonz/sources/toonzqt/styleeditor.cpp b/toonz/sources/toonzqt/styleeditor.cpp index 752ba1c..7ce1d68 100644 --- a/toonz/sources/toonzqt/styleeditor.cpp +++ b/toonz/sources/toonzqt/styleeditor.cpp @@ -88,7 +88,7 @@ public: , m_oldEditedFlag(oldColor.getIsEditedFlag()) , m_newEditedFlag(newColor.getIsEditedFlag()) {} - void undo() const { + void undo() const override { m_palette->setStyle(m_styleId, m_oldColor->clone()); m_palette->getStyle(m_styleId)->setIsEditedFlag(m_oldEditedFlag); m_palette->getStyle(m_styleId)->setName(m_oldName); @@ -101,7 +101,7 @@ public: m_paletteHandle->notifyColorStyleChanged(false, false); } - void redo() const { + void redo() const override { m_palette->setStyle(m_styleId, m_newColor->clone()); m_palette->getStyle(m_styleId)->setIsEditedFlag(m_newEditedFlag); m_palette->getStyle(m_styleId)->setName(m_newName); @@ -115,9 +115,9 @@ public: } // imprecise - depends on the style - int getSize() const { return sizeof(*this) + 2 * sizeof(TColorStyle *); } + int getSize() const override { return sizeof(*this) + 2 * sizeof(TColorStyle *); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr( "Change Style Palette : %1 Style#%2 [R%3 G%4 B%5] -> [R%6 " "G%7 B%8]") @@ -131,7 +131,7 @@ public: .arg(m_newColor->getMainColor().b); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; } // namespace @@ -1860,31 +1860,31 @@ public: static CustomStyleManager *styleManager(); - bool event(QEvent *e); + bool event(QEvent *e) override; - void showEvent(QShowEvent *) { + void showEvent(QShowEvent *) override { connect(styleManager(), SIGNAL(patternAdded()), this, SLOT(computeSize())); styleManager()->loadItems(); } - void hideEvent(QHideEvent *) { + void hideEvent(QHideEvent *) override { disconnect(styleManager(), SIGNAL(patternAdded()), this, SLOT(computeSize())); } - bool loadIfNeeded() { return false; } // serve? + bool loadIfNeeded() override { return false; } // serve? /* if(!m_loaded) {loadItems(); m_loaded=true;return true;} else return false; } */ - int getChipCount() const { return styleManager()->getPatternCount(); } + int getChipCount() const override { return styleManager()->getPatternCount(); } - void drawChip(QPainter &p, QRect rect, int index) { + void drawChip(QPainter &p, QRect rect, int index) override { assert(0 <= index && index < getChipCount()); CustomStyleManager::PatternData pattern = styleManager()->getPattern(index); p.drawImage(rect, *pattern.m_image); } - void onSelect(int index); + void onSelect(int index) override; }; //----------------------------------------------------------------------------- @@ -1947,22 +1947,22 @@ public: static CustomStyleManager *styleManager(); - bool event(QEvent *e); + bool event(QEvent *e) override; - void showEvent(QShowEvent *) { + void showEvent(QShowEvent *) override { connect(styleManager(), SIGNAL(patternAdded()), this, SLOT(computeSize())); styleManager()->loadItems(); } - void hideEvent(QHideEvent *) { + void hideEvent(QHideEvent *) override { disconnect(styleManager(), SIGNAL(patternAdded()), this, SLOT(computeSize())); } - bool loadIfNeeded() { return false; } + bool loadIfNeeded() override { return false; } - int getChipCount() const { return styleManager()->getPatternCount() + 1; } + int getChipCount() const override { return styleManager()->getPatternCount() + 1; } - void drawChip(QPainter &p, QRect rect, int index); - void onSelect(int index); + void drawChip(QPainter &p, QRect rect, int index) override; + void onSelect(int index) override; }; //----------------------------------------------------------------------------- @@ -2052,7 +2052,7 @@ class TextureStyleChooserPage : public StyleChooserPage { public: TextureStyleChooserPage(QWidget *parent = 0) : StyleChooserPage(parent) {} - bool loadIfNeeded() { + bool loadIfNeeded() override { if (!m_loaded) { loadItems(); m_loaded = true; @@ -2061,19 +2061,19 @@ public: return false; } - int getChipCount() const { return m_textures.size(); } + int getChipCount() const override { return m_textures.size(); } static void loadTexture(const TFilePath &fp); static void loadItems(); - void drawChip(QPainter &p, QRect rect, int index) { + void drawChip(QPainter &p, QRect rect, int index) override { assert(0 <= index && index < getChipCount()); p.drawImage(rect, rasterToQImage(m_textures[index].m_raster)); } - void onSelect(int index); + void onSelect(int index) override; - bool event(QEvent *e); + bool event(QEvent *e) override; }; //----------------------------------------------------------------------------- @@ -2186,7 +2186,7 @@ public: const TFilePath &rootDir = TFilePath()) : StyleChooserPage(parent) {} - bool loadIfNeeded() { + bool loadIfNeeded() override { if (!m_loaded) { loadItems(); m_loaded = true; @@ -2194,13 +2194,13 @@ public: } else return false; } - int getChipCount() const { return m_customStyles.size(); } + int getChipCount() const override { return m_customStyles.size(); } void loadItems(); - void drawChip(QPainter &p, QRect rect, int index); - void onSelect(int index); - bool event(QEvent *e); + void drawChip(QPainter &p, QRect rect, int index) override; + void onSelect(int index) override; + bool event(QEvent *e) override; }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonzqt/styleselection.cpp b/toonz/sources/toonzqt/styleselection.cpp index 3c993ba..8f0fada 100644 --- a/toonz/sources/toonzqt/styleselection.cpp +++ b/toonz/sources/toonzqt/styleselection.cpp @@ -280,7 +280,7 @@ public: ~PasteStylesUndo() { delete m_data; } - void undo() const { + void undo() const override { TPaletteHandle *paletteHandle = m_selection->getPaletteHandle(); std::set styleIndicesInPage = m_styleIndicesInPage; cutStylesWithoutUndo(m_palette.getPointer(), paletteHandle, m_pageIndex, @@ -294,7 +294,7 @@ public: paletteHandle->setStyleIndex(m_oldStyleIndex); } - void redo() const { + void redo() const override { // Se e' la paletta corrente setto l'indice corrente. TPaletteHandle *paletteHandle = m_selection->getPaletteHandle(); if (m_palette.getPointer() == paletteHandle->getPalette()) @@ -321,12 +321,12 @@ public: } } - int getSize() const { return sizeof(*this); } - QString getHistoryString() { + int getSize() const override { return sizeof(*this); } + QString getHistoryString() override { return QObject::tr("Paste Style in Palette : %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -356,7 +356,7 @@ public: ~DeleteStylesUndo() { delete m_data; } - void undo() const { + void undo() const override { TPaletteHandle *paletteHandle = m_selection->getPaletteHandle(); // Prendo il data corrente QClipboard *clipboard = QApplication::clipboard(); @@ -385,7 +385,7 @@ public: paletteHandle->notifyColorStyleChanged(false, false); } - void redo() const { + void redo() const override { std::set styleIndicesInPage = m_styleIndicesInPage; deleteStylesWithoutUndo(m_palette.getPointer(), m_selection->getPaletteHandle(), m_pageIndex, @@ -396,13 +396,13 @@ public: } } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Delete Style from Palette : %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //============================================================================= @@ -430,7 +430,7 @@ public: delete m_data; } - void undo() const { + void undo() const override { TPaletteHandle *paletteHandle = m_selection->getPaletteHandle(); // Setto il data del cut @@ -455,7 +455,7 @@ public: clipboard->setMimeData(cloneData(m_oldData), QClipboard::Clipboard); } - void redo() const { + void redo() const override { std::set styleIndicesInPage = m_styleIndicesInPage; cutStylesWithoutUndo(m_palette.getPointer(), m_selection->getPaletteHandle(), m_pageIndex, @@ -465,13 +465,13 @@ public: m_selection->makeCurrent(); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Cut Style from Palette : %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //----------------------------------------------------------------------------- @@ -840,7 +840,7 @@ public: getPalette()->getStyle(styleId)->setName(newStyle->getName()); } - void undo() const { + void undo() const override { m_selection->selectNone(); TPalette::Page *page = getPalette()->getPage(m_pageIndex); @@ -871,7 +871,7 @@ public: m_paletteHandle->notifyColorStyleSwitched(); } - void redo() const { + void redo() const override { m_selection->selectNone(); TPalette::Page *page = getPalette()->getPage(m_pageIndex); @@ -986,11 +986,11 @@ public: m_paletteHandle->notifyColorStyleSwitched(); } - int getSize() const { + int getSize() const override { return sizeof(*this) + (int)m_items.size() * 100; // forfait } - QString getHistoryString() { + QString getHistoryString() override { QString palNameStr = QObject::tr(" to Palette : %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); @@ -1003,7 +1003,7 @@ public: else return QObject::tr("Paste%1").arg(palNameStr); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //----------------------------------------------------------------------------- @@ -1217,7 +1217,7 @@ public: ~UndoBlendColor() {} - void undo() const { + void undo() const override { if (!m_palette) return; TPalette::Page *page = m_palette->getPage(m_pageIndex); if (!page) return; @@ -1237,7 +1237,7 @@ public: m_paletteHandle->notifyColorStyleSwitched(); } - void redo() const { + void redo() const override { if (!m_palette) return; TPalette::Page *page = m_palette->getPage(m_pageIndex); if (!page) return; @@ -1257,16 +1257,16 @@ public: m_paletteHandle->notifyColorStyleSwitched(); } - int getSize() const { + int getSize() const override { return sizeof( *this); //+500*m_oldStyles.size(); //dipende da che stile ha salvato } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Blend Colors in Palette : %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //----------------------------------------------------------------------------- @@ -1360,7 +1360,7 @@ public: m_styles.push_back(data); } - void undo() const { + void undo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); int i; @@ -1375,7 +1375,7 @@ public: m_paletteHandle->notifyColorStyleSwitched(); } - void redo() const { + void redo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); int i; @@ -1390,13 +1390,13 @@ public: StudioPalette::instance()->updateLinkedColors(m_palette.getPointer()); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Toggle Link in Palette : %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //----------------------------------------------------------------------------- @@ -1542,7 +1542,7 @@ public: m_styles.push_back(data); } - void undo() const { + void undo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); int i; @@ -1556,7 +1556,7 @@ public: m_paletteHandle->notifyColorStyleChanged(false, false); } - void redo() const { + void redo() const override { TPalette::Page *page = m_palette->getPage(m_pageIndex); assert(page); int i; @@ -1570,13 +1570,13 @@ public: m_paletteHandle->notifyColorStyleChanged(false, false); } - int getSize() const { return sizeof(*this); } + int getSize() const override { return sizeof(*this); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Remove Link in Palette : %1") .arg(QString::fromStdWString(m_palette->getPaletteName())); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //----------------------------------------------------------------------------- @@ -1652,12 +1652,12 @@ public: styles.push_back(page->getStyle(*it)); } - int getSize() const { + int getSize() const override { return sizeof *this + (m_oldColors.size() + m_newColors.size()) * sizeof(TPixel32); } - void onAdd() { getColors(m_newColors, m_newEditedFlags); } + void onAdd() override { getColors(m_newColors, m_newEditedFlags); } void getColors(std::vector &colors, std::vector &flags) const { @@ -1687,14 +1687,14 @@ public: m_selection.getPaletteHandle()->notifyColorStyleChanged(false, false); } - void undo() const { setColors(m_oldColors, m_oldEditedFlags); } + void undo() const override { setColors(m_oldColors, m_oldEditedFlags); } - void redo() const { setColors(m_newColors, m_newEditedFlags); } + void redo() const override { setColors(m_newColors, m_newEditedFlags); } - QString getHistoryString() { + QString getHistoryString() override { return QObject::tr("Get Color from Studio Palette"); } - int getHistoryType() { return HistoryType::Palette; } + int getHistoryType() override { return HistoryType::Palette; } }; //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonzqt/swatchviewer.cpp b/toonz/sources/toonzqt/swatchviewer.cpp index 9d19a57..7e4bdbe 100644 --- a/toonz/sources/toonzqt/swatchviewer.cpp +++ b/toonz/sources/toonzqt/swatchviewer.cpp @@ -90,12 +90,12 @@ public: void getResource(TCacheResourceP &resource, const std::string &alias, const TFxP &fx, double frame, const TRenderSettings &rs, - ResourceDeclaration *resData); + ResourceDeclaration *resData) override; // void onRenderInstanceStart(unsigned long renderId); // void onRenderInstanceEnd(unsigned long renderId); - bool renderHasOwnership() { return false; } + bool renderHasOwnership() override { return false; } }; //***************************************************************************************** @@ -103,7 +103,7 @@ public: //***************************************************************************************** class SwatchCacheManagerGenerator : public TRenderResourceManagerGenerator { - TRenderResourceManager *operator()(void) { + TRenderResourceManager *operator()(void) override { // return new TPassiveCacheManager; return SwatchCacheManager::instance(); } diff --git a/toonz/sources/toonzqt/tdockwindows.cpp b/toonz/sources/toonzqt/tdockwindows.cpp index 63d2471..7f91e4d 100644 --- a/toonz/sources/toonzqt/tdockwindows.cpp +++ b/toonz/sources/toonzqt/tdockwindows.cpp @@ -19,9 +19,9 @@ class TDockDecoAllocator : public DockDecoAllocator { DockSeparator *newSeparator(DockLayout *owner, bool orientation, - Region *parentRegion); + Region *parentRegion) override; DockPlaceholder *newPlaceholder(DockWidget *owner, Region *r, int idx, - int attributes); + int attributes) override; }; //======================================================================== @@ -331,7 +331,7 @@ public: TDockSeparator(DockLayout *owner, bool orientation, Region *parentRegion) : DockSeparator(owner, orientation, parentRegion) {} - void paintEvent(QPaintEvent *pe); + void paintEvent(QPaintEvent *pe) override; }; //---------------------------------------- @@ -343,10 +343,10 @@ public: TDockPlaceholder(DockWidget *owner, Region *r, int idx, int attributes); ~TDockPlaceholder(); - void buildGeometry(); + void buildGeometry() override; - void showEvent(QShowEvent *se); - void hideEvent(QHideEvent *he); + void showEvent(QShowEvent *se) override; + void hideEvent(QHideEvent *he) override; }; //---------------------------------------- diff --git a/toonz/sources/toonzqt/tdockwindows.h b/toonz/sources/toonzqt/tdockwindows.h index 5c181d2..8cd6062 100644 --- a/toonz/sources/toonzqt/tdockwindows.h +++ b/toonz/sources/toonzqt/tdockwindows.h @@ -59,7 +59,7 @@ public: DockLayout *dockLayout() const { return m_layout; } protected: - virtual void resizeEvent(QResizeEvent *event); + void resizeEvent(QResizeEvent *event) override; }; //======================================================================== @@ -105,17 +105,17 @@ public: bool getOrientation() const; private: - QSize getDockedMinimumSize(); - QSize getDockedMaximumSize(); - void setFloatingAppearance(); - void setDockedAppearance(); + QSize getDockedMinimumSize() override; + QSize getDockedMaximumSize() override; + void setFloatingAppearance() override; + void setDockedAppearance() override; - void selectDockPlaceholder(QMouseEvent *me); + void selectDockPlaceholder(QMouseEvent *me) override; - bool isDragGrip(QPoint p); - int isResizeGrip(QPoint p); + bool isDragGrip(QPoint p) override; + int isResizeGrip(QPoint p) override; - void windowTitleEvent(QEvent *e); + void windowTitleEvent(QEvent *e) override; }; #endif // TDOCKWINDOWS_H diff --git a/toonz/sources/toonzqt/tmessageviewer.cpp b/toonz/sources/toonzqt/tmessageviewer.cpp index 053397b..53361d7 100644 --- a/toonz/sources/toonzqt/tmessageviewer.cpp +++ b/toonz/sources/toonzqt/tmessageviewer.cpp @@ -23,7 +23,7 @@ public: MyQListView(QWidget *parent) : QListView(parent) {} protected: - void rowsInserted(const QModelIndex &parent, int start, int end) { + void rowsInserted(const QModelIndex &parent, int start, int end) override { QListView::rowsInserted(parent, start, end); scrollToBottom(); } @@ -37,7 +37,7 @@ class MySortFilterProxyModel : public QSortFilterProxyModel { public: MySortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) {} - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const { + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override { TMessageViewer *v = dynamic_cast(parent()); assert(v);